Imported Debian patch 8.14.0~Beta4-1debian/8.14.0_Beta4-1

1 files changed, 33 insertions, 20 deletions

diff --git a/debian/configure b/debian/configure
index 2d11b4a..6cb6aec 100644
--- a/debian/configure
+++ b/debian/configure
@@ -1,19 +1,19 @@
 #! /bin/sh
-# From configure.ac Revision: 8.13.4 .
+# From configure.ac Revision: 8.14.0 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sendmail 8.13.4.
+# Generated by GNU Autoconf 2.61 for Sendmail 8.14.0.
 #
 # Report bugs to <bug/reportbug or sendmail@packages.debian.org>.
 #
 # #
 # #	$Sendmail$
-# #	   from Sendmail: ./configure.ac,v 8.13.4 2005-02-21 21:00:00
+# #	   from Sendmail: ./configure.ac,v 8.14.0 2007-01-04 10:00:00
 # #
 # cat <<EOF
 #
 #    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 #
-#    Sendmail 8.13.4
+#    Sendmail 8.14.0
 #    Generated by Autoconf 2.61,  Automake 1.9
 #
 #    Debian configure script for building Sendmail
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sendmail'
 PACKAGE_TARNAME='sendmail'
-PACKAGE_VERSION='8.13.4'
-PACKAGE_STRING='Sendmail 8.13.4'
+PACKAGE_VERSION='8.14.0'
+PACKAGE_STRING='Sendmail 8.14.0'
 PACKAGE_BUGREPORT='bug/reportbug or sendmail@packages.debian.org'
 
 ac_unique_file="./build/site.config.m4.in"
@@ -1343,7 +1343,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.4 to adapt to many kinds of systems.
+\`configure' configures Sendmail 8.14.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sendmail 8.13.4:";;
+     short | recursive ) echo "Configuration of Sendmail 8.14.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1526,7 +1526,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sendmail configure 8.13.4
+Sendmail configure 8.14.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1536,13 +1536,13 @@ gives unlimited permission to copy, distribute and modify it.
 
 #
 #	$Sendmail$
-#	   from Sendmail: ./configure.ac,v 8.13.4 2005-02-21 21:00:00
+#	   from Sendmail: ./configure.ac,v 8.14.0 2007-01-04 10:00:00
 #
 cat <<EOF
 
    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 
-   Sendmail 8.13.4
+   Sendmail 8.14.0
    Generated by Autoconf 2.61,  Automake 1.9
 
    Debian configure script for building Sendmail
@@ -1559,7 +1559,7 @@ cat >config.log <<_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.4, which was
+It was created by Sendmail $as_me 8.14.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2354,7 +2354,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sendmail'
- VERSION='8.13.4'
+ VERSION='8.14.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2531,8 +2531,8 @@ am_version="1.9";
 am_version="$am__api_version";
 
 
-SM_VERS='8.13.4';
-SM_DATE='2005-02-21 21:00:00';
+SM_VERS='8.14.0';
+SM_DATE='2007-01-04 10:00:00';
 SM_MINVERS='8.7.6';
 SM_MAXVERS='9.0.0';
 SM_CPYRT='2005';
@@ -2561,7 +2561,7 @@ if test -f ../build-tree/*/sendmail/version.c; then
 else
 	curr_dir=$(echo `pwd` | sed -e 's/\/debian$//' -);
 	version=$(expr "${curr_dir}" : '.*-\([0-9.].*\)');
-	beta_version=$(expr "${curr_dir}" : '.*+\([0-9.].*\)');
+	beta_version=$(expr "${curr_dir}" : '.*~\([0-9.].*\)');
 	if test -z "$beta_version"; then
 		sm_version="$version";
 	else
@@ -2591,6 +2591,7 @@ PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}";
 #	beta  = suffix for beta version (8.12.0.Beta7 -> 7)
 #	math  = for numeric (<, >=, etc.) comparisons
 #		 9.0.0	 = 589824  (9.0  = 589824)
+#                8.14.0  = 527872  (8.14 = 527872)
 #		 8.13.1  = 527617  (8.13 = 527616)
 #		 8.12.11 = 527371  (8.12 = 527360)
 #		 8.11.7  = 527111  (8.11 = 527104)
@@ -2888,7 +2889,7 @@ echo "${ECHO_T}$DEBIAN, using debhelper v$DEBIAN_DH" >&6; }
 #-------------------------------------------------------------------
 
 echo ""
-echo "Sendmail ${sm_custom}${sm_version}${sm_revision} \
+echo "Sendmail ${sm_custom}${sm_version}${sm_revision} (${sm_version_math}) \
 on ${sm_dist_name} ${sm_dist_vers} ${sm_build_arch}/${sm_host_arch}.";
 echo "Generated by Autoconf ${ac_version},	Automake ${am_version}.";
 echo "";
@@ -4747,7 +4748,19 @@ sm_libsm_envdef="$sm_libsm_envdef -DHAVE_NANOSLEEP=1";
 sm_ffr="$sm_ffr -D_FFR_QUEUE_SCHED_DBG"; # %%%%%% TESTING %%%%%%%%
 #
 # version specific setup
-if	 test "$sm_version_major" = "8.13"; then
+if test "$sm_version_major" = "8.14"; then
+	sm_ffr="$sm_ffr -D_FFR_SKIP_DOMAINS";
+	sm_mapdef="$sm_mapdef -DSOCKETMAP";
+	sm_envdef="$sm_envdef -DUSESETEUID=1 -DHASGETUSERSHELL=1";
+	sm_ffr="$sm_ffr -D_FFR_GROUPREADABLEAUTHINFOFILE";
+	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_RHS";
+	sm_ffr="$sm_ffr -D_FFR_MAIL_MACRO";
+	sm_m4_ffr="$sm_m4_ffr define(\`_FFR_MAIL_MACRO')";
+	sm_ffr="$sm_ffr -D_FFR_QUEUEDELAY=1";
+elif test "$sm_version_major" = "8.13"; then
 	sm_ffr="$sm_ffr -D_FFR_SKIP_DOMAINS";
 	sm_mapdef="$sm_mapdef -DSOCKETMAP";
 	sm_ffr="$sm_ffr -D_FFR_BLOCK_PROXIES";
@@ -10789,7 +10802,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sendmail $as_me 8.13.4, which was
+This file was extended by Sendmail $as_me 8.14.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10836,7 +10849,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sendmail config.status 8.13.4
+Sendmail config.status 8.14.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"