Merging debian version 3.9.0-1~exp1.

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

10 files changed, 52 insertions, 79 deletions

diff --git a/debian/patches/05_debian_defaults.diff b/debian/patches/05_debian_defaults.diff
index d44c98c..3dd3121 100644
--- a/debian/patches/05_debian_defaults.diff
+++ b/debian/patches/05_debian_defaults.diff
@@ -72,7 +72,7 @@ Index: postfix/conf/postfix-files
 ===================================================================
 --- postfix.orig/conf/postfix-files
 +++ postfix/conf/postfix-files
-@@ -143,27 +143,28 @@ $newaliases_path:l:$sendmail_path
+@@ -144,27 +144,28 @@ $newaliases_path:l:$sendmail_path
  $mailq_path:l:$sendmail_path
  $config_directory/LICENSE:f:root:-:644:1
  $config_directory/TLS_LICENSE:f:root:-:644:1
diff --git a/debian/patches/05_debian_manpage_differences.diff b/debian/patches/05_debian_manpage_differences.diff
index da7c086..a2494b8 100644
--- a/debian/patches/05_debian_manpage_differences.diff
+++ b/debian/patches/05_debian_manpage_differences.diff
@@ -1,11 +1,11 @@
 From: Scott Kitterman <scott@kitterman.com>
 Subject: Update postfix-files for Debian man page naming specifics
 Forwarded: not-needed
-Index: postfix-dev/conf/postfix-files
+Index: postfix/conf/postfix-files
 ===================================================================
---- postfix-dev.orig/conf/postfix-files	2019-03-01 11:07:21.045697994 -0500
-+++ postfix-dev/conf/postfix-files	2019-03-01 11:17:55.721711534 -0500
-@@ -166,79 +166,81 @@
+--- 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
@@ -38,6 +38,7 @@ Index: postfix-dev/conf/postfix-files
 -$manpage_directory/man5/lmdb_table.5:f:root:-:644
 -$manpage_directory/man5/master.5:f:root:-:644
 -$manpage_directory/man5/memcache_table.5:f:root:-:644
+-$manpage_directory/man5/mongodb_table.5:f:root:-:644
 -$manpage_directory/man5/mysql_table.5:f:root:-:644
 -$manpage_directory/man5/socketmap_table.5:f:root:-:644
 -$manpage_directory/man5/sqlite_table.5:f:root:-:644
@@ -111,6 +112,7 @@ Index: postfix-dev/conf/postfix-files
 +$manpage_directory/man5/lmdb_table.5.gz:f:root:-:644
 +$manpage_directory/man5/master.5.gz:f:root:-:644
 +$manpage_directory/man5/memcache_table.5.gz:f:root:-:644
++$manpage_directory/man5/mongodb_table.5.gz:f:root:-:644
 +$manpage_directory/man5/mysql_table.5.gz:f:root:-:644
 +$manpage_directory/man5/socketmap_table.5.gz:f:root:-:644
 +$manpage_directory/man5/sqlite_table.5.gz:f:root:-:644
diff --git a/debian/patches/05_debian_readme_differences.diff b/debian/patches/05_debian_readme_differences.diff
index 74f8789..3a0ac63 100644
--- a/debian/patches/05_debian_readme_differences.diff
+++ b/debian/patches/05_debian_readme_differences.diff
@@ -5,7 +5,7 @@ Index: postfix/conf/postfix-files
 ===================================================================
 --- postfix.orig/conf/postfix-files
 +++ postfix/conf/postfix-files
-@@ -273,69 +273,68 @@ $sample_directory/sample-tls.cf:f:root:-
+@@ -275,71 +275,71 @@ $sample_directory/sample-tls.cf:f:root:-
  $sample_directory/sample-transport.cf:f:root:-:644:o
  $sample_directory/sample-verify.cf:f:root:-:644:o
  $sample_directory/sample-virtual.cf:f:root:-:644:o
@@ -23,6 +23,7 @@ Index: postfix/conf/postfix-files
 +$readme_directory/ADDRESS_VERIFICATION_README.gz:f:root:-:644
 +$readme_directory/BACKSCATTER_README.gz:f:root:-:644
 +$readme_directory/BASIC_CONFIGURATION_README.gz:f:root:-:644
++$readme_directory/BDAT_README.gz:f:root:-:644
 +$readme_directory/BUILTIN_FILTER_README.gz:f:root:-:644
  $readme_directory/CDB_README:f:root:-:644
 -$readme_directory/COMPATIBILITY_README:f:root:-:644
@@ -30,26 +31,26 @@ Index: postfix/conf/postfix-files
 +$readme_directory/COMPATIBILITY_README.gz:f:root:-:644
 +$readme_directory/CONNECTION_CACHE_README.gz:f:root:-:644
  $readme_directory/CONTENT_INSPECTION_README:f:root:-:644
--$readme_directory/DATABASE_README:f:root:-:644
+ $readme_directory/DATABASE_README:f:root:-:644
 -$readme_directory/DB_README:f:root:-:644
 -$readme_directory/DEBUG_README:f:root:-:644
+-$readme_directory/DEPRECATION_README:f:root:-:644
 -$readme_directory/DSN_README:f:root:-:644
 -$readme_directory/ETRN_README:f:root:-:644
 -$readme_directory/FILTER_README:f:root:-:644
 -$readme_directory/FORWARD_SECRECY_README:f:root:-:644
 -$readme_directory/HOSTING_README:f:root:-:644:o
--$readme_directory/INSTALL:f:root:-:644
--$readme_directory/IPV6_README:f:root:-:644
--$readme_directory/LDAP_README:f:root:-:644
-+$readme_directory/DATABASE_README.gz:f:root:-:644
 +$readme_directory/DB_README.gz:f:root:-:644
 +$readme_directory/DEBUG_README.gz:f:root:-:644
++$readme_directory/DEPRECATION_README.gz:f:root:-:644
 +$readme_directory/DSN_README.gz:f:root:-:644
 +$readme_directory/ETRN_README.gz:f:root:-:644
 +$readme_directory/FILTER_README.gz:f:root:-:644
 +$readme_directory/FORWARD_SECRECY_README.gz:f:root:-:644
-+#$readme_directory/HOSTING_README:f:root:-:644:o
-+#$readme_directory/INSTALL:f:root:-:644
++$readme_directory/HOSTING_README.gz:f:root:-:644:o
+ $readme_directory/INSTALL:f:root:-:644
+-$readme_directory/IPV6_README:f:root:-:644
+-$readme_directory/LDAP_README:f:root:-:644
 +$readme_directory/IPV6_README.gz:f:root:-:644
 +$readme_directory/LDAP_README.gz:f:root:-:644
  $readme_directory/LINUX_README:f:root:-:644
@@ -58,14 +59,16 @@ Index: postfix/conf/postfix-files
 +$readme_directory/LMDB_README.gz:f:root:-:644
 +$readme_directory/LOCAL_RECIPIENT_README.gz:f:root:-:644
  $readme_directory/MACOSX_README:f:root:-:644:o
--$readme_directory/MAILDROP_README:f:root:-:644
-+$readme_directory/MAILDROP_README.gz:f:root:-:644
- $readme_directory/MAILLOG_README:f:root:-:644
+ $readme_directory/MAILDROP_README:f:root:-:644
+-$readme_directory/MAILLOG_README:f:root:-:644
++$readme_directory/MAILLOG_README.gz:f:root:-:644
  $readme_directory/MEMCACHE_README:f:root:-:644
 -$readme_directory/MILTER_README:f:root:-:644
+-$readme_directory/MONGODB_README:f:root:-:644
 -$readme_directory/MULTI_INSTANCE_README:f:root:-:644
 -$readme_directory/MYSQL_README:f:root:-:644
 +$readme_directory/MILTER_README.gz:f:root:-:644
++$readme_directory/MONGODB_README.gz:f:root:-:644
 +$readme_directory/MULTI_INSTANCE_README.gz:f:root:-:644
 +$readme_directory/MYSQL_README.gz:f:root:-:644
  $readme_directory/SMTPUTF8_README:f:root:-:644
@@ -75,7 +78,7 @@ Index: postfix/conf/postfix-files
 -$readme_directory/PACKAGE_README:f:root:-:644
 +$readme_directory/NFS_README.gz:f:root:-:644
 +$readme_directory/OVERVIEW.gz:f:root:-:644
-+$readme_directory/PACKAGE_README.gz:f:root:-:64
++$readme_directory/PACKAGE_README.gz:f:root:-:644
  $readme_directory/PCRE_README:f:root:-:644
 -$readme_directory/PGSQL_README:f:root:-:644
 +$readme_directory/PGSQL_README.gz:f:root:-:644
diff --git a/debian/patches/06_debian_paths.diff b/debian/patches/06_debian_paths.diff
index 4a9a6ee..a441f75 100644
--- a/debian/patches/06_debian_paths.diff
+++ b/debian/patches/06_debian_paths.diff
@@ -5,7 +5,7 @@ Index: postfix/conf/main.cf
 ===================================================================
 --- postfix.orig/conf/main.cf
 +++ postfix/conf/main.cf
-@@ -51,7 +51,7 @@ compatibility_level = 3.8
+@@ -51,7 +51,7 @@ compatibility_level = 3.9
  # See the files in examples/chroot-setup for setting up Postfix chroot
  # environments on different UNIX systems.
  #
@@ -51,7 +51,7 @@ Index: postfix/makedefs
 ===================================================================
 --- postfix.orig/makedefs
 +++ postfix/makedefs
-@@ -570,11 +570,18 @@ case "$SYSTEM.$RELEASE" in
+@@ -574,11 +574,18 @@ case "$SYSTEM.$RELEASE" in
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
@@ -71,7 +71,7 @@ Index: postfix/makedefs
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
-@@ -650,11 +657,18 @@ EOF
+@@ -654,11 +661,18 @@ EOF
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
@@ -91,7 +91,7 @@ Index: postfix/makedefs
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
-@@ -688,11 +702,18 @@ EOF
+@@ -692,11 +706,18 @@ EOF
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
diff --git a/debian/patches/07_sasl_config.diff b/debian/patches/07_sasl_config.diff
index e1ab0fc..29c6658 100644
--- a/debian/patches/07_sasl_config.diff
+++ b/debian/patches/07_sasl_config.diff
@@ -9,11 +9,11 @@ Forwarded: not-needed
  src/xsasl/xsasl_cyrus_server.c |  3 +++
  4 files changed, 25 insertions(+)
 
-diff --git a/src/xsasl/xsasl_cyrus_client.c b/src/xsasl/xsasl_cyrus_client.c
-index fc799c9..e76f0db 100644
---- a/src/xsasl/xsasl_cyrus_client.c
-+++ b/src/xsasl/xsasl_cyrus_client.c
-@@ -229,6 +229,9 @@ XSASL_CLIENT_IMPL *xsasl_cyrus_client_init(const char *unused_client_type,
+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},
@@ -23,10 +23,10 @@ index fc799c9..e76f0db 100644
  	{SASL_CB_LIST_END, 0, 0}
      };
  
-diff --git a/src/xsasl/xsasl_cyrus_common.h b/src/xsasl/xsasl_cyrus_common.h
-index 5447378..1cd2251 100644
---- a/src/xsasl/xsasl_cyrus_common.h
-+++ b/src/xsasl/xsasl_cyrus_common.h
+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)
@@ -45,10 +45,10 @@ index 5447378..1cd2251 100644
  
  #endif
  
-diff --git a/src/xsasl/xsasl_cyrus_log.c b/src/xsasl/xsasl_cyrus_log.c
-index 7bf25c3..6d1e413 100644
---- a/src/xsasl/xsasl_cyrus_log.c
-+++ b/src/xsasl/xsasl_cyrus_log.c
+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. */
  
@@ -66,7 +66,7 @@ index 7bf25c3..6d1e413 100644
  
  /* Application-specific */
  
-@@ -101,4 +107,12 @@ int     xsasl_cyrus_log(void *unused_context, int priority,
+@@ -101,4 +107,12 @@ int     xsasl_cyrus_log(void *unused_con
      return (SASL_OK);
  }
  
@@ -79,11 +79,11 @@ index 7bf25c3..6d1e413 100644
 +#endif
 +
  #endif
-diff --git a/src/xsasl/xsasl_cyrus_server.c b/src/xsasl/xsasl_cyrus_server.c
-index 89e1fc9..8f5edae 100644
---- a/src/xsasl/xsasl_cyrus_server.c
-+++ b/src/xsasl/xsasl_cyrus_server.c
-@@ -181,6 +181,9 @@ static const char *xsasl_cyrus_server_get_username(XSASL_SERVER *);
+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},
diff --git a/debian/patches/10_openssl_version_check.diff b/debian/patches/10_openssl_version_check.diff
index 1c6271f..2be413f 100644
--- a/debian/patches/10_openssl_version_check.diff
+++ b/debian/patches/10_openssl_version_check.diff
@@ -5,7 +5,7 @@ Index: postfix/src/tls/tls_misc.c
 ===================================================================
 --- postfix.orig/src/tls/tls_misc.c
 +++ postfix/src/tls/tls_misc.c
-@@ -1386,26 +1386,7 @@ static void tls_version_split(unsigned l
+@@ -1431,26 +1431,7 @@ static void tls_version_split(unsigned l
  
  void    tls_check_version(void)
  {
diff --git a/debian/patches/70_postfix-check.diff b/debian/patches/70_postfix-check.diff
index 34ab906..8a89467 100644
--- a/debian/patches/70_postfix-check.diff
+++ b/debian/patches/70_postfix-check.diff
@@ -5,7 +5,7 @@ Index: postfix/conf/postfix-script
 ===================================================================
 --- postfix.orig/conf/postfix-script
 +++ postfix/conf/postfix-script
-@@ -314,9 +314,17 @@ check-warn)
+@@ -327,9 +327,17 @@ check-warn)
  	find $todo ! -user root \
  	    -exec $WARN not owned by root: {} \;
  
diff --git a/debian/patches/Disable-LD_LIBRARY_PATH-check.patch b/debian/patches/Disable-LD_LIBRARY_PATH-check.patch
index 5579bb4..726830d 100644
--- a/debian/patches/Disable-LD_LIBRARY_PATH-check.patch
+++ b/debian/patches/Disable-LD_LIBRARY_PATH-check.patch
@@ -9,11 +9,11 @@ Forwarded: not-needed
  makedefs | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/makedefs b/makedefs
-index 4feea3d..972b89f 100644
---- a/makedefs
-+++ b/makedefs
-@@ -194,11 +194,6 @@ error() {
+Index: postfix/makedefs
+===================================================================
+--- postfix.orig/makedefs
++++ postfix/makedefs
+@@ -198,11 +198,6 @@ error() {
     exit 1
  }
  
diff --git a/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch b/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch
deleted file mode 100644
index 3532879..0000000
--- a/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
-Date: Mon, 1 Jan 2024 19:45:09 +0100
-Subject: Sort list of AUXLIBS for reproducible builds
-
-Forwarded: https://www.mail-archive.com/postfix-users@postfix.org/msg101292.html
----
- makedefs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: postfix/makedefs
-===================================================================
---- postfix.orig/makedefs
-+++ postfix/makedefs
-@@ -184,6 +184,8 @@
- #	New York, NY 10011, USA
- #--
- 
-+LC_ALL=C; export LC_ALL
-+
- # By now all shells must have functions.
- 
- error() {
-@@ -211,7 +213,7 @@ echo "#---------------------------------
- echo "# Start of summary of user-configurable 'make makefiles' options."
- echo "# CCARGS=$CCARGS"
- echo "# AUXLIBS=$AUXLIBS"
--env | grep '^AUXLIBS_' | sed 's/^/# /'
-+env | grep '^AUXLIBS_' | sed 's/^/# /' | sort
- echo "# shared=$shared"
- echo "# dynamicmaps=$dynamicmaps"
- echo "# pie=$pie"
diff --git a/debian/patches/series b/debian/patches/series
index 1971fe5..3f7eee0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@
 debian-man-name.diff
 71_debianize_collate.pl.diff
 Disable-LD_LIBRARY_PATH-check.patch
-Sort-list-of-AUXLIBS-for-reproducible-builds.patch