diff options
author | Richard A Nelson (Rick) <cowboy@debian.org> | 2007-05-05 20:10:00 +0000 |
---|---|---|
committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 19:59:13 +0200 |
commit | 8e0ff014d191e36ffe7884c43538ed0aac75f915 (patch) | |
tree | b83d8f314a0aefc00980fa002bc90261e65bdabf | |
parent | cadba4b08782dfec4d3e0a3c7a0ff0d729bf6829 (diff) | |
download | sendmail-8e0ff014d191e36ffe7884c43538ed0aac75f915.tar.gz |
Imported Debian patch 8.14.1-1debian/8.14.1-1
-rw-r--r-- | debian/build/autoconf.mk | 101 | ||||
-rw-r--r-- | debian/build/autoconf.mk.in | 3 | ||||
-rw-r--r-- | debian/build/config.guess | 32 | ||||
-rw-r--r-- | debian/build/config.sub | 16 | ||||
-rw-r--r-- | debian/build/debian/control.m4.in | 12 | ||||
-rw-r--r-- | debian/build/debian/libmilter-dbg.dirs.in (renamed from debian/build/debian/libmilter0-dbg.dirs.in) | 0 | ||||
-rw-r--r-- | debian/build/debian/libmilter-dev.links.in | 3 | ||||
-rw-r--r-- | debian/build/debian/libmilter.dirs.in (renamed from debian/build/debian/libmilter0.dirs.in) | 2 | ||||
-rw-r--r-- | debian/build/debian/libmilter.links.in | 1 | ||||
-rw-r--r-- | debian/build/debian/libmilter.lintian-overrides.in | 4 | ||||
-rw-r--r-- | debian/build/debian/libmilter.postrm.in (renamed from debian/build/debian/libmilter0.postrm.in) | 2 | ||||
-rw-r--r-- | debian/build/debian/libmilter.preinst.in (renamed from debian/build/debian/libmilter0.preinst.in) | 2 | ||||
-rw-r--r-- | debian/build/debian/libmilter0.lintian-overrides | 4 | ||||
-rw-r--r-- | debian/build/version.c | 2 | ||||
-rw-r--r-- | debian/cf/Makefile.in | 79 | ||||
-rw-r--r-- | debian/changelog | 74 | ||||
-rw-r--r-- | debian/configure | 466 | ||||
-rw-r--r-- | debian/configure.ac | 58 | ||||
-rw-r--r-- | debian/configure.options | 10 | ||||
-rw-r--r-- | debian/control | 12 | ||||
-rw-r--r-- | debian/examples/Makefile.in | 92 | ||||
-rw-r--r-- | debian/faq.txt | 131 | ||||
-rw-r--r-- | debian/libmilter-dev.links | 4 | ||||
-rw-r--r-- | debian/libmilter0.links | 2 | ||||
-rw-r--r-- | debian/libmilter1.dirs | 5 | ||||
-rw-r--r-- | debian/libmilter1.links | 1 | ||||
-rw-r--r-- | debian/libmilter1.lintian-overrides | 4 | ||||
-rw-r--r-- | debian/libmilter1.postrm | 53 | ||||
-rw-r--r-- | debian/libmilter1.preinst | 55 | ||||
-rw-r--r-- | debian/local/Makefile.in | 91 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.0.Beta5/qtool.patch | 101 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/cyrusv2.m4.debian-patch (renamed from debian/patches/8.14/8.14.0.Beta5/cyrusv2.m4.debian-patch) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/dpatch.001 (renamed from debian/patches/8.14/8.14.0.Beta5/dpatch.001) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/dpatch.002 (renamed from debian/patches/8.14/8.14.0.Beta5/dpatch.002) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/dpatch.003 (renamed from debian/patches/8.14/8.14.0.Beta5/dpatch.003) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/dpatch.004 (renamed from debian/patches/8.14/8.14.0.Beta5/dpatch.004) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/dpatch.005 (renamed from debian/patches/8.14/8.14.0.Beta5/dpatch.005) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/drac.patch (renamed from debian/patches/8.14/8.14.0.Beta5/drac.patch) | 6 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/kfreebsd.patch (renamed from debian/patches/8.14/8.14.0.Beta5/kfreebsd.patch) | 18 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/ldap_url_search.p0 (renamed from debian/patches/8.14/8.14.0.Beta5/ldap_url_search.p0) | 2 | ||||
-rw-r--r-- | debian/patches/8.14/8.14.1/maxseq.patch (renamed from debian/patches/8.14/8.14.0.Beta5/maxseq.patch) | 2 | ||||
-rwxr-xr-x | debian/rules | 26 | ||||
-rw-r--r-- | debian/sensible_mda/Makefile.in | 99 | ||||
-rw-r--r-- | log | 55 |
44 files changed, 1120 insertions, 522 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"; diff --git a/debian/cf/Makefile.in b/debian/cf/Makefile.in index 755c59f..28cdd94 100644 --- a/debian/cf/Makefile.in +++ b/debian/cf/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,8 +44,6 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -79,6 +73,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -89,9 +84,8 @@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -104,21 +98,17 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SM_CPYRT = @SM_CPYRT@ SM_DATE = @SM_DATE@ -SM_ENABLE_AUTH_FALSE = @SM_ENABLE_AUTH_FALSE@ -SM_ENABLE_AUTH_TRUE = @SM_ENABLE_AUTH_TRUE@ -SM_ENABLE_LDAP_FALSE = @SM_ENABLE_LDAP_FALSE@ -SM_ENABLE_LDAP_TRUE = @SM_ENABLE_LDAP_TRUE@ -SM_ENABLE_TLS_FALSE = @SM_ENABLE_TLS_FALSE@ -SM_ENABLE_TLS_TRUE = @SM_ENABLE_TLS_TRUE@ SM_MAXVERS = @SM_MAXVERS@ SM_MINVERS = @SM_MINVERS@ SM_VERS = @SM_VERS@ STRIP = @STRIP@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_version = @ac_version@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -131,6 +121,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ buildtree = @buildtree@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -197,6 +188,7 @@ sm_incdirs = @sm_incdirs@ sm_ldap_lib = @sm_ldap_lib@ sm_libmilter_envdef = @sm_libmilter_envdef@ sm_libmilter_libs = @sm_libmilter_libs@ +sm_libmilter_version = @sm_libmilter_version@ sm_libs = @sm_libs@ sm_libsm_envdef = @sm_libsm_envdef@ sm_libsm_libs = @sm_libsm_libs@ @@ -235,12 +227,15 @@ sm_version_math = @sm_version_math@ sm_version_minor = @sm_version_minor@ sm_version_r = @sm_version_r@ sm_version_v = @sm_version_v@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ #!/usr/bin/make -f #------------------------------------------------------------------------------ @@ -299,7 +294,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -308,22 +302,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -384,12 +377,20 @@ install-data-am: @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -408,16 +409,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-data-hook install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am # # Local customisation... not automake friendly diff --git a/debian/changelog b/debian/changelog index da8e055..4ff0af6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +sendmail (8.14.1-1) unstable; urgency=low + + * *** *** libmilter gets a new version *** *** + *** *** MimeDefang and other packages will need to be rebuilt *** *** + + * New upstream release + - Fix 8.14.0 regressions & issues + * Refit patches + * Drop qtool patch, equivalent applied upstream + * Force configure defaults (new machine, gotta get it right) + * update configure.ac for newer db versions + * refresh FAQ + * build against db4.5 closes: #421945 + * build-indep-depends on groff, not groff-base closes: #362872 + + -- Richard A Nelson (Rick) <cowboy@debian.org> Sat, 05 May 2007 20:10:00 -0000 + +sendmail (8.14.1-0) private; urgency=low + + * New upstream release + - Fix 8.14.0 regressions & issues + * Refit patches + * Drop qtool patch, equivalent applied upstream + * Force configure defaults (new machine, gotta get it right) + * update configure.ac for newer db versions + * refresh FAQ + + -- Richard A Nelson (Rick) <cowboy@debian.org> Fri, 04 Apr 2007 04:00:00 -0000 + +sendmail (8.14.1.Gamma0-0) private; urgency=low + + * New upstream Gamma + * Refit patches + + -- Richard A Nelson (Rick) <cowboy@debian.org> Fri, 30 Mar 2007 04:40:00 -0000 + +sendmail (8.14.1.Beta2-0) private; urgency=low + + * New upstream Beta + * Refit patches + + -- Richard A Nelson (Rick) <cowboy@debian.org> Sat, 24 Mar 2007 04:30:00 -0000 + +sendmail (8.14.1.Beta1-0) private; urgency=low + + * New upstream Beta + * Refit patches + + -- Richard A Nelson (Rick) <cowboy@debian.org> Fri, 09 Mar 2007 17:00:00 -0000 + +sendmail (8.14.1.Beta0-0) private; urgency=low + + * New upstream Beta + * Refit patches + + -- Richard A Nelson (Rick) <cowboy@debian.org> Mon, 05 Mar 2007 05:40:00 -0000 + +sendmail (8.14.0-0) private; urgency=low + + * New upstream Release + - Headers 8bit clean + - Milter enhancements + * Refit patches + * Some issues, so this will not be uploaded - errata of (2007/02/06) help + + -- Richard A Nelson (Rick) <cowboy@debian.org> Thu, 01 Feb 2007 16:20:00 -0000 + +sendmail (8.14.0.Gamma0-0) private; urgency=low + + * New upstream Release + * Refit patches + + -- Richard A Nelson (Rick) <cowboy@debian.org> Wed, 31 Jan 2007 20:50:00 -0000 + sendmail (8.14.0.Beta5-1) experimental; urgency=low * New upstream Beta diff --git a/debian/configure b/debian/configure index c4681a1..33ae5d3 100644 --- a/debian/configure +++ b/debian/configure @@ -1,20 +1,20 @@ #! /bin/sh -# From configure.ac Revision: 8.14.0 . +# From configure.ac Revision: 8.14.1 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Sendmail 8.14.0. +# Generated by GNU Autoconf 2.61 for Sendmail 8.14.1. # # Report bugs to <bug/reportbug or sendmail@packages.debian.org>. # # # # # $Sendmail$ -# # from Sendmail: ./configure.ac,v 8.14.0 2007-01-04 10:00:00 +# # from Sendmail: ./configure.ac,v 8.14.1 2007-04-03 21:00:00 # # # cat <<EOF # # Copyright (c) 1998-2005 Richard Nelson. All Rights Reserved. # -# Sendmail 8.14.0 -# Generated by Autoconf 2.61, Automake 1.9 +# Sendmail 8.14.1 +# Generated by Autoconf 2.61, Automake _am_version # # Debian configure script for building Sendmail # Note: this file supports Sendmail 8.7.6 - 9.0.0 @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Sendmail' PACKAGE_TARNAME='sendmail' -PACKAGE_VERSION='8.14.0' -PACKAGE_STRING='Sendmail 8.14.0' +PACKAGE_VERSION='8.14.1' +PACKAGE_STRING='Sendmail 8.14.1' PACKAGE_BUGREPORT='bug/reportbug or sendmail@packages.debian.org' ac_unique_file="./build/site.config.m4.in" @@ -689,6 +689,7 @@ SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA +am__isrc CYGPATH_W PACKAGE VERSION @@ -771,6 +772,7 @@ sm_editmap_envdef sm_editmap_libs sm_libmilter_envdef sm_libmilter_libs +sm_libmilter_version sm_libsm_envdef sm_libsm_libs sm_libsmdb_envdef @@ -1343,7 +1345,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.14.0 to adapt to many kinds of systems. +\`configure' configures Sendmail 8.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1416,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Sendmail 8.14.0:";; + short | recursive ) echo "Configuration of Sendmail 8.14.1:";; esac cat <<\_ACEOF @@ -1526,7 +1528,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Sendmail configure 8.14.0 +Sendmail configure 8.14.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1536,14 +1538,14 @@ gives unlimited permission to copy, distribute and modify it. # # $Sendmail$ -# from Sendmail: ./configure.ac,v 8.14.0 2007-01-04 10:00:00 +# from Sendmail: ./configure.ac,v 8.14.1 2007-04-03 21:00:00 # cat <<EOF Copyright (c) 1998-2005 Richard Nelson. All Rights Reserved. - Sendmail 8.14.0 - Generated by Autoconf 2.61, Automake 1.9 + Sendmail 8.14.1 + Generated by Autoconf 2.61, Automake _am_version Debian configure script for building Sendmail Note: this file supports Sendmail 8.7.6 - 9.0.0 @@ -1559,7 +1561,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.14.0, which was +It was created by Sendmail $as_me 8.14.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2111,7 +2113,8 @@ echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -am__api_version="1.9" +am__api_version='1.10' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2250,38 +2253,53 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do @@ -2334,12 +2352,16 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -2354,7 +2376,7 @@ fi # Define the identity of the package. PACKAGE='sendmail' - VERSION='8.14.0' + VERSION='8.14.1' cat >>confdefs.h <<_ACEOF @@ -2382,7 +2404,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2486,7 +2508,7 @@ else fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2511,9 +2533,7 @@ fi { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - -if test $USE_MAINTAINER_MODE = yes; then + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -2525,14 +2545,14 @@ fi ac_version="2.61"; -am_version="1.9"; +am_version="_am_version"; am_version="$am__api_version"; -SM_VERS='8.14.0'; -SM_DATE='2007-01-04 10:00:00'; +SM_VERS='8.14.1'; +SM_DATE='2007-04-03 21:00:00'; SM_MINVERS='8.7.6'; SM_MAXVERS='9.0.0'; SM_CPYRT='2005'; @@ -2591,7 +2611,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) @@ -3872,9 +3892,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -3884,7 +3902,6 @@ fi - depcc="$CC" am_compiler_list= { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -3952,6 +3969,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3981,9 +3999,7 @@ fi echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -4669,6 +4685,7 @@ sm_editmap_libs=''; # libmilter sm_libmilter_envdef='-fPIC'; sm_libmilter_libs=''; +sm_libmilter_version=0; # libsm sm_libsm_envdef='-fPIC'; sm_libsm_libs=''; @@ -4918,6 +4935,11 @@ if test "$sm_enable_shm" != "no"; then # 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; @@ -5771,7 +5793,7 @@ cat >>conftest.$ac_ext <<_ACEOF _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "sm_newdb_lib=4" >/dev/null 2>&1; then - sm_newdb_lib=db-4.2 + sm_newdb_lib=db4 else cat >conftest.$ac_ext <<_ACEOF @@ -5865,7 +5887,7 @@ rm -f conftest* #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 { echo "$as_me:$LINENO: WARNING: <8.10.0 & $sm_newdb_lib: trying db2" >&5 @@ -5904,15 +5926,209 @@ echo "$as_me: WARNING: NEWDB version unknown, omitting support!" >&2;} # 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 - as_ac_Lib=`echo "ac_cv_lib_$sm_newdb_lib''_db_create_4002" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for db_create_4002 in -l$sm_newdb_lib" >&5 -echo $ECHO_N "checking for db_create_4002 in -l$sm_newdb_lib... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + if test $sm_newdb_lib = db4; then + { 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$sm_newdb_lib $LIBS" +LIBS="-ldb-4.5 $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_5_db_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_db_4_5_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_5_db_create" >&5 +echo "${ECHO_T}$ac_cv_lib_db_4_5_db_create" >&6; } +if test $ac_cv_lib_db_4_5_db_create = yes; then + sm_newdb_lib='db-4.5' +else + + { echo "$as_me:$LINENO: checking for db_create in -ldb-4.4" >&5 +echo $ECHO_N "checking for db_create in -ldb-4.4... $ECHO_C" >&6; } +if test "${ac_cv_lib_db_4_4_db_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldb-4.4 $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_4_db_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_db_4_4_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_4_db_create" >&5 +echo "${ECHO_T}$ac_cv_lib_db_4_4_db_create" >&6; } +if test $ac_cv_lib_db_4_4_db_create = yes; then + sm_newdb_lib='db-4.4' +else + + { echo "$as_me:$LINENO: checking for db_create in -ldb-4.3" >&5 +echo $ECHO_N "checking for db_create in -ldb-4.3... $ECHO_C" >&6; } +if test "${ac_cv_lib_db_4_3_db_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldb-4.3 $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_3_db_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_db_4_3_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_3_db_create" >&5 +echo "${ECHO_T}$ac_cv_lib_db_4_3_db_create" >&6; } +if test $ac_cv_lib_db_4_3_db_create = yes; then + sm_newdb_lib='db-4.3' +else + + { echo "$as_me:$LINENO: checking for db_create_4002 in -ldb-4.2" >&5 +echo $ECHO_N "checking for db_create_4002 in -ldb-4.2... $ECHO_C" >&6; } +if test "${ac_cv_lib_db_4_2_db_create_4002+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldb-4.2 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5953,28 +6169,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" + ac_cv_lib_db_4_2_db_create_4002=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Lib=no" + ac_cv_lib_db_4_2_db_create_4002=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 -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - : +{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_2_db_create_4002" >&5 +echo "${ECHO_T}$ac_cv_lib_db_4_2_db_create_4002" >&6; } +if test $ac_cv_lib_db_4_2_db_create_4002 = yes; then + sm_newdb_lib='db-4.2' else - { echo "$as_me:$LINENO: checking for db_create_4002 in -ldb" >&5 -echo $ECHO_N "checking for db_create_4002 in -ldb... $ECHO_C" >&6; } -if test "${ac_cv_lib_db_db_create_4002+set}" = set; then + { echo "$as_me:$LINENO: checking for db_create in -ldb" >&5 +echo $ECHO_N "checking for db_create in -ldb... $ECHO_C" >&6; } +if test "${ac_cv_lib_db_db_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5992,11 +6207,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char db_create_4002 (); +char db_create (); int main () { -return db_create_4002 (); +return db_create (); ; return 0; } @@ -6019,27 +6234,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_db_db_create_4002=yes + ac_cv_lib_db_db_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_db_db_create_4002=no + ac_cv_lib_db_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_db_create_4002" >&5 -echo "${ECHO_T}$ac_cv_lib_db_db_create_4002" >&6; } -if test $ac_cv_lib_db_db_create_4002 = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5 +echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6; } +if test $ac_cv_lib_db_db_create = yes; then sm_newdb_lib='db' else sm_have_newdb=no fi 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 @@ -6597,7 +6818,7 @@ echo "$as_me: WARNING: Could not find -l$sm_newdb_lib (or -ldb)" >&2;} # 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 @@ -7765,9 +7986,7 @@ echo "$as_me: error: Could not locate LDAP (libldap2-dev) package" >&2;} fi; fi; sm_enable_ldap=$sm_have_ldap; - - -if test x$sm_enable_ldap = xyes; then + if test x$sm_enable_ldap = xyes; then SM_ENABLE_LDAP_TRUE= SM_ENABLE_LDAP_FALSE='#' else @@ -9849,9 +10068,7 @@ echo "$as_me: error: SMTP authentication not supported!" >&2;} fi; sm_enable_auth=$sm_have_auth; - - -if test x$sm_enable_auth = xyes; then + if test x$sm_enable_auth = xyes; then SM_ENABLE_AUTH_TRUE= SM_ENABLE_AUTH_FALSE='#' else @@ -10130,9 +10347,7 @@ echo "$as_me: error: SSL/TLS privacy protection not supported!" >&2;} fi; fi; sm_enable_tls=$sm_have_tls; - - -if test x$sm_enable_tls = xyes; then + if test x$sm_enable_tls = xyes; then SM_ENABLE_TLS_TRUE= SM_ENABLE_TLS_FALSE='#' else @@ -10190,14 +10405,20 @@ ac_config_files="$ac_config_files build/site.config.m4" ac_config_files="$ac_config_files build/debian/control.m4" -ac_config_files="$ac_config_files libmilter0.dirs:./build/debian/libmilter0.dirs.in" +ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in" -ac_config_files="$ac_config_files libmilter0.postrm:./build/debian/libmilter0.postrm.in" +ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in" -ac_config_files="$ac_config_files libmilter0.preinst:./build/debian/libmilter0.preinst.in" +ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in" + +ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.postrm:./build/debian/libmilter.postrm.in" + +ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in" ac_config_files="$ac_config_files libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in" +ac_config_files="$ac_config_files libmilter-dev.links:./build/debian/libmilter-dev.links.in" + ac_config_files="$ac_config_files libmilter-dev.postrm:./build/debian/libmilter-dev.postrm.in" ac_config_files="$ac_config_files libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in" @@ -10802,7 +11023,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.14.0, which was +This file was extended by Sendmail $as_me 8.14.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10849,7 +11070,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Sendmail config.status 8.14.0 +Sendmail config.status 8.14.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -10860,6 +11081,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -10963,10 +11185,13 @@ do "build/update_chaos") CONFIG_FILES="$CONFIG_FILES build/update_chaos" ;; "build/site.config.m4") CONFIG_FILES="$CONFIG_FILES build/site.config.m4" ;; "build/debian/control.m4") CONFIG_FILES="$CONFIG_FILES build/debian/control.m4" ;; - "libmilter0.dirs") CONFIG_FILES="$CONFIG_FILES libmilter0.dirs:./build/debian/libmilter0.dirs.in" ;; - "libmilter0.postrm") CONFIG_FILES="$CONFIG_FILES libmilter0.postrm:./build/debian/libmilter0.postrm.in" ;; - "libmilter0.preinst") CONFIG_FILES="$CONFIG_FILES libmilter0.preinst:./build/debian/libmilter0.preinst.in" ;; + "libmilter${sm_libmilter_version}.dirs") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in" ;; + "libmilter${sm_libmilter_version}.links") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in" ;; + "libmilter${sm_libmilter_version}.lintian-overrides") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in" ;; + "libmilter${sm_libmilter_version}.postrm") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.postrm:./build/debian/libmilter.postrm.in" ;; + "libmilter${sm_libmilter_version}.preinst") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in" ;; "libmilter-dev.dirs") CONFIG_FILES="$CONFIG_FILES libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in" ;; + "libmilter-dev.links") CONFIG_FILES="$CONFIG_FILES libmilter-dev.links:./build/debian/libmilter-dev.links.in" ;; "libmilter-dev.postrm") CONFIG_FILES="$CONFIG_FILES libmilter-dev.postrm:./build/debian/libmilter-dev.postrm.in" ;; "libmilter-dev.preinst") CONFIG_FILES="$CONFIG_FILES libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in" ;; "rmail.dirs") CONFIG_FILES="$CONFIG_FILES rmail.dirs:./build/debian/rmail.dirs.in" ;; @@ -11149,6 +11374,7 @@ SET_MAKE!$SET_MAKE$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim @@ -11192,7 +11418,6 @@ buildtree!$buildtree$ac_delim sm_dist_name!$sm_dist_name$ac_delim sm_dist_vers!$sm_dist_vers$ac_delim DEBIAN!$DEBIAN$ac_delim -DEBIAN_DH!$DEBIAN_DH$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -11234,6 +11459,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +DEBIAN_DH!$DEBIAN_DH$ac_delim DEB_BUILD_ARCH!$DEB_BUILD_ARCH$ac_delim DEB_BUILD_GNU_CPU!$DEB_BUILD_GNU_CPU$ac_delim DEB_BUILD_GNU_SYSTEM!$DEB_BUILD_GNU_SYSTEM$ac_delim @@ -11272,6 +11498,7 @@ sm_editmap_envdef!$sm_editmap_envdef$ac_delim sm_editmap_libs!$sm_editmap_libs$ac_delim sm_libmilter_envdef!$sm_libmilter_envdef$ac_delim sm_libmilter_libs!$sm_libmilter_libs$ac_delim +sm_libmilter_version!$sm_libmilter_version$ac_delim sm_libsm_envdef!$sm_libsm_envdef$ac_delim sm_libsm_libs!$sm_libsm_libs$ac_delim sm_libsmdb_envdef!$sm_libsmdb_envdef$ac_delim @@ -11329,8 +11556,6 @@ SM_ENABLE_AUTH_TRUE!$SM_ENABLE_AUTH_TRUE$ac_delim SM_ENABLE_AUTH_FALSE!$SM_ENABLE_AUTH_FALSE$ac_delim sm_enable_tls!$sm_enable_tls$ac_delim SM_ENABLE_TLS_TRUE!$SM_ENABLE_TLS_TRUE$ac_delim -SM_ENABLE_TLS_FALSE!$SM_ENABLE_TLS_FALSE$ac_delim -LIBOBJS!$LIBOBJS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -11372,10 +11597,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SM_ENABLE_TLS_FALSE!$SM_ENABLE_TLS_FALSE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -11602,6 +11829,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -11655,6 +11887,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out @@ -11689,8 +11922,9 @@ echo "$as_me: executing $ac_file commands" >&6;} # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ @@ -11819,8 +12053,8 @@ done echo 'creating ./control'; m4 ./build/debian/control.m4 > ./build/debian/control; cp ./build/debian/control ./; ;; - "libmilter0.postrm":F) chmod a+x ./libmilter0.postrm ;; - "libmilter0.preinst":F) chmod a+x ./libmilter0.preinst ;; + "libmilter${sm_libmilter_version}.postrm":F) chmod a+x ./libmilter${sm_libmilter_version}.postrm ;; + "libmilter${sm_libmilter_version}.preinst":F) chmod a+x ./libmilter${sm_libmilter_version}.preinst ;; "libmilter-dev.postrm":F) chmod a+x ./libmilter-dev.postrm ;; "libmilter-dev.preinst":F) chmod a+x ./libmilter-dev.preinst ;; "rmail.postrm":F) chmod a+x ./rmail.postrm ;; 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], diff --git a/debian/configure.options b/debian/configure.options index 5e1d598..fbc46b3 100644 --- a/debian/configure.options +++ b/debian/configure.options @@ -69,7 +69,7 @@ # (and sometimes confusing) to the casual installer #--enable-maintainer-mode # --enable-regex=.........Allow REGEX maps [auto] ---enable-regex=auto +--enable-regex=yes # --enable-ndbm=..........Allow NDBM maps [no] --enable-ndbm=no # --enable-newdb=.........Allow NEWDB maps [yes] @@ -91,15 +91,15 @@ # --enable-maillock=......Allow maillock [yes] --enable-maillock=yes # --enable-milter=........Allow milter [auto] ---enable-milter=auto +--enable-milter=yes # --enable-sfio=..........Allow SFIO usage [no] --enable-sfio=no # --enable-auth=..........Allow SMTP auth [auto] ---enable-auth=auto +--enable-auth=yes # --enable-tls=...........Allow TLS/SSL [auto] ---enable-tls=auto +--enable-tls=yes # --enable-shm=...........Allow shared memory [auto] ---enable-shm=auto +--enable-shm=yes # --enable-doc=...........Build sendmail-doc pkg [yes] --enable-doc=${ENABLE_DOC} # --enable-dev=...........Build libmilter-dev pkg [yes] diff --git a/debian/control b/debian/control index 8a946ac..23fcd71 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ 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: make (>> 3.79.1-14), m4, patch, debhelper (>= 4.1.68) , libdb4.2-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +Build-Depends-Indep: groff, bsdmainutils +Build-Depends: make (>> 3.79.1-14), m4, patch, debhelper (>= 4.1.68) , libdb4.5-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5) Package: sendmail-bin @@ -62,7 +62,7 @@ Description: Mail Delivery Agent wrapper the following MDAs that it finds (in this order): procmail, maildrop, deliver, mail.local -Package: libmilter0 +Package: libmilter1 Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -78,7 +78,7 @@ Description: Sendmail Mail Filter API (Milter) . Homepage: http://www.sendmail.org -Package: libmilter0-dbg +Package: libmilter1-dbg Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -97,7 +97,7 @@ Description: Sendmail Mail Filter API (Milter) Package: libmilter-dev Architecture: any Section: libdevel -Depends: libmilter0 (= ${Source-Version}) +Depends: libmilter1 (= ${Source-Version}) Suggests: sendmail-doc Description: Sendmail Mail Filter API (Milter) The Sendmail Mail Filter API (Milter) is designed to allow third-party @@ -163,7 +163,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent 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/examples/Makefile.in b/debian/examples/Makefile.in index 8a3e5d7..31881cf 100644 --- a/debian/examples/Makefile.in +++ b/debian/examples/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -67,8 +63,6 @@ nobase_dist_sysconfDATA_INSTALL = $(install_sh_DATA) DATA = $(nobase_dist_sysconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -98,6 +92,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -108,9 +103,8 @@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -123,21 +117,17 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SM_CPYRT = @SM_CPYRT@ SM_DATE = @SM_DATE@ -SM_ENABLE_AUTH_FALSE = @SM_ENABLE_AUTH_FALSE@ -SM_ENABLE_AUTH_TRUE = @SM_ENABLE_AUTH_TRUE@ -SM_ENABLE_LDAP_FALSE = @SM_ENABLE_LDAP_FALSE@ -SM_ENABLE_LDAP_TRUE = @SM_ENABLE_LDAP_TRUE@ -SM_ENABLE_TLS_FALSE = @SM_ENABLE_TLS_FALSE@ -SM_ENABLE_TLS_TRUE = @SM_ENABLE_TLS_TRUE@ SM_MAXVERS = @SM_MAXVERS@ SM_MINVERS = @SM_MINVERS@ SM_VERS = @SM_VERS@ STRIP = @STRIP@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_version = @ac_version@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -150,6 +140,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ buildtree = @buildtree@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -216,6 +207,7 @@ sm_incdirs = @sm_incdirs@ sm_ldap_lib = @sm_ldap_lib@ sm_libmilter_envdef = @sm_libmilter_envdef@ sm_libmilter_libs = @sm_libmilter_libs@ +sm_libmilter_version = @sm_libmilter_version@ sm_libs = @sm_libs@ sm_libsm_envdef = @sm_libsm_envdef@ sm_libsm_libs = @sm_libsm_libs@ @@ -254,12 +246,15 @@ sm_version_math = @sm_version_math@ sm_version_minor = @sm_version_minor@ sm_version_r = @sm_version_r@ sm_version_v = @sm_version_v@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ #!/usr/bin/make -f #------------------------------------------------------------------------------ @@ -341,7 +336,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(dist_sbin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -358,10 +353,9 @@ uninstall-dist_sbinSCRIPTS: echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ rm -f "$(DESTDIR)$(sbindir)/$$f"; \ done -uninstall-info-am: install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -406,7 +400,7 @@ uninstall-man8: done install-nobase_dist_sysconfDATA: $(nobase_dist_sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" + test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @$(am__vpath_adj_setup) \ list='$(nobase_dist_sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -431,23 +425,21 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/checksendmail $(distdir)/dhcp3/dhclient-exit-hooks.d $(distdir)/logcheck/ignore.d.paranoid $(distdir)/logcheck/ignore.d.server $(distdir)/logcheck/ignore.d.workstation $(distdir)/logcheck/violations.ignore.d $(distdir)/network/if-down.d $(distdir)/network/if-up.d $(distdir)/pam.d $(distdir)/ppp/ip-down.d $(distdir)/ppp/ip-up.d $(distdir)/resolvconf/update-libc.d - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -463,7 +455,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -511,15 +503,23 @@ install-data-am: install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + install-exec-am: install-dist_sbinSCRIPTS \ install-nobase_dist_sysconfDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +install-html: install-html-am + install-info: install-info-am install-man: install-man8 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -538,22 +538,26 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_sbinSCRIPTS uninstall-info-am \ - uninstall-man uninstall-nobase_dist_sysconfDATA +uninstall-am: uninstall-dist_sbinSCRIPTS uninstall-man \ + uninstall-nobase_dist_sysconfDATA uninstall-man: uninstall-man8 +.MAKE: install-am install-data-am install-exec-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-data-hook install-dist_sbinSCRIPTS install-exec \ - install-exec-am install-exec-hook install-info install-info-am \ + install-data-hook install-dist_sbinSCRIPTS install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-hook \ + install-html install-html-am install-info install-info-am \ install-man install-man8 install-nobase_dist_sysconfDATA \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_sbinSCRIPTS uninstall-info-am uninstall-man \ - uninstall-man8 uninstall-nobase_dist_sysconfDATA + uninstall-dist_sbinSCRIPTS uninstall-man uninstall-man8 \ + uninstall-nobase_dist_sysconfDATA # # Local customisation... not automake friendly diff --git a/debian/faq.txt b/debian/faq.txt index 437e1e5..4738894 100644 --- a/debian/faq.txt +++ b/debian/faq.txt @@ -1,18 +1,7 @@ - sendmail.org - -Sendmail -Frequently Asked Questions (FAQ) - - Last updated March 27, 2005 - - Comments and questions on this FAQ should be directed to - sendmail+faq@sendmail.org. - Bug reports should be directed to sendmail-bugs@sendmail.org. + Frequently Asked Questions - If you post a message to comp.mail.sendmail and send it to one of the - above addresses, please clearly indicate so at the top of your - message. +Last updated April 3, 2007 _________________________________________________________________ Top 5 - the most frequently asked questions about sendmail @@ -32,7 +21,7 @@ Table of Contents + 2.1 What is this newsgroup? + 2.2 What is the scope of this FAQ? + 2.3 Where can I find the latest version of this FAQ? - + 2.4 deprecated + + 2.4 Where can I send comments, questions and bug reports? + 2.5 Where can I ask email-related DNS questions? + 2.6 How can I subscribe to these newsgroups? + 2.7 Which version of sendmail should I run? @@ -61,8 +50,7 @@ Table of Contents + 3.7 How do I manage several (virtual) domains? + 3.8 There are four UUCP mailers listed in the configuration files. Which one should I use? - + 3.9 How do I fix "undefined symbol inet_aton" and "undefined - symbol _strerror" messages? + + 3.9 deprecated + 3.10 How do I solve "collect: I/O error on connection" or "reply: read error from host.name" errors? + 3.11 Why can't my users forward their mail to a program? @@ -198,8 +186,6 @@ Table of Contents relating to Internet email * 7. THANKS! - home - sendmail.org 1. COPYRIGHT NOTICE / REDISTRIBUTION REQUIREMENTS The entire contents of this document are copyright 1997 - 2000 by the @@ -238,7 +224,7 @@ Table of Contents * 2.1 What is this newsgroup? * 2.2 What is the scope of this FAQ? * 2.3 Where can I find the latest version of this FAQ? - * 2.4 (deprecated) + * 2.4 Where can I send comments, questions and bug reports? * 2.5 Where can I ask email-related DNS questions? * 2.6 How can I subscribe to these newsgroups? * 2.7 Which version of sendmail should I run? @@ -346,7 +332,57 @@ Q2.3 -- Where can I find the latest version of this FAQ? http://www.sendmail.org/faq/. _________________________________________________________________ -Q2.4 -- has been deprecated. +Q2.4 -- Where can I send comments, questions and bug reports? + + Date: April 26, 2006 + + First, please refer to our E-mail Addresses page + (http://www.sendmail.org/misc/email-addresses.php), which has a more + complete answer. + + Next, if you have a question about sendmail, then please post it to + the Usenet group comp.mail.sendmail. This newsgroup is dedicated to + sendmail. Please make sure you check the usual resources before + posting and follow the netiquette. Also, if you do not have access to + an NNTP server, you might want to use Google Groups. + + Finally, e-mail addresses to contact sendmail.org are (do not send + questions about sendmail to these addresses, see above instead; + replace YYYY with the current year, e.g., 2006, in all of these + addresses): + * < sendmail-YYYY (at) support.sendmail.org > for contributing + patches, feature requests, and general comments but not questions + how to use, install, or configure sendmail; + * < sendmail-bugs-YYYY (at) support.sendmail.org > to report + implementation bugs; + * < sendmail-faq-YYYY (at) support.sendmail.org > only for comments + / questions about the FAQ. Please mark your mail clearly with + "FAQ: item" where item is the entry in the faq to which you are + referring. If it is a general comment about the FAQ, use "FAQ: + general", if it is an addition, use "FAQ: new". + * < sendmail-security-YYYY (at) support.sendmail.org > (use this + only to report security related bugs or problems in sendmail). + Please do not use this to ask about problems with your + configuration, including how to stop spam, how to set up your own + certificate authority, how to make sendmail work with S/MIME, etc. + All such questions should be asked in comp.mail.sendmail. Also, + please do not tell us that you were able to forge mail by using + telnet to connect to port 25; this is fundamental to the Internet + design for SMTP, and not a sendmail bug. Please use PGP for + encryption to send mail to this address. + * < sendmail-mirror-YYYY (at) support.sendmail.org > for updates + about a mirror (e.g., a new mirror or an address change). + * < webmaster-YYYY (at) support.sendmail.org > for comments about + the website. + + Note: remove all spaces in those addresses and replace "(at)" with "@" + (without the quotes). + + If you post a message to comp.mail.sendmail and send it to one of the + above addresses, please clearly indicate so at the top of your + message. + + Also, please don't send HTML or graphics; plain text is sufficient. _________________________________________________________________ Q2.5 -- Where can I ask email-related DNS questions? @@ -463,17 +499,23 @@ Q2.7 -- Which version of sendmail should I run? Q2.8 -- What is the latest release of sendmail? Date: October 24, 1997 - Updated: March 27, 2005 + Updated: April 3, 2007 - For version 8 sendmail, there are five release trees. + For version 8 sendmail, there are six release trees. For those people who, for whatever reason, are unable or unwilling to - upgrade to version 8.13.x, releases of versions 8.12, 8.11, 8.10 and - 8.9 sendmail are still available but are not being updated. The last - release of version 8.9 sendmail was 8.9.3; the last release of 8.10 - was 8.10.2; the last release of 8.11 was 8.11.6; the last release of - 8.12 was 8.12.11 . - + upgrade to version 8.14.x, releases of versions 8.13, 8.12, 8.11, 8.10 + and 8.9 sendmail are still available but are not being updated. The + last release of version 8.9 sendmail was 8.9.3; the last release of + 8.10 was 8.10.2; the last release of 8.11 was 8.11.6; the last release + of 8.12 was 8.12.11; the last release of 8.13 was 8.13.8 . + + Version 8.14.1 was released on April 3, 2007. + Version 8.14.0 was released on January 31, 2007. + Version 8.13.8 was released on August 9, 2006. + Version 8.13.7 was released on June 14, 2006. + Version 8.13.6 was released on March 22, 2006. + Version 8.13.5 was released on September 16, 2005. Version 8.13.4 was released on March 27, 2005. Version 8.13.3 was released on January 11, 2005. Version 8.13.2 was released on December 15, 2004. @@ -507,8 +549,8 @@ Q2.8 -- What is the latest release of sendmail? Version 8.9.0 was released on May 20, 1998. On machines exposed directly to the Internet, you should either - already be running sendmail 8.13.4 or plan on upgrading in the - immediate future. 8.13.4 is considered "stable", has fixes included + already be running sendmail 8.14.1 or plan on upgrading in the + immediate future. 8.14.1 is considered "stable", has fixes included that will not be found in any previous release, and therefore supercedes all previous releases. @@ -828,8 +870,7 @@ Q2.17 -- What is makemap and where can I get it? * 3.7 How do I manage several (virtual) domains? * 3.8 There are four UUCP mailers listed in the configuration files. Which one should I use? - * 3.9 How do I fix "undefined symbol inet_aton" and "undefined - symbol _strerror" messages? + * 3.9 (deprecated) * 3.10 How do I solve "collect: I/O error on connection" or "reply: read error from host.name" errors? * 3.11 Why can't my users forward their mail to a program? @@ -993,11 +1034,7 @@ one should I use? Mailers page. _________________________________________________________________ -Q3.9 -- How do I fix "undefined symbol inet_aton" and "undefined symbol -_strerror" messages? - - This question is answered in detail within the Compiling Sendmail - page. +Q3.9 -- has been deprecated. _________________________________________________________________ Q3.10 -- How do I solve "collect: I/O error on connection" or "reply: read @@ -1924,6 +1961,7 @@ Q3.44 -- I disabled sendmail on some machines which don't receive mail, but since upgrading to 8.12 they can't send mail either; why? Date: January 13, 2003 + Updated: October 19, 2005 8.12 uses a new paradigm: the binary is no longer setuid-root; to make this work, there are now two queues, a "main" queue and a client-only @@ -1934,16 +1972,20 @@ since upgrading to 8.12 they can't send mail either; why? client queue runner must be able to submit mail to the daemon on the local SMTP port. If the daemon is not listening on the SMTP port, the mail remains in the client-only queue. If you don't want to accept - mail from other machines, you should add one or both of the following + mail from other machines, you should add some or all of the following lines to your .mc file: -DAEMON_OPTIONS(`NAME=NoMTA4, Family=inet, Addr=127.0.0.1')dnl +FEATURE(`no_default_msa')dnl +DAEMON_OPTIONS(`NAME=NoMTA4, Family=inet, Addr=127.0.0.1')dnl +DAEMON_OPTIONS(`Name=MSA4, Family=inet, Addr=127.0.0.1, Port=587, M=E')dnl DAEMON_OPTIONS(`NAME=NoMTA6, Family=inet6, Addr=::1')dnl +DAEMON_OPTIONS(`Name=MSA6, Family=inet6, Addr=::1, Port=587, M=E')dnl - If your machine has IPv4 addresses configured, use the first line; - likewise, use the second line if it has IPv6 addresses configured, and - both if both types of addresses are configured. Then build a new .cf - file from your .mc file, install it as /etc/mail/sendmail.cf and start - sendmail. + Use the FEATURE line regardless, then if your machine has IPv4 + addresses configured, use the first two DAEMON_OPTIONS lines; + likewise, use the second two DAEMON_OPTIONS lines if it has IPv6 + addresses configured, and all four if both types of addresses are + configured. Then build a new .cf file from your .mc file, install it + as /etc/mail/sendmail.cf and start sendmail. In some cases, however, it might be better instead to modify submit.mc, to use @@ -2161,6 +2203,7 @@ the syslog? Updated: May, 2001 Updated: August, 2001 Updated: November, 2001 + Updated: May, 2006 This question is addressed on pages 445-449 of _sendmail, 2nd Ed_ (see page 319 of first edition) by Bryan Costales (see entry diff --git a/debian/libmilter-dev.links b/debian/libmilter-dev.links index 9038370..445183e 100644 --- a/debian/libmilter-dev.links +++ b/debian/libmilter-dev.links @@ -1,3 +1,3 @@ usr/share/bug/sendmail usr/share/bug/libmilter-dev -usr/lib/libmilter.so.0 usr/lib/libmilter/libmilter.so.0 -usr/lib/libmilter.so usr/lib/libmilter/libmilter.so +usr/lib/libmilter.so.1 usr/lib/libmilter/libmilter.so.1 +usr/lib/libmilter/libmilter.so.1 usr/lib/libmilter/libmilter.so diff --git a/debian/libmilter0.links b/debian/libmilter0.links deleted file mode 100644 index 8584867..0000000 --- a/debian/libmilter0.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/bug/sendmail usr/share/bug/libmilter0 -usr/lib/libmilter.so.0 usr/lib/libmilter.so diff --git a/debian/libmilter1.dirs b/debian/libmilter1.dirs new file mode 100644 index 0000000..b2f5da8 --- /dev/null +++ b/debian/libmilter1.dirs @@ -0,0 +1,5 @@ +./DEBIAN +./usr/lib/libmilter +./usr/share/doc/libmilter1 +./usr/share/bug +./usr/share/lintian/overrides diff --git a/debian/libmilter1.links b/debian/libmilter1.links new file mode 100644 index 0000000..9f6597f --- /dev/null +++ b/debian/libmilter1.links @@ -0,0 +1 @@ +usr/share/bug/sendmail usr/share/bug/libmilter1 diff --git a/debian/libmilter1.lintian-overrides b/debian/libmilter1.lintian-overrides new file mode 100644 index 0000000..6e12b65 --- /dev/null +++ b/debian/libmilter1.lintian-overrides @@ -0,0 +1,4 @@ +libmilter1: description-synopsis-starts-with-a-capital-letter +libmilter1: postinst-has-useless-call-to-ldconfig +libmilter1: postrm-has-useless-call-to-ldconfig +libmilter1: non-dev-pkg-with-shlib-symlink diff --git a/debian/libmilter1.postrm b/debian/libmilter1.postrm new file mode 100644 index 0000000..dd9b983 --- /dev/null +++ b/debian/libmilter1.postrm @@ -0,0 +1,53 @@ +#!/bin/sh -e +# +# Debian post removal script +# +# Install of already installed package: +# 1) Upgrade of package: +# new-preinst upgrade old-version +# *) new-postrm abort-upgrade old-version +# 2) package had some configuration files from a previous version installed +# new-preinst install old-version +# *) new-postrm abort-install old-version +# 3) Otherwise (i.e., the package was completely purged) +# new-preinst install +# *) new-postrm abort-install +# +# Removal of a package: +# 1) prerm remove +# 2) The package's files are removed (except conffiles). +# 3) postrm remove +# 4) All the maintainer scripts except the postrm are removed. +# 5) The conffiles and any backup files +# (~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed. +# 6) postrm purge +# 7) The package's file list is removed +# +set -e; + +PACKAGE=libmilter1; + +case "$1" in + remove) + # /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail + rm -f /usr/share/doc/$PACKAGE 2>/dev/null || true; + rmdir /usr/share/doc/sendmail 2>/dev/null || true; + ;; + + purge) + ;; + + upgrade) + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "$PACKAGE postrm called with unknown argument \`$1'" >&2; + exit 1; + ;; + esac; + +#DEBHELPER# +exit 0; diff --git a/debian/libmilter1.preinst b/debian/libmilter1.preinst new file mode 100644 index 0000000..f396aee --- /dev/null +++ b/debian/libmilter1.preinst @@ -0,0 +1,55 @@ +#!/bin/sh -e +# +# Debian pre install script +# +# Install of already installed package: +# 1) Upgrade of package: +# new-preinst upgrade old-version +# *) new-postrm abort-upgrade old-version +# 2) package had some configuration files from a previous version installed +# new-preinst install old-version +# *) new-postrm abort-install old-version +# 3) Otherwise (i.e., the package was completely purged) +# new-preinst install +# *) new-postrm abort-install +# +set -e; + +PACKAGE=libmilter1; + +case "$1" in + install) + # DPKG doesn't overwrite directories with symlinks... + if [ -d /usr/share/doc/$PACKAGE ]; then + rm -rf /usr/share/doc/$PACKAGE; + fi; + if [ ! -d /usr/share/doc/sendmail ]; then + mkdir -p /usr/share/doc/sendmail; + chmod a+rx /usr/share/doc/sendmail; + fi; + ln -sf sendmail /usr/share/doc/$PACKAGE; + ;; + + upgrade) + # DPKG doesn't overwrite directories with symlinks... + if [ -d /usr/share/doc/$PACKAGE ]; then + rm -rf /usr/share/doc/$PACKAGE; + fi; + if [ ! -d /usr/share/doc/sendmail ]; then + mkdir -p /usr/share/doc/sendmail; + chmod a+rx /usr/share/doc/sendmail; + fi; + ln -sf sendmail /usr/share/doc/$PACKAGE; + ;; + + abort-upgrade) + ;; + + *) + echo "$PACKAGE preinst called with unknown argument \`$1'" >&2; + exit 1; + ;; + esac; + +#DEBHELPER# +exit 0; diff --git a/debian/local/Makefile.in b/debian/local/Makefile.in index 40f36e4..12734df 100644 --- a/debian/local/Makefile.in +++ b/debian/local/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -82,8 +78,6 @@ nobase_dist_sysconfDATA_INSTALL = $(install_sh_DATA) DATA = $(nobase_dist_data_DATA) $(nobase_dist_sysconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -113,6 +107,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -123,9 +118,8 @@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -138,21 +132,17 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SM_CPYRT = @SM_CPYRT@ SM_DATE = @SM_DATE@ -SM_ENABLE_AUTH_FALSE = @SM_ENABLE_AUTH_FALSE@ -SM_ENABLE_AUTH_TRUE = @SM_ENABLE_AUTH_TRUE@ -SM_ENABLE_LDAP_FALSE = @SM_ENABLE_LDAP_FALSE@ -SM_ENABLE_LDAP_TRUE = @SM_ENABLE_LDAP_TRUE@ -SM_ENABLE_TLS_FALSE = @SM_ENABLE_TLS_FALSE@ -SM_ENABLE_TLS_TRUE = @SM_ENABLE_TLS_TRUE@ SM_MAXVERS = @SM_MAXVERS@ SM_MINVERS = @SM_MINVERS@ SM_VERS = @SM_VERS@ STRIP = @STRIP@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_version = @ac_version@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -165,6 +155,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ buildtree = @buildtree@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -231,6 +222,7 @@ sm_incdirs = @sm_incdirs@ sm_ldap_lib = @sm_ldap_lib@ sm_libmilter_envdef = @sm_libmilter_envdef@ sm_libmilter_libs = @sm_libmilter_libs@ +sm_libmilter_version = @sm_libmilter_version@ sm_libs = @sm_libs@ sm_libsm_envdef = @sm_libsm_envdef@ sm_libsm_libs = @sm_libsm_libs@ @@ -269,12 +261,15 @@ sm_version_math = @sm_version_math@ sm_version_minor = @sm_version_minor@ sm_version_r = @sm_version_r@ sm_version_v = @sm_version_v@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ #!/usr/bin/make -f #------------------------------------------------------------------------------ @@ -408,7 +403,7 @@ update_tlsm4: $(top_builddir)/config.status $(srcdir)/update_tlsm4.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -427,7 +422,7 @@ uninstall-dist_pkgdataSCRIPTS: done install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(dist_sbin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -444,10 +439,9 @@ uninstall-dist_sbinSCRIPTS: echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ rm -f "$(DESTDIR)$(sbindir)/$$f"; \ done -uninstall-info-am: install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -492,7 +486,7 @@ uninstall-man8: done install-nobase_dist_dataDATA: $(nobase_dist_data_DATA) @$(NORMAL_INSTALL) - test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" + test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" @$(am__vpath_adj_setup) \ list='$(nobase_dist_data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -511,7 +505,7 @@ uninstall-nobase_dist_dataDATA: done install-nobase_dist_sysconfDATA: $(nobase_dist_sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" + test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @$(am__vpath_adj_setup) \ list='$(nobase_dist_sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -536,23 +530,21 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/bug/sendmail $(distdir)/mail $(distdir)/mail/peers - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -568,7 +560,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -617,13 +609,21 @@ install-data-am: install-dist_pkgdataSCRIPTS install-man \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + install-exec-am: install-dist_sbinSCRIPTS \ install-nobase_dist_sysconfDATA +install-html: install-html-am + install-info: install-info-am install-man: install-man8 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -643,24 +643,27 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_pkgdataSCRIPTS uninstall-dist_sbinSCRIPTS \ - uninstall-info-am uninstall-man uninstall-nobase_dist_dataDATA \ + uninstall-man uninstall-nobase_dist_dataDATA \ uninstall-nobase_dist_sysconfDATA uninstall-man: uninstall-man8 +.MAKE: install-am install-data-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ install-data-hook install-dist_pkgdataSCRIPTS \ - install-dist_sbinSCRIPTS install-exec install-exec-am \ + install-dist_sbinSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man8 \ install-nobase_dist_dataDATA install-nobase_dist_sysconfDATA \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-dist_pkgdataSCRIPTS uninstall-dist_sbinSCRIPTS \ - uninstall-info-am uninstall-man uninstall-man8 \ - uninstall-nobase_dist_dataDATA \ + uninstall-man uninstall-man8 uninstall-nobase_dist_dataDATA \ uninstall-nobase_dist_sysconfDATA # diff --git a/debian/patches/8.14/8.14.0.Beta5/qtool.patch b/debian/patches/8.14/8.14.0.Beta5/qtool.patch deleted file mode 100644 index 28ba7d1..0000000 --- a/debian/patches/8.14/8.14.0.Beta5/qtool.patch +++ /dev/null @@ -1,101 +0,0 @@ -*** ./sendmail-8.14.0.Beta5/contrib/qtool.pl Wed Mar 5 16:11:54 2003 ---- ./sendmail-8.14.0.Beta5/contrib/qtool.pl Wed Mar 5 15:59:10 2003 -*************** -*** 355,373 **** - sub lock_file - { - my $file_name = shift; - my $result; - - $result = sysopen(FILE_TO_LOCK, $file_name, Fcntl::O_RDWR); - if (!$result) - { - return (undef, "Unable to open '$file_name': $!"); - } - -! $result = flock(FILE_TO_LOCK, Fcntl::LOCK_EX | Fcntl::LOCK_NB); -! if (!$result) - { - return (undef, "Could not obtain lock on '$file_name': $!"); - } - - return (\*FILE_TO_LOCK, undef); - } ---- 355,394 ---- - sub lock_file - { - my $file_name = shift; - my $result; - -+ my $FLOCK_STRUCT; -+ my $fcntllock; -+ -+ # Supposedly under linux -+ # my $FLOCK_STRUCT = 's s l l i'; -+ # But I think perl's using __off64_t instead of __off_t -+ # my $FLOCK_STRUCT = 's s l l l l i'; -+ # Screw it, its all zero anyway... -+ -+ $FLOCK_STRUCT = 's H60'; -+ $fcntllock = pack($FLOCK_STRUCT, F_WRLCK, -+ "000000000000000000000000000000000000000000000000000000000000"); -+ - $result = sysopen(FILE_TO_LOCK, $file_name, Fcntl::O_RDWR); - if (!$result) - { -+ # print "Unable to open '$file_name': $!"; - return (undef, "Unable to open '$file_name': $!"); - } - -! $result = fcntl (FILE_TO_LOCK, F_SETLK, $fcntllock); -! -! # print "Fcntl Lock result on $file_name = $result\n"; -! -! # $result = flock(FILE_TO_LOCK, Fcntl::LOCK_EX | Fcntl::LOCK_NB); -! # print "Lock result on $file_name = $result\n"; -! # if (!$result) -! if ($result ne "0 but true") - { -+ # print "Could not obtain lock on '$file_name': $!\n"; - return (undef, "Could not obtain lock on '$file_name': $!"); - } - - return (\*FILE_TO_LOCK, undef); - } -*************** -*** 387,399 **** - - sub unlock_file - { - my $file = shift; - my $result; - -! $result = flock($file, Fcntl::LOCK_UN); -! if (!$result) - { - return "Unlock failed on '$result': $!"; - } - - return undef; ---- 408,428 ---- - - sub unlock_file - { - my $file = shift; - my $result; -+ my $FLOCK_STRUCT; -+ my $fcntllock; - -! $FLOCK_STRUCT = 's H60'; -! $fcntllock = pack($FLOCK_STRUCT, F_UNLCK, -! "000000000000000000000000000000000000000000000000000000000000"); -! $result = fcntl (FILE_TO_LOCK, F_SETLK, $fcntllock); -! -! if ($result ne "0 but true") -! # $result = flock($file, Fcntl::LOCK_UN); -! # if (!$result) - { - return "Unlock failed on '$result': $!"; - } - - return undef; diff --git a/debian/patches/8.14/8.14.0.Beta5/cyrusv2.m4.debian-patch b/debian/patches/8.14/8.14.1/cyrusv2.m4.debian-patch index e2d662b..7ddbbe8 100644 --- a/debian/patches/8.14/8.14.0.Beta5/cyrusv2.m4.debian-patch +++ b/debian/patches/8.14/8.14.1/cyrusv2.m4.debian-patch @@ -1,4 +1,4 @@ ---- sendmail-8.14.0.Beta5/cf/mailer/cyrusv2.m4 Sat Jun 1 15:14:57 2002 +--- sendmail-8.14.1/cf/mailer/cyrusv2.m4 Sat Jun 1 15:14:57 2002 +++ cyrusv2.m4.new Wed Jun 5 04:21:34 2002 @@ -12,7 +12,7 @@ diff --git a/debian/patches/8.14/8.14.0.Beta5/dpatch.001 b/debian/patches/8.14/8.14.1/dpatch.001 index a19762a..fabaa06 100644 --- a/debian/patches/8.14/8.14.0.Beta5/dpatch.001 +++ b/debian/patches/8.14/8.14.1/dpatch.001 @@ -19,7 +19,7 @@ diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4' Index: ./cf/feature/local_procmail.m4 Prereq: 8.22 -*** sendmail-8.14.0.Beta5/cf/feature/local_procmail.m4 Sat Nov 20 15:26:21 1999 +*** sendmail-8.14.1/cf/feature/local_procmail.m4 Sat Nov 20 15:26:21 1999 --- ./debian/patches/local_procmail.m4 Sat Nov 20 15:39:46 1999 *************** *** 27,32 **** diff --git a/debian/patches/8.14/8.14.0.Beta5/dpatch.002 b/debian/patches/8.14/8.14.1/dpatch.002 index 1204954..4f52c19 100644 --- a/debian/patches/8.14/8.14.0.Beta5/dpatch.002 +++ b/debian/patches/8.14/8.14.1/dpatch.002 @@ -1,4 +1,4 @@ ---- sendmail-8.14.0.Beta5/cf/mailer/cyrus.m4 Tue May 2 14:40:24 2000 +--- sendmail-8.14.1/cf/mailer/cyrus.m4 Tue May 2 14:40:24 2000 +++ ./debian/patches/cf/mailer/cyrus.m4 Tue May 2 14:41:21 2000 @@ -36,12 +36,12 @@ # diff --git a/debian/patches/8.14/8.14.0.Beta5/dpatch.003 b/debian/patches/8.14/8.14.1/dpatch.003 index da95f7e..19c3c05 100644 --- a/debian/patches/8.14/8.14.0.Beta5/dpatch.003 +++ b/debian/patches/8.14/8.14.1/dpatch.003 @@ -19,7 +19,7 @@ diff -c 'rmail/rmail.c' 'debian/patches/rmail.c' Index: ./rmail/rmail.c Prereq: 8.61 -*** sendmail-8.14.0.Beta5/rmail/rmail.c Sat Sep 16 18:20:25 2000 +*** sendmail-8.14.1/rmail/rmail.c Sat Sep 16 18:20:25 2000 --- ./debian/patches/rmail.c Thu Sep 28 17:00:59 2000 *************** *** 318,324 **** diff --git a/debian/patches/8.14/8.14.0.Beta5/dpatch.004 b/debian/patches/8.14/8.14.1/dpatch.004 index 3295e3e..578d178 100644 --- a/debian/patches/8.14/8.14.0.Beta5/dpatch.004 +++ b/debian/patches/8.14/8.14.1/dpatch.004 @@ -19,7 +19,7 @@ diff -c 'sendmail/control.c' 'debian/patches/control.c' Index: ./sendmail/control.c Prereq: 8.128 -*** sendmail-8.14.0.Beta5/sendmail/control.c Sat Nov 20 15:26:23 1999 +*** sendmail-8.14.1/sendmail/control.c Sat Nov 20 15:26:23 1999 --- ./debian/patches/control.c Sat Nov 20 15:39:52 1999 *************** *** 92,98 **** diff --git a/debian/patches/8.14/8.14.0.Beta5/dpatch.005 b/debian/patches/8.14/8.14.1/dpatch.005 index 63f5d27..c779634 100644 --- a/debian/patches/8.14/8.14.0.Beta5/dpatch.005 +++ b/debian/patches/8.14/8.14.1/dpatch.005 @@ -19,7 +19,7 @@ diff -c './cf/mailer/fax.m4' 'fax.m4' Index: ./cf/mailer/fax.m4 Prereq: 8.16 -*** sendmail-8.14.0.Beta5/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999 +*** sendmail-8.14.1/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999 --- ./fax.m4 Wed Jan 3 14:26:13 2001 *************** *** 19,26 **** diff --git a/debian/patches/8.14/8.14.0.Beta5/drac.patch b/debian/patches/8.14/8.14.1/drac.patch index 88f93c9..5094538 100644 --- a/debian/patches/8.14/8.14.0.Beta5/drac.patch +++ b/debian/patches/8.14/8.14.1/drac.patch @@ -1,5 +1,5 @@ ---- sendmail-8.14.0.Beta5/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900 -+++ sendmail-8.14.0.Beta5/cf/m4/proto.m4 2003-03-30 13:22:18.731049640 +0900 +--- sendmail-8.14.1/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900 ++++ sendmail-8.14.1/cf/m4/proto.m4 2003-03-30 13:22:18.731049640 +0900 @@ -2110,6 +2110,13 @@ R127.0.0.1 $@ RELAY originated locally RIPv6:::1 $@ RELAY originated locally @@ -15,7 +15,7 @@ R$* $: $>A <$1> <?> <+ Connect> <$1> R<RELAY> $* $@ RELAY relayable IP address --- /dev/null 2002-01-01 00:00:00.000000000 +0900 -+++ sendmail-8.14.0.Beta5/cf/feature/drac.m4 2002-04-18 21:33:31.716576810 +0900 ++++ sendmail-8.14.1/cf/feature/drac.m4 2002-04-18 21:33:31.716576810 +0900 @@ -0,0 +1,5 @@ +define(`_DRAC_', `') + diff --git a/debian/patches/8.14/8.14.0.Beta5/kfreebsd.patch b/debian/patches/8.14/8.14.1/kfreebsd.patch index 8d4590e..bbb1f1b 100644 --- a/debian/patches/8.14/8.14.0.Beta5/kfreebsd.patch +++ b/debian/patches/8.14/8.14.1/kfreebsd.patch @@ -1,6 +1,6 @@ -diff -Nurd sendmail-8.14.0.Beta5.orig/devtools/bin/Build sendmail-8.14.0.Beta5/devtools/bin/Build ---- sendmail-8.14.0.Beta5.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.0.Beta5/devtools/bin/Build 2005-09-09 12:02:15.000000000 +0200 +diff -Nurd sendmail-8.14.1.orig/devtools/bin/Build sendmail-8.14.1/devtools/bin/Build +--- sendmail-8.14.1.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200 ++++ sendmail-8.14.1/devtools/bin/Build 2005-09-09 12:02:15.000000000 +0200 @@ -422,6 +422,7 @@ NeXT) mkdir="mkdirs";; UNICOSMK) rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;; @@ -9,9 +9,9 @@ diff -Nurd sendmail-8.14.0.Beta5.orig/devtools/bin/Build sendmail-8.14.0.Beta5/d esac # get "base part" of operating system release -diff -Nurd sendmail-8.14.0.Beta5.orig/include/sm/conf.h sendmail-8.14.0.Beta5/include/sm/conf.h ---- sendmail-8.14.0.Beta5.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.0.Beta5/include/sm/conf.h 2005-09-09 11:57:33.000000000 +0200 +diff -Nurd sendmail-8.14.1.orig/include/sm/conf.h sendmail-8.14.1/include/sm/conf.h +--- sendmail-8.14.1.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200 ++++ sendmail-8.14.1/include/sm/conf.h 2005-09-09 11:57:33.000000000 +0200 @@ -783,7 +783,7 @@ ** See also BSD defines. */ @@ -100,9 +100,9 @@ diff -Nurd sendmail-8.14.0.Beta5.orig/include/sm/conf.h sendmail-8.14.0.Beta5/in ** DELL SVR4 Issue 2.2, and others ** From Kimmo Suominen <kim@grendel.lut.fi> ** -diff -Nurd sendmail-8.14.0.Beta5.orig/include/sm/os/sm_os_linux.h sendmail-8.14.0.Beta5/include/sm/os/sm_os_linux.h ---- sendmail-8.14.0.Beta5.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.0.Beta5/include/sm/os/sm_os_linux.h 2005-09-09 11:45:45.000000000 +0200 +diff -Nurd sendmail-8.14.1.orig/include/sm/os/sm_os_linux.h sendmail-8.14.1/include/sm/os/sm_os_linux.h +--- sendmail-8.14.1.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200 ++++ sendmail-8.14.1/include/sm/os/sm_os_linux.h 2005-09-09 11:45:45.000000000 +0200 @@ -15,23 +15,27 @@ #define SM_OS_NAME "linux" diff --git a/debian/patches/8.14/8.14.0.Beta5/ldap_url_search.p0 b/debian/patches/8.14/8.14.1/ldap_url_search.p0 index 97fbd1e..5175ec9 100644 --- a/debian/patches/8.14/8.14.0.Beta5/ldap_url_search.p0 +++ b/debian/patches/8.14/8.14.1/ldap_url_search.p0 @@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v retrieving revision 1.51 retrieving revision 1.53 diff -u -r1.51 -r1.53 ---- ./sendmail-8.14.0.Beta5/libsm/ldap.c 30 Oct 2003 23:11:12 -0000 1.51 +--- ./sendmail-8.14.1/libsm/ldap.c 30 Oct 2003 23:11:12 -0000 1.51 +++ ldap.c 30 Oct 2003 23:33:10 -0000 1.53 @@ -1043,6 +1043,7 @@ NULL : lmap->ldap_attr), diff --git a/debian/patches/8.14/8.14.0.Beta5/maxseq.patch b/debian/patches/8.14/8.14.1/maxseq.patch index 3b4aefe..5447136 100644 --- a/debian/patches/8.14/8.14.0.Beta5/maxseq.patch +++ b/debian/patches/8.14/8.14.1/maxseq.patch @@ -19,7 +19,7 @@ diff -c 'conf.h' 'conf.h.new' Index: ./conf.h Prereq: 8.574 -*** ./sendmail-8.14.0.Beta5/sendmail/conf.h Fri Sep 21 19:01:46 2001 +*** ./sendmail-8.14.1/sendmail/conf.h Fri Sep 21 19:01:46 2001 --- ./conf.h.new Wed Oct 10 09:24:41 2001 *************** *** 74,79 **** diff --git a/debian/rules b/debian/rules index c436464..3d36ce9 100755 --- a/debian/rules +++ b/debian/rules @@ -304,7 +304,13 @@ refresh-debian: SM_CONF_OPT="${SM_CONF_OPT}" \ DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \ configure; + # Need to save this + /bin/mv ${debian_dir}/build/autoconf.mk \ + ${debian_dir}/build/autoconf.mk.save; -(cd ${debian_dir} && $(MAKE) distclean;) + # Need to save this + /bin/mv ${debian_dir}/build/autoconf.mk.save \ + ${debian_dir}/build/autoconf.mk; $(RM) -r ${debian_dir}/autom4te.cache; # Remove pieces not needed for further building find ${debian_dir}/patches -type d -a ! -name 'patches' \ @@ -604,6 +610,10 @@ clean: # First, remove any patches, and source directories #$(MAKE) -f ${debian_dir}/sys-build.mk source.clean; + # Need to save this + /bin/mv ${debian_dir}/build/autoconf.mk \ + ${debian_dir}/build/autoconf.mk.save; + # Local stuff -if [ -f ${debian_dir}/Makefile ]; then \ (cd ${debian_dir} && $(MAKE) -f Makefile clean;) \ @@ -646,6 +656,10 @@ endif #find .. -name ${package}*.asc -size 0 -maxdepth 1 -exec rm {} ';'; dh_clean; + # Need to save this + /bin/mv ${debian_dir}/build/autoconf.mk.save \ + ${debian_dir}/build/autoconf.mk; + #------------- .PHONY: setup @@ -793,8 +807,8 @@ else fi; \ if [ -d ${BUILD_TREE}/libmilter ]; then \ (cd ${BUILD_TREE}/obj*/libmilter && \ - gcc -shared -pthread -o libmilter.so.0 \ - -Wl,-soname,libmilter.so.0 \ + gcc -shared -pthread -o libmilter.so.${sm_libmilter_version} \ + -Wl,-soname,libmilter.so.${sm_libmilter_version} \ main.o engine.o listener.o handler.o comm.o \ smfi.o signal.o sm_gethost.o errstring.o strl.o;); \ fi; \ @@ -930,8 +944,8 @@ else if [ -d ${BUILD_TREE}/$${subdir} ]; then \ if [ "$${subdir}" = 'libmilter' ]; then \ (cd ${BUILD_TREE}/obj*/$${subdir} && \ - $(INSTALL) libmilter.so.0 \ - ../../../../debian/libmilter0/usr/lib/; \ + $(INSTALL) libmilter.so.${sm_libmilter_version} \ + ../../../../debian/libmilter${sm_libmilter_version}/usr/lib/; \ ); \ elif [ "$${subdir}" = 'mail.local' ] \ || [ "$${subdir}" = 'rmail' ]; then \ @@ -1055,8 +1069,8 @@ endif echo 'perl:Depends=perl5|perl' >> debian/substvars; fi; # Install Lintian overrides $(INSTALL_DATA) -g root -m 644 \ - debian/build/debian/libmilter0.lintian-overrides \ - debian/libmilter0/usr/share/lintian/overrides/libmilter0; + debian/libmilter${sm_libmilter_version}.lintian-overrides \ + debian/libmilter${sm_libmilter_version}/usr/share/lintian/overrides/libmilter${sm_libmilter_version}; ifeq (yes, ${ENABLE_DEV}) $(INSTALL_DATA) -g root -m 644 \ debian/build/debian/libmilter-dev.lintian-overrides \ diff --git a/debian/sensible_mda/Makefile.in b/debian/sensible_mda/Makefile.in index 45d4769..e24cf2a 100644 --- a/debian/sensible_mda/Makefile.in +++ b/debian/sensible_mda/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,7 +49,7 @@ PROGRAMS = $(sbin_PROGRAMS) am_sensible_mda_OBJECTS = sensible-mda.$(OBJEXT) sensible_mda_OBJECTS = $(am_sensible_mda_OBJECTS) sensible_mda_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) +DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/./build/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -69,8 +65,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -100,6 +94,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -110,9 +105,8 @@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -125,21 +119,17 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SM_CPYRT = @SM_CPYRT@ SM_DATE = @SM_DATE@ -SM_ENABLE_AUTH_FALSE = @SM_ENABLE_AUTH_FALSE@ -SM_ENABLE_AUTH_TRUE = @SM_ENABLE_AUTH_TRUE@ -SM_ENABLE_LDAP_FALSE = @SM_ENABLE_LDAP_FALSE@ -SM_ENABLE_LDAP_TRUE = @SM_ENABLE_LDAP_TRUE@ -SM_ENABLE_TLS_FALSE = @SM_ENABLE_TLS_FALSE@ -SM_ENABLE_TLS_TRUE = @SM_ENABLE_TLS_TRUE@ SM_MAXVERS = @SM_MAXVERS@ SM_MINVERS = @SM_MINVERS@ SM_VERS = @SM_VERS@ STRIP = @STRIP@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_version = @ac_version@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -152,6 +142,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ buildtree = @buildtree@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -218,6 +209,7 @@ sm_incdirs = @sm_incdirs@ sm_ldap_lib = @sm_ldap_lib@ sm_libmilter_envdef = @sm_libmilter_envdef@ sm_libmilter_libs = @sm_libmilter_libs@ +sm_libmilter_version = @sm_libmilter_version@ sm_libs = @sm_libs@ sm_libsm_envdef = @sm_libsm_envdef@ sm_libsm_libs = @sm_libsm_libs@ @@ -256,12 +248,15 @@ sm_version_math = @sm_version_math@ sm_version_minor = @sm_version_minor@ sm_version_r = @sm_version_r@ sm_version_v = @sm_version_v@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ # # Shipped manpages # @@ -307,7 +302,7 @@ sensible-mda.c: $(top_builddir)/config.status $(srcdir)/sensible-mda.c.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -330,7 +325,7 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) sensible-mda$(EXEEXT): $(sensible_mda_OBJECTS) $(sensible_mda_DEPENDENCIES) @rm -f sensible-mda$(EXEEXT) - $(LINK) $(sensible_mda_LDFLAGS) $(sensible_mda_OBJECTS) $(sensible_mda_LDADD) $(LIBS) + $(LINK) $(sensible_mda_OBJECTS) $(sensible_mda_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -341,22 +336,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sensible-mda.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -449,22 +443,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -480,7 +473,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -528,12 +521,20 @@ info-am: install-data-am: install-man +install-dvi: install-dvi-am + install-exec-am: install-sbinPROGRAMS +install-html: install-html-am + install-info: install-info-am install-man: install-man8 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -553,21 +554,25 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS +uninstall-am: uninstall-man uninstall-sbinPROGRAMS uninstall-man: uninstall-man8 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-sbinPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-man8 install-sbinPROGRAMS \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am uninstall-man \ - uninstall-man8 uninstall-sbinPROGRAMS + tags uninstall uninstall-am uninstall-man uninstall-man8 \ + uninstall-sbinPROGRAMS # # Debian targets, phase out @@ -0,0 +1,55 @@ +# Debian build daemons don't (for the nonce) support build-indep, +# so this rule allows *me* to build both arch and indep portions +# of sendmail in one go (so I don't forget). +#time /usr/bin/make -f ./debian/rules parts; +time SM_BUILD_OPT="" SM_CONF="" SM_CONF_OPT="" DEB_BUILD_OPTIONS="" debuild -e SM_CONF -e SM_CONF_OPT -e SM_BUILD_OPT; + fakeroot debian/rules clean +# Add here commands to clean up after the build process. +#-/usr/bin/make clean; +#-/usr/bin/make distclean; +# First, remove any patches, and source directories +#/usr/bin/make -f ./debian/sys-build.mk source.clean; +# Need to save this +/bin/mv ./debian/build/autoconf.mk \ + ./debian/build/autoconf.mk.save; +# Local stuff +if [ -f ./debian/Makefile ]; then \ + (cd ./debian && /usr/bin/make -f Makefile clean;) \ + fi; +# Debian stuff +rm -f -r build-tree ./debian/build/stampdir; +rm -f \ + ./debian/config.log \ + ./debian/config.status \ + ./debian/*.buildinfo.Debian \ + ./debian/*.debhelper \ + ./debian/build/debian/changelog.in \ + ./debian/build/debian/control \ + ; +for file in tmp sendmail sendmail-base sendmail-cf sendmail-doc libmilter-dev rmail sensible-mda;do \ + rm -f -r ./debian/$file; \ + done; +# Debhelper V3 conffile handling - prevent duplicates +for file in $(find ./debian -maxdepth 1 -type f -name '*\.conffiles\.sav'); do \ + mv $file $(echo "$file" | sed -e 's?\.sav$??'); \ + done; +# Restore pre-existing config.{guess,sub} +if [ -e ./debian/build/config.sub.sav ]; then \ + cp -pf ./debian/build/config.sub.sav \ + ./debian/build/config.sub \ + && rm -f ./debian/build/config.sub.sav; \ + fi; +if [ -e ./debian/build/config.guess.sav ]; then \ + cp -pf ./debian/build/config.guess.sav \ + ./debian/build/config.guess \ + && rm -f ./debian/build/config.guess.sav; \ + fi; +# Cleanup after build (for pristine source, smaller diffs) +#find .. -name sendmail*.asc -size 0 -maxdepth 1 -exec rm {} ';'; +dh_clean; +# Need to save this +/bin/mv ./debian/build/autoconf.mk.save \ + ./debian/build/autoconf.mk; + dpkg-source -b sendmail-8.14.1 +dpkg-source: building sendmail using existing sendmail_8.14.1.orig.tar.gz +dpkg-source: building sendmail in sendmail_8.14.1-1.diff.gz |