From 52f315fc9bac02fe438668a881ec3308576dde77 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 15 May 2023 19:07:39 +0200 Subject: [PATCH 01/16] - updated to 3.8.0, separated shlib and daemon directories - merged build updates and dict-{cdb,lmdb} subpackages from PLD --- postfix.spec | 188 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 64 deletions(-) diff --git a/postfix.spec b/postfix.spec index 56cea1c..ee2cf82 100644 --- a/postfix.spec +++ b/postfix.spec @@ -7,6 +7,7 @@ %bcond_without sasl # without SMTP AUTH support %bcond_without ssl # without SSL/TLS support %bcond_without cdb # without cdb map support +%bcond_without lmdb # lmdb map suppor %bcond_without epoll # disable epoll for 2.4 kernels Summary: Postfix Mail Transport Agent @@ -17,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.7.4 +Version: 3.8.0 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 2442d1e53d58e61842d99fb5978fec4a +# Source0-md5: 73cce85d78a6bf0d5a0c326c23361ed1 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init @@ -146,6 +147,18 @@ Header files to build additional map types for Postfix. %description devel -l pl.UTF-8 Pliki nagłówkowe do tworzenia dodatkowych typów map dla Postfiksa. +%package dict-cdb +Summary: CDB map support for Postfix +Summary(pl.UTF-8): Obsługa map CDB dla Postfiksa +Group: Networking/Daemons/SMTP +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dict-cdb +This package provides support for CDB maps in Postfix. + +%description dict-cdb -l pl.UTF-8 +Ten pakiet dodaje obsługę map CDB do Postfiksa. + %package dict-ldap Summary: LDAP map support for Postfix Summary(pl.UTF-8): Obsługa map LDAP dla Postfiksa @@ -159,6 +172,18 @@ This package provides support for LDAP maps in Postfix. %description dict-ldap -l pl.UTF-8 Ten pakiet dodaje obsługę map LDAP do Postfiksa. +%package dict-lmdb +Summary: LMDB map support for Postfix +Summary(pl.UTF-8): Obsługa map LMDB dla Postfiksa +Group: Networking/Daemons/SMTP +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dict-lmdb +This package provides support for LMDB maps in Postfix. + +%description dict-lmdb -l pl.UTF-8 +Ten pakiet dodaje obsługę map LMDB do Postfiksa. + %package dict-mysql Summary: MySQL map support for Postfix Summary(pl.UTF-8): Obsługa map MySQL dla Postfiksa @@ -252,58 +277,43 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt %patch5 -p1 %build -%{__make} -f Makefile.init makefiles -%{__make} tidy -CC="%{__cc}" -export CC +# export, as the same variables must be passed both to 'make makefiles' and 'make' +export CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE} %{?with_lmdb:-DHAS_LMDB} -LHAS_SDBM" +export AUXLIBS="%{rpmldflags} -lsasl -lssl -lcrypto" +export AUXLIBS_CDB="%{?with_cdb:-lcdb}" +export AUXLIBS_LDAP="%{?with_ldap:-lldap -llber}" +export AUXLIBS_LMDB="%{?with_lmdb:-llmdb}" +export AUXLIBS_MYSQL="%{?with_mysql:-lmysqlclient}" +export AUXLIBS_PCRE="-lpcre" +export AUXLIBS_PGSQL="%{?with_pgsql:-lpq}" +export AUXLIBS_SQLITE="%{?with_sqlite:-lsqlite3}" + +export CC="%{__cc}" +%{__make} makefiles \ + shared=yes \ + dynamicmaps=yes \ + daemon_directory="%{_libdir}/postfix/sbin" \ + shlib_directory="%{_libdir}/postfix" \ + manpage_directory="%{_mandir}" + %{__make} -j1 \ - dynamicmaps=yes \ - shared=yes \ - shlib_directory=%{_libdir}/postfix \ - DEBUG="" \ - OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \ - CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE}" \ - %{?with_cdb:AUXLIBS_CDB="-lcdb"} \ - %{?with_ldap:AUXLIBS_LDAP="-lldap -llber"} \ - %{?with_mysql:AUXLIBS_MYSQL="-lmysqlclient"} \ - AUXLIBS_PCRE="-lpcre" \ - %{?with_pgsql:AUXLIBS_PGSQL="-lpq"} \ - %{?with_sqlite:AUXLIBS_SQLITE="-lsqlite3 -lpthread"} \ - AUXLIBS="%{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto}" + DEBUG="" \ + OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,monit} \ $RPM_BUILD_ROOT%{_sysconfdir}/{postfix,sasl} \ - $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix,/usr/lib}\ + $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix/sbin,/usr/lib}\ $RPM_BUILD_ROOT{%{_includedir}/postfix,%{_mandir}} \ $RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \ $RPM_BUILD_ROOT%{_var}/lib/postfix -%{__rm} -f html/Makefile.in conf/{LICENSE,main.cf.default} - -install -p bin/* $RPM_BUILD_ROOT%{_sbindir} -install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix -ln $RPM_BUILD_ROOT%{_libdir}/postfix/smtp $RPM_BUILD_ROOT%{_libdir}/postfix/lmtp -ln $RPM_BUILD_ROOT%{_libdir}/postfix/qmgr $RPM_BUILD_ROOT%{_libdir}/postfix/nqmgr -cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/postfix -sed -e's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix,' \ - conf/main.cf > $RPM_BUILD_ROOT%{_sysconfdir}/postfix/main.cf +%{__make} non-interactive-package \ + install_root=$RPM_BUILD_ROOT -sed -e 's,${LIB_PREFIX},%{_libdir}/postfix/postfix-,g;s,${LIB_SUFFIX},.so,g' \ - conf/dynamicmaps.cf > $RPM_BUILD_ROOT%{_sysconfdir}/postfix/dynamicmaps.cf - -for f in dns global master util tls; do - cp -a lib/libpostfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1 - ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so -done -for f in cdb mysql ldap pcre pgsql sqlite; do - install -p lib/postfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/postfix -done cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix -cp -a man/man* $RPM_BUILD_ROOT%{_mandir} - cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/aliases install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix @@ -315,6 +325,7 @@ cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/bounce.cf.de cp -a %{SOURCE9} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape +install -p man/man1/qshape.1 $RPM_BUILD_ROOT%{_mandir}/man1 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/mailq ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/newaliases @@ -327,10 +338,8 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger -%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/makedefs.out -%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/TLS_LICENSE - -%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{postfix-script,postfix-tls-script,postfix-wrapper,post-install,postmulti-script} +%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.{default,proto},master.cf.proto} +%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{,TLS_}LICENSE %clean rm -rf $RPM_BUILD_ROOT @@ -376,6 +385,12 @@ if [ "$1" = "0" ]; then %groupremove postfix fi +%triggerun -- %{name} < 2:3.8.0-1 +if [ $1 -le 1 ]; then + exit 0 +fi +[ -f "/etc/postfix/main.cf" ] && sed -i -e 's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix/sbin,' /etc/postfix/main.cf 2>/dev/null || : + %triggerun -- %{name} < 2:3.4.6-2 if [ $1 -le 1 ]; then exit 0 @@ -400,6 +415,12 @@ for f in /etc/mail/*.db; do done [ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || : +%triggerpostun -- %{name} < 2:3.8.0-1 +echo +echo "Warning! Option daemon_directory in file /etc/postfix/main.cf was set to" +echo "path %{_libdir}/postfix/sbin." +echo + %triggerpostun -- %{name} < 2:3.4.6-2 echo echo "Warning! Configuration has been migrated to /etc/postfix." @@ -436,34 +457,64 @@ echo %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp %{?with_sasl:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/smtpd.conf} -%attr(755,root,root) %{_libdir}/libpostfix-*.so.* %attr(755,root,root) %{_bindir}/mailq %attr(755,root,root) %{_bindir}/newaliases %attr(755,root,root) %{_bindir}/rmail -%attr(755,root,root) %{_sbindir}/s* -%attr(755,root,root) %{_sbindir}/postfix %attr(755,root,root) %{_sbindir}/postalias +%attr(755,root,root) %{_sbindir}/postcat +%attr(755,root,root) %{_sbindir}/postconf %attr(2755,root,maildrop) %{_sbindir}/postdrop +%attr(755,root,root) %{_sbindir}/postfix %attr(755,root,root) %{_sbindir}/postkick -%attr(755,root,root) %{_sbindir}/postl* -%attr(755,root,root) %{_sbindir}/postc* +%attr(755,root,root) %{_sbindir}/postlock +%attr(755,root,root) %{_sbindir}/postlog %attr(755,root,root) %{_sbindir}/postmap %attr(755,root,root) %{_sbindir}/postmulti %attr(2755,root,maildrop) %{_sbindir}/postqueue %attr(755,root,root) %{_sbindir}/postsuper -%attr(755,root,root) %{_sbindir}/posttls-finger -%attr(755,root,root) %{_sbindir}/qmqp-sink -%attr(755,root,root) %{_sbindir}/qmqp-source +%attr(755,root,root) %{_sbindir}/sendmail %attr(755,root,root) /usr/lib/sendmail %dir %{_libdir}/postfix -%attr(755,root,root) %{_libdir}/postfix/[!d]* -%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-ldap.so -%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-mysql.so -%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pcre.so -%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pgsql.so -%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-sqlite.so -%attr(755,root,root) %{_libdir}/postfix/discard -%attr(755,root,root) %{_libdir}/postfix/dnsblog +%attr(755,root,root) %{_libdir}/postfix/libpostfix-dns.so +%attr(755,root,root) %{_libdir}/postfix/libpostfix-global.so +%attr(755,root,root) %{_libdir}/postfix/libpostfix-master.so +%attr(755,root,root) %{_libdir}/postfix/libpostfix-tls.so +%attr(755,root,root) %{_libdir}/postfix/libpostfix-util.so +%dir %{_libdir}/postfix/sbin +%attr(755,root,root) %{_libdir}/postfix/sbin/anvil +%attr(755,root,root) %{_libdir}/postfix/sbin/bounce +%attr(755,root,root) %{_libdir}/postfix/sbin/cleanup +%attr(755,root,root) %{_libdir}/postfix/sbin/discard +%attr(755,root,root) %{_libdir}/postfix/sbin/dnsblog +%attr(755,root,root) %{_libdir}/postfix/sbin/error +%attr(755,root,root) %{_libdir}/postfix/sbin/flush +%attr(755,root,root) %{_libdir}/postfix/sbin/lmtp +%attr(755,root,root) %{_libdir}/postfix/sbin/local +%attr(755,root,root) %{_libdir}/postfix/sbin/master +%attr(755,root,root) %{_libdir}/postfix/sbin/nqmgr +%attr(755,root,root) %{_libdir}/postfix/sbin/oqmgr +%attr(755,root,root) %{_libdir}/postfix/sbin/pickup +%attr(755,root,root) %{_libdir}/postfix/sbin/pipe +%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-script +%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-tls-script +%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-wrapper +%attr(755,root,root) %{_libdir}/postfix/sbin/post-install +%attr(755,root,root) %{_libdir}/postfix/sbin/postlogd +%attr(755,root,root) %{_libdir}/postfix/sbin/postmulti-script +%attr(755,root,root) %{_libdir}/postfix/sbin/postscreen +%attr(755,root,root) %{_libdir}/postfix/sbin/proxymap +%attr(755,root,root) %{_libdir}/postfix/sbin/qmgr +%attr(755,root,root) %{_libdir}/postfix/sbin/qmqpd +%attr(755,root,root) %{_libdir}/postfix/sbin/scache +%attr(755,root,root) %{_libdir}/postfix/sbin/showq +%attr(755,root,root) %{_libdir}/postfix/sbin/smtp +%attr(755,root,root) %{_libdir}/postfix/sbin/smtpd +%attr(755,root,root) %{_libdir}/postfix/sbin/spawn +%attr(755,root,root) %{_libdir}/postfix/sbin/tlsmgr +%attr(755,root,root) %{_libdir}/postfix/sbin/tlsproxy +%attr(755,root,root) %{_libdir}/postfix/sbin/trivial-rewrite +%attr(755,root,root) %{_libdir}/postfix/sbin/verify +%attr(755,root,root) %{_libdir}/postfix/sbin/virtual %attr(755,root,root) %dir %{_var}/spool/postfix %attr(700,postfix,root) %dir %{_var}/spool/postfix/active %attr(700,postfix,root) %dir %{_var}/spool/postfix/bounce @@ -481,9 +532,7 @@ echo %{_mandir}/man1/mailq.1* %{_mandir}/man1/newaliases.1* %{_mandir}/man1/post*.1* -%{_mandir}/man1/qmqp-*.1* %{_mandir}/man1/sendmail.1* -%{_mandir}/man1/smtp-*.1* %{_mandir}/man5/access.5* %{_mandir}/man5/aliases.5* %{_mandir}/man5/body_checks.5* @@ -508,9 +557,13 @@ echo %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libpostfix-*.so %{_includedir}/postfix +%if %{with cdb} +%files dict-cdb +%attr(755,root,root) %{_libdir}/postfix/postfix-cdb.so +%endif + %if %{with ldap} %files dict-ldap %defattr(644,root,root,755) @@ -518,6 +571,13 @@ echo %{_mandir}/man5/ldap_table.5* %endif +%if %{with lmdb} +%files dict-lmdb +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/postfix/postfix-lmdb.so +%{_mandir}/man5/lmdb_table.5* +%endif + %if %{with mysql} %files dict-mysql %defattr(644,root,root,755) -- 2.51.0 From d0801a5faf9f1c076f33efe1a1aae30cc5916b59 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 16 May 2023 20:10:36 +0200 Subject: [PATCH 02/16] - .proto config files are required for setting up multi instance postfix --- postfix.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index ee2cf82..0fafa10 100644 --- a/postfix.spec +++ b/postfix.spec @@ -19,7 +19,7 @@ Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix Version: 3.8.0 -Release: 1 +Release: 2 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP @@ -338,7 +338,7 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger -%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.{default,proto},master.cf.proto} +%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.default} %{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{,TLS_}LICENSE %clean @@ -449,7 +449,9 @@ echo #%ghost %{_sysconfdir}/postfix/*.db %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/dynamicmaps.cf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/main.cf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/main.cf.proto %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/master.cf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/master.cf.proto %{_sysconfdir}/postfix/postfix-files %attr(740,root,root) /etc/cron.daily/postfix %attr(754,root,root) /etc/rc.d/init.d/postfix -- 2.51.0 From d6aaa485e6534e1a3e85caaf847f977aea8f83ba Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 9 Jul 2023 22:22:46 +0200 Subject: [PATCH 03/16] - updated to 3.8.1, dropped duplicate trigger, rediffed patch 1 --- postfix-conf_msg.patch | 26 +++++++++++++------------- postfix.spec | 37 +++---------------------------------- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch index 7bf98f5..aecd61f 100644 --- a/postfix-conf_msg.patch +++ b/postfix-conf_msg.patch @@ -1,6 +1,6 @@ -diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.c postfix-3.7.0/src/global/mail_params.c ---- postfix-3.7.0.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200 -+++ postfix-3.7.0/src/global/mail_params.c 2022-04-04 19:57:20.999351108 +0200 +diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/src/global/mail_params.c +--- postfix-3.8.1.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200 ++++ postfix-3.8.1/src/global/mail_params.c 2023-07-09 22:19:21.172026512 +0200 @@ -83,6 +83,7 @@ /* char *var_debug_peer_list; /* int var_debug_peer_level; @@ -25,12 +25,12 @@ diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.c postfix-3.7.0/ 0, }; static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = { -diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.h postfix-3.7.0/src/global/mail_params.h ---- postfix-3.7.0.org/src/global/mail_params.h 2022-04-04 19:57:20.803350655 +0200 -+++ postfix-3.7.0/src/global/mail_params.h 2022-04-04 19:57:21.000351111 +0200 -@@ -4322,6 +4322,13 @@ extern char *var_dnssec_probe; - "lmtp=24, smtp=25, smtps=submissions=465, submission=587" - extern char *var_known_tcp_ports; +diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.h postfix-3.8.1/src/global/mail_params.h +--- postfix-3.8.1.org/src/global/mail_params.h 2023-07-09 22:19:21.003024104 +0200 ++++ postfix-3.8.1/src/global/mail_params.h 2023-07-09 22:19:21.172026512 +0200 +@@ -4411,6 +4411,13 @@ extern bool var_ign_srv_lookup_err; + #define DEF_ALLOW_SRV_FALLBACK 0 + extern bool var_allow_srv_fallback; + /* + * SMTPD messages @@ -42,10 +42,10 @@ diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.h postfix-3.7.0/ /* LICENSE /* .ad /* .fi -diff -urNp -x '*.orig' postfix-3.7.0.org/src/smtpd/smtpd.c postfix-3.7.0/src/smtpd/smtpd.c ---- postfix-3.7.0.org/src/smtpd/smtpd.c 2021-10-02 16:46:46.000000000 +0200 -+++ postfix-3.7.0/src/smtpd/smtpd.c 2022-04-04 19:57:21.001351113 +0200 -@@ -6577,6 +6577,7 @@ int main(int argc, char **argv) +diff -urNp -x '*.orig' postfix-3.8.1.org/src/smtpd/smtpd.c postfix-3.8.1/src/smtpd/smtpd.c +--- postfix-3.8.1.org/src/smtpd/smtpd.c 2023-06-05 21:06:51.000000000 +0200 ++++ postfix-3.8.1/src/smtpd/smtpd.c 2023-07-09 22:19:21.173026526 +0200 +@@ -6645,6 +6645,7 @@ int main(int argc, char **argv) VAR_MILT_MACRO_DEFLTS, DEF_MILT_MACRO_DEFLTS, &var_milt_macro_deflts, 0, 0, VAR_SMTPD_MILTER_MAPS, DEF_SMTPD_MILTER_MAPS, &var_smtpd_milter_maps, 0, 0, VAR_STRESS, DEF_STRESS, &var_stress, 0, 0, diff --git a/postfix.spec b/postfix.spec index 0fafa10..cfdb4e9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.8.0 -Release: 2 +Version: 3.8.1 +Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 73cce85d78a6bf0d5a0c326c23361ed1 +# Source0-md5: 956d0baca1259189c80a9311ef4daaa1 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init @@ -391,43 +391,12 @@ if [ $1 -le 1 ]; then fi [ -f "/etc/postfix/main.cf" ] && sed -i -e 's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix/sbin,' /etc/postfix/main.cf 2>/dev/null || : -%triggerun -- %{name} < 2:3.4.6-2 -if [ $1 -le 1 ]; then - exit 0 -fi -[ -d /etc/postfix ] || mkdir /etc/postfix 2>/dev/null || : -for f in /etc/mail/{access,aliases,body_checks,bounce.cf.*,canonical,dynamicmaps.cf,generic,header_checks,main.cf,master.cf,postfix-files,relocated,transport,virtual}; do - f=${f##*/} - [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || : -done -find /etc/postfix -type f 2>/dev/null | xargs sed -i -e 's|/etc/mail|/etc/postfix|g' 2>/dev/null -for f in /etc/mail/*.db; do - f=${f##*/} - [ "$f" = "*.db" ] && break - [ -f "/etc/mail/$f" ] && rm "/etc/mail/$f" 2>/dev/null || : - f=${f%%.db} - [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" /etc/postfix 2>/dev/null || : - if [ "$f" = "aliases" ]; then - /usr/sbin/postalias "/etc/postfix/aliases" 2>/dev/null || : - else - /usr/sbin/postmap "/etc/postfix/$f" 2>/dev/null || : - fi -done -[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || : - %triggerpostun -- %{name} < 2:3.8.0-1 echo echo "Warning! Option daemon_directory in file /etc/postfix/main.cf was set to" echo "path %{_libdir}/postfix/sbin." echo -%triggerpostun -- %{name} < 2:3.4.6-2 -echo -echo "Warning! Configuration has been migrated to /etc/postfix." -echo "It may be required to move some files manually from /etc/mail" -echo "to /etc/postfix and/or run postmap on some files in /etc/postfix." -echo - %files %defattr(644,root,root,755) %doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_* -- 2.51.0 From efd326d117184f1bd634d326dd8abf10a79374d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Thu, 3 Aug 2023 21:25:24 +0200 Subject: [PATCH 04/16] - add lmdb-devel BR --- postfix.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postfix.spec b/postfix.spec index cfdb4e9..4eb2064 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,6 +47,7 @@ URL: http://www.postfix.org/ BuildRequires: db-devel # getifaddrs() with IPv6 support BuildRequires: glibc-devel >= 6:2.3.4 +%{?with_lmdb:BuildRequires: lmdb-devel} BuildRequires: libnsl-devel >= 1.3.0 %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel >= 2.0.12} -- 2.51.0 From 38386a0d8f83b587faed219916d99a1bf14eca16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Thu, 3 Aug 2023 21:51:59 +0200 Subject: [PATCH 05/16] - rel 2 --- postfix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix.spec b/postfix.spec index 4eb2064..c49b282 100644 --- a/postfix.spec +++ b/postfix.spec @@ -19,7 +19,7 @@ Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix Version: 3.8.1 -Release: 1 +Release: 2 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP -- 2.51.0 From bdb6287730eb7ebfd85b902fe3997c083f399524 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 15 Oct 2023 13:33:37 +0200 Subject: [PATCH 06/16] - updated to 3.8.2 --- postfix.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index c49b282..366ce37 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.8.1 -Release: 2 +Version: 3.8.2 +Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 956d0baca1259189c80a9311ef4daaa1 +# Source0-md5: 3e9d80bbbb692693f4172d465c08c893 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 055f2ddc78c9748f6917af3cb8a5d01465b4ae53 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 8 Dec 2023 23:32:56 +0100 Subject: [PATCH 07/16] - updated to 3.8.3 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 366ce37..2085f05 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.8.2 +Version: 3.8.3 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 3e9d80bbbb692693f4172d465c08c893 +# Source0-md5: 7edfadf15fafe73523266829172d890f Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 6f17b0ffda6ff7b1cf20ab67801e01d46791a2a3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 31 Mar 2024 11:27:56 +0200 Subject: [PATCH 08/16] - updated to 3.8.6 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 2085f05..78f6eb9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.8.3 +Version: 3.8.6 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 7edfadf15fafe73523266829172d890f +# Source0-md5: 6a04fb70afead55f6ca106dc87a3a9db Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From a70e23e45d2d3d77047965700aec45fb87d2c05c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Tue, 14 May 2024 08:35:34 +0200 Subject: [PATCH 09/16] - Up to 3.9.0 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 78f6eb9..10673e5 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.8.6 +Version: 3.9.0 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 6a04fb70afead55f6ca106dc87a3a9db +# Source0-md5: 3eda9b945ed6cdf11ef58a731c574a04 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From de99fe6840992e91f55ff9e13f875626ead02664 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 22 Dec 2024 14:34:14 +0100 Subject: [PATCH 10/16] - updated to 3.9.1 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 10673e5..da51ff1 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.9.0 +Version: 3.9.1 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 3eda9b945ed6cdf11ef58a731c574a04 +# Source0-md5: b2fe7ab1a37a05b24b595d441aa1247f Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 01acd4ed71ccc5357011155a4bec207cd81c5c12 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 19 Feb 2025 22:42:36 +0100 Subject: [PATCH 11/16] - updated to 3.10.0 --- postfix-conf_msg.patch | 30 +++++++++++++++--------------- postfix.spec | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch index aecd61f..9844b8b 100644 --- a/postfix-conf_msg.patch +++ b/postfix-conf_msg.patch @@ -1,6 +1,6 @@ -diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/src/global/mail_params.c ---- postfix-3.8.1.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200 -+++ postfix-3.8.1/src/global/mail_params.c 2023-07-09 22:19:21.172026512 +0200 +diff -urNp -x '*.orig' postfix-3.10.0.org/src/global/mail_params.c postfix-3.10.0/src/global/mail_params.c +--- postfix-3.10.0.org/src/global/mail_params.c 2025-02-01 22:43:40.000000000 +0100 ++++ postfix-3.10.0/src/global/mail_params.c 2025-02-19 22:39:32.053747827 +0100 @@ -83,6 +83,7 @@ /* char *var_debug_peer_list; /* int var_debug_peer_level; @@ -9,7 +9,7 @@ diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/ /* int var_fault_inj_code; /* char *var_bounce_service; /* char *var_cleanup_service; -@@ -319,6 +320,7 @@ char *var_import_environ; +@@ -323,6 +324,7 @@ char *var_import_environ; char *var_export_environ; char *var_debug_peer_list; int var_debug_peer_level; @@ -17,7 +17,7 @@ diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/ int var_fault_inj_code; char *var_bounce_service; char *var_cleanup_service; -@@ -806,6 +808,7 @@ void mail_params_init() +@@ -819,6 +821,7 @@ void mail_params_init() VAR_SMTPUTF8_AUTOCLASS, DEF_SMTPUTF8_AUTOCLASS, &var_smtputf8_autoclass, 1, 0, VAR_DROP_HDRS, DEF_DROP_HDRS, &var_drop_hdrs, 0, 0, VAR_INFO_LOG_ADDR_FORM, DEF_INFO_LOG_ADDR_FORM, &var_info_log_addr_form, 1, 0, @@ -25,12 +25,12 @@ diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/ 0, }; static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = { -diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.h postfix-3.8.1/src/global/mail_params.h ---- postfix-3.8.1.org/src/global/mail_params.h 2023-07-09 22:19:21.003024104 +0200 -+++ postfix-3.8.1/src/global/mail_params.h 2023-07-09 22:19:21.172026512 +0200 -@@ -4411,6 +4411,13 @@ extern bool var_ign_srv_lookup_err; - #define DEF_ALLOW_SRV_FALLBACK 0 - extern bool var_allow_srv_fallback; +diff -urNp -x '*.orig' postfix-3.10.0.org/src/global/mail_params.h postfix-3.10.0/src/global/mail_params.h +--- postfix-3.10.0.org/src/global/mail_params.h 2025-02-19 22:39:31.869745563 +0100 ++++ postfix-3.10.0/src/global/mail_params.h 2025-02-19 22:39:32.053747827 +0100 +@@ -4509,6 +4509,13 @@ extern int var_sockmap_max_reply; + #define DEF_SMTPD_HIDE_CLIENT_SESSION "no" + extern int var_smtpd_hide_client_session; + /* + * SMTPD messages @@ -42,10 +42,10 @@ diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.h postfix-3.8.1/ /* LICENSE /* .ad /* .fi -diff -urNp -x '*.orig' postfix-3.8.1.org/src/smtpd/smtpd.c postfix-3.8.1/src/smtpd/smtpd.c ---- postfix-3.8.1.org/src/smtpd/smtpd.c 2023-06-05 21:06:51.000000000 +0200 -+++ postfix-3.8.1/src/smtpd/smtpd.c 2023-07-09 22:19:21.173026526 +0200 -@@ -6645,6 +6645,7 @@ int main(int argc, char **argv) +diff -urNp -x '*.orig' postfix-3.10.0.org/src/smtpd/smtpd.c postfix-3.10.0/src/smtpd/smtpd.c +--- postfix-3.10.0.org/src/smtpd/smtpd.c 2025-02-05 23:04:14.000000000 +0100 ++++ postfix-3.10.0/src/smtpd/smtpd.c 2025-02-19 22:39:32.053747827 +0100 +@@ -6894,6 +6894,7 @@ int main(int argc, char **argv) VAR_MILT_MACRO_DEFLTS, DEF_MILT_MACRO_DEFLTS, &var_milt_macro_deflts, 0, 0, VAR_SMTPD_MILTER_MAPS, DEF_SMTPD_MILTER_MAPS, &var_smtpd_milter_maps, 0, 0, VAR_STRESS, DEF_STRESS, &var_stress, 0, 0, diff --git a/postfix.spec b/postfix.spec index da51ff1..2f0b773 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.9.1 +Version: 3.10.0 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: b2fe7ab1a37a05b24b595d441aa1247f +# Source0-md5: cfd1ea453df07acdec6bcff586bb604c Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 05ecc16d4089482c5b8bece43dde5030a5cc5543 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 25 Mar 2025 18:53:44 +0100 Subject: [PATCH 12/16] - updated to 3.10.1 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 2f0b773..8f472fa 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.10.0 +Version: 3.10.1 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: cfd1ea453df07acdec6bcff586bb604c +# Source0-md5: 9ba37162bba6128cb94704888bf77fac Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 21f6c82d7f1fd2dc507822e63cf0803cc0684f18 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 27 Apr 2025 20:25:34 +0200 Subject: [PATCH 13/16] - updated to 3.10.2, replaced sed with proper patch --- postfix-scache_clnt.patch | 13 +++++++++++-- postfix.spec | 17 ++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/postfix-scache_clnt.patch b/postfix-scache_clnt.patch index f09ca02..ddb9db9 100644 --- a/postfix-scache_clnt.patch +++ b/postfix-scache_clnt.patch @@ -1,5 +1,14 @@ ---- postfix-3.6.2/src/global/scache_clnt.c.orig 2021-08-27 14:41:51.981598457 +0200 -+++ postfix-3.6.2/src/global/scache_clnt.c 2021-08-27 14:44:13.138605407 +0200 +--- postfix-3.10.2/src/global/scache_clnt.c 2025-04-27 20:17:20.375607859 +0200 ++++ postfix-3.10.2/src/global/scache_clnt.c 2025-04-27 20:18:13.907769758 +0200 +@@ -415,7 +415,7 @@ + + /* scache_clnt_create - initialize */ + +-SCACHE *scache_clnt_create(const char *server, int timeout, ++SCACHE *scache_clnt_create(const char *var_scache_service, int timeout, + int idle_limit, int ttl_limit) + { + SCACHE_CLNT *sp = (SCACHE_CLNT *) mymalloc(sizeof(*sp)); @@ -428,7 +428,7 @@ sp->scache->size = scache_clnt_size; sp->scache->free = scache_clnt_free; diff --git a/postfix.spec b/postfix.spec index 8f472fa..bcfa762 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.10.1 +Version: 3.10.2 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 9ba37162bba6128cb94704888bf77fac +# Source0-md5: c0b89a5aff286148194e9e2bb5529405 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init @@ -269,13 +269,12 @@ Plik monitrc do monitorowania serwera Postfix. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 %build # export, as the same variables must be passed both to 'make makefiles' and 'make' -- 2.51.0 From f262c388fefb01ab85e687b295259d526dc0f2e3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 27 Apr 2025 20:44:00 +0200 Subject: [PATCH 14/16] - P: group(maildrop) --- postfix.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postfix.spec b/postfix.spec index bcfa762..636e71b 100644 --- a/postfix.spec +++ b/postfix.spec @@ -77,6 +77,7 @@ Requires: rc-scripts Requires: sed %{?with_cdb:Requires:tinycdb} Suggests: cyrus-sasl-saslauthd +Provides: group(maildrop) Provides: group(postfix) Provides: smtpdaemon Provides: user(postfix) -- 2.51.0 From ae1b839da3da2184c7c16dc3be2ea8aaa71f7662 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Thu, 10 Jul 2025 14:15:56 +0200 Subject: [PATCH 15/16] - Up to 3.10.3 --- postfix.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postfix.spec b/postfix.spec index 636e71b..68bf508 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.10.2 +Version: 3.10.3 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: c0b89a5aff286148194e9e2bb5529405 +# Source0-md5: 3bdbc20e1d4b59f4fc353a0f9f99b5d2 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init -- 2.51.0 From 213187a8cef559d828f07da3a78bc52007ca8cf0 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 9 Sep 2025 22:51:36 +0200 Subject: [PATCH 16/16] - updated to 3.10.4, fix build with GCC 15 --- postfix.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/postfix.spec b/postfix.spec index 68bf508..3311f1d 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,13 +18,13 @@ Summary(pl.UTF-8): Serwer SMTP Postfix Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix -Version: 3.10.3 +Version: 3.10.4 Release: 1 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 3bdbc20e1d4b59f4fc353a0f9f99b5d2 +# Source0-md5: c9f472fe0455eff7a8334479fb0f1154 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init @@ -279,7 +279,7 @@ Plik monitrc do monitorowania serwera Postfix. %build # export, as the same variables must be passed both to 'make makefiles' and 'make' -export CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE} %{?with_lmdb:-DHAS_LMDB} -LHAS_SDBM" +export CCARGS="-std=gnu17 %{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE} %{?with_lmdb:-DHAS_LMDB} -LHAS_SDBM" export AUXLIBS="%{rpmldflags} -lsasl -lssl -lcrypto" export AUXLIBS_CDB="%{?with_cdb:-lcdb}" export AUXLIBS_LDAP="%{?with_ldap:-lldap -llber}" -- 2.51.0