Merging debian version 3.9.0-2.

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

14 files changed, 58 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 2154cce..c39219e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+postfix (3.9.0-2) unstable; urgency=medium
+
+  * Add debian/postfix-collate to debian/clean
+  * Restart postfix via trigger after new map type packages are added.
+    Closes: #1063772
+  * Add d/p/reproducible to restore AUXLIBS sort missed when original patch
+    was upstreamed.  Closes: #1067483
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 02 Apr 2024 09:08:31 -0400
+
 postfix (3.9.0-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/clean b/debian/clean
index a6c3b08..1de0789 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
 conf/main.cf.debian
 conf/main.cf.dist
+debian/postfix-collate
diff --git a/debian/patches/reproducible b/debian/patches/reproducible
new file mode 100644
index 0000000..846292c
--- /dev/null
+++ b/debian/patches/reproducible
@@ -0,0 +1,13 @@
+Index: postfix/makedefs
+===================================================================
+--- postfix.orig/makedefs
++++ postfix/makedefs
+@@ -215,7 +215,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 3f7eee0..bbe3d62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 debian-man-name.diff
 71_debianize_collate.pl.diff
 Disable-LD_LIBRARY_PATH-check.patch
+reproducible
diff --git a/debian/postfix-cdb.postinst b/debian/postfix-cdb.postinst
index 26b959a..ad1ec6c 100644
--- a/debian/postfix-cdb.postinst
+++ b/debian/postfix-cdb.postinst
@@ -33,6 +33,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "cdb" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-ldap.postinst b/debian/postfix-ldap.postinst
index b533658..e15c09b 100644
--- a/debian/postfix-ldap.postinst
+++ b/debian/postfix-ldap.postinst
@@ -33,6 +33,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "ldap" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-lmdb.postinst b/debian/postfix-lmdb.postinst
index d7f3a96..0de361c 100644
--- a/debian/postfix-lmdb.postinst
+++ b/debian/postfix-lmdb.postinst
@@ -34,6 +34,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "lmdb" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-mongodb.postinst b/debian/postfix-mongodb.postinst
index dd3bdc3..834aa48 100644
--- a/debian/postfix-mongodb.postinst
+++ b/debian/postfix-mongodb.postinst
@@ -34,6 +34,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "mongodb" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-mysql.postinst b/debian/postfix-mysql.postinst
index 2051721..48ebbfa 100644
--- a/debian/postfix-mysql.postinst
+++ b/debian/postfix-mysql.postinst
@@ -33,6 +33,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "mysql" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-pcre.postinst b/debian/postfix-pcre.postinst
index 91ecd35..44bfdf8 100644
--- a/debian/postfix-pcre.postinst
+++ b/debian/postfix-pcre.postinst
@@ -32,6 +32,7 @@ case "$1" in
        addmap pcre
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "pcre" ]; then
            runnewaliases
+	   touch /var/spool/postfix/restart
        fi
     ;;
 
diff --git a/debian/postfix-pgsql.postinst b/debian/postfix-pgsql.postinst
index 993b771..bc7d2d2 100644
--- a/debian/postfix-pgsql.postinst
+++ b/debian/postfix-pgsql.postinst
@@ -33,6 +33,7 @@ case "$1" in
        if [ "$(postconf -h alias_database | cut -f1 -d:)" = "pgsql" ]; then
            runnewaliases
        fi
+       touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix-sqlite.postinst b/debian/postfix-sqlite.postinst
index ebae590..e19f116 100644
--- a/debian/postfix-sqlite.postinst
+++ b/debian/postfix-sqlite.postinst
@@ -30,6 +30,10 @@ set -e
 case "$1" in
     configure)
         addmap sqlite
+       if [ "$(postconf -h alias_database | cut -f1 -d:)" = "sqlite" ]; then
+           runnewaliases
+       fi
+        touch /var/spool/postfix/restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index 6168a9f..42a8657 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -13,6 +13,26 @@ CHROOT=/var/spool/postfix
 
 . /usr/share/postfix/postinst.functions
 
+if [ "$1" = triggered ]; then
+    echo "Restarting postfix"
+    [ -x /usr/sbin/invoke-rc.d ] && \
+	    INIT="invoke-rc.d postfix" || \
+	    INIT="/etc/init.d/postfix"
+    # start postfix
+    if [ -f /var/spool/postfix/restart ]; then
+	rm -f /var/spool/postfix/restart
+	${INIT} restart
+    else
+	# or maybe just restart postfix
+	if [ -f /var/spool/postfix/reload ]; then
+	    rm -f /var/spool/postfix/reload
+	    ${INIT} restart
+	fi
+    fi
+
+    exit 0
+fi
+
 set_maildrop_perms() {
     MAILDROP=${CHROOT}/maildrop
     POSTDROP=/usr/sbin/postdrop
diff --git a/debian/triggers b/debian/triggers
new file mode 100644
index 0000000..01268b6
--- /dev/null
+++ b/debian/triggers
@@ -0,0 +1,2 @@
+interest-noawait /usr/lib/postfix
+interest-noawait /var/spool/postfix