Imported Debian patch 8.14.4-2debian/8.14.4-2

8 files changed, 18 insertions, 18 deletions

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