Merging debian version 3.9.1-6.

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

4 files changed, 129 insertions, 1 deletions

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