Imported Debian patch 8.14.1-1debian/8.14.1-1

1 files changed, 37 insertions, 21 deletions

diff --git a/debian/configure.ac b/debian/configure.ac
index b33d60b..374b59b 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1,11 +1,11 @@
 #------------------------------------------------------------------------------
 #
-#	$Sendmail: ./configure.ac,v 8.12.4 2006/01/03 10:00:00 cowboy Exp $
+#	$Sendmail: ./configure.ac,v 8.14.1 2007/04/03 21:00:00 cowboy Exp $
 #
 #	Copyright (c) 1998-2006 Richard Nelson.  All Rights Reserved.
 #
 #	Debian configure file for building Sendmail
-#	  Note: this file supports Sendmail 8.7.6 - 8.12.8
+#	  Note: this file supports Sendmail 8.7.6 - 8.14.1
 #			and has been tested on autoconf 2.12, 2.13, 2.50, 2.52, 2.53
 #
 #	  Note: Most of this file is vanilla 2.12, but the copyright and
@@ -13,8 +13,8 @@
 #
 #------------------------------------------------------------------------------
 define([_SM_CPYRT],  [2005])dnl
-define([_SM_VERS],	[8.14.0])dnl
-define([_SM_DATE],	[2007-01-04 10:00:00])dnl
+define([_SM_VERS],	[8.14.1])dnl
+define([_SM_DATE],	[2007-04-03 21:00:00])dnl
 define([_SM_MAXVERS],[9.0.0])dnl
 define([_SM_MINVERS],[8.7.6])dnl
 
@@ -25,12 +25,12 @@ ifdef([AC_COPYRIGHT],
 [define([_ac_version], m4_PACKAGE_VERSION)]
 ,[define([_ac_version], AC_ACVERSION)])
 m4_ifdef([AM_AUTOMAKE_VERSION],[dnl
-m4_define([_TMP_], m4_defn([AM_AUTOMAKE_VERSION]))dnl
+dnl m4_define([_MY_TMP_], m4_defn([AM_AUTOMAKE_VERSION]))dnl
 dnl delete a char $2 from a string $1 if it is there
-m4_define([_DELCHAR_],[m4_define([_IDX_],[m4_index([$1],[$2])])[]m4_define([_I_],[m4_eval(_IDX_ >= 0)])[]m4_if(_I_,[1],[m4_substr([$1],0,_IDX_)[]m4_substr([$1],m4_eval(_IDX_+1))],[$1])])dnl
+dnl m4_define([_DELCHAR_],[m4_define([_IDX_],[m4_index([$1],[$2])])[]m4_define([_I_],[m4_eval(_IDX_ >= 0)])[]m4_if(_I_,[1],[m4_substr([$1],0,_IDX_)[]m4_substr([$1],m4_eval(_IDX_+1))],[$1])])dnl
 dnl delete a char $2 (and everything before it from a string $1 if it is there
-m4_define([_DELPFX_],[m4_define([_IDX_],[m4_index([$1],[$2])])[]m4_define([_I_],[m4_eval(_IDX_ >= 0)])[]m4_if(_I_,[1],[m4_substr([$1],m4_eval(_IDX_+1))],[$1])])dnl
-m4_define([_am_version], [_DELCHAR_(_DELPFX_(_TMP_,["]),["])])dnl
+dnl m4_define([_DELPFX_],[m4_define([_IDX_],[m4_index([$1],[$2])])[]m4_define([_I_],[m4_eval(_IDX_ >= 0)])[]m4_if(_I_,[1],[m4_substr([$1],m4_eval(_IDX_+1))],[$1])])dnl
+dnl m4_define([_am_version], [_DELCHAR_(_DELPFX_(_MY_TMP_,["]),["])])dnl
 ],[dnl
 define([_am_version],[<=1.5])
 ])dnl
@@ -172,7 +172,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.14.1  = 527873  (8.14 = 527872) 
 #		 8.13.1  = 527617  (8.13 = 527616)
 #		 8.12.11 = 527371  (8.12 = 527360)
 #		 8.11.7  = 527111  (8.11 = 527104)
@@ -389,6 +389,7 @@ sm_editmap_libs='';			AC_SUBST(sm_editmap_libs)
 # libmilter
 sm_libmilter_envdef='-fPIC';		AC_SUBST(sm_libmilter_envdef)
 sm_libmilter_libs='';		AC_SUBST(sm_libmilter_libs)
+sm_libmilter_version=0;		AC_SUBST(sm_libmilter_version)
 # libsm
 sm_libsm_envdef='-fPIC';			AC_SUBST(sm_libsm_envdef)
 sm_libsm_libs='';			AC_SUBST(sm_libsm_libs)
@@ -638,6 +639,11 @@ AC_SUBST(sm_enable_shm)
 
 # Milter (_FFR_ on 8.10, 8.11, native on 8.12+)
 if test "$sm_enable_milter" != "no"; then
+	sm_libmilter_version=0;
+	v2i 8.14.0;
+	if  test $sm_version_math -ge $sm_version_test; then
+		sm_libmilter_version=1;
+		fi;
 	v2i 8.10.0;
 	if	test $sm_version_math -ge $sm_version_test; then
 		sm_enable_milter=yes;
@@ -796,7 +802,7 @@ if test $sm_enable_newdb != no; then
 			#if DB_VERSION_MAJOR >= 4
 				sm_newdb_lib=4
 				#endif
-			], [sm_newdb_lib=db-4.2], [
+			], [sm_newdb_lib=db4], [
 			AC_EGREP_CPP(sm_newdb_lib=3,[
 				#if defined(HAVE_DB3_DB_H)
 					#include <db3/db.h>
@@ -842,7 +848,7 @@ if test $sm_enable_newdb != no; then
 			#else
 				ac_cv_header_db4_db_h=no;
 				ac_cv_header_db3_db_h=no;
-				if [[ $sm_newdb_lib = db-4.2 ]]  \
+				if [[ $sm_newdb_lib = db4 ]]  \
 				|| [[ $sm_newdb_lib = db3 ]]; then
 					if test $ac_cv_header_db2_db_h = yes; then
 						AC_MSG_WARN([<8.10.0 & $sm_newdb_lib: trying db2])
@@ -876,10 +882,17 @@ if test $sm_enable_newdb != no; then
 	# then check to see if -ldb will work
 	if test $sm_have_newdb != no; then
 		sm_old_libs="$LIBS";
-		if test $sm_newdb_lib = db-4.2; then
-			AC_CHECK_LIB($sm_newdb_lib, db_create_4002, [:], [
-				AC_CHECK_LIB(db, db_create_4002,
-					[sm_newdb_lib='db'], [sm_have_newdb=no])dnl
+		if test $sm_newdb_lib = db4; then
+			AC_CHECK_LIB(db-4.5, db_create, [sm_newdb_lib='db-4.5'], [
+				AC_CHECK_LIB(db-4.4, db_create, [sm_newdb_lib='db-4.4'], [
+					AC_CHECK_LIB(db-4.3, db_create, [sm_newdb_lib='db-4.3'], [
+						AC_CHECK_LIB(db-4.2, db_create_4002,
+									 [sm_newdb_lib='db-4.2'], [
+							AC_CHECK_LIB(db, db_create,
+								[sm_newdb_lib='db'], [sm_have_newdb=no])dnl
+							])dnl
+						])dnl
+					])dnl
 				])dnl
 		elif test $sm_newdb_lib = db3; then
 			AC_CHECK_LIB($sm_newdb_lib, db_create, [:], [
@@ -913,7 +926,7 @@ if test $sm_enable_newdb != no; then
 	# only libsmdb and sendmail #include <db.h>, but libsmdb is needed
 	# by most of the other components
 	if test $sm_have_newdb = yes; then
-		if test \( $ac_cv_header_db4_db_h = yes -a $sm_newdb_lib = db-4.1 \) \
+		if test \( $ac_cv_header_db4_db_h = yes -a $sm_newdb_lib = db4 \) \
 			-o	\( $ac_cv_header_db3_db_h = yes -a $sm_newdb_lib = db3 \) \
 			-o	\( $ac_cv_header_db2_db_h = yes -a $sm_newdb_lib = db2 \) \
 			-o	\( $ac_cv_header_db1_db_h = yes -a $sm_newdb_lib = db1 \); then
@@ -1634,12 +1647,15 @@ AC_CONFIG_FILES([build/debian/control.m4],[
 		m4 ./build/debian/control.m4 > ./build/debian/control;
 		cp ./build/debian/control ./;])
 dnl AC_CONFIG_FILES([rules:./build/rules.in], [chmod a+x ./rules])
-AC_CONFIG_FILES([libmilter0.dirs:./build/debian/libmilter0.dirs.in])
-AC_CONFIG_FILES([libmilter0.postrm:./build/debian/libmilter0.postrm.in],
-	[chmod a+x ./libmilter0.postrm])
-AC_CONFIG_FILES([libmilter0.preinst:./build/debian/libmilter0.preinst.in],
-	[chmod a+x ./libmilter0.preinst])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.postrm:./build/debian/libmilter.postrm.in],
+	[chmod a+x ./libmilter${sm_libmilter_version}.postrm])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in],
+	[chmod a+x ./libmilter${sm_libmilter_version}.preinst])
 AC_CONFIG_FILES([libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in])
+AC_CONFIG_FILES([libmilter-dev.links:./build/debian/libmilter-dev.links.in])
 AC_CONFIG_FILES([libmilter-dev.postrm:./build/debian/libmilter-dev.postrm.in],
 	[chmod a+x ./libmilter-dev.postrm])
 AC_CONFIG_FILES([libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in],