Imported Debian patch 8.14.1-9debian/8.14.1-9

7 files changed, 90 insertions, 76 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index c940333..ffe8f81 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.1 2007-07-29 09:41:45 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.1 2007-08-17 21:03:32 cowboy Exp $
 #
 # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -16,7 +16,7 @@
 #		on Debian slink, potato, woody, testing, sid, ...
 #		but the generated file is customized to the version noted above.
 #
-# Richard Nelson <cowboy@debian.org> 2007-07-29 09:41:45 (-0700)
+# Richard Nelson <cowboy@debian.org> 2007-08-17 21:03:32 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/cf/mailer/cyrus21.m4 b/debian/cf/mailer/cyrus21.m4
deleted file mode 100644
index c12dce0..0000000
--- a/debian/cf/mailer/cyrus21.m4
+++ /dev/null
@@ -1,66 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
-#	All rights reserved.
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the sendmail distribution.
-#
-#
-# This code incorporates code from Carnegie Mellon University, whose
-# copyright notice and conditions of redistribution are as follows:
-#
-#***************************************************************************
-#	(C) Copyright 1995 by Carnegie Mellon University
-#
-#                      All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted,
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in
-# supporting documentation, and that the name of CMU not be
-# used in advertising or publicity pertaining to distribution of the
-# software without specific, written prior permission.
-#
-# CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-# CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-#
-#	Contributed to Berkeley by John Gardiner Myers <jgm+@CMU.EDU>.
-#
-
-errprint(`*** Warning: cyrus21 deprecated in favour of cyrusv2')
-errprint(`*** Please migrate to cyrusv2 ASAP')
-
-ifdef(`CYRUS_MAILER_USER',, `define(`CYRUS_MAILER_USER', `cyrus:mail')')
-define(`_CYRUS_QGRP', `ifelse(defn(`CYRUS_MAILER_QGRP'),`',`', ` Q=CYRUS_MAILER_QGRP,')')dnl
-
-_DEFIFNOT(`CYRUS_MAILER_FLAGS', `AhmXz5@/:|')
-ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', `[IPC]')')
-ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `FILE /var/run/cyrus/socket/lmtp')')
-
-_DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `SuX')
-ifdef(`CYRUS_BB_MAILER_PATH',, `define(`CYRUS_BB_MAILER_PATH', `/usr/sbin/cyrdeliver')')
-ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `cyrdeliver -m $u')')
-
-POPDIVERT
-
-##################################################
-###   Cyrus Mailer specification               ###
-##################################################
-
-VERSIONID(`$Id: cyrus21.m4, v8.23.1 2002/04/05 12:36:34 Omniflux Exp $')
-
-Mcyrus,		P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnq', CYRUS_MAILER_FLAGS), `CYRUS'), E=\r\n, S=EnvFromL, R=EnvToL/HdrToL,
-		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
-		A=CYRUS_MAILER_ARGS
-
-Mcyrusbb,	P=CYRUS_BB_MAILER_PATH,	F=_MODMF_(CONCAT(`lsDFMnq1', CYRUS_BB_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL,
-		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
-		A=CYRUS_BB_MAILER_ARGS
diff --git a/debian/changelog b/debian/changelog
index ed9f90e..d12eaea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sendmail (8.14.1-9) unstable; urgency=low
+
+  * Finally drop MAILER(cyrus21) in favour of cyrusv2
+  * Egads, a rules typo dropped all local patches :(  closes: #436185
+  * upgrade to db4.6 (and newer libdb-dev)
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 13 Aug 2007 23:52:22 -0000
+
 sendmail (8.14.1-8) unstable; urgency=low
 
   * remove dependancy on update-inetd and netbase/inet-superserver
diff --git a/debian/configure b/debian/configure
index 2d38e39..f3430d0 100644
--- a/debian/configure
+++ b/debian/configure
@@ -5901,6 +5901,71 @@ echo "$as_me: WARNING: NEWDB version unknown, omitting support!" >&2;}
 	if test $sm_have_newdb != no; then
 		sm_old_libs="$LIBS";
 		if test $sm_newdb_lib = db4; then
+			{ echo "$as_me:$LINENO: checking for db_create in -ldb-4.6" >&5
+echo $ECHO_N "checking for db_create in -ldb-4.6... $ECHO_C" >&6; }
+if test "${ac_cv_lib_db_4_6_db_create+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb-4.6  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char db_create ();
+int
+main ()
+{
+return db_create ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_db_4_6_db_create=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_db_4_6_db_create=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_6_db_create" >&5
+echo "${ECHO_T}$ac_cv_lib_db_4_6_db_create" >&6; }
+if test $ac_cv_lib_db_4_6_db_create = yes; then
+  sm_newdb_lib='db-4.6'
+else
+
 			{ echo "$as_me:$LINENO: checking for db_create in -ldb-4.5" >&5
 echo $ECHO_N "checking for db_create in -ldb-4.5... $ECHO_C" >&6; }
 if test "${ac_cv_lib_db_4_5_db_create+set}" = set; then
@@ -6235,6 +6300,8 @@ fi
 fi
 
 fi
+
+fi
 		elif test $sm_newdb_lib = db3; then
 			as_ac_Lib=`echo "ac_cv_lib_$sm_newdb_lib''_db_create" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for db_create in -l$sm_newdb_lib" >&5
diff --git a/debian/configure.ac b/debian/configure.ac
index 4655b90..1b72a75 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#	$Sendmail: ./configure.ac,v 8.14.1 2007/04/03 21:00:00 cowboy Exp $
+#	$Sendmail: ./configure.ac,v 8.14.1 2007/08/18 04:03:00 cowboy Exp $
 #
 #	Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -877,6 +877,7 @@ if test $sm_enable_newdb != no; then
 	if test $sm_have_newdb != no; then
 		sm_old_libs="$LIBS";
 		if test $sm_newdb_lib = db4; then
+			AC_CHECK_LIB(db-4.6, db_create, [sm_newdb_lib='db-4.6'], [
 			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'], [
@@ -888,6 +889,7 @@ if test $sm_enable_newdb != no; then
 						])dnl
 					])dnl
 				])dnl
+				])dnl
 		elif test $sm_newdb_lib = db3; then
 			AC_CHECK_LIB($sm_newdb_lib, db_create, [:], [
 				AC_CHECK_LIB(db, db_create,
diff --git a/debian/control b/debian/control
index 48b15f4..bd66aef 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section:  mail
 Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.7.2
 Build-Depends-Indep: groff, bsdmainutils
-Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils , libdb4.5-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
+Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils , libdb4.6-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
 
 Package: sendmail-bin
diff --git a/debian/rules b/debian/rules
index 18cd9a5..6356594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,10 @@
 #include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 # Overridden below, but needed now
-DEB_TAR_SRCDIR := .
-include /usr/share/cdbs/1/rules/tarball.mk
+#DEB_TAR_SRCDIR := .
+#include /usr/share/cdbs/1/rules/tarball.mk
 
 # Make it even harder to exploit sendmail.
 # Well, almost impossible now 8-)
@@ -37,10 +37,10 @@ ifneq (y, $(shell test -f debian/changelog && echo 'y'))
 # strip of a optionally added data (ie: upstream+cvs-debian)
 DEB_UPSTREAM_TARBALL_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+[^-]*//')
 DEB_TAR_SRCDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
-DEB_SRCDIR := $(_cdbs_tarball_dir)/$(DEB_TAR_SRCDIR)
+DEB_SRCDIR := build-tree/$(DEB_TAR_SRCDIR)
 DEB_BUILDDIR := $(DEB_SRCDIR)
-DEB_DESTDIR = $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)
-DEB_PATCHDIRS = debian/patches/${version_major}/${version_string}
+DEB_DESTDIR = debian/$(DEB_SOURCE_PACKAGE)
+DEB_PATCHDIRS = $(CURDIR)/debian/patches/${version_major}/${version_full}
 DEB_DBG_PACKAGES = libmilter$(sm_libmilter_version)-dbg
 DEB_DBG_PACKAGE_libmilter$(sm_libmilter_version) = libmilter$(sm_libmilter_version)-dbg
 DEB_DH_INSTALL_CRON_ARGS = --name=$(DEB_SOURCE_PACKAGE)
@@ -109,6 +109,9 @@ else
 		endif
 	endif
 
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
 # Default rule
 all::
 	@echo 'Please specify a real target in the future...';