Imported Debian patch 8.14.1-1debian/8.14.1-1

14 files changed, 157 insertions, 27 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
new file mode 100644
index 0000000..cc6209c
--- /dev/null
+++ b/debian/build/autoconf.mk
@@ -0,0 +1,101 @@
+#!/usr/bin/make -f
+#------------------------------------------------------------------------------
+# vim: syntax=make
+#
+# $Sendmail: autoconf.mk,v 8.14.1 2007-05-05 15:58:55 cowboy Exp $
+#
+# Copyright (c) 1998-2005 Richard Nelson.  All Rights Reserved.
+#
+# build/autoconf.mk.  Generated from autoconf.mk.in by configure.
+#
+# Rules file for Sendmail 8.14.1(527873)
+#			 on  Debian lenny/sid
+#			 via Debhelper V4.1
+#
+# Note: the .in file supports Sendmail 8.7.6 - 9.0.0
+#		on Debian slink, potato, woody, testing, sid, ...
+#		but the generated file is customized to the version noted above.
+#
+# Richard Nelson <cowboy@debian.org> 2007-05-05 15:58:55 (-0700)
+#------------------------------------------------------------------------------
+#SHELL := /bin/sh -x
+
+# Variables for, and by, Autoconf (Don't touch these! edit config step)
+PACKAGE_NAME = Sendmail
+PACKAGE_VERSION = 8.14.1
+prefix = /usr
+exec_prefix = /usr
+bindir = ${DESTDIR}/usr/bin
+sbindir = ${DESTDIR}/usr/sbin
+libexecdir = ${DESTDIR}/usr/lib/sm.bin
+datadir = ${DESTDIR}/usr/share
+sysconfdir = ${DESTDIR}/etc
+sharedstatedir = ${DESTDIR}/usr/com
+localstatedir = ${DESTDIR}/var
+libdir = ${DESTDIR}/usr/lib
+includedir = ${DESTDIR}/usr/include
+infodir = ${DESTDIR}/usr/share/info
+mandir = ${DESTDIR}/usr/share/man
+srcdir = /home/src/sendmail/sendmail-8.14.1/debian/build
+abs_srcdir = /home/src/sendmail/sendmail-8.14.1/debian/build
+top_srcdir = /home/src/sendmail/sendmail-8.14.1/debian
+abs_top_srcdir = /home/src/sendmail/sendmail-8.14.1/debian
+builddir = .
+abs_builddir = /u/src/sendmail/sendmail-8.14.1/debian/build
+top_builddir = ..
+abs_top_builddir = /u/src/sendmail/sendmail-8.14.1/debian
+VPATH = /home/src/sendmail/sendmail-8.14.1/debian/build
+
+docdir = ${DESTDIR}/usr/share/doc
+buildtree = build-tree/sendmail-8.14.1
+
+# I like to preserve timestamps...
+INSTALL := /usr/bin/install -c -p
+INSTALL_PROGRAM := ${INSTALL}
+# We'll let the dh_strip program take care of this for us...
+#ifeq (,$(findstring nostrip,${DEB_BUILD_OPTIONS}))
+#	 override INSTALL_PROGRAM += -s
+#	 endif
+INSTALL_DATA := ${INSTALL} -m 644
+# Scripts need to be executable also
+INSTALL_SCRIPT := ${INSTALL} -m 0755
+
+# AutoConfig generated
+AC_CC	:= x86_64-linux-gnu-gcc
+AC_CFLAGS := -g -O2
+AC_DEFS :=  -DPACKAGE_NAME=\"Sendmail\" -DPACKAGE_TARNAME=\"sendmail\" -DPACKAGE_VERSION=\"8.14.1\" -DPACKAGE_STRING=\"Sendmail\ 8.14.1\" -DPACKAGE_BUGREPORT=\"bug/reportbug\ or\ sendmail@packages.debian.org\" -DPACKAGE=\"sendmail\" -DVERSION=\"8.14.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_REGEX_H=1 -DHAVE_DB_H=1 -DHAVE_DB_185_H=1 -DHAVE_RPCSVC_YPCLNT_H=1 -DHAVE_RPCSVC_NIS_H=1 -DHAVE_LDAP_H=1 -DHAVE_RESOLV_H=1 -DHAVE_TCPD_H=1 -DHAVE_NETINET_IP6_H=1 -DHAVE_GETADDRINFO=1 -DHAVE_MAILLOCK_H=1 -DHAVE_SASL_SASL_H=1 -DHAVE_OPENSSL_SSL_H=1
+AC_LDFLAGS := 
+AC_LIBS := 
+
+# Private AutoConfig generated
+sm_libmilter_version := 1
+
+# Define standard compile/install flags (skip if not yet configured)
+DUMMY_CC := $(shell echo '-CC-' | tr '-' '@')
+ifeq ("cc", "${AC_CC}")
+	ifeq ("y", "$(shell test -x /usr/bin/gcc-3.2 && echo 'y' || echo 'n')")
+		AC_CC := gcc-3.2
+	else
+		ifeq ("y", "$(shell test -x /usr/bin/gcc-3.1 && echo 'y' || echo 'n')")
+			AC_CC := gcc-3.1
+			endif
+		endif
+	endif
+ifneq ("${DUMMY_CC}", "${AC_CC}")
+	CC := ${AC_CC}
+	#DEFS := ${AC_DEFS} ${DEFINES}
+	DEFS := ${DEFINES}
+	LDFLAGS := ${AC_LDFLAGS}
+	LIBS := ${AC_LIBS}
+	endif
+ifeq (,${CFLAGS})
+	CFLAGS := -O2 -g -Wall ${DEFS}
+	endif
+# No longer needed, left as an example:
+# Force no optimization for arm - buggy compiler...
+#ifeq ("arm", "${DEB_HOST_ARCH}")
+#	override CFLAGS := -O0 -Wall
+#	endif
+ifneq (,$(findstring noopt,${DEB_BUILD_OPTIONS}))
+	override CFLAGS += -O0
+	endif
diff --git a/debian/build/autoconf.mk.in b/debian/build/autoconf.mk.in
index 804d2b6..344dbd4 100644
--- a/debian/build/autoconf.mk.in
+++ b/debian/build/autoconf.mk.in
@@ -67,6 +67,9 @@ AC_DEFS := @CPPFLAGS@ @DEFS@
 AC_LDFLAGS := @LDFLAGS@
 AC_LIBS := @LIBS@
 
+# Private AutoConfig generated
+sm_libmilter_version := @sm_libmilter_version@
+
 # Define standard compile/install flags (skip if not yet configured)
 DUMMY_CC := $(shell echo '-CC-' | tr '-' '@')
 ifeq ("cc", "${AC_CC}")
diff --git a/debian/build/config.guess b/debian/build/config.guess
index 396482d..0f0fe71 100644
--- a/debian/build/config.guess
+++ b/debian/build/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-03-06'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -950,6 +954,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/debian/build/config.sub b/debian/build/config.sub
index fab0aa3..5defff6 100644
--- a/debian/build/config.sub
+++ b/debian/build/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-01-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1219,7 +1222,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 0c3a33b..605c3e4 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -23,7 +23,7 @@ Priority: extra
 Section:  mail
 Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.6.10.0
-Build-Depends-Indep: groff-base, bsdmainutils
+Build-Depends-Indep: groff, bsdmainutils
 Build-Depends: make (>> 3.79.1-14), m4, patch, debhelper (>= 4.1.68) @sm_badepends@
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)]]dnl
 dnl #
@@ -97,12 +97,12 @@ Description: Mail Delivery Agent wrapper
  the following MDAs that it finds (in this order):
  procmail, maildrop, deliver, mail.local]]dnl
 dnl #
-dnl # The arch=any package: libmilter0
+dnl # The arch=any package: libmilter
 dnl # Only built if MILTER is enabled
 dnl #
 ifelse([[@sm_enable_milter@]], [[yes]], [[[[
 
-Package: libmilter0
+Package: libmilter@sm_libmilter_version@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
@@ -118,7 +118,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  Homepage: http://www.sendmail.org
 
-Package: libmilter0-dbg
+Package: libmilter@sm_libmilter_version@-dbg
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
@@ -142,7 +142,7 @@ ifelse([[@sm_enable_dev@]], [[yes]], [[[[
 Package: libmilter-dev
 Architecture: any
 Section: libdevel
-Depends: libmilter0 (= ${Source-Version})
+Depends: libmilter@sm_libmilter_version@ (= ${Source-Version})
 Suggests: sendmail-doc
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
@@ -223,7 +223,7 @@ dnl #
 Package: sendmail-base
 Architecture: all
 Section: mail
-Depends: m4, make, adduser, netbase (>= 4.08), ${perl:Depends}
+Depends: update-inetd, m4, make, adduser, netbase (>= 4.08), ${perl:Depends}
 Recommends: resolvconf
 Suggests: sendmail-doc, ca-certificates, logcheck, logrotate
 Conflicts: sendmail (<= 8.13.1-7)
diff --git a/debian/build/debian/libmilter0-dbg.dirs.in b/debian/build/debian/libmilter-dbg.dirs.in
index 91d68a1..91d68a1 100644
--- a/debian/build/debian/libmilter0-dbg.dirs.in
+++ b/debian/build/debian/libmilter-dbg.dirs.in
diff --git a/debian/build/debian/libmilter-dev.links.in b/debian/build/debian/libmilter-dev.links.in
new file mode 100644
index 0000000..529e052
--- /dev/null
+++ b/debian/build/debian/libmilter-dev.links.in
@@ -0,0 +1,3 @@
+usr/share/bug/sendmail usr/share/bug/libmilter-dev
+usr/lib/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so.@sm_libmilter_version@
+usr/lib/libmilter/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so
diff --git a/debian/build/debian/libmilter0.dirs.in b/debian/build/debian/libmilter.dirs.in
index 16a222c..8145c07 100644
--- a/debian/build/debian/libmilter0.dirs.in
+++ b/debian/build/debian/libmilter.dirs.in
@@ -1,5 +1,5 @@
 ./DEBIAN
 .@libdir@/libmilter
-.@docdir@/libmilter0
+.@docdir@/libmilter@sm_libmilter_version@
 .@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/libmilter.links.in b/debian/build/debian/libmilter.links.in
new file mode 100644
index 0000000..b0ffc90
--- /dev/null
+++ b/debian/build/debian/libmilter.links.in
@@ -0,0 +1 @@
+usr/share/bug/sendmail usr/share/bug/libmilter@sm_libmilter_version@
diff --git a/debian/build/debian/libmilter.lintian-overrides.in b/debian/build/debian/libmilter.lintian-overrides.in
new file mode 100644
index 0000000..077630b
--- /dev/null
+++ b/debian/build/debian/libmilter.lintian-overrides.in
@@ -0,0 +1,4 @@
+libmilter@sm_libmilter_version@: description-synopsis-starts-with-a-capital-letter
+libmilter@sm_libmilter_version@: postinst-has-useless-call-to-ldconfig
+libmilter@sm_libmilter_version@: postrm-has-useless-call-to-ldconfig
+libmilter@sm_libmilter_version@: non-dev-pkg-with-shlib-symlink
diff --git a/debian/build/debian/libmilter0.postrm.in b/debian/build/debian/libmilter.postrm.in
index c70730c..a671fc2 100644
--- a/debian/build/debian/libmilter0.postrm.in
+++ b/debian/build/debian/libmilter.postrm.in
@@ -25,7 +25,7 @@
 #
 set -e;
 
-PACKAGE=libmilter0;
+PACKAGE=libmilter@sm_libmilter_version@;
 
 case "$1" in
 	remove)
diff --git a/debian/build/debian/libmilter0.preinst.in b/debian/build/debian/libmilter.preinst.in
index 0b2b6db..ba1380c 100644
--- a/debian/build/debian/libmilter0.preinst.in
+++ b/debian/build/debian/libmilter.preinst.in
@@ -15,7 +15,7 @@
 #
 set -e;
 
-PACKAGE=libmilter0;
+PACKAGE=libmilter@sm_libmilter_version@;
 
 case "$1" in
 	install)
diff --git a/debian/build/debian/libmilter0.lintian-overrides b/debian/build/debian/libmilter0.lintian-overrides
deleted file mode 100644
index f4df27b..0000000
--- a/debian/build/debian/libmilter0.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libmilter0: description-synopsis-starts-with-a-capital-letter
-libmilter0: postinst-has-useless-call-to-ldconfig
-libmilter0: postrm-has-useless-call-to-ldconfig
-libmilter0: non-dev-pkg-with-shlib-symlink
diff --git a/debian/build/version.c b/debian/build/version.c
index e19b1e2..6c02acf 100644
--- a/debian/build/version.c
+++ b/debian/build/version.c
@@ -1 +1 @@
-char	Version[] = "8.13.8";
+char	Version[] = "8.l4.1";