Merging debian version 3.9.1-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 89 insertions, 169 deletions

diff --git a/debian/patches/05_debian_defaults.diff b/debian/patches/05_debian_defaults.diff
index 3dd3121..070ef9c 100644
--- a/debian/patches/05_debian_defaults.diff
+++ b/debian/patches/05_debian_defaults.diff
@@ -1,22 +1,17 @@
 From: LaMont Jones <lamont@debian.org>
 Subject: Set Debian specific defaults
 Forwarded: not-needed
-Index: postfix/conf/main.cf
-===================================================================
---- postfix.orig/conf/main.cf
-+++ postfix/conf/main.cf
-@@ -79,7 +79,7 @@ data_directory = /var/lib/postfix
- # particular, don't specify nobody or daemon. PLEASE USE A DEDICATED
- # USER.
+Updated: Wed, 11 Dec 2024 00:08:31 +0300
+
+diff --git a/conf/main.cf b/conf/main.cf
+--- a/conf/main.cf
++++ b/conf/main.cf
+@@ -81,3 +81,3 @@ data_directory = /var/lib/postfix
  #
 -mail_owner = postfix
 +#mail_owner = postfix
  
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
-@@ -118,6 +118,11 @@ mail_owner = postfix
- # myorigin also specifies the default domain name that is appended
- # to recipient addresses that have no @domain part.
+@@ -120,2 +120,7 @@ mail_owner = postfix
  #
 +# Debian GNU/Linux specific:  Specifying a file name will cause the
 +# first line of that file to be used as the name.  The Debian default
@@ -24,57 +19,23 @@ Index: postfix/conf/main.cf
 +#
 +#myorigin = /etc/mailname
  #myorigin = $myhostname
- #myorigin = $mydomain
- 
-@@ -286,6 +291,7 @@ unknown_local_recipient_reject_code = 55
- #mynetworks = 168.100.3.0/28, 127.0.0.0/8
- #mynetworks = $config_directory/mynetworks
+@@ -288,2 +293,3 @@ unknown_local_recipient_reject_code = 550
  #mynetworks = hash:/etc/postfix/network_table
 +mynetworks = 127.0.0.0/8
  
- # The relay_domains parameter restricts what destinations this system will
- # relay mail to.  See the smtpd_relay_restrictions and
-@@ -576,6 +582,8 @@ unknown_local_recipient_reject_code = 55
- #
- #smtpd_banner = $myhostname ESMTP $mail_name
+@@ -578,2 +584,3 @@ unknown_local_recipient_reject_code = 550
  #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
 +smtpd_banner = $myhostname ESMTP $mail_name (@@DISTRO@@)
-+
  
- # PARALLEL DELIVERY TO THE SAME DESTINATION
- #
-@@ -600,7 +608,7 @@ unknown_local_recipient_reject_code = 55
- # logging level when an SMTP client or server host name or address
- # matches a pattern in the debug_peer_list parameter.
+@@ -602,3 +609,3 @@ unknown_local_recipient_reject_code = 550
  #
 -debug_peer_level = 2
 +#debug_peer_level = 2
  
- # The debug_peer_list parameter specifies an optional list of domain
- # or network patterns, /file/name patterns or type:name tables. When
-Index: postfix/conf/main.cf.tls
-===================================================================
---- /dev/null
-+++ postfix/conf/main.cf.tls
-@@ -0,0 +1,11 @@
-+
-+# TLS parameters
-+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-+smtpd_tls_security_level=may
-+
-+smtp_tls_CApath=/etc/ssl/certs
-+smtp_tls_security_level=may
-+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
-+
-+
-Index: postfix/conf/postfix-files
-===================================================================
---- postfix.orig/conf/postfix-files
-+++ postfix/conf/postfix-files
-@@ -144,27 +144,28 @@ $newaliases_path:l:$sendmail_path
- $mailq_path:l:$sendmail_path
- $config_directory/LICENSE:f:root:-:644:1
+diff --git a/conf/postfix-files b/conf/postfix-files
+--- a/conf/postfix-files
++++ b/conf/postfix-files
+@@ -146,24 +146,25 @@ $config_directory/LICENSE:f:root:-:644:1
  $config_directory/TLS_LICENSE:f:root:-:644:1
 -$config_directory/access:f:root:-:644:p1
 -$config_directory/aliases:f:root:-:644:p1
@@ -105,17 +66,18 @@ Index: postfix/conf/postfix-files
 -$config_directory/tcp_table:f:root:-:644:o
 -$config_directory/transport:f:root:-:644:p1
 -$config_directory/virtual:f:root:-:644:p1
+-$config_directory/postfix-script:f:root:-:755:o
+-$config_directory/postfix-script-sgid:f:root:-:755:o
+-$config_directory/postfix-script-nosgid:f:root:-:755:o
+-$config_directory/post-install:f:root:-:755:o
 +#$config_directory/pcre_table:f:root:-:644:o
 +#$config_directory/regexp_table:f:root:-:644:o
 +#$config_directory/relocated:f:root:-:644:p1
 +#$config_directory/tcp_table:f:root:-:644:o
 +#$config_directory/transport:f:root:-:644:p1
 +#$config_directory/virtual:f:root:-:644:p1
- $config_directory/postfix-script:f:root:-:755:o
--$config_directory/postfix-script-sgid:f:root:-:755:o
--$config_directory/postfix-script-nosgid:f:root:-:755:o
++#$config_directory/postfix-script:f:root:-:755:o
 +#$config_directory/postfix-script-sgid:f:root:-:755:o
 +#$config_directory/postfix-script-nosgid:f:root:-:755:o
- $config_directory/post-install:f:root:-:755:o
++#$config_directory/post-install:f:root:-:755:o
  $manpage_directory/man1/mailq.1:f:root:-:644
- $manpage_directory/man1/newaliases.1:f:root:-:644
diff --git a/debian/patches/05_debian_manpage_differences.diff b/debian/patches/05_debian_manpage_differences.diff
index a2494b8..c746dec 100644
--- a/debian/patches/05_debian_manpage_differences.diff
+++ b/debian/patches/05_debian_manpage_differences.diff
@@ -1,14 +1,14 @@
-From: Scott Kitterman <scott@kitterman.com>
-Subject: Update postfix-files for Debian man page naming specifics
+From: Michael Tokarev <mjt@tls.msk.ru>
+Subject: update postfix-files for debian manpage naming
 Forwarded: not-needed
-Index: postfix/conf/postfix-files
-===================================================================
---- postfix.orig/conf/postfix-files
-+++ postfix/conf/postfix-files
-@@ -167,80 +167,82 @@ $config_directory/postfix-script:f:root:
- #$config_directory/postfix-script-sgid:f:root:-:755:o
- #$config_directory/postfix-script-nosgid:f:root:-:755:o
- $config_directory/post-install:f:root:-:755:o
+Debian-Specific: yes
+
+Auto-generated by debian/gen-manpage-diff.sh
+
+--- a/conf/postfix-files
++++ b/conf/postfix-files
+@@ -169,76 +169,76 @@
+ #$config_directory/post-install:f:root:-:755:o
 -$manpage_directory/man1/mailq.1:f:root:-:644
 -$manpage_directory/man1/newaliases.1:f:root:-:644
 -$manpage_directory/man1/postalias.1:f:root:-:644
@@ -142,8 +142,6 @@ Index: postfix/conf/postfix-files
 +$manpage_directory/man8/pickup.8postfix.gz:f:root:-:644
 +$manpage_directory/man8/pipe.8postfix.gz:f:root:-:644
 +$manpage_directory/man8/postlogd.8postfix.gz:f:root:-:644
-+$manpage_directory/man8/postfix-add-filter.8.gz:f:root:-:644
-+$manpage_directory/man8/postfix-add-policy.8.gz:f:root:-:644
 +$manpage_directory/man8/postscreen.8postfix.gz:f:root:-:644
 +$manpage_directory/man8/proxymap.8postfix.gz:f:root:-:644
 +$manpage_directory/man8/qmgr.8postfix.gz:f:root:-:644
@@ -160,5 +158,3 @@ Index: postfix/conf/postfix-files
 +$manpage_directory/man8/verify.8postfix.gz:f:root:-:644
 +$manpage_directory/man8/virtual.8postfix.gz:f:root:-:644
  $sample_directory/sample-aliases.cf:f:root:-:644:o
- $sample_directory/sample-auth.cf:f:root:-:644:o
- $sample_directory/sample-canonical.cf:f:root:-:644:o
diff --git a/debian/patches/07_sasl_config.diff b/debian/patches/07_sasl_config.diff
deleted file mode 100644
index 29c6658..0000000
--- a/debian/patches/07_sasl_config.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From: LaMont Jones <lamont@debian.org>
-Date: Fri, 5 Feb 2016 22:47:00 +0200
-Subject: sasl config
-Forwarded: not-needed
----
- src/xsasl/xsasl_cyrus_client.c |  3 +++
- src/xsasl/xsasl_cyrus_common.h |  5 +++++
- src/xsasl/xsasl_cyrus_log.c    | 14 ++++++++++++++
- src/xsasl/xsasl_cyrus_server.c |  3 +++
- 4 files changed, 25 insertions(+)
-
-Index: postfix/src/xsasl/xsasl_cyrus_client.c
-===================================================================
---- postfix.orig/src/xsasl/xsasl_cyrus_client.c
-+++ postfix/src/xsasl/xsasl_cyrus_client.c
-@@ -229,6 +229,9 @@ XSASL_CLIENT_IMPL *xsasl_cyrus_client_in
-      */
-     static sasl_callback_t callbacks[] = {
- 	{SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, 0},
-+#ifdef SASL_CB_GETCONFPATH
-+{SASL_CB_GETCONFPATH, (XSASL_CYRUS_CB) &xsasl_getconfpath, 0},
-+#endif
- 	{SASL_CB_LIST_END, 0, 0}
-     };
- 
-Index: postfix/src/xsasl/xsasl_cyrus_common.h
-===================================================================
---- postfix.orig/src/xsasl/xsasl_cyrus_common.h
-+++ postfix/src/xsasl/xsasl_cyrus_common.h
-@@ -16,12 +16,17 @@
-   */
- #if defined(USE_SASL_AUTH) && defined(USE_CYRUS_SASL)
- 
-+#include <sasl.h>
-+
- #define NO_SASL_LANGLIST	((const char *) 0)
- #define NO_SASL_OUTLANG		((const char **) 0)
- #define xsasl_cyrus_strerror(status) \
- 	sasl_errstring((status), NO_SASL_LANGLIST, NO_SASL_OUTLANG)
- extern int xsasl_cyrus_log(void *, int, const char *);
- extern int xsasl_cyrus_security_parse_opts(const char *);
-+#ifdef SASL_CB_GETCONFPATH
-+extern int xsasl_getconfpath(void * context, char ** path);
-+#endif
- 
- #endif
- 
-Index: postfix/src/xsasl/xsasl_cyrus_log.c
-===================================================================
---- postfix.orig/src/xsasl/xsasl_cyrus_log.c
-+++ postfix/src/xsasl/xsasl_cyrus_log.c
-@@ -28,10 +28,16 @@
- /* System library. */
- 
- #include <sys_defs.h>
-+#include <string.h>
- 
- /* Utility library. */
- 
- #include <msg.h>
-+#include <stringops.h>
-+
-+/* Global library. */
-+
-+#include <mail_params.h>
- 
- /* Application-specific */
- 
-@@ -101,4 +107,12 @@ int     xsasl_cyrus_log(void *unused_con
-     return (SASL_OK);
- }
- 
-+#ifdef SASL_CB_GETCONFPATH
-+int xsasl_getconfpath(void * context, char ** path)
-+{
-+    *path = concatenate(var_config_dir, "/", "sasl:/usr/lib/sasl", (char *) 0);
-+    return SASL_OK;
-+}
-+#endif
-+
- #endif
-Index: postfix/src/xsasl/xsasl_cyrus_server.c
-===================================================================
---- postfix.orig/src/xsasl/xsasl_cyrus_server.c
-+++ postfix/src/xsasl/xsasl_cyrus_server.c
-@@ -185,6 +185,9 @@ static const char *xsasl_cyrus_server_ge
- 
- static sasl_callback_t callbacks[] = {
-     {SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, NO_CALLBACK_CONTEXT},
-+#ifdef SASL_CB_GETCONFPATH
-+    {SASL_CB_GETCONFPATH, (XSASL_CYRUS_CB) &xsasl_getconfpath, 0},
-+#endif
-     {SASL_CB_LIST_END, 0, 0}
- };
- 
diff --git a/debian/patches/40_chroot_by_default.diff b/debian/patches/40_chroot_by_default.diff
index a648e4b..b01f73a 100644
--- a/debian/patches/40_chroot_by_default.diff
+++ b/debian/patches/40_chroot_by_default.diff
@@ -70,7 +70,7 @@ Index: postfix/conf/master.cf
 -relay     unix  -       -       n       -       -       smtp
 +smtp      unix  -       -       y       -       -       smtp
 +relay     unix  -       -       y       -       -       smtp
-         -o syslog_name=postfix/$service_name
+         -o syslog_name=${multi_instance_name?{$multi_instance_name}:{postfix}}/$service_name
  #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
 -showq     unix  n       -       n       -       -       showq
 -error     unix  -       -       n       -       -       error
diff --git a/debian/patches/debian-differences-main-cf.diff b/debian/patches/debian-differences-main-cf.diff
new file mode 100644
index 0000000..e674e72
--- /dev/null
+++ b/debian/patches/debian-differences-main-cf.diff
@@ -0,0 +1,30 @@
+diff --git a/conf/main.cf b/conf/main.cf
+index 2f4eba9e..f5448915 100644
+--- a/conf/main.cf
++++ b/conf/main.cf
+@@ -81,3 +81,3 @@ data_directory = /var/lib/postfix
+ #
+-mail_owner = postfix
++#mail_owner = postfix
+ 
+@@ -120,2 +120,7 @@ mail_owner = postfix
+ #
++# Debian GNU/Linux specific:  Specifying a file name will cause the
++# first line of that file to be used as the name.  The Debian default
++# is /etc/mailname.
++#
++#myorigin = /etc/mailname
+ #myorigin = $myhostname
+@@ -288,2 +293,3 @@ unknown_local_recipient_reject_code = 550
+ #mynetworks = hash:/etc/postfix/network_table
++mynetworks = 127.0.0.0/8
+ 
+@@ -578,2 +584,3 @@ unknown_local_recipient_reject_code = 550
+ #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
++smtpd_banner = $myhostname ESMTP $mail_name (@@DISTRO@@)
+ 
+@@ -602,3 +609,3 @@ unknown_local_recipient_reject_code = 550
+ #
+-debug_peer_level = 2
++#debug_peer_level = 2
+ 
diff --git a/debian/patches/reproducible b/debian/patches/reproducible
index 846292c..e3b6fba 100644
--- a/debian/patches/reproducible
+++ b/debian/patches/reproducible
@@ -1,3 +1,10 @@
+From: Scott Kitterman <scott@kitterman.com>
+Date: Sun, 21 Jul 2024 12:14:10 -0500
+Forwarded: https://marc.info/?l=postfix-users&m=172156435021439&w=2
+Subject: Reproducible
+
+Need to sort auxlibs for reproducible.  Missed part of upstreaming in 3.9.0.
+
 Index: postfix/makedefs
 ===================================================================
 --- postfix.orig/makedefs
diff --git a/debian/patches/run-configure-instance-from-postfix-script.patch b/debian/patches/run-configure-instance-from-postfix-script.patch
new file mode 100644
index 0000000..dec9637
--- /dev/null
+++ b/debian/patches/run-configure-instance-from-postfix-script.patch
@@ -0,0 +1,20 @@
+Subject: run debian-specific configure-instance script from postfix-script
+From: Michael Tokarev <mjt@tls.msk.ru
+Date: Tue, 10 Dec 2024 11:25:40 +0300
+Forwarded: not-needed
+Debian-Specific: yes
+
+Run debian-provided (mostly chroot setup) script when starting
+a postfix instance.
+
+diff --git a/conf/postfix-script b/conf/postfix-script
+index c43d764f..0e68d833 100755
+--- a/conf/postfix-script
++++ b/conf/postfix-script
+@@ -138,2 +138,6 @@ start|start-fg)
+ 	else
++		/usr/lib/postfix/configure-instance.sh || { # debian-specific
++			$FATAL Postfix instance configuration script failed!
++			exit 1
++		}
+ 		$daemon_directory/postfix-script check-fatal || {
diff --git a/debian/patches/series b/debian/patches/series
index bbe3d62..9cc1322 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 05_debian_manpage_differences.diff
 05_debian_readme_differences.diff
 06_debian_paths.diff
-07_sasl_config.diff
 10_openssl_version_check.diff
 40_chroot_by_default.diff
 41_rmail.diff
@@ -13,3 +12,4 @@ debian-man-name.diff
 71_debianize_collate.pl.diff
 Disable-LD_LIBRARY_PATH-check.patch
 reproducible
+run-configure-instance-from-postfix-script.patch