Imported Debian patch 8.13.4-3debian/8.13.4-3

5 files changed, 97 insertions, 37 deletions

diff --git a/debian/changelog b/debian/changelog
index d9a0055..c370e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sendmail (8.13.4-3) unstable; urgency=high
+  * More migration fixes
+   + -D_FFR_QUEUEDELAY                                closes: #311769
+   + Tighten regex for TRUSTED_USER                   closes: #307309
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 03 Jun 2005 16:00:00 -0000
+
 sendmail (8.13.4-2) unstable; urgency=high
   * Important migration fixes
    + Correct netbase depends (4.08, not 4.0.8)         closes: #305513
diff --git a/debian/configure b/debian/configure
index ff45eed..3bec995 100644
--- a/debian/configure
+++ b/debian/configure
@@ -1,19 +1,19 @@
 #! /bin/sh
-# From configure.ac Revision: 8.13.3 .
+# From configure.ac Revision: 8.13.4 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Sendmail 8.13.3.
+# Generated by GNU Autoconf 2.59 for Sendmail 8.13.4.
 #
 # Report bugs to <bug/reportbug or sendmail@packages.debian.org>.
 #
 # #
 # #	$Sendmail$
-# #	   from Sendmail: ./configure.ac,v 8.13.3 2005-02-21 21:00:00
+# #	   from Sendmail: ./configure.ac,v 8.13.4 2005-02-21 21:00:00
 # #
 # cat <<EOF
 #
 #    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 #
-#    Sendmail 8.13.3
+#    Sendmail 8.13.4
 #    Generated by Autoconf 2.59,  Automake 1.9
 #
 #    Debian configure script for building Sendmail
@@ -289,8 +289,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sendmail'
 PACKAGE_TARNAME='sendmail'
-PACKAGE_VERSION='8.13.3'
-PACKAGE_STRING='Sendmail 8.13.3'
+PACKAGE_VERSION='8.13.4'
+PACKAGE_STRING='Sendmail 8.13.4'
 PACKAGE_BUGREPORT='bug/reportbug or sendmail@packages.debian.org'
 
 ac_unique_file="./build/site.config.m4.in"
@@ -801,7 +801,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sendmail 8.13.3 to adapt to many kinds of systems.
+\`configure' configures Sendmail 8.13.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -868,7 +868,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sendmail 8.13.3:";;
+     short | recursive ) echo "Configuration of Sendmail 8.13.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1014,7 +1014,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Sendmail configure 8.13.3
+Sendmail configure 8.13.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1023,13 +1023,13 @@ gives unlimited permission to copy, distribute and modify it.
 
 #
 #	$Sendmail$
-#	   from Sendmail: ./configure.ac,v 8.13.3 2005-02-21 21:00:00
+#	   from Sendmail: ./configure.ac,v 8.13.4 2005-02-21 21:00:00
 #
 cat <<EOF
 
    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 
-   Sendmail 8.13.3
+   Sendmail 8.13.4
    Generated by Autoconf 2.59,  Automake 1.9
 
    Debian configure script for building Sendmail
@@ -1047,7 +1047,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sendmail $as_me 8.13.3, which was
+It was created by Sendmail $as_me 8.13.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1771,7 +1771,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sendmail'
- VERSION='8.13.3'
+ VERSION='8.13.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1932,7 +1932,7 @@ am_version="1.9";
 am_version="$am__api_version";
 
 
-SM_VERS='8.13.3';
+SM_VERS='8.13.4';
 SM_DATE='2005-02-21 21:00:00';
 SM_MINVERS='8.7.6';
 SM_MAXVERS='9.0.0';
@@ -4009,11 +4009,12 @@ if	 test "$sm_version_major" = "8.13"; then
 	sm_ffr="$sm_ffr -D_FFR_CONTROL_MSTAT";
 	sm_ffr="$sm_ffr -D_FFR_DAEMON_NETUNIX";
 	sm_ffr="$sm_ffr -D_FFR_NO_PIPE";
-	sm_ffr="$sm_ffr -D_FFR_SHM_STATUS";
+	sm_ffr="$sm_ffr -D_FFR_SHM_STATUS"
 	sm_ffr="$sm_ffr -D_FFR_RHS";
 	sm_ffr="$sm_ffr -D_FFR_MAIL_MACRO";
 	sm_ffr="$sm_ffr -D_FFR_HELONAME";
 	sm_m4_ffr="$sm_m4_ffr define(\`_FFR_MAIL_MACRO')";
+	sm_ffr="$sm_ffr -D_FFR_QUEUEDELAY=1";
 elif test "$sm_version_major" = "8.12"; then
 	sm_envdef="$sm_envdef -DUSESETEUID=1 -DHASGETUSERSHELL=1";
 	#
@@ -10132,7 +10133,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Sendmail $as_me 8.13.3, which was
+This file was extended by Sendmail $as_me 8.13.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10190,7 +10191,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sendmail config.status 8.13.3
+Sendmail config.status 8.13.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/debian/configure.ac b/debian/configure.ac
index 54c64d2..f06e7a3 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -13,7 +13,7 @@
 #
 #------------------------------------------------------------------------------
 define([_SM_CPYRT],  [2005])dnl
-define([_SM_VERS],	[8.13.3])dnl
+define([_SM_VERS],	[8.13.4])dnl
 define([_SM_DATE],	[2005-02-21 21:00:00])dnl
 define([_SM_MAXVERS],[9.0.0])dnl
 define([_SM_MINVERS],[8.7.6])dnl
@@ -476,11 +476,12 @@ if	 test "$sm_version_major" = "8.13"; then
 	sm_ffr="$sm_ffr -D_FFR_CONTROL_MSTAT";
 	sm_ffr="$sm_ffr -D_FFR_DAEMON_NETUNIX";
 	sm_ffr="$sm_ffr -D_FFR_NO_PIPE";
-	sm_ffr="$sm_ffr -D_FFR_SHM_STATUS";
+	sm_ffr="$sm_ffr -D_FFR_SHM_STATUS"
 	sm_ffr="$sm_ffr -D_FFR_RHS";
 	sm_ffr="$sm_ffr -D_FFR_MAIL_MACRO";
 	sm_ffr="$sm_ffr -D_FFR_HELONAME";
 	sm_m4_ffr="$sm_m4_ffr [define(\`_FFR_MAIL_MACRO')]";
+	sm_ffr="$sm_ffr -D_FFR_QUEUEDELAY=1";
 elif test "$sm_version_major" = "8.12"; then
 	sm_envdef="$sm_envdef -DUSESETEUID=1 -DHASGETUSERSHELL=1";
 	#
diff --git a/debian/local/update_mc.in b/debian/local/update_mc.in
index 51a9cdf..297d784 100644
--- a/debian/local/update_mc.in
+++ b/debian/local/update_mc.in
@@ -276,8 +276,8 @@ case "$DAEMON_HOSTSTATS" in
 #-----------------------------------------------------------------------------
 # Cleanup submit.mc
 if [ -f @sysconfdir@/mail/submit.mc ]; then
-	sed -e "/^define(\`\?confRUN_AS_USER.*$/d" \
-		-e "/^define(\`\?confTRUSTED_USER.*$/d" \
+	sed -e "/^define(\`\?confRUN_AS_USER'\?,.*$/d" \
+		-e "/^define(\`\?confTRUSTED_USER'\?,.*$/d" \
 		@sysconfdir@/mail/submit.mc > @sysconfdir@/mail/submit.mc.new;
 	new_mc submit;
 	fi;
diff --git a/debian/rules b/debian/rules
index 53e4ac3..1791f45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,20 +38,20 @@
 #		nostrip - Do *NOT* strip binaries (for debugging)
 #
 # SM_CONF
-# 	A quick means to customize the Debian Sendmail package according
-# 	to your sites guidelines !
-# 		 1) Choose a configuration name (ie FooBar)
-# 		 2) cp debian/configure.options debian/FooBar.options
-# 		 3) $(EDIT) debian/FooBar.options to taste
-# 		 4) mkdir debian/FooBar.patches
-# 		 5) add any local patches in that directory - following
-# 		    the style in debian/patches style (ie, 8.13/8.13.3 subdirectory)
-# 		 6) cp debian/changelog debian/FooBar.changelog
-# 		 7) $(EDIT) debian/FooBar.changelog, delete everything after the
-# 		    1st null line (but leave that null!!!)
-# 		 8) Update debian/FooBar.changelog to show your updates
-# 		 9) SM_CONF="FooBar" debian/rules configure ** IMPORTANT ***
-# 		10) build the package (SM_CONF="FooBar" dpkg-buildpackage or debuild)
+#	A quick means to customize the Debian Sendmail package according
+#	to your sites guidelines !
+#		 1) Choose a configuration name (ie FooBar)
+#		 2) cp debian/configure.options debian/FooBar.options
+#		 3) $(EDIT) debian/FooBar.options to taste
+#		 4) mkdir debian/FooBar.patches
+#		 5) add any local patches in that directory - following
+#			the style in debian/patches style (ie, 8.13/8.13.3 subdirectory)
+#		 6) cp debian/changelog debian/FooBar.changelog
+#		 7) $(EDIT) debian/FooBar.changelog, delete everything after the
+#			1st null line (but leave that null!!!)
+#		 8) Update debian/FooBar.changelog to show your updates
+#		 9) SM_CONF="FooBar" debian/rules configure ** IMPORTANT ***
+#		10) build the package (SM_CONF="FooBar" dpkg-buildpackage or debuild)
 #
 #
 # SM_CONF_OPT
@@ -131,7 +131,7 @@ version_string := $(shell (cd ${debian_dir}/.. >/dev/null && \
 # Remove local site name from version string
 ifneq (, ${SM_CONF})
 ifneq (, $(findstring ${SM_CONF}.,${version_string}))
-    version_string := $(shell expr "${version_string}" : "${SM_CONF}.\(.*\)")
+	version_string := $(shell expr "${version_string}" : "${SM_CONF}.\(.*\)")
 endif
 endif
 version_full   := $(shell expr "${version_string}" : '\([^-]*\)')
@@ -721,6 +721,21 @@ ifeq (3, $(shell test ${DH_COMPAT} -ge 3 && echo '3'))
 		mv $$file $$file.sav; \
 		done;
 endif
+ifeq (smX, ${package})
+	(cd ${BUILD_TREE} && \
+		CFLAGS="-DSM_USE_TLS -DSM_USE_SASL ${CFLAGS}" \
+		./configure \
+			--libexecdir=/usr/lib/sm.bin \
+			--datadir=${DATA_DIR} \
+			--sysconfdir=/etc \
+			--localstatedir=/var \
+			--infodir=${DATA_DIR}/info \
+			--mandir=${DATA_DIR}/man \
+			--enable-TLS \
+			--enable-SASL \
+			--enable-pmilter \
+	)
+endif
 	touch ${STAMP_DIR}/configure;
 
 
@@ -731,6 +746,8 @@ ${STAMP_DIR}/build-indep: ${STAMP_DIR}/configure
 # Skip work if nothing to do...
 ifeq (yes, ${ENABLE_INDEP})
 	@dh_testdir;
+ifeq (smX,${package})
+else
 	# Add here commands to build/compile the documentation/package.
 	#$(MAKE) doc;
 	# Only valid on newer (8.11+) Sendmails
@@ -742,6 +759,7 @@ ifeq (yes, ${ENABLE_INDEP})
 	# Debian stuff
 	(cd ${debian_dir} && $(MAKE) -f Makefile build-indep;)
 endif
+endif
 	touch ${STAMP_DIR}/build-indep;
 
 
@@ -753,7 +771,12 @@ ${STAMP_DIR}/build-arch: ${STAMP_DIR}/configure
 ifeq (yes, ${ENABLE_ARCH})
 	@dh_testdir;
 	# Add here commands to compile the package.
-	#$(MAKE);
+	# $(MAKE);
+	#
+ifeq (smX,${package})
+	(cd ${BUILD_TREE} && make)
+	#(cd ${BUILD_TREE} && make -i check >check.log 2>&1)
+else
 	# Place our m4 configuration files for the sendmail build to use
 	if [ -d ${BUILD_TREE}/devtools/Site ]; then \
 		cp -f ${debian_dir}/build/site.config.m4 \
@@ -778,10 +801,29 @@ ifeq (yes, ${ENABLE_ARCH})
 	# Remove our config m4 files
 	$(RM) ${BUILD_TREE}/devtools/Site/site.config.m4;
 endif
+endif
 	touch ${STAMP_DIR}/build-arch;
 
 
 #-------------
+.PHONY: build-arch
+check-arch: ${STAMP_DIR}/check-arch
+${STAMP_DIR}/check-arch: ${STAMP_DIR}/build-arch
+# Skip work if nothing to do...
+ifeq (yes, ${ENABLE_ARCH})
+	@dh_testdir;
+	# Add here commands to compile the package.
+	# $(MAKE);
+	#
+ifeq (smX,${package})
+	(cd ${BUILD_TREE} && make -i check >check.log 2>&1)
+else
+endif
+endif
+	touch ${STAMP_DIR}/check-arch;
+
+
+#-------------
 .PHONY: install-indep
 install-indep: ${STAMP_DIR}/install-indep
 ${STAMP_DIR}/install-indep: DH_OPTIONS=-i
@@ -793,6 +835,8 @@ ifeq (yes, ${ENABLE_INDEP})
 	#dh_clean -k;
 	dh_installdirs;
 	if [ -x /usr/bin/dh_link ]; then dh_link; fi;
+ifeq (smX,${package})
+else
 	# Add here commands to install the documentation/package.
 	#$(MAKE) prefix=`pwd`/${PKG_DIR}/usr install;
 	# sendmail operations guide and other documentation
@@ -856,6 +900,7 @@ endif
 		debian/build/debian/sendmail-base.lintian-overrides \
 		debian/sendmail-base/usr/share/lintian/overrides/sendmail-base;
 endif
+endif
 	touch ${STAMP_DIR}/install-indep;
 
 
@@ -876,6 +921,8 @@ ifeq (yes, ${ENABLE_ARCH})
 	# sendmail install proper... with a little help ;-}
 	#$(MAKE) install DESTDIR="$${pwd}/${PKG_DIR}";
 	# Finally, install the whole enchilada
+ifeq (smX,${package})
+else
 	for subdir in ${SM_SUBDIRS}; do \
 		if [ -d  ${BUILD_TREE}/$${subdir} ]; then \
 			if [ "$${subdir}" = 'libmilter' ]; then \
@@ -1024,6 +1071,7 @@ endif
 ifeq (, $(findstring nostrip,${DEB_BUILD_OPTIONS}))
 	dh_strip;
 endif
+endif
 	dh_makeshlibs; # -V "libmilter0 (>= ${version_major}.${version_minor})";
 	dh_shlibdeps;
 endif
@@ -1134,6 +1182,9 @@ source diff:
 build: build-arch
 .PHONY: build-all
 build-all: build-indep build-arch
+.PHONY: check check-all
+check: check-arch
+check-all: check-arch
 .PHONY: install
 install: install-arch
 .PHONY: binary