From 5f45aebfdb12d293286e51aafebe45be35e5c4725be52c88b939fba99180a838 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Tue, 30 Oct 2018 20:13:37 +0000 Subject: [PATCH] Accepting request 643762 from home:computersalat:devel:mail update config.postfix, update main.cf patch OBS-URL: https://build.opensuse.org/request/show/643762 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=310 --- fix-postfix-script.patch | 8 +++++--- pointer_to_literals.patch | 8 ++++---- postfix-SuSE.tar.gz | 4 ++-- postfix-linux45.patch | 8 +++++--- postfix-main.cf.patch | 8 +++++++- postfix-master.cf.patch | 6 +++--- postfix-no-md5.patch | 4 ++-- postfix-vda-v14-3.0.3.patch | 16 ++++++++-------- postfix.changes | 22 ++++++++++++++++++++++ postfix.spec | 2 +- 10 files changed, 59 insertions(+), 27 deletions(-) diff --git a/fix-postfix-script.patch b/fix-postfix-script.patch index d49d583..6c57220 100644 --- a/fix-postfix-script.patch +++ b/fix-postfix-script.patch @@ -1,6 +1,8 @@ ---- conf/postfix-script 2016-01-31 16:05:46.000000000 -0500 -+++ conf/postfix-script 2016-03-01 19:23:51.000000000 -0500 -@@ -272,10 +277,17 @@ +Index: conf/postfix-script +=================================================================== +--- conf/postfix-script.orig ++++ conf/postfix-script +@@ -299,10 +299,17 @@ check-warn) } todo=`echo "$todo" | tr ' ' '\12' | sort -u` diff --git a/pointer_to_literals.patch b/pointer_to_literals.patch index 5743693..f6edc01 100644 --- a/pointer_to_literals.patch +++ b/pointer_to_literals.patch @@ -2,7 +2,7 @@ Index: src/cleanup/cleanup_message.c =================================================================== --- src/cleanup/cleanup_message.c.orig +++ src/cleanup/cleanup_message.c -@@ -290,7 +290,7 @@ static const char *cleanup_act(CLEANUP_S +@@ -296,7 +296,7 @@ static const char *cleanup_act(CLEANUP_S while (*optional_text && ISSPACE(*optional_text)) optional_text++; @@ -28,7 +28,7 @@ Index: src/smtpd/smtpd_check.c =================================================================== --- src/smtpd/smtpd_check.c.orig +++ src/smtpd/smtpd_check.c -@@ -379,6 +379,10 @@ static STRING_LIST *smtpd_acl_perm_log; +@@ -380,6 +380,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. -@@ -2335,8 +2339,6 @@ static int check_table_result(SMTPD_STAT +@@ -2339,8 +2343,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. */ -@@ -3368,8 +3370,6 @@ static const char *rbl_expand_lookup(con +@@ -3375,8 +3377,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 991b757..a391883 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:21761ce060fa24ea04c0c904b48321b33076a3ca06f0acaa8fe902c288ebd671 -size 27525 +oid sha256:8b0e7418a449b5f4def70efdfdd82d508868febb845b68f27380235df8f8f6b6 +size 27446 diff --git a/postfix-linux45.patch b/postfix-linux45.patch index 03ac817..14eaaa3 100644 --- a/postfix-linux45.patch +++ b/postfix-linux45.patch @@ -2,9 +2,11 @@ makedefs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- makedefs -+++ makedefs 2017-04-13 08:33:01.425823067 +0000 -@@ -543,7 +543,7 @@ EOF +Index: makedefs +=================================================================== +--- makedefs.orig ++++ makedefs +@@ -546,7 +546,7 @@ EOF : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC-gcc} -shared"} ;; diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch index 1f7b09b..ebc5937 100644 --- a/postfix-main.cf.patch +++ b/postfix-main.cf.patch @@ -10,7 +10,7 @@ Index: conf/main.cf # PARALLEL DELIVERY TO THE SAME DESTINATION # -@@ -673,4 +674,132 @@ sample_directory = +@@ -673,4 +674,138 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = @@ -77,6 +77,12 @@ Index: conf/main.cf +smtp_sasl_security_options = +smtp_sasl_password_maps = +smtpd_sasl_auth_enable = no ++# cyrus : smtpd_sasl_type = cyrus ++# smtpd_sasl_path = smtpd ++# dovecot : smtpd_sasl_type = dovecot ++# smtpd_sasl_path = private/auth ++smtpd_sasl_type = cyrus ++smtpd_sasl_path = smtpd +############################################################ +# TLS stuff +############################################################ diff --git a/postfix-master.cf.patch b/postfix-master.cf.patch index 0a616eb..88d3f7b 100644 --- a/postfix-master.cf.patch +++ b/postfix-master.cf.patch @@ -63,7 +63,7 @@ Index: conf/master.cf #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 +@@ -64,6 +70,27 @@ virtual unix - n n lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache @@ -91,7 +91,7 @@ Index: conf/master.cf # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -96,7 +123,7 @@ scache unix - - n +@@ -97,7 +124,7 @@ scache unix - - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -100,7 +100,7 @@ Index: conf/master.cf # # ==================================================================== # -@@ -129,3 +156,10 @@ scache unix - - n +@@ -130,3 +157,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 22fd829..f13d827 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 -@@ -1338,7 +1338,7 @@ extern char *var_smtpd_tls_excl_ciph; +@@ -1349,7 +1349,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" -@@ -1497,9 +1497,9 @@ extern char *var_smtp_tls_excl_ciph; +@@ -1508,9 +1508,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-vda-v14-3.0.3.patch b/postfix-vda-v14-3.0.3.patch index 924157e..a105011 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 -@@ -2487,6 +2487,54 @@ extern char *var_virt_uid_maps; +@@ -2538,6 +2538,54 @@ extern char *var_virt_uid_maps; #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -95,7 +95,7 @@ Index: src/virtual/mailbox.c =================================================================== --- src/virtual/mailbox.c.orig +++ src/virtual/mailbox.c -@@ -52,6 +52,7 @@ +@@ -57,6 +57,7 @@ #include #include #include @@ -103,7 +103,7 @@ Index: src/virtual/mailbox.c /* Global library. */ -@@ -70,6 +71,70 @@ +@@ -75,6 +76,70 @@ #define YES 1 #define NO 0 @@ -174,7 +174,7 @@ Index: src/virtual/mailbox.c /* deliver_mailbox_file - deliver to recipient mailbox */ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr) -@@ -214,62 +279,72 @@ int deliver_mailbox(LOCAL_STATE stat +@@ -219,62 +284,72 @@ int deliver_mailbox(LOCAL_STATE stat * Look up the mailbox owner rights. Defer in case of trouble. */ uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user, @@ -1274,7 +1274,7 @@ Index: src/virtual/virtual.c =================================================================== --- src/virtual/virtual.c.orig +++ src/virtual/virtual.c -@@ -347,12 +347,28 @@ char *var_mail_spool_dir; /* XXX depe +@@ -357,12 +357,28 @@ char *var_mail_spool_dir; /* XXX depe bool var_strict_mbox_owner; char *var_virt_dsn_filter; @@ -1303,7 +1303,7 @@ Index: src/virtual/virtual.c /* * Bit masks. -@@ -462,18 +478,27 @@ static void post_init(char *unused_name, +@@ -472,18 +488,27 @@ static void post_init(char *unused_name, */ virtual_mailbox_maps = maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps, @@ -1337,7 +1337,7 @@ Index: src/virtual/virtual.c virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock); } -@@ -525,11 +550,23 @@ int main(int argc, char **argv) +@@ -535,11 +560,23 @@ int main(int argc, char **argv) VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0, VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0, VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0, @@ -1361,7 +1361,7 @@ Index: src/virtual/virtual.c 0, }; -@@ -546,6 +583,7 @@ int main(int argc, char **argv) +@@ -556,6 +593,7 @@ int main(int argc, char **argv) CA_MAIL_SERVER_PRE_INIT(pre_init), CA_MAIL_SERVER_POST_INIT(post_init), CA_MAIL_SERVER_PRE_ACCEPT(pre_accept), diff --git a/postfix.changes b/postfix.changes index 6e97ce3..2fded81 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Oct 22 13:00:03 UTC 2018 - Christian Wittmer + +- update config.postfix + * don't reject mail from authenticated users even if + reject_unknown_client_hostname would match, + add permit_sasl_authenticated to all restrictions + requires smtpd_delay_reject = yes +- update postfix-main.cf.patch + * recover removed setting smtpd_sasl_path and smtpd_sasl_type, + set to default value + config.postfix will not 'enable' (remove #) var, but place + modified (enabled) var at end of file, far away from place + where it should be +- rebase patches + * fix-postfix-script.patch + * postfix-vda-v14-3.0.3.patch + * postfix-linux45.patch + * postfix-master.cf.patch + * pointer_to_literals.patch + * postfix-no-md5.patch + ------------------------------------------------------------------- Thu Oct 4 12:51:32 UTC 2018 - varkoly@suse.com diff --git a/postfix.spec b/postfix.spec index d036168..29cd75c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #