Merging debian version 3.9.1-6.

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

15 files changed, 230 insertions, 79 deletions

diff --git a/debian/changelog b/debian/changelog
index eea4704..97507d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+postfix (3.9.1-6) unstable; urgency=medium
+
+  * a "making some clean-ups, part 4" release (plus a bugfix)
+  * cp isn't able to cope with dangling symlinks when copying certs left
+    from the previous release.  Fix by using find(1) to traverse the dest dir
+    and delete anything which does not look like a regular hashed cert file,
+    since we process the directory anyway.  Closes: #1089836)
+  * simplify ip-up.d/ip-down.d/update-libc.d to just one line (cp -pLu)
+    and instal it everywhere.  Do not trigger queue run in ifup, it is
+    not our job to know which interfaces to use for the trigger.
+    Just copy the file, glibc will pick it up on the next query.
+  * d/postfix.postfix-resolvconf.service: use the same simple cp command
+    here too, with Conditions
+  * install NetworkManager hook to update resolv.conf too
+    (Closes: 1070120, #1054064)
+  * d/rules rework:
+   - stop passing $CPPFLAGS $CFLAGS to PLUGIN_LD
+   - move common CCARGS/CONFARGS/AUXLIBS definition further up
+   - move shared-build options to separate place
+   - clean the cleaning
+   - drop custom $(DISTRO), use ${DEB_VENDOR} everywhere in an uniform way
+   - drop execute_before_dh_gencontrol (move to install)
+   - reorder install target to better group things together
+   - stop exporting buildflags - specify CC, the only var we use, directly
+  * d/control: actually mark postfix-mongodb as linux-any
+    (forgotten in previous upload)
+  * d/patches: 2 patches to support building on hurd
+  * postfix now builds on hurd, let's see how it works there
+
+ -- Michael Tokarev <mjt@tls.msk.ru>  Fri, 13 Dec 2024 19:41:09 +0300
+
 postfix (3.9.1-5~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index a6c3b08..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-conf/main.cf.debian
-conf/main.cf.dist
diff --git a/debian/configure-instance.in b/debian/configure-instance.in
index a90c0b8..af3d542 100644
--- a/debian/configure-instance.in
+++ b/debian/configure-instance.in
@@ -97,7 +97,7 @@ do
     [ -f /$file ] && cp="$cp /$file" || rm="$rm ./$file"
 done
 [ -n "$rm" ] && rm -f $rm
-[ -n "$cp" ] && cp -pLu --parents -t . -- $cp
+[ -n "$cp" ] && cp -pLuf --parents -t . -- $cp
 
 [ -n "$need_chroot" ] || exit 0
 
@@ -136,17 +136,21 @@ do
     dest=$queue_directory$cadir
     if [ -d $dest ]; then (
 	cd $dest
-	for f in *; do
-	    case "$f" in
-		( [0-9a-f]*[0-9a-f].[0-9] ) [ -f "$cadir/$f" ] || rm -f -- "$f" ;;
-		( * ) rm -f -- "$f" ;;
-	    esac
-	done
+	# cp does not write over dangling symlinks (#1089836).
+	# walk through the dest dir, print names of regular files looking
+	# like a cert (to process later), delete everything else..
+	find . -mindepth 1 -maxdepth 1 \( \
+		\( -name '[0-9a-f]*[0-9a-f].[0-9]' -type f -print \) \
+		-o -delete \
+	    \) | while read file; do
+		# ..and remove files which don't exist in source anymore
+		[ -f "$caddr/$file" ] || rm -f "$file"
+	    done
     ) fi
     mkdir -p $dest
     ( cd $cadir
 	find -L . -name '[0-9a-f]*.[0-9]' -type f \
-	    -exec cp -pLu -t $dest '{}' +
+	    -exec cp -pLuf -t $dest '{}' +
     )
 done
 
diff --git a/debian/control b/debian/control
index 399d32a..f454b65 100644
--- a/debian/control
+++ b/debian/control
@@ -141,7 +141,7 @@ Description: PCRE map support for Postfix
  maps in Postfix.  If you plan to use PCRE maps with Postfix, you need this.
 
 Package: postfix-mongodb
-Architecture: any
+Architecture: linux-any
 Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: MongoDB map support for Postfix
  Postfix is Wietse Venema's mail transport agent, available in Debian
diff --git a/debian/ip-down.d b/debian/ip-down.d
deleted file mode 100644
index 82acc2f..0000000
--- a/debian/ip-down.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-# update postfix copy of resolv.conf; only default instance is handled
-file=/etc/resolv.conf queue=/var/spool/postfix
-if [ lo != "$IFACE" ] && [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ]
-then # just refresh, glibc pick it up automatically
-  [ ! -f $file ] && rm -f $queue$file && cp -pLu $file $queue$file
-fi
diff --git a/debian/ip-up.d b/debian/ip-up.d
deleted file mode 100644
index 56b8c96..0000000
--- a/debian/ip-up.d
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-# update postfix copy of resolv.conf; only default instance is handled
-file=/etc/resolv.conf queue=/var/spool/postfix
-if [ lo != "$IFACE" ] && [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ]
-then # just refresh, glibc pick it up automatically
-    [ ! -f $file ] && rm -f $queue$file || cp -pLu $file $queue$file
-    #sendmail -q 2>/dev/null || : # flush mail queue
-fi
diff --git a/debian/main.cf.in b/debian/main.cf.in
index 995f8c2..b8fa99c 100644
--- a/debian/main.cf.in
+++ b/debian/main.cf.in
@@ -6,7 +6,7 @@
 # is /etc/mailname.
 #myorigin = /etc/mailname
 
-smtpd_banner = $myhostname ESMTP $mail_name (@@DISTRO@@)
+smtpd_banner = $myhostname ESMTP $mail_name (@DEB_VENDOR@)
 biff = no
 
 # appending .domain is the MUA's job.
diff --git a/debian/patches/05_debian_defaults.diff b/debian/patches/05_debian_defaults.diff
index 070ef9c..15c164d 100644
--- a/debian/patches/05_debian_defaults.diff
+++ b/debian/patches/05_debian_defaults.diff
@@ -25,7 +25,7 @@ diff --git a/conf/main.cf b/conf/main.cf
  
 @@ -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@@)
++smtpd_banner = $myhostname ESMTP $mail_name (@DEB_VENDOR@)
  
 @@ -602,3 +609,3 @@ unknown_local_recipient_reject_code = 550
  #
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
new file mode 100644
index 0000000..6ce997a
--- /dev/null
+++ b/debian/patches/hurd.patch
@@ -0,0 +1,65 @@
+From: Michael Tokarev <mjt@tls.msk.ru>
+Subject: hurd support v1
+Forwarded: no
+
+diff --git a/makedefs b/makedefs
+index 1932e36d..6f251fdb 100644
+--- a/makedefs
++++ b/makedefs
+@@ -704,12 +704,12 @@ EOF
+ 			}
+ 		    done
+ 		done
+-		case "`uname -s`" in
+-		GNU)
+-			# currently no IPv6 support on Hurd
+-			CCARGS="$CCARGS -DNO_IPV6"
+-			;;
+-		esac
++		: ${SHLIB_SUFFIX=.so}
++		: ${SHLIB_CFLAGS=-fPIC}
++		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
++		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
++		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
++		: ${PLUGIN_LD="${CC-gcc} -shared"}
+ 		;;
+      IRIX*.5.*)	SYSTYPE=IRIX5
+ 		# Use the native compiler by default
+diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
+index 62749ab5..1366b56c 100644
+--- a/src/util/sys_defs.h
++++ b/src/util/sys_defs.h
+@@ -918,22 +918,24 @@ extern int initgroups(const char *, int);
+ #endif
+ #define SOCKADDR_SIZE	socklen_t
+ #define SOCKOPT_SIZE	socklen_t
+-#ifdef __FreeBSD_kernel__
+ #define HAS_DUPLEX_PIPE
+-#define HAS_ISSETUGID
+-#endif
+ #ifndef NO_IPV6
+ #define HAS_IPV6
+-#ifdef __FreeBSD_kernel__
+ #define HAVE_GETIFADDRS
+-#else
+-#define HAS_PROCNET_IFINET6
+-#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
+ #endif
+-#endif
+-#define CANT_USE_SEND_RECV_MSG
+ #define DEF_SMTP_CACHE_DEMAND	0
+ #define PREFERRED_RAND_SOURCE	"dev:/dev/urandom"
++#define USE_SYSV_POLL
++#ifndef NO_POSIX_GETPW_R
++#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) \
++	|| (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 1) \
++	|| (defined(_BSD_SOURCE) && _BSD_SOURCE >= 1) \
++	|| (defined(_SVID_SOURCE) && _SVID_SOURCE >= 1) \
++	|| (defined(_POSIX_SOURCE) && _POSIX_SOURCE >= 1)
++#define HAVE_POSIX_GETPW_R
++#endif
++#endif
++#define HAS_CLOSEFROM
+ #endif
+ 
+  /*
diff --git a/debian/patches/makedefs-fix-RELEASE_MAJOR-expression.patch b/debian/patches/makedefs-fix-RELEASE_MAJOR-expression.patch
new file mode 100644
index 0000000..16ad96c
--- /dev/null
+++ b/debian/patches/makedefs-fix-RELEASE_MAJOR-expression.patch
@@ -0,0 +1,61 @@
+From: Michael Tokarev via Postfix-users <postfix-users@postfix.org>
+Date: Fri, 13 Dec 2024 07:56:08 +0300
+Subject: makedefs: fix $RELEASE_MAJOR expression
+Forwarded: https://marc.info/?l=postfix-users&m=173406561120227&w=2
+
+There are 2 issues with the way RELEASE_MAJOR is currently
+computed in ./makedefs.  First, it is not set at all when
+the system name/release are specified on the command line,
+so this change moves it a few lines down.
+
+And second, the usage of "expr" utility is wrong, as it does
+not work when the system release is 0.something.  Consider:
+
+  expr 0.foo : '\([0-9]*\)'
+
+the ":" expression itself will return the first N digits,
+which is "0" in this case.  But the less widely known thing
+about expr is that it works with numbers, not strings.
+So this becomes:
+
+  expr 0
+
+which, in turn, is false.  So while expr utility will produce
+"0" on output, it will ALSO exit with non-zero status.  And the
+next "exit 1" immediately gets in, so whole makedefs terminates.
+
+Fix this by using sed instead of expr.
+
+Introduced in 3.0.2.
+
+Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
+---
+ makedefs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/makedefs b/makedefs
+index 1932e36d..8a2120b8 100644
+--- a/makedefs
++++ b/makedefs
+@@ -239,8 +239,6 @@ case $# in
+  # Officially supported usage.
+  0) SYSTEM=`(uname -s) 2>/dev/null`
+     RELEASE=`(uname -r) 2>/dev/null`
+-    # No ${x%%y} support in Solaris 11 /bin/sh
+-    RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1
+     VERSION=`(uname -v) 2>/dev/null`
+     case "$VERSION" in
+      dcosx*) SYSTEM=$VERSION;;
+@@ -250,6 +248,9 @@ case $# in
+  *) echo usage: $0 [system release] 1>&2; exit 1;;
+ esac
+ 
++# No ${x%%y} support in Solaris 11 /bin/sh
++RELEASE_MAJOR=`echo "$RELEASE" | sed 's/[^0-9].*//'` || exit 1
++
+ case "$SYSTEM.$RELEASE" in
+    SCO_SV.3.2)	SYSTYPE=SCO5
+ 		# Use the native compiler by default
+-- 
+2.39.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 9cc1322..cddd365 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@ debian-man-name.diff
 Disable-LD_LIBRARY_PATH-check.patch
 reproducible
 run-configure-instance-from-postfix-script.patch
+makedefs-fix-RELEASE_MAJOR-expression.patch
+hurd.patch
diff --git a/debian/postfix.postfix-resolvconf.service b/debian/postfix.postfix-resolvconf.service
index 38eeb08..15044d9 100644
--- a/debian/postfix.postfix-resolvconf.service
+++ b/debian/postfix.postfix-resolvconf.service
@@ -2,8 +2,11 @@
 # Works for main/default postfix instance only
 [Unit]
 Description=Updates postfix copy of resolv.conf
-Documentation=man:postfix(1) man:resolvconf(8)
+Documentation=man:postfix(1)
+Documentation=file:/usr/share/doc/postfix/README.Debian.gz
+ConditionPathExists=/etc/resolv.conf
+ConditionPathIsDirectory=/var/spool/postfix/etc
 
 [Service]
 Type=oneshot
-ExecStart=/etc/resolvconf/update-libc.d/postfix
+ExecStart=cp -pLu /etc/resolv.conf /var/spool/postfix/etc/resolv.conf
diff --git a/debian/rules b/debian/rules
index 3e7b051..d2bfc83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,20 +7,18 @@
 
 export SHELL = /bin/sh -e
 
-DISTRO:=$(shell (lsb_release -is 2>/dev/null || echo Debian) | sed s:Debian:Debian/GNU:)
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto future=+lfs
 # Extra hardening flags (level 3):
 # https://developers.redhat.com/articles/2022/09/17/gccs-new-fortification-level
 # https://fedoraproject.org/wiki/Changes/Add_FORTIFY_SOURCE%3D3_to_distribution_build_flags
 export DEB_CPPFLAGS_MAINT_APPEND = -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
 export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
-DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/buildtools.mk  # for ${CC}
 include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/vendor.mk
 
 # list of packages we build (cache it to avoid extra execs)
 export POSTFIX_PACKAGES_2BUILD ?= $(shell dh_listpackages)
@@ -36,13 +34,30 @@ maps = cdb ldap lmdb mysql pcre pgsql sqlite
 # sed ERE for postfix-files to select files for the doc package
 docfiles-re = \$$(sample|readme|html)_directory
 
+# common defines
 CCARGS = \
 	-DDEBIAN \
+	-DMYORIGIN_FROM_FILE
+CONFARGS = \
+	CC="${CC}" \
+	DEBUG='' \
+	OPT="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+AUXLIBS =
+
+# shared libs and dynamic modules
+# can add SHLIB_CFLAGS SHLIB_SUFFIX
+CONFARGS += \
+	PLUGIN_LD="${CC} -shared ${LDFLAGS}" \
+	SHLIB_RPATH="-Wl,-rpath,${prvlibdir} ${LDFLAGS}" \
+	shlib_directory=${prvlibdir} \
+	shared=yes pie=yes dynamicmaps=yes
+
+# optional stuff
+CCARGS += \
 	-DHAS_PCRE=2 $(shell pcre2-config --cflags) \
 	-DHAS_LDAP \
 	-DUSE_LDAP_SASL \
 	-DHAS_SQLITE \
-	-DMYORIGIN_FROM_FILE \
 	-DHAS_CDB \
 	-DHAS_LMDB \
 	-DHAS_MYSQL -I/usr/include/mysql \
@@ -53,12 +68,7 @@ CCARGS = \
 	-DUSE_CYRUS_SASL \
 	-DUSE_TLS \
 
-CONFARGS = \
-	DEBUG='' \
-	OPT="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \
-	PLUGIN_LD="${CC} -shared ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \
-	SHLIB_RPATH="-Wl,-rpath,${prvlibdir} ${LDFLAGS}" \
-	AUXLIBS="${AUXLIBS}" \
+CONFARGS += \
 	AUXLIBS_CDB="-lcdb" \
 	AUXLIBS_LDAP="-lldap -llber" \
 	AUXLIBS_LMDB="-llmdb" \
@@ -67,11 +77,12 @@ CONFARGS = \
 	AUXLIBS_PGSQL="-lpq" \
 	AUXLIBS_SQLITE="-lsqlite3" \
 
-AUXLIBS = -lssl -lcrypto -lsasl2 -lpthread
+AUXLIBS += -lssl -lcrypto -lsasl2 -lpthread
 
 ifneq (,$(filter ${package}-mongodb,${POSTFIX_PACKAGES_2BUILD}))
 maps += mongodb
-CCARGS += -DHAS_MONGODB -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0
+CCARGS += -DHAS_MONGODB \
+	-I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0
 CONFARGS += AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0"
 endif
 
@@ -80,13 +91,11 @@ endif
 
 
 override_dh_auto_configure:
-	touch .makefiles-made
 	${MAKE} \
 		CCARGS="${CCARGS}" \
 		${CONFARGS} \
-		shared=yes pie=yes dynamicmaps=yes \
+		AUXLIBS="${AUXLIBS}" \
 		daemon_directory=${daemondir} \
-		shlib_directory=${prvlibdir} \
 		manpage_directory=/usr/share/man \
 		readme_directory=${docdir} \
 		html_directory=${docdir}/html \
@@ -103,8 +112,8 @@ override_dh_auto_build-arch:
 	sed -i 's@\s\+-ffile-prefix-map=\S\+=.\s\+@ @g' conf/makedefs.out
 	sed -i 's@SHLIB_ENV = LD_LIBRARY_PATH=\S\+@SHLIB_ENV = /debian-build-path/lib@g' conf/makedefs.out
 
-	sed "s:@@DISTRO@@:$(DISTRO):g" < debian/main.cf.in > conf/main.cf.debian
-	sed "s:@@DISTRO@@:$(DISTRO):g" < conf/main.cf > conf/main.cf.dist
+	sed "s:@DEB_VENDOR@:${DEB_VENDOR}:g" < debian/main.cf.in > conf/main.cf.debian
+	sed "s:@DEB_VENDOR@:${DEB_VENDOR}:g" < conf/main.cf > conf/main.cf.dist
 
 
 override_dh_auto_build-indep:
@@ -211,30 +220,31 @@ override_dh_install-arch:
 	sed 's/@MULTIARCH@/${DEB_HOST_MULTIARCH}/' debian/configure-instance.in > \
 		${base}${prvlibdir}/configure-instance.sh
 	chmod 0755 ${base}${prvlibdir}/configure-instance.sh
-	install -m0755 \
-		debian/postfix-add-filter \
-		debian/postfix-add-policy \
-		-t ${base}/usr/sbin/
+	echo ${package}:Provides=default-mta \
+		>> debian/${package}.substvars
+	install -m0644 debian/postfix.ufw.profile -DT ${base}/etc/ufw/applications.d/postfix
+	install -m0644 debian/rsyslog.conf -DT ${base}/etc/rsyslog.d/postfix.conf
+	install -m0644 debian/postfix.insserv.conf -DT ${base}/etc/insserv.conf.d/postfix
+	for file in \
+		/etc/ppp/ip-up.d/postfix /etc/ppp/ip-down.d/postfix \
+		/etc/network/if-up.d/postfix /etc/network/ip-down.d/postfix \
+		/etc/resolvconf/update-libc.d/postfix \
+		/usr/lib/networkd-dispatcher/routable.d/postfix \
+		/usr/lib/networkd-dispatcher/off.d/postfix \
+		/usr/lib/NetworkManager/dispatcher.d/postfix \
+	    ; do \
+		install -m0755 debian/update-resolvconf -DT ${base}$$file; \
+	done
+	$(if $(filter ${DEB_VENDOR},Ubuntu),\
+		install -m0644 debian/postfix.apport -DT ${base}/usr/share/apport/package-hooks/postfix.py)
 	install -m0755 auxiliary/collate/collate.pl -T ${base}/usr/sbin/postfix-collate
 	txt2man -t postfix-collate -r postfix-$(DEB_VERSION_UPSTREAM) \
 		-d '$(shell date -d @$(SOURCE_DATE_EPOCH))' -s 1 \
 		auxiliary/collate/README \
 		> ${base}/usr/share/man/man1/postfix-collate.1
 	install -m0755 auxiliary/qshape/qshape.pl -T ${base}/usr/sbin/qshape
-	dh_installman -p ${package} debian/*.8
-	install -m0644 debian/postfix.ufw.profile -DT ${base}/etc/ufw/applications.d/postfix
-	install -m0644 debian/rsyslog.conf -DT ${base}/etc/rsyslog.d/postfix.conf
-	install -m0644 debian/postfix.insserv.conf -DT ${base}/etc/insserv.conf.d/postfix
-	install -m0755 debian/ip-up.d   -DT ${base}/etc/ppp/ip-up.d/postfix
-	install -m0755 debian/ip-down.d -DT ${base}/etc/ppp/ip-down.d/postfix
-	install -m0755 debian/ip-up.d   -DT ${base}/etc/network/if-up.d/postfix
-	install -m0755 debian/ip-down.d -DT ${base}/etc/network/if-down.d/postfix
-	install -m0755 debian/ip-up.d   -DT ${base}/usr/lib/networkd-dispatcher/routable.d/postfix
-	install -m0755 debian/ip-down.d -DT ${base}/usr/lib/networkd-dispatcher/off.d/postfix
-	install -m0755 debian/update-libc.d -DT ${base}/etc/resolvconf/update-libc.d/postfix
-	if dpkg-vendor --is ubuntu; then \
-	    install -m0644 debian/postfix.apport -DT ${base}/usr/share/apport/package-hooks/postfix.py; \
-	fi
+	install -m0755 debian/postfix-add-filter debian/postfix-add-policy -t ${base}/usr/sbin/
+	dh_installman -p ${package} debian/postfix-add-filter.8 debian/postfix-add-policy.8
 	install -m0755 debian/postfix_groups.pl -t ${base}${prvlibdir}/
 
 override_dh_installsystemd:
@@ -243,14 +253,10 @@ override_dh_installsystemd:
 	install -m0755 debian/postfix-instance-generator \
 		-Dt ${base}/$(shell pkg-config --variable=systemdsystemgeneratordir systemd)/
 
-execute_before_dh_gencontrol:
-	echo ${package}:Provides=default-mta \
-		>> debian/${package}.substvars
-
 
-override_dh_auto_clean:
-	[ ! -f .makefiles-made ] || ${MAKE} tidy
-	rm -f .makefiles-made
+clean:
+	[ ! -f conf/makedefs.out ] || ${MAKE} tidy
+	dh_clean conf/main.cf.debian conf/main.cf.dist
 
 # Below here is fairly generic really
 
diff --git a/debian/update-libc.d b/debian/update-libc.d
deleted file mode 100644
index d071430..0000000
--- a/debian/update-libc.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-# update postfix copy of resolv.conf; only default instance is handled
-file=/etc/resolv.conf queue=/var/spool/postfix
-if [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ]
-then # just refresh, glibc pick it up automatically
-    [ ! -f $file ] && rm -f $queue$file || cp -pLu $file $queue$file
-fi
diff --git a/debian/update-resolvconf b/debian/update-resolvconf
new file mode 100644
index 0000000..9db2b8b
--- /dev/null
+++ b/debian/update-resolvconf
@@ -0,0 +1,3 @@
+#! /bin/sh
+# update postfix copy of resolv.conf (picked up automatically); only default instance is handled
+[ lo != "$IFACE" ] && cp -pLu /etc/resolv.conf /var/spool/postfix/etc/resolv.conf 2>/dev/null || :