diff options
| author | Richard A Nelson (Rick) <cowboy@debian.org> | 2010-11-03 22:05:00 +0000 |
|---|---|---|
| committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 20:07:50 +0200 |
| commit | cb1b9d89c5278ac97b3fee2d39f9219bbda5180f (patch) | |
| tree | 6a88bbe1d2b1f10e0763a6992ace4d6c4bc05da6 | |
| parent | e253e5b372f6123431d41466fc6e33e357d98b57 (diff) | |
| download | sendmail-debian/8.14.4-2.tar.gz | |
Imported Debian patch 8.14.4-2debian/8.14.4-2
52 files changed, 138 insertions, 126 deletions
diff --git a/debian/Makefile b/debian/Makefile index 9798274..484ba83 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -89,7 +89,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/cf/hack/debian_auth.m4.in \ $(top_srcdir)/cf/hack/virthost_by_ip.m4.in \ $(top_srcdir)/cf/ostype/debian.m4.in $(top_srcdir)/configure \ - $(top_srcdir)/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in \ + $(top_srcdir)/examples/dhcp/dhclient-exit-hooks.d/sendmail.in \ $(top_srcdir)/examples/network/if-down.d/sendmail.in \ $(top_srcdir)/examples/network/if-up.d/sendmail.in \ $(top_srcdir)/examples/ppp/ip-down.d/sendmail.in \ @@ -130,7 +130,7 @@ CONFIG_CLEAN_FILES = build/autoconf.mk build/autoconf.pl \ cf/domain/debian-msp.m4 cf/domain/debian-mta.m4 \ cf/hack/debian_auth.m4 cf/hack/virthost_by_ip.m4 \ cf/ostype/debian.m4 \ - examples/dhcp3/dhclient-exit-hooks.d/sendmail \ + examples/dhcp/dhclient-exit-hooks.d/sendmail \ examples/network/if-down.d/sendmail \ examples/network/if-up.d/sendmail \ examples/ppp/ip-down.d/sendmail examples/ppp/ip-up.d/sendmail \ @@ -298,7 +298,7 @@ sm_build_arch = amd64 sm_custom = sm_custom_s = sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS -sm_date = 2010-10-16 +sm_date = 2010-11-03 sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid @@ -349,7 +349,7 @@ sm_newdb_lib = -ldb-4.8 sm_praliases_envdef = sm_praliases_libs = -ldb-4.8 -lldap -llber sm_recommends = -sm_revision = -1 +sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL @@ -357,7 +357,7 @@ sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl -sm_time = 19:38:59 +sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = sm_vacation_libs = -ldb-4.8 -lldap -llber @@ -531,7 +531,7 @@ cf/hack/virthost_by_ip.m4: $(top_builddir)/config.status $(top_srcdir)/cf/hack/v cd $(top_builddir) && $(SHELL) ./config.status $@ cf/ostype/debian.m4: $(top_builddir)/config.status $(top_srcdir)/cf/ostype/debian.m4.in cd $(top_builddir) && $(SHELL) ./config.status $@ -examples/dhcp3/dhclient-exit-hooks.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in +examples/dhcp/dhclient-exit-hooks.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/dhcp/dhclient-exit-hooks.d/sendmail.in cd $(top_builddir) && $(SHELL) ./config.status $@ examples/network/if-down.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/network/if-down.d/sendmail.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/debian/Makefile.in b/debian/Makefile.in index 730c6e0..fd1cf57 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -89,7 +89,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/cf/hack/debian_auth.m4.in \ $(top_srcdir)/cf/hack/virthost_by_ip.m4.in \ $(top_srcdir)/cf/ostype/debian.m4.in $(top_srcdir)/configure \ - $(top_srcdir)/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in \ + $(top_srcdir)/examples/dhcp/dhclient-exit-hooks.d/sendmail.in \ $(top_srcdir)/examples/network/if-down.d/sendmail.in \ $(top_srcdir)/examples/network/if-up.d/sendmail.in \ $(top_srcdir)/examples/ppp/ip-down.d/sendmail.in \ @@ -130,7 +130,7 @@ CONFIG_CLEAN_FILES = build/autoconf.mk build/autoconf.pl \ cf/domain/debian-msp.m4 cf/domain/debian-mta.m4 \ cf/hack/debian_auth.m4 cf/hack/virthost_by_ip.m4 \ cf/ostype/debian.m4 \ - examples/dhcp3/dhclient-exit-hooks.d/sendmail \ + examples/dhcp/dhclient-exit-hooks.d/sendmail \ examples/network/if-down.d/sendmail \ examples/network/if-up.d/sendmail \ examples/ppp/ip-down.d/sendmail examples/ppp/ip-up.d/sendmail \ @@ -531,7 +531,7 @@ cf/hack/virthost_by_ip.m4: $(top_builddir)/config.status $(top_srcdir)/cf/hack/v cd $(top_builddir) && $(SHELL) ./config.status $@ cf/ostype/debian.m4: $(top_builddir)/config.status $(top_srcdir)/cf/ostype/debian.m4.in cd $(top_builddir) && $(SHELL) ./config.status $@ -examples/dhcp3/dhclient-exit-hooks.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in +examples/dhcp/dhclient-exit-hooks.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/dhcp/dhclient-exit-hooks.d/sendmail.in cd $(top_builddir) && $(SHELL) ./config.status $@ examples/network/if-down.d/sendmail: $(top_builddir)/config.status $(top_srcdir)/examples/network/if-down.d/sendmail.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk index e6ef7c2..79b2339 100644 --- a/debian/build/autoconf.mk +++ b/debian/build/autoconf.mk @@ -2,13 +2,13 @@ #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: autoconf.mk,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: autoconf.mk,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # build/autoconf.mk. Generated from autoconf.mk.in by configure. # -# Rules file for Sendmail 8.14.4-1(527876) +# Rules file for Sendmail 8.14.4-2(527876) # on Debian squeeze/sid # via Debhelper V1 # @@ -16,7 +16,7 @@ # on Debian slink, potato, woody, testing, sid, ... # but the generated file is customized to the version noted above. # -# Richard Nelson <cowboy@debian.org> 2010-10-16 19:38:59 (+0000) +# Richard Nelson <cowboy@debian.org> 2010-11-03 22:21:32 (+0000) #------------------------------------------------------------------------------ #SHELL := /bin/sh -x @@ -54,7 +54,7 @@ buildtree = build-tree/sendmail-8.14.4 sm_custom = sm_custom_s = sm_version = 8.14.4 -sm_revision = -1 +sm_revision = -2 # I like to preserve timestamps... INSTALL := /usr/bin/install -c -p diff --git a/debian/build/debian/changelog b/debian/build/debian/changelog index 26d256b..41a1021 100644 --- a/debian/build/debian/changelog +++ b/debian/build/debian/changelog @@ -1,3 +1,9 @@ +sendmail (8.14.4-2) unstable; urgency=high + + * Actually get the DHCP config files installed :( Closes: #602252 + + -- Richard A Nelson (Rick) <cowboy@debian.org> Wed, 03 Nov 2010 22:05:00 -0000 + sendmail (8.14.4-1) unstable; urgency=high * Long past due diff --git a/debian/build/debian/changelog.sh b/debian/build/debian/changelog.sh index 0f45a63..6ff7e6b 100644 --- a/debian/build/debian/changelog.sh +++ b/debian/build/debian/changelog.sh @@ -1,12 +1,12 @@ #!/bin/sh -e #----------------------------------------------------------------------------- -# $Sendmail: changelog.sh,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: changelog.sh,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # build/debian/changelog.sh. Generated from changelog.sh.in by configure. # -# Debian script to generate changelogs for sendmail 8.14.4-1 +# Debian script to generate changelogs for sendmail 8.14.4-2 # # Note: this file supports 8.7.6 - 9.0.0 # @@ -20,7 +20,7 @@ PACKAGE='sendmail'; # Remove old combined changelog rm -f build/debian/changelog; -echo "Building Sendmail 8.14.4-1 (527876) changelog."; +echo "Building Sendmail 8.14.4-2 (527876) changelog."; # # Start with Custom changelog (if any) diff --git a/debian/build/debian/control.m4 b/debian/build/debian/control.m4 index 2034f47..846e89e 100644 --- a/debian/build/debian/control.m4 +++ b/debian/build/debian/control.m4 @@ -1,11 +1,11 @@ dnl #-------------------------------------------------------------------------- -dnl # $Sendmail: control.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +dnl # $Sendmail: control.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ dnl # dnl # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. dnl # dnl # build/debian/control.m4. Generated from control.m4.in by configure. dnl # -dnl # Debian control.m4 for sendmail 8.14.4-1(527876) +dnl # Debian control.m4 for sendmail 8.14.4-2(527876) dnl # dnl # Note: the .in file supports 8.7.6 - 9.0.0, but the generated dnl # file is customized to the version noted above. diff --git a/debian/build/debian/sendmail-base.dirs.in b/debian/build/debian/sendmail-base.dirs.in index c8e2877..5c46b96 100644 --- a/debian/build/debian/sendmail-base.dirs.in +++ b/debian/build/debian/sendmail-base.dirs.in @@ -2,8 +2,8 @@ .@sysconfdir@/cron.d .@sysconfdir@/cron.daily .@sysconfdir@/default -.@sysconfdir@/dhcp3 -.@sysconfdir@/dhcp3/dhclient-exit-hooks.d +.@sysconfdir@/dhcp +.@sysconfdir@/dhcp/dhclient-exit-hooks.d .@sysconfdir@/logcheck .@sysconfdir@/logcheck/ignore.d.paranoid .@sysconfdir@/logcheck/ignore.d.server @@ -36,8 +36,8 @@ .@datadir@/sendmail .@datadir@/sendmail/examples .@datadir@/sendmail/examples/db -.@datadir@/sendmail/examples/dhcp3 -.@datadir@/sendmail/examples/dhcp3/dhclient-exit-hooks.d +.@datadir@/sendmail/examples/dhcp +.@datadir@/sendmail/examples/dhcp/dhclient-exit-hooks.d .@datadir@/sendmail/examples/ppp .@datadir@/sendmail/examples/ppp/ip-down.d .@datadir@/sendmail/examples/ppp/ip-up.d diff --git a/debian/build/site.config.m4 b/debian/build/site.config.m4 index 491f938..34f424e 100644 --- a/debian/build/site.config.m4 +++ b/debian/build/site.config.m4 @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Sendmail: site.config.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: site.config.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # build/site.config.m4. Generated from site.config.m4.in by configure. # -# Debian site.config.m4 for sendmail 8.14.4-1(527876) +# Debian site.config.m4 for sendmail 8.14.4-2(527876) # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. @@ -13,7 +13,7 @@ #----------------------------------------------------------------------------- # #------------------------------------------------------------------ -# Sendmail 8.14.4-1(527876) on 2010-10-16 at 19:38:59 (+0000) +# Sendmail 8.14.4-2(527876) on 2010-11-03 at 22:21:32 (+0000) #------------------------------------------------------------------ # #------------------------------------------------------------------ diff --git a/debian/build/update_chaos b/debian/build/update_chaos index 603308d..7baff1a 100644 --- a/debian/build/update_chaos +++ b/debian/build/update_chaos @@ -1,12 +1,12 @@ #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: update_chaos,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_chaos,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2001-2010 Richard Nelson. All Rights Reserved. # # build/update_chaos. Generated from update_chaos.in by configure. # -# Debian script to rationalize builds for Sendmail 8.14.4-1(@sm_math@) +# Debian script to rationalize builds for Sendmail 8.14.4-2(@sm_math@) # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. diff --git a/debian/cf/Makefile b/debian/cf/Makefile index ad02ee2..afb013b 100644 --- a/debian/cf/Makefile +++ b/debian/cf/Makefile @@ -160,7 +160,7 @@ sm_build_arch = amd64 sm_custom = sm_custom_s = sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS -sm_date = 2010-10-16 +sm_date = 2010-11-03 sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid @@ -211,7 +211,7 @@ sm_newdb_lib = -ldb-4.8 sm_praliases_envdef = sm_praliases_libs = -ldb-4.8 -lldap -llber sm_recommends = -sm_revision = -1 +sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL @@ -219,7 +219,7 @@ sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl -sm_time = 19:38:59 +sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = sm_vacation_libs = -ldb-4.8 -lldap -llber @@ -245,13 +245,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # cf/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.4-1(527876) +# Rules file for Sendmail 8.14.4-2(527876) # on Debian squeeze/sid # via Debhelper V1 # @@ -259,7 +259,7 @@ top_srcdir = .. # on Debian slink, potato, woody, testing, sid, ... # but the generated file is customized to the version noted above. # -# Richard Nelson <cowboy@debian.org> 2010-10-16 19:38:59 (+0000) +# Richard Nelson <cowboy@debian.org> 2010-11-03 22:21:32 (+0000) #------------------------------------------------------------------------------ # # Shipped data diff --git a/debian/cf/debian/autoconf.m4 b/debian/cf/debian/autoconf.m4 index 7320a00..e75004d 100644 --- a/debian/cf/debian/autoconf.m4 +++ b/debian/cf/debian/autoconf.m4 @@ -1,12 +1,12 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: autoconf.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: autoconf.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2001-2010 Richard Nelson. All Rights Reserved. # # cf/debian/autoconf.m4. Generated from autoconf.m4.in by configure. # -# m4 autoconf config file for building Sendmail 8.14.4-1 +# m4 autoconf config file for building Sendmail 8.14.4-2 # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. @@ -14,7 +14,7 @@ divert(-1)dnl #----------------------------------------------------------------------------- # divert(0)dnl -VERSIONID(`$Id: autoconf.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: autoconf.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Export (from autoconf to m4) some items of dubious value @@ -24,11 +24,11 @@ define(`SM_DATE', `2010-10-11 17:53:00')dnl define(`SM_MINVERS', `8.7.6')dnl define(`SM_MAXVERS', `9.0.0')dnl define(`SM_CPYRT', `2010')dnl -define(`sm_date', `2010-10-16')dnl -define(`sm_time', `19:38:59')dnl +define(`sm_date', `2010-11-03')dnl +define(`sm_time', `22:21:32')dnl define(`sm_utc', `+0000')dnl define(`sm_version', `8.14.4')dnl -define(`sm_revision', `-1')dnl +define(`sm_revision', `-2')dnl define(`sm_version_v', `8')dnl define(`sm_version_r', `14')dnl define(`sm_version_major', `8.14')dnl diff --git a/debian/cf/debian/sendmail.mc b/debian/cf/debian/sendmail.mc index 5d234ea..156177a 100644 --- a/debian/cf/debian/sendmail.mc +++ b/debian/cf/debian/sendmail.mc @@ -1,6 +1,6 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: debproto.mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: debproto.mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # @@ -33,7 +33,7 @@ divert(0)dnl # define(`_USE_ETC_MAIL_')dnl include(`/usr/share/sendmail/cf/m4/cf.m4')dnl -VERSIONID(`$Id: sendmail.mc, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: sendmail.mc, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') OSTYPE(`debian')dnl DOMAIN(`debian-mta')dnl dnl # Items controlled by /etc/mail/sendmail.conf - DO NOT TOUCH HERE diff --git a/debian/cf/debian/submit.mc b/debian/cf/debian/submit.mc index 0fd5239..d2d5596 100644 --- a/debian/cf/debian/submit.mc +++ b/debian/cf/debian/submit.mc @@ -1,6 +1,6 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: submit.mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: submit.mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2000-2010 Richard Nelson. All Rights Reserved. # @@ -33,7 +33,7 @@ divert(0)dnl # define(`_USE_ETC_MAIL_')dnl include(`/usr/share/sendmail/cf/m4/cf.m4')dnl -VERSIONID(`$Id: submit.mc, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: submit.mc, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') OSTYPE(`debian')dnl DOMAIN(`debian-msp')dnl dnl # diff --git a/debian/cf/domain/debian-msp.m4 b/debian/cf/domain/debian-msp.m4 index 5f7be4b..6a6f037 100644 --- a/debian/cf/domain/debian-msp.m4 +++ b/debian/cf/domain/debian-msp.m4 @@ -1,12 +1,12 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: debian-msp.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: debian-msp.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # cf/domain/debian-msp.m4. Generated from debian-msp.m4.in by configure. # -# domain(debian-msp) config file for building Sendmail 8.14.4-1 +# domain(debian-msp) config file for building Sendmail 8.14.4-2 # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. @@ -21,7 +21,7 @@ dnl #--------------------------------------------------------------------- ifdef(`sm_version', `dnl', `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl') dnl # -VERSIONID(`$Id: debian-msp.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: debian-msp.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') define(`DEBIAN_MSP')dnl define(`confCF_VERSION', `Submit')dnl dnl # diff --git a/debian/cf/domain/debian-mta.m4 b/debian/cf/domain/debian-mta.m4 index d5e79af..fc46120 100644 --- a/debian/cf/domain/debian-mta.m4 +++ b/debian/cf/domain/debian-mta.m4 @@ -1,12 +1,12 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: debian-mta.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: debian-mta.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # cf/domain/debian-mta.m4. Generated from debian-mta.m4.in by configure. # -# domain(debian-mta) config file for building Sendmail 8.14.4-1 +# domain(debian-mta) config file for building Sendmail 8.14.4-2 # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. @@ -21,7 +21,7 @@ dnl #--------------------------------------------------------------------- ifdef(`sm_version', `dnl' , `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl') dnl # -VERSIONID(`$Id: debian-mta.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: debian-mta.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') define(`DEBIAN_MTA')dnl dnl # dnl # changes made herein *must* be reflected in parse_mc,update_db,debian.m4 diff --git a/debian/cf/hack/debian_auth.m4 b/debian/cf/hack/debian_auth.m4 index 697c328..0aa6852 100644 --- a/debian/cf/hack/debian_auth.m4 +++ b/debian/cf/hack/debian_auth.m4 @@ -1,6 +1,6 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: debian_auth.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: debian_auth.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2001-2010 Richard Nelson. All Rights Reserved. # @@ -17,7 +17,7 @@ divert(-1)dnl # #----------------------------------------------------------------------------- divert(0)dnl -VERSIONID(`$Id: debian_auth.m4,v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: debian_auth.m4,v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') dnl # dnl # MTA as Client authentication - only if authinfo/access_db *NOT* used... define(`confDEF_AUTH_INFO', `MAIL_SETTINGS_DIR`'default-auth-info')dnl diff --git a/debian/cf/hack/virthost_by_ip.m4 b/debian/cf/hack/virthost_by_ip.m4 index 4c142e9..e147d2f 100644 --- a/debian/cf/hack/virthost_by_ip.m4 +++ b/debian/cf/hack/virthost_by_ip.m4 @@ -1,12 +1,12 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: virthost_by_ip.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: virthost_by_ip.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2001-2010 Richard Nelson. All Rights Reserved. # # cf/hack/virthost_by_ip.m4. Generated from virthost_by_ip.m4.in by configure. # -# hack(virthost_by_ip) config file for building Sendmail 8.14.4-1 +# hack(virthost_by_ip) config file for building Sendmail 8.14.4-2 # Note: Also check op.{ps,txt} for the 'b' modifier to daemon_options - it # extends ip based virtual hosting. # @@ -23,7 +23,7 @@ dnl #--------------------------------------------------------------------- ifdef(`sm_version', `dnl', `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl') dnl # -VERSIONID(`$Id: virthost_by_ip.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: virthost_by_ip.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Virtual hosting extensions - Login (greeting message) diff --git a/debian/cf/ostype/debian.m4 b/debian/cf/ostype/debian.m4 index 22c2d25..36ca11d 100644 --- a/debian/cf/ostype/debian.m4 +++ b/debian/cf/ostype/debian.m4 @@ -1,12 +1,12 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: debian.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: debian.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # cf/ostype/debian.m4. Generated from debian.m4.in by configure. # -# ostype(debian) config file for building Sendmail 8.14.4-1 +# ostype(debian) config file for building Sendmail 8.14.4-2 # # Note: the .in file supports 8.7.6 - 9.0.0, but the generated # file is customized to the version noted above. @@ -21,8 +21,8 @@ dnl #--------------------------------------------------------------------- ifdef(`sm_version', `dnl', `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl') dnl # -VERSIONID(`$Id: debian.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') -define(`confCF_VERSION', `Debian-1')dnl +VERSIONID(`$Id: debian.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') +define(`confCF_VERSION', `Debian-2')dnl dnl # dnl # changes made herein *must* be reflected in parse_mc,update_db,debian.m4 dnl # @@ -98,10 +98,10 @@ ifelse(sm_enable_milter, `yes',dnl # #------------------------------------------------------------------------- # -# Undocumented features are available in Debian Sendmail 8.14.4-1. +# Undocumented features are available in Debian Sendmail 8.14.4-2. # * none # -# _FFR_ features are available in Debian Sendmail 8.14.4-1. +# _FFR_ features are available in Debian Sendmail 8.14.4-2. ifelse(sm_enable_milter, `yes',dnl `# * milter') # * sm_ffr diff --git a/debian/changelog b/debian/changelog index 26d256b..41a1021 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sendmail (8.14.4-2) unstable; urgency=high + + * Actually get the DHCP config files installed :( Closes: #602252 + + -- Richard A Nelson (Rick) <cowboy@debian.org> Wed, 03 Nov 2010 22:05:00 -0000 + sendmail (8.14.4-1) unstable; urgency=high * Long past due diff --git a/debian/configure b/debian/configure index 2b94e52..ccfbeba 100644 --- a/debian/configure +++ b/debian/configure @@ -7778,7 +7778,7 @@ ac_config_files="$ac_config_files cf/ostype/debian.m4" ac_config_files="$ac_config_files examples/Makefile" -ac_config_files="$ac_config_files examples/dhcp3/dhclient-exit-hooks.d/sendmail" +ac_config_files="$ac_config_files examples/dhcp/dhclient-exit-hooks.d/sendmail" ac_config_files="$ac_config_files examples/network/if-down.d/sendmail" @@ -8640,7 +8640,7 @@ do "cf/hack/virthost_by_ip.m4") CONFIG_FILES="$CONFIG_FILES cf/hack/virthost_by_ip.m4" ;; "cf/ostype/debian.m4") CONFIG_FILES="$CONFIG_FILES cf/ostype/debian.m4" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/dhcp3/dhclient-exit-hooks.d/sendmail") CONFIG_FILES="$CONFIG_FILES examples/dhcp3/dhclient-exit-hooks.d/sendmail" ;; + "examples/dhcp/dhclient-exit-hooks.d/sendmail") CONFIG_FILES="$CONFIG_FILES examples/dhcp/dhclient-exit-hooks.d/sendmail" ;; "examples/network/if-down.d/sendmail") CONFIG_FILES="$CONFIG_FILES examples/network/if-down.d/sendmail" ;; "examples/network/if-up.d/sendmail") CONFIG_FILES="$CONFIG_FILES examples/network/if-up.d/sendmail" ;; "examples/ppp/ip-down.d/sendmail") CONFIG_FILES="$CONFIG_FILES examples/ppp/ip-down.d/sendmail" ;; @@ -9229,7 +9229,7 @@ $as_echo X"$file" | "sensible-mda.preinst":F) chmod a+x ./sensible-mda.preinst ;; "cf/Makefile":F) chmod a+x ./cf/Makefile ;; "examples/Makefile":F) chmod a+x ./examples/Makefile ;; - "examples/dhcp3/dhclient-exit-hooks.d/sendmail":F) chmod a+x ./examples/dhcp3/dhclient-exit-hooks.d/sendmail ;; + "examples/dhcp/dhclient-exit-hooks.d/sendmail":F) chmod a+x ./examples/dhcp/dhclient-exit-hooks.d/sendmail ;; "examples/network/if-down.d/sendmail":F) chmod a+x ./examples/network/if-down.d/sendmail ;; "examples/network/if-up.d/sendmail":F) chmod a+x ./examples/network/if-up.d/sendmail ;; "examples/ppp/ip-down.d/sendmail":F) chmod a+x ./examples/ppp/ip-down.d/sendmail ;; diff --git a/debian/configure.ac b/debian/configure.ac index 6a994e9..91e8d49 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -1768,8 +1768,8 @@ AC_CONFIG_FILES([cf/hack/debian_auth.m4]) AC_CONFIG_FILES([cf/hack/virthost_by_ip.m4]) AC_CONFIG_FILES([cf/ostype/debian.m4]) AC_CONFIG_FILES([examples/Makefile], [chmod a+x ./examples/Makefile]) -AC_CONFIG_FILES([examples/dhcp3/dhclient-exit-hooks.d/sendmail], - [chmod a+x ./examples/dhcp3/dhclient-exit-hooks.d/sendmail]) +AC_CONFIG_FILES([examples/dhcp/dhclient-exit-hooks.d/sendmail], + [chmod a+x ./examples/dhcp/dhclient-exit-hooks.d/sendmail]) AC_CONFIG_FILES([examples/network/if-down.d/sendmail], [chmod a+x ./examples/network/if-down.d/sendmail]) AC_CONFIG_FILES([examples/network/if-up.d/sendmail], diff --git a/debian/examples/Makefile b/debian/examples/Makefile index e6c9778..2a47027 100644 --- a/debian/examples/Makefile +++ b/debian/examples/Makefile @@ -192,7 +192,7 @@ sm_build_arch = amd64 sm_custom = sm_custom_s = sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS -sm_date = 2010-10-16 +sm_date = 2010-11-03 sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid @@ -243,7 +243,7 @@ sm_newdb_lib = -ldb-4.8 sm_praliases_envdef = sm_praliases_libs = -ldb-4.8 -lldap -llber sm_recommends = -sm_revision = -1 +sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL @@ -251,7 +251,7 @@ sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl -sm_time = 19:38:59 +sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = sm_vacation_libs = -ldb-4.8 -lldap -llber @@ -277,13 +277,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # examples/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.4-1(527876) +# Rules file for Sendmail 8.14.4-2(527876) # on Debian squeeze/sid # via Debhelper V1 # @@ -291,7 +291,7 @@ top_srcdir = .. # on Debian slink, potato, woody, testing, sid, ... # but the generated file is customized to the version noted above. # -# Richard Nelson <cowboy@debian.org> 2010-10-16 19:38:59 (+0000) +# Richard Nelson <cowboy@debian.org> 2010-11-03 22:21:32 (+0000) #------------------------------------------------------------------------------ # # Shipped programs @@ -305,13 +305,13 @@ dist_man_MANS = checksendmail/checksendmail.8 # Shipped data # # Installed example subdirectories -EXAMPLES_DIRS = amavis db dhcp3 \ +EXAMPLES_DIRS = amavis db dhcp \ ldap logcheck milter network \ pam.d ppp resolvconf sasl tls # # Sigh... I wanted to use sysconf_SCRIPTS, but automake says NO! -nobase_dist_sysconf_DATA = dhcp3/dhclient-exit-hooks.d/sendmail \ +nobase_dist_sysconf_DATA = dhcp/dhclient-exit-hooks.d/sendmail \ logcheck/ignore.d.paranoid/sendmail \ logcheck/ignore.d.server/sendmail \ logcheck/ignore.d.workstation/sendmail \ @@ -630,14 +630,14 @@ install-data-hook: $(INSTALL_DATA) '{}' ${DESTDIR}${pkgdatadir}/examples/'{}'; \ done; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/milter/Makefile; - chmod a+rx ${DESTDIR}${pkgdatadir}/examples/dhcp3/dhclient-exit-hooks.d/sendmail; + chmod a+rx ${DESTDIR}${pkgdatadir}/examples/dhcp/dhclient-exit-hooks.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-post-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-up.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/ppp/ip-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/ppp/ip-up.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/resolvconf/update-libc.d/sendmail; - chmod a+rx ${DESTDIR}${sysconfdir}/dhcp3/dhclient-exit-hooks.d/sendmail; + chmod a+rx ${DESTDIR}${sysconfdir}/dhcp/dhclient-exit-hooks.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-down.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-post-down.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-up.d/sendmail; diff --git a/debian/examples/Makefile.in b/debian/examples/Makefile.in index 56ead40..671d543 100644 --- a/debian/examples/Makefile.in +++ b/debian/examples/Makefile.in @@ -305,13 +305,13 @@ dist_man_MANS = checksendmail/checksendmail.8 # Shipped data # # Installed example subdirectories -EXAMPLES_DIRS = amavis db dhcp3 \ +EXAMPLES_DIRS = amavis db dhcp \ ldap logcheck milter network \ pam.d ppp resolvconf sasl tls # # Sigh... I wanted to use sysconf_SCRIPTS, but automake says NO! -nobase_dist_sysconf_DATA = dhcp3/dhclient-exit-hooks.d/sendmail \ +nobase_dist_sysconf_DATA = dhcp/dhclient-exit-hooks.d/sendmail \ logcheck/ignore.d.paranoid/sendmail \ logcheck/ignore.d.server/sendmail \ logcheck/ignore.d.workstation/sendmail \ @@ -630,14 +630,14 @@ install-data-hook: $(INSTALL_DATA) '{}' ${DESTDIR}${pkgdatadir}/examples/'{}'; \ done; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/milter/Makefile; - chmod a+rx ${DESTDIR}${pkgdatadir}/examples/dhcp3/dhclient-exit-hooks.d/sendmail; + chmod a+rx ${DESTDIR}${pkgdatadir}/examples/dhcp/dhclient-exit-hooks.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-post-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/network/if-up.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/ppp/ip-down.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/ppp/ip-up.d/sendmail; chmod a+rx ${DESTDIR}${pkgdatadir}/examples/resolvconf/update-libc.d/sendmail; - chmod a+rx ${DESTDIR}${sysconfdir}/dhcp3/dhclient-exit-hooks.d/sendmail; + chmod a+rx ${DESTDIR}${sysconfdir}/dhcp/dhclient-exit-hooks.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-down.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-post-down.d/sendmail; chmod a+rx ${DESTDIR}${sysconfdir}/network/if-up.d/sendmail; diff --git a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail index 7135a80..7135a80 100644 --- a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail +++ b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail diff --git a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.1.old b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.1.old index ba6b98c..ba6b98c 100644 --- a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.1.old +++ b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.1.old diff --git a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.in index c517033..c517033 100644 --- a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.in +++ b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.in diff --git a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.md5sum b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.md5sum index d18e257..d18e257 100644 --- a/debian/examples/dhcp3/dhclient-exit-hooks.d/sendmail.md5sum +++ b/debian/examples/dhcp/dhclient-exit-hooks.d/sendmail.md5sum diff --git a/debian/examples/sasl/sasl.m4 b/debian/examples/sasl/sasl.m4 index 46f527f..e237939 100644 --- a/debian/examples/sasl/sasl.m4 +++ b/debian/examples/sasl/sasl.m4 @@ -1,6 +1,6 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: sasl.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: sasl.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2003-2010 Richard Nelson. All Rights Reserved. # @@ -15,7 +15,7 @@ divert(-1)dnl #----------------------------------------------------------------------------- # divert(0)dnl -VERSIONID(`$Id: sasl.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: sasl.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/examples/tls/starttls.m4 b/debian/examples/tls/starttls.m4 index 2bc40df..0b5d167 100644 --- a/debian/examples/tls/starttls.m4 +++ b/debian/examples/tls/starttls.m4 @@ -1,6 +1,6 @@ divert(-1)dnl #----------------------------------------------------------------------------- -# $Sendmail: starttls.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: starttls.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 2002-2010 Richard Nelson. All Rights Reserved. # @@ -15,7 +15,7 @@ divert(-1)dnl #----------------------------------------------------------------------------- # divert(0)dnl -VERSIONID(`$Id: starttls.m4,v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $') +VERSIONID(`$Id: starttls.m4,v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/local/Makefile b/debian/local/Makefile index 9608d39..2cab4ca 100644 --- a/debian/local/Makefile +++ b/debian/local/Makefile @@ -205,7 +205,7 @@ sm_build_arch = amd64 sm_custom = sm_custom_s = sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS -sm_date = 2010-10-16 +sm_date = 2010-11-03 sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid @@ -256,7 +256,7 @@ sm_newdb_lib = -ldb-4.8 sm_praliases_envdef = sm_praliases_libs = -ldb-4.8 -lldap -llber sm_recommends = -sm_revision = -1 +sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL @@ -264,7 +264,7 @@ sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl -sm_time = 19:38:59 +sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = sm_vacation_libs = -ldb-4.8 -lldap -llber @@ -290,13 +290,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # # local/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.4-1(527876) +# Rules file for Sendmail 8.14.4-2(527876) # on Debian squeeze/sid # via Debhelper V1 # @@ -304,7 +304,7 @@ top_srcdir = .. # on Debian slink, potato, woody, testing, sid, ... # but the generated file is customized to the version noted above. # -# Richard Nelson <cowboy@debian.org> 2010-10-16 19:38:59 (+0000) +# Richard Nelson <cowboy@debian.org> 2010-11-03 22:21:32 (+0000) #------------------------------------------------------------------------------ # # Shipped programs diff --git a/debian/local/Parse_conf.pm b/debian/local/Parse_conf.pm index e3d1f29..f1c04a1 100644 --- a/debian/local/Parse_conf.pm +++ b/debian/local/Parse_conf.pm @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: Parse_conf.pm,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: Parse_conf.pm,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Parse and update /etc/mail/sendmail.conf # @@ -43,7 +43,7 @@ require Parse_mc; #$main::Version = '$Revision: 1.00 $ '; $Parse_conf::program_name = 'Parse_conf.pm'; $Parse_conf::program_version = '8.14.4'; -$Parse_conf::program_date = '2010-10-16 19:38:59 cowboy'; +$Parse_conf::program_date = '2010-11-03 22:21:32 cowboy'; $Parse_conf::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/Parse_mc.pm b/debian/local/Parse_mc.pm index d15a499..bcd8058 100644 --- a/debian/local/Parse_mc.pm +++ b/debian/local/Parse_mc.pm @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: Parse_mc.pm,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: Parse_mc.pm,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Parse Sendmail config for databases # @@ -48,7 +48,7 @@ use FileHandle; # I/O #$main::Version = '$Revision: 2.00 $ '; $Parse_mc::program_name = 'Parse_mc.pm'; $Parse_mc::program_version = '8.14.4'; -$Parse_mc::program_date = '2010-10-16 19:38:59 cowboy'; +$Parse_mc::program_date = '2010-11-03 22:21:32 cowboy'; $Parse_mc::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/bug/sendmail/script b/debian/local/bug/sendmail/script index 482a405..03b2bf9 100644 --- a/debian/local/bug/sendmail/script +++ b/debian/local/bug/sendmail/script @@ -1,6 +1,6 @@ #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: sendmail.bug,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: sendmail.bug,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # diff --git a/debian/local/dynamic b/debian/local/dynamic index 6c94f49..a4ed835 100644 --- a/debian/local/dynamic +++ b/debian/local/dynamic @@ -1,7 +1,7 @@ #!/bin/sh #------------------------------------------------------------------------ # -# $Sendmail: dynamic,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: dynamic,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Shell functions to handle dynamic network updates. # Supports ppp, dhcp, ifup/down, etc. diff --git a/debian/local/parse_mc b/debian/local/parse_mc index 3d38aa6..3ce510d 100644 --- a/debian/local/parse_mc +++ b/debian/local/parse_mc @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: parse_mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: parse_mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Parse Sendmail config for databases # @@ -37,7 +37,7 @@ require Parse_conf; #$main::Version = '$Revision: 2.00 $ '; $main::program_name = $0; $main::program_version = '8.14.4'; -$main::program_date = '2010-10-16 19:38:59 cowboy'; +$main::program_date = '2010-11-03 22:21:32 cowboy'; $main::debug = 0; # diff --git a/debian/local/sendmail b/debian/local/sendmail index 3df3d91..f3c7bce 100644 --- a/debian/local/sendmail +++ b/debian/local/sendmail @@ -1,6 +1,6 @@ #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: sm_helper.sh,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: sm_helper.sh,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # diff --git a/debian/local/sendmailconfig b/debian/local/sendmailconfig index dc3235c..b585d94 100644 --- a/debian/local/sendmailconfig +++ b/debian/local/sendmailconfig @@ -1,6 +1,6 @@ #!/bin/sh -e #----------------------------------------------------------------------------- -# $Sendmail: sendmailconfig,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: sendmailconfig,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Interactively configure Sendmail for Debian # diff --git a/debian/local/update_auth b/debian/local/update_auth index 53a1aa5..6c2c96a 100644 --- a/debian/local/update_auth +++ b/debian/local/update_auth @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_auth,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_auth,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Sendmail support for SMTP AUTH (SASL) # diff --git a/debian/local/update_authm4 b/debian/local/update_authm4 index 710e9e4..6999876 100644 --- a/debian/local/update_authm4 +++ b/debian/local/update_authm4 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: update_auth,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_auth,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Create /etc/mail/sasl/sasl.m4 for Debian Sendmail # @@ -35,7 +35,7 @@ require Parse_mc; #$main::Version = '$Revision: 2.00 $ '; $main::program_name = $0; $main::program_version = '8.14.4'; -$main::program_date = '2010-10-16 19:38:59 cowboy'; +$main::program_date = '2010-11-03 22:21:32 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; @@ -183,7 +183,7 @@ divert(-1)dnl ##### #################################################################### divert(0)dnl -VERSIONID(\`\$Id: sasl.m4,v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp \$\') +VERSIONID(\`\$Id: sasl.m4,v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp \$\') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/local/update_conf b/debian/local/update_conf index 94a3b9a..41c3103 100644 --- a/debian/local/update_conf +++ b/debian/local/update_conf @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: update_conf,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_conf,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Parse and update /etc/mail/sendmail.conf and reflect its values in # /etc/cron.d/sendmail and /etc/inetd.conf. @@ -26,7 +26,7 @@ require Parse_mc; $main::program_name = $0; #'update_conf'; $main::program_version = '8.14.4'; -$main::program_date = '2010-10-16 19:38:59 cowboy'; +$main::program_date = '2010-11-03 22:21:32 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/update_db b/debian/local/update_db index fe9802f..dbc9d94 100644 --- a/debian/local/update_db +++ b/debian/local/update_db @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_db,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_db,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Update Sendmail databases for Debian # diff --git a/debian/local/update_ldap b/debian/local/update_ldap index 4b6abc7..afe3b13 100644 --- a/debian/local/update_ldap +++ b/debian/local/update_ldap @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_ldap,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_ldap,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Sendmail support for LDAP # diff --git a/debian/local/update_mc b/debian/local/update_mc index 0c0c2ea..a590a41 100644 --- a/debian/local/update_mc +++ b/debian/local/update_mc @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Update Sendmail databases for Debian # diff --git a/debian/local/update_mk b/debian/local/update_mk index 1613fee..c3d1880 100644 --- a/debian/local/update_mk +++ b/debian/local/update_mk @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: update_mk,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_mk,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Create /etc/mail/Makefile for Debian Sendmail databases # @@ -36,7 +36,7 @@ require Parse_conf; #$main::Version = '$Revision: 2.00 $ '; $main::program_name = $0; $main::program_version = '8.14.4'; -$main::program_date = '2010-10-16 19:38:59 cowboy'; +$main::program_date = '2010-11-03 22:21:32 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/update_smrsh b/debian/local/update_smrsh index 7776425..a9333d1 100644 --- a/debian/local/update_smrsh +++ b/debian/local/update_smrsh @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_smrsh,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_smrsh,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Update MDA programs used by Sendmail for Debian # diff --git a/debian/local/update_sys b/debian/local/update_sys index 54fc332..7a6452c 100644 --- a/debian/local/update_sys +++ b/debian/local/update_sys @@ -1,7 +1,7 @@ #!/bin/sh #----------------------------------------------------------------------------- # -# $Sendmail: update_sys,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_sys,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Update system files used by Sendmail for Debian # diff --git a/debian/local/update_tls b/debian/local/update_tls index bcf27f7..c7beec7 100644 --- a/debian/local/update_tls +++ b/debian/local/update_tls @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_tls,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_tls,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Sendmail support for TLS # diff --git a/debian/local/update_tlsm4 b/debian/local/update_tlsm4 index e87da01..403c8dd 100644 --- a/debian/local/update_tlsm4 +++ b/debian/local/update_tlsm4 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #------------------------------------------------------------------------ # -# $Sendmail: update_tls,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: update_tls,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Create /etc/mail/tls/starttls.m4 for Debian Sendmail # @@ -35,7 +35,7 @@ require Parse_mc; #$main::Version = '$Revision: 2.00 $ '; $main::program_name = $0; $main::program_version = '8.14.4'; -$main::program_date = '2010-10-16 19:38:59 cowboy'; +$main::program_date = '2010-11-03 22:21:32 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; @@ -190,7 +190,7 @@ divert(-1)dnl ##### #################################################################### divert(0)dnl -VERSIONID(\`\$Id: starttls.m4,v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp \$\') +VERSIONID(\`\$Id: starttls.m4,v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp \$\') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/sendmail-base.dirs b/debian/sendmail-base.dirs index 4f0ae0f..7d8d16f 100644 --- a/debian/sendmail-base.dirs +++ b/debian/sendmail-base.dirs @@ -2,8 +2,8 @@ ./etc/cron.d ./etc/cron.daily ./etc/default -./etc/dhcp3 -./etc/dhcp3/dhclient-exit-hooks.d +./etc/dhcp +./etc/dhcp/dhclient-exit-hooks.d ./etc/logcheck ./etc/logcheck/ignore.d.paranoid ./etc/logcheck/ignore.d.server @@ -36,8 +36,8 @@ ./usr/share/sendmail ./usr/share/sendmail/examples ./usr/share/sendmail/examples/db -./usr/share/sendmail/examples/dhcp3 -./usr/share/sendmail/examples/dhcp3/dhclient-exit-hooks.d +./usr/share/sendmail/examples/dhcp +./usr/share/sendmail/examples/dhcp/dhclient-exit-hooks.d ./usr/share/sendmail/examples/ppp ./usr/share/sendmail/examples/ppp/ip-down.d ./usr/share/sendmail/examples/ppp/ip-up.d diff --git a/debian/sendmail.init.d b/debian/sendmail.init.d index dde8c50..66e3319 100644 --- a/debian/sendmail.init.d +++ b/debian/sendmail.init.d @@ -39,7 +39,7 @@ SCRIPTNAME=/etc/init.d/$NAME #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: sm_helper.sh,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ +# $Sendmail: sm_helper.sh,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ # # Copyright (c) 1998-2010 Richard Nelson. All Rights Reserved. # diff --git a/debian/sensible_mda/Makefile b/debian/sensible_mda/Makefile index 59a5fbd..a368c88 100644 --- a/debian/sensible_mda/Makefile +++ b/debian/sensible_mda/Makefile @@ -202,7 +202,7 @@ sm_build_arch = amd64 sm_custom = sm_custom_s = sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS -sm_date = 2010-10-16 +sm_date = 2010-11-03 sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid @@ -253,7 +253,7 @@ sm_newdb_lib = -ldb-4.8 sm_praliases_envdef = sm_praliases_libs = -ldb-4.8 -lldap -llber sm_recommends = -sm_revision = -1 +sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL @@ -261,7 +261,7 @@ sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl -sm_time = 19:38:59 +sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = sm_vacation_libs = -ldb-4.8 -lldap -llber diff --git a/debian/sensible_mda/sensible-mda.c b/debian/sensible_mda/sensible-mda.c index e9c30d3..7729cb1 100644 --- a/debian/sensible_mda/sensible-mda.c +++ b/debian/sensible_mda/sensible-mda.c @@ -1,5 +1,5 @@ /* - * $Sendmail: sensible-mda.c,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $ + * $Sendmail: sensible-mda.c,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $ * * sensible-mda.c * Copyright (c) 1998, Johnie Ingram. @@ -22,7 +22,7 @@ */ #ifndef lint -static const char id[] = "@(#)$Id: sensible-mda.c,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $"; +static const char id[] = "@(#)$Id: sensible-mda.c,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $"; #endif /* ! lint */ #include <stdio.h> |