From 9f23f174f6b9bcfded873c91464b45109565e5e37c501d4d4db6c1222ad5a76a Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Tue, 11 Aug 2015 14:09:08 +0000 Subject: [PATCH 1/2] Accepting request 309705 from home:elvigia:branches:server:mail - postfix-SuSE.tar.gz/postfix.service: None of nss-lookup.target network.target local-fs.target time-sync.target should be Wanted or Required except by the services the implement the relevant functionality i.e network.target is wanted/required by networkmanager, wicked, systemd-network. other software must be ordered After them, see systemd.special(7) OBS-URL: https://build.opensuse.org/request/show/309705 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=223 --- postfix-SuSE.tar.gz | 4 ++-- postfix.changes | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz index 8fb412b..30d02ce 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:a05ae513411b5b35e15d62acb762dc187dade2f49921a6bd6405e43b6a866790 -size 26433 +oid sha256:a557e6aec737fe6094f0f022471d8adc77419149fa5660953f1dafc9d0981f53 +size 26325 diff --git a/postfix.changes b/postfix.changes index 5f1404a..d11d145 100644 --- a/postfix.changes +++ b/postfix.changes @@ -7,6 +7,17 @@ Wed Jul 22 16:44:44 UTC 2015 - michael@stroeder.com protocols. - removed postfix-2.11.5_linux4.patch because it's obsolete +------------------------------------------------------------------- +Mon Jun 1 22:25:51 UTC 2015 - crrodriguez@opensuse.org + +- postfix-SuSE.tar.gz/postfix.service: None of + nss-lookup.target network.target local-fs.target time-sync.target + should be Wanted or Required except by the services + the implement the relevant functionality i.e network.target + is wanted/required by networkmanager, wicked, + systemd-network. other software must be ordered After them, + see systemd.special(7) + ------------------------------------------------------------------- Sun May 17 18:41:52 UTC 2015 - mpluskal@suse.com From ec92bf34f4d08e2bcda1fad69557bf8dc807495557c8fcb9ead569fb344ef11d Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Tue, 11 Aug 2015 14:10:15 +0000 Subject: [PATCH 2/2] Accepting request 320339 from home:msmeissn:branches:server:mail - postfix-no-md5.patch: replace fingerprint defaults by sha1. - %verifyscript is a new section, move it out of the %ifdef so the fillups are run afterwards. OBS-URL: https://build.opensuse.org/request/show/320339 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=224 --- postfix-no-md5.patch | 25 +++++++++++++++++++++++++ postfix.changes | 11 +++++++++++ postfix.spec | 15 ++++++++++----- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 postfix-no-md5.patch diff --git a/postfix-no-md5.patch b/postfix-no-md5.patch new file mode 100644 index 0000000..db9abe6 --- /dev/null +++ b/postfix-no-md5.patch @@ -0,0 +1,25 @@ +Index: postfix-2.11.0/src/global/mail_params.h +=================================================================== +--- postfix-2.11.0.orig/src/global/mail_params.h ++++ postfix-2.11.0/src/global/mail_params.h +@@ -1300,7 +1300,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" +-#define DEF_SMTPD_TLS_FPT_DGST "md5" ++#define DEF_SMTPD_TLS_FPT_DGST "sha1" + extern char *var_smtpd_tls_fpt_dgst; + + #define VAR_SMTPD_TLS_512_FILE "smtpd_tls_dh512_param_file" +@@ -1449,9 +1449,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" +-#define DEF_SMTP_TLS_FPT_DGST "md5" ++#define DEF_SMTP_TLS_FPT_DGST "sha1" + #define VAR_LMTP_TLS_FPT_DGST "lmtp_tls_fingerprint_digest" +-#define DEF_LMTP_TLS_FPT_DGST "md5" ++#define DEF_LMTP_TLS_FPT_DGST "sha1" + extern char *var_smtp_tls_fpt_dgst; + + #define VAR_SMTP_TLS_TAFILE "smtp_tls_trust_anchor_file" diff --git a/postfix.changes b/postfix.changes index d11d145..ebff156 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 4 09:09:04 UTC 2015 - meissner@suse.com + +- postfix-no-md5.patch: replace fingerprint defaults by sha1. + +------------------------------------------------------------------- +Tue Aug 4 09:07:25 UTC 2015 - meissner@suse.com + +- %verifyscript is a new section, move it out of the %ifdef + so the fillups are run afterwards. + ------------------------------------------------------------------- Wed Jul 22 16:44:44 UTC 2015 - michael@stroeder.com diff --git a/postfix.spec b/postfix.spec index d056ed6..cb5fb9f 100644 --- a/postfix.spec +++ b/postfix.spec @@ -78,6 +78,7 @@ Patch100: %{name}-vda-v13-2.10.0.patch Patch101: postfix-db6.diff #PATCH-FIX-SLE PATCH-FIX-OPENSUSE to be able to build the agent tls_proxy Patch102: add_missed_library.patch +Patch103: postfix-no-md5.patch BuildRequires: cyrus-sasl-devel BuildRequires: db-devel BuildRequires: libopenssl-devel @@ -171,6 +172,7 @@ PostgreSQL. %patch100 -p1 %patch101 %patch102 +%patch103 -p1 # --------------------------------------------------------------------------- %build @@ -454,17 +456,20 @@ fi %set_permissions %{_sysconfdir}/%{name}/sasl_passwd %set_permissions %{_sbindir}/sendmail -%verifyscript -%verify_permissions -e %{_sbindir}/postqueue -%verify_permissions -e %{_sbindir}/postdrop -%verify_permissions -e %{_sysconfdir}/%{name}/sasl_passwd -%verify_permissions -e %{_sbindir}/sendmail %{fillup_only -y postfix} %else %{fillup_and_insserv -y postfix} %endif %{fillup_only -an mail} /sbin/ldconfig + +%if 0%{?suse_version} > 1210 +%verifyscript +%verify_permissions -e %{_sbindir}/postqueue +%verify_permissions -e %{_sbindir}/postdrop +%verify_permissions -e %{_sysconfdir}/%{name}/sasl_passwd +%verify_permissions -e %{_sbindir}/sendmail +%endif # --------------------------------------------------------------------------- %postun