From 6e63b0e03ac368ca7f3c20a1b7b935c00b46dec00fe8523f17b8333e6e65fe1d Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sat, 8 Apr 2017 22:23:20 +0000 Subject: [PATCH 1/5] Accepting request 486859 from home:computersalat:devel:mail update postfix-master.cf.patch: recover lost submission, smtps sections OBS-URL: https://build.opensuse.org/request/show/486859 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=259 --- pointer_to_literals.patch | 6 ++-- postfix-SuSE.tar.gz | 4 +-- postfix-master.cf.patch | 57 ++++++++++++++++++++++++++++--- postfix-no-md5.patch | 4 +-- postfix-ssl-release-buffers.patch | 4 +-- postfix-vda-v14-3.0.3.patch | 2 +- postfix.changes | 14 ++++++++ 7 files changed, 77 insertions(+), 14 deletions(-) diff --git a/pointer_to_literals.patch b/pointer_to_literals.patch index 880d565..5743693 100644 --- a/pointer_to_literals.patch +++ b/pointer_to_literals.patch @@ -28,7 +28,7 @@ Index: src/smtpd/smtpd_check.c =================================================================== --- src/smtpd/smtpd_check.c.orig +++ src/smtpd/smtpd_check.c -@@ -368,6 +368,10 @@ static STRING_LIST *smtpd_acl_perm_log; +@@ -379,6 +379,10 @@ static STRING_LIST *smtpd_acl_perm_log; #define CONST_STR(x) ((const char *) vstring_str(x)) #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } @@ -39,7 +39,7 @@ Index: src/smtpd/smtpd_check.c /* * If some decision can't be made due to a temporary error, then change * other decisions into deferrals. -@@ -2297,8 +2301,6 @@ static int check_table_result(SMTPD_STAT +@@ -2335,8 +2339,6 @@ static int check_table_result(SMTPD_STAT if (msg_verbose) msg_info("%s: %s %s %s", myname, table, value, datum); @@ -48,7 +48,7 @@ Index: src/smtpd/smtpd_check.c /* * DUNNO means skip this table. Silently ignore optional text. */ -@@ -3374,8 +3376,6 @@ static const char *rbl_expand_lookup(con +@@ -3368,8 +3370,6 @@ static const char *rbl_expand_lookup(con SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context; SMTPD_STATE *state = rbl_exp->state; diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz index ab39b8f..580bcc9 100644 --- a/postfix-SuSE.tar.gz +++ b/postfix-SuSE.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a3fedccd6d756b92ac8d4472ddffc014a9a3f1ec5a3bdd2b6a7fbc2f6aa3389 -size 27456 +oid sha256:8b90aff157bda4dd3110d884bdab8d8fdf3541c6aaeb73030e5c80c3aa86241f +size 27921 diff --git a/postfix-master.cf.patch b/postfix-master.cf.patch index d3fbec0..0a616eb 100644 --- a/postfix-master.cf.patch +++ b/postfix-master.cf.patch @@ -2,7 +2,7 @@ Index: conf/master.cf =================================================================== --- conf/master.cf.orig +++ conf/master.cf -@@ -10,6 +10,11 @@ +@@ -10,33 +10,39 @@ # (yes) (yes) (no) (never) (100) # ========================================================================== smtp inet n - n - - smtpd @@ -14,7 +14,56 @@ Index: conf/master.cf #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -63,6 +68,27 @@ virtual unix - n n + #tlsproxy unix - - n - 0 tlsproxy + #submission inet n - n - - smtpd +-# -o syslog_name=postfix/submission +-# -o smtpd_tls_security_level=encrypt +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_tls_auth_only=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/submission ++# -o smtpd_tls_security_level=encrypt ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_tls_auth_only=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #smtps inet n - n - - smtpd +-# -o syslog_name=postfix/smtps +-# -o smtpd_tls_wrappermode=yes +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/smtps ++# -o smtpd_tls_wrappermode=yes ++# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #628 inet n - n - - qmqpd + pickup unix n - n 60 1 pickup + cleanup unix n - n - 0 cleanup +@@ -63,6 +69,27 @@ virtual unix - n n lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache @@ -42,7 +91,7 @@ Index: conf/master.cf # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -96,7 +122,7 @@ scache unix - - n +@@ -96,7 +123,7 @@ scache unix - - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -51,7 +100,7 @@ Index: conf/master.cf # # ==================================================================== # -@@ -129,3 +155,10 @@ scache unix - - n +@@ -129,3 +156,10 @@ scache unix - - n #mailman unix - n n - - pipe # flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # ${nexthop} ${user} diff --git a/postfix-no-md5.patch b/postfix-no-md5.patch index ec42bfe..22fd829 100644 --- a/postfix-no-md5.patch +++ b/postfix-no-md5.patch @@ -2,7 +2,7 @@ Index: src/global/mail_params.h =================================================================== --- src/global/mail_params.h.orig +++ src/global/mail_params.h -@@ -1333,7 +1333,7 @@ extern char *var_smtpd_tls_excl_ciph; +@@ -1338,7 +1338,7 @@ extern char *var_smtpd_tls_excl_ciph; extern char *var_smtpd_tls_mand_excl; #define VAR_SMTPD_TLS_FPT_DGST "smtpd_tls_fingerprint_digest" @@ -11,7 +11,7 @@ Index: src/global/mail_params.h extern char *var_smtpd_tls_fpt_dgst; #define VAR_SMTPD_TLS_512_FILE "smtpd_tls_dh512_param_file" -@@ -1488,9 +1488,9 @@ extern char *var_smtp_tls_excl_ciph; +@@ -1497,9 +1497,9 @@ extern char *var_smtp_tls_excl_ciph; extern char *var_smtp_tls_mand_excl; #define VAR_SMTP_TLS_FPT_DGST "smtp_tls_fingerprint_digest" diff --git a/postfix-ssl-release-buffers.patch b/postfix-ssl-release-buffers.patch index 54adf7d..5a3ef7f 100644 --- a/postfix-ssl-release-buffers.patch +++ b/postfix-ssl-release-buffers.patch @@ -2,7 +2,7 @@ Index: src/tls/tls_client.c =================================================================== --- src/tls/tls_client.c.orig +++ src/tls/tls_client.c -@@ -371,6 +371,12 @@ TLS_APPL_STATE *tls_client_init(const TL +@@ -363,6 +363,12 @@ TLS_APPL_STATE *tls_client_init(const TL SSL_CTX_set_security_level(client_ctx, 0); #endif @@ -19,7 +19,7 @@ Index: src/tls/tls_server.c =================================================================== --- src/tls/tls_server.c.orig +++ src/tls/tls_server.c -@@ -462,6 +462,12 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -454,6 +454,12 @@ TLS_APPL_STATE *tls_server_init(const TL SSL_CTX_set_security_level(server_ctx, 0); #endif diff --git a/postfix-vda-v14-3.0.3.patch b/postfix-vda-v14-3.0.3.patch index 128cde7..924157e 100644 --- a/postfix-vda-v14-3.0.3.patch +++ b/postfix-vda-v14-3.0.3.patch @@ -19,7 +19,7 @@ Index: src/global/mail_params.h =================================================================== --- src/global/mail_params.h.orig +++ src/global/mail_params.h -@@ -2474,6 +2474,54 @@ extern char *var_virt_uid_maps; +@@ -2487,6 +2487,54 @@ extern char *var_virt_uid_maps; #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; diff --git a/postfix.changes b/postfix.changes index 64ee973..f354e99 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Apr 8 15:06:14 UTC 2017 - chris@computersalat.de + +- update postfix-master.cf.patch + * recover lost (with 3.2.0 update) submission, smtps sections + * merge with upstream update +- update config.postfix + * update master.cf generation for submission +- rebase patches against 3.2.0 + * pointer_to_literals.patch + * postfix-no-md5.patch + * postfix-ssl-release-buffers.patch + * postfix-vda-v14-3.0.3.patch + ------------------------------------------------------------------- Mon Mar 20 18:01:36 CET 2017 - kukuk@suse.de From 1ca4ad7ebb88c284e8977006f6c109ee58023a1fe3faeacf217fb5fe6a82b182 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Sun, 9 Apr 2017 18:32:47 +0000 Subject: [PATCH 2/5] - bnc#830818 - yast2-mail does not set amavis configuration correctly OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=260 --- postfix-linux45.patch | 11 +++++++++++ postfix.changes | 4 +++- postfix.spec | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 postfix-linux45.patch diff --git a/postfix-linux45.patch b/postfix-linux45.patch new file mode 100644 index 0000000..493d7ac --- /dev/null +++ b/postfix-linux45.patch @@ -0,0 +1,11 @@ +--- makedefs.orig 2017-03-16 12:08:55.536876205 +0100 ++++ makedefs 2017-03-16 12:09:14.337057377 +0100 +@@ -523,7 +523,7 @@ + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; +- Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR ++ Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR + case "$CCARGS" in + *-DNO_DB*) ;; + *-DHAS_DB*) ;; diff --git a/postfix.changes b/postfix.changes index f354e99..632cdbb 100644 --- a/postfix.changes +++ b/postfix.changes @@ -171,13 +171,15 @@ Wed Jan 11 14:07:35 UTC 2017 - varkoly@suse.com Merging changes with SLES12-SP2 Removeved patches: add_missed_library.patch bnc#947707.diff dynamic_maps.patch postfix-db6.diff postfix-opensslconfig.patch bnc#947519.diff dynamic_maps_pie.patch - postfix-linux45.patch postfix-post-install.patch + postfix-post-install.patch These are included in the new version of postfix - Remove references to SuSEconfig.postfix from sysconfig docs. (bsc#871575) - bnc#947519 SuSEconfig.postfix should enforce umask 022 - bnc#947707 mail generated by Amavis being prevented from being re-adressed by /etc/postfix/virtual - bnc#972346 /usr/sbin/SuSEconfig.postfix is wrong +- postfix-linux45.patch: handle Linux 4.x and Linux 5.x (used by aarch64) + (bsc#940289) ------------------------------------------------------------------- Tue Jan 3 12:20:18 UTC 2017 - varkoly@suse.com diff --git a/postfix.spec b/postfix.spec index 561014a..9e50f13 100644 --- a/postfix.spec +++ b/postfix.spec @@ -76,6 +76,7 @@ Patch2: pointer_to_literals.patch Patch3: ipv6_disabled.patch Patch4: %{name}-main.cf.patch Patch5: %{name}-master.cf.patch +Patch6: %{name}-linux45.patch Patch7: %{name}-ssl-release-buffers.patch Patch8: %{name}-vda-v14-3.0.3.patch @@ -188,6 +189,7 @@ PostgreSQL. %patch3 %patch4 %patch5 +%patch6 %patch7 %patch8 From 3899726842d4b0433b7ce945f4c924ba6e54877c4081509cd2c92b61530157de Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Thu, 13 Apr 2017 06:56:45 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=261 --- postfix-main.cf.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch index 7a44f09..7a1d270 100644 --- a/postfix-main.cf.patch +++ b/postfix-main.cf.patch @@ -64,8 +64,10 @@ Index: conf/main.cf +smtp_sasl_security_options = +smtp_sasl_password_maps = +smtpd_sasl_auth_enable = no -+smtpd_sasl_path = smtpd -+smtpd_sasl_type = cyrus ++#smtpd_sasl_path = private/auth ++#smtpd_sasl_type = dovecot ++#smtpd_sasl_path = smtpd ++#smtpd_sasl_type = cyrus +############################################################ +# TLS stuff +############################################################ From 0f9fd20b859ae13a72f86bb9021e7d613c2f42736fcc6986c50e845a043924ec Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 13 Apr 2017 09:23:37 +0000 Subject: [PATCH 4/5] some smaller fixes OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=262 --- postfix-SuSE.tar.gz | 4 ++-- postfix-linux45.patch | 10 +++++++--- postfix.changes | 9 +++++++++ postfix.spec | 9 +++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz index 580bcc9..f3a269d 100644 --- a/postfix-SuSE.tar.gz +++ b/postfix-SuSE.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b90aff157bda4dd3110d884bdab8d8fdf3541c6aaeb73030e5c80c3aa86241f -size 27921 +oid sha256:c40249cc9d278e1068b45c5e768ee64dccb2886818cfc2a296c1a7e76597a220 +size 27289 diff --git a/postfix-linux45.patch b/postfix-linux45.patch index 493d7ac..03ac817 100644 --- a/postfix-linux45.patch +++ b/postfix-linux45.patch @@ -1,6 +1,10 @@ ---- makedefs.orig 2017-03-16 12:08:55.536876205 +0100 -+++ makedefs 2017-03-16 12:09:14.337057377 +0100 -@@ -523,7 +523,7 @@ +--- + makedefs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- makedefs ++++ makedefs 2017-04-13 08:33:01.425823067 +0000 +@@ -543,7 +543,7 @@ EOF : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC-gcc} -shared"} ;; diff --git a/postfix.changes b/postfix.changes index 632cdbb..79bc19a 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 13 09:18:45 UTC 2017 - werner@suse.de + +- Some cleanups + * Fix SUSE postfix-files to avoud chown error (anyway this file + seems to be obsolete) + * Avoid installing shared libraries twice + * Refresh patch postfix-linux45.patch + ------------------------------------------------------------------- Sat Apr 8 15:06:14 UTC 2017 - chris@computersalat.de diff --git a/postfix.spec b/postfix.spec index 9e50f13..0ae2292 100644 --- a/postfix.spec +++ b/postfix.spec @@ -83,6 +83,7 @@ Patch8: %{name}-vda-v14-3.0.3.patch BuildRequires: ca-certificates BuildRequires: cyrus-sasl-devel BuildRequires: db-devel +BuildRequires: diffutils BuildRequires: libopenssl-devel %if %{with lmdb} BuildRequires: lmdb-devel @@ -387,6 +388,14 @@ ln -s -f %{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} %fdupes %{buildroot}%{pf_docdir} %fdupes %{buildroot}%{_mandir} %endif +for path in %{buildroot}%{_libexecdir}/%{name}/libpostfix-*.so +do + test -e "$path" || continue + name=${path##*/} + cmp "$path" %{buildroot}%{_libdir}/$name || continue + rm -vf $path + ln -sf %{_libdir}/$name $path +done # --------------------------------------------------------------------------- install -m 755 %{SOURCE11} %{buildroot}%{_sbindir}/ From 6b265ae5e967c5fcc24ef6e47b9bfe4bcbb69058f95fc16810c2657f9082882f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 13 Apr 2017 09:36:49 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=263 --- postfix.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix.changes b/postfix.changes index 79bc19a..30cf7a3 100644 --- a/postfix.changes +++ b/postfix.changes @@ -2,7 +2,7 @@ Thu Apr 13 09:18:45 UTC 2017 - werner@suse.de - Some cleanups - * Fix SUSE postfix-files to avoud chown error (anyway this file + * Fix SUSE postfix-files to avoid chown errors (anyway this file seems to be obsolete) * Avoid installing shared libraries twice * Refresh patch postfix-linux45.patch