diff options
| author | Richard A Nelson (Rick) <cowboy@debian.org> | 2009-03-01 06:15:00 +0000 |
|---|---|---|
| committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 20:07:44 +0200 |
| commit | ce95a56b62dfc55ef26a7d1494fc88854c33a6bc (patch) | |
| tree | dde60c8879369aee5d66f455fd91cd2fb4c73d7f | |
| parent | 83792056bacbb2db3bc1255f9993844e5e3aee28 (diff) | |
| download | sendmail-ce95a56b62dfc55ef26a7d1494fc88854c33a6bc.tar.gz | |
Imported Debian patch 8.14.3-8debian/8.14.3-8
60 files changed, 124 insertions, 620 deletions
diff --git a/debian/Makefile b/debian/Makefile index 79de8b0..d8a3cf4 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -317,7 +317,7 @@ sm_newdb_lib = -ldb-4.7 sm_praliases_envdef = sm_praliases_libs = -ldb-4.7 -lldap -llber sm_recommends = -sm_revision = -7 +sm_revision = -8 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 @@ -325,7 +325,7 @@ sm_sendmail_libs = -ldb-4.7 -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 = 22:32:11 +sm_time = 23:40:41 sm_utc = -0800 sm_vacation_envdef = sm_vacation_libs = -ldb-4.7 -lldap -llber diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk index 676969f..7ae7c75 100644 --- a/debian/build/autoconf.mk +++ b/debian/build/autoconf.mk @@ -2,13 +2,13 @@ #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: autoconf.mk,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: autoconf.mk,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # # build/autoconf.mk. Generated from autoconf.mk.in by configure. # -# Rules file for Sendmail 8.14.3-7(527875) +# Rules file for Sendmail 8.14.3-8(527875) # on Debian squeeze/sid # via Debhelper V4.1 # @@ -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> 2009-02-28 22:32:11 (-0800) +# Richard Nelson <cowboy@debian.org> 2009-02-28 23:40:41 (-0800) #------------------------------------------------------------------------------ #SHELL := /bin/sh -x @@ -54,7 +54,7 @@ buildtree = build-tree/sendmail-8.14.3 sm_custom = sm_custom_s = sm_version = 8.14.3 -sm_revision = -7 +sm_revision = -8 # I like to preserve timestamps... INSTALL := /usr/bin/install -c -p diff --git a/debian/build/debian/changelog b/debian/build/debian/changelog index ed25cb0..ee1f5f5 100644 --- a/debian/build/debian/changelog +++ b/debian/build/debian/changelog @@ -1,3 +1,9 @@ +sendmail (8.14.3-8) unstable; urgency=low + + * Sigh, move some defines so the patches actually apply + + -- Richard A Nelson (Rick) <cowboy@debian.org> Sun, 01 Mar 2009 06:15:00 -0000 + sendmail (8.14.3-7) unstable; urgency=low * Use quilt for patch management diff --git a/debian/build/debian/changelog.sh b/debian/build/debian/changelog.sh index e908ddf..5c36865 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: changelog.sh,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7 +# Debian script to generate changelogs for sendmail 8.14.3-8 # # 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.3-7 (527875) changelog."; +echo "Building Sendmail 8.14.3-8 (527875) changelog."; # # Start with Custom changelog (if any) diff --git a/debian/build/debian/control.m4 b/debian/build/debian/control.m4 index aed498f..c7c710b 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.3 2009-02-28 22:32:11 cowboy Exp $ +dnl # $Sendmail: control.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ dnl # dnl # Copyright (c) 1998-2009 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.3-7(527875) +dnl # Debian control.m4 for sendmail 8.14.3-8(527875) 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/site.config.m4 b/debian/build/site.config.m4 index 52998e1..c8c5f25 100644 --- a/debian/build/site.config.m4 +++ b/debian/build/site.config.m4 @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Sendmail: site.config.m4,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: site.config.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7(527875) +# Debian site.config.m4 for sendmail 8.14.3-8(527875) # # 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.3-7(527875) on 2009-02-28 at 22:32:11 (-0800) +# Sendmail 8.14.3-8(527875) on 2009-02-28 at 23:40:41 (-0800) #------------------------------------------------------------------ # #------------------------------------------------------------------ diff --git a/debian/build/update_chaos b/debian/build/update_chaos index 24fe8c6..e9e930b 100644 --- a/debian/build/update_chaos +++ b/debian/build/update_chaos @@ -1,12 +1,12 @@ #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: update_chaos,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_chaos,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2001-2009 Richard Nelson. All Rights Reserved. # # build/update_chaos. Generated from update_chaos.in by configure. # -# Debian script to rationalize builds for Sendmail 8.14.3-7(@sm_math@) +# Debian script to rationalize builds for Sendmail 8.14.3-8(@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 34719a5..056f7d0 100644 --- a/debian/cf/Makefile +++ b/debian/cf/Makefile @@ -207,7 +207,7 @@ sm_newdb_lib = -ldb-4.7 sm_praliases_envdef = sm_praliases_libs = -ldb-4.7 -lldap -llber sm_recommends = -sm_revision = -7 +sm_revision = -8 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 @@ -215,7 +215,7 @@ sm_sendmail_libs = -ldb-4.7 -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 = 22:32:11 +sm_time = 23:40:41 sm_utc = -0800 sm_vacation_envdef = sm_vacation_libs = -ldb-4.7 -lldap -llber @@ -240,13 +240,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # # cf/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.3-7(527875) +# Rules file for Sendmail 8.14.3-8(527875) # on Debian squeeze/sid # via Debhelper V4.1 # @@ -254,7 +254,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> 2009-02-28 22:32:11 (-0800) +# Richard Nelson <cowboy@debian.org> 2009-02-28 23:40:41 (-0800) #------------------------------------------------------------------------------ # # Shipped data diff --git a/debian/cf/debian/autoconf.m4 b/debian/cf/debian/autoconf.m4 index d1cbf73..2320d43 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: autoconf.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2001-2009 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.3-7 +# m4 autoconf config file for building Sendmail 8.14.3-8 # # 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: autoconf.m4, v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Export (from autoconf to m4) some items of dubious value @@ -25,10 +25,10 @@ define(`SM_MINVERS', `8.7.6')dnl define(`SM_MAXVERS', `9.0.0')dnl define(`SM_CPYRT', `2009')dnl define(`sm_date', `2009-02-28')dnl -define(`sm_time', `22:32:11')dnl +define(`sm_time', `23:40:41')dnl define(`sm_utc', `-0800')dnl define(`sm_version', `8.14.3')dnl -define(`sm_revision', `-7')dnl +define(`sm_revision', `-8')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 6ac307b..3f1ad74 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: debproto.mc,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: sendmail.mc, v 8.14.3-8 2009-02-28 23:40:41 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 9e426a3..43ac948 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: submit.mc,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2000-2009 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: submit.mc, v 8.14.3-8 2009-02-28 23:40:41 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 29ec473..c2b79ce 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: debian-msp.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7 +# domain(debian-msp) config file for building Sendmail 8.14.3-8 # # 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: debian-msp.m4, v 8.14.3-8 2009-02-28 23:40:41 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 0ec1d46..86c8cae 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: debian-mta.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7 +# domain(debian-mta) config file for building Sendmail 8.14.3-8 # # 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: debian-mta.m4, v 8.14.3-8 2009-02-28 23:40:41 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 d04bead..be71e72 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: debian_auth.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2001-2009 Richard Nelson. All Rights Reserved. # @@ -17,7 +17,7 @@ divert(-1)dnl # #----------------------------------------------------------------------------- divert(0)dnl -VERSIONID(`$Id: debian_auth.m4,v 8.14.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: debian_auth.m4,v 8.14.3-8 2009-02-28 23:40:41 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 fe978bc..f3b5497 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: virthost_by_ip.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2001-2009 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.3-7 +# hack(virthost_by_ip) config file for building Sendmail 8.14.3-8 # 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.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: virthost_by_ip.m4, v 8.14.3-8 2009-02-28 23:40:41 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 e7073e8..2003491 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: debian.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 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.3-7 +# ostype(debian) config file for building Sendmail 8.14.3-8 # # 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.3-7 2009-02-28 22:32:11 cowboy Exp $') -define(`confCF_VERSION', `Debian-7')dnl +VERSIONID(`$Id: debian.m4, v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp $') +define(`confCF_VERSION', `Debian-8')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.3-7. +# Undocumented features are available in Debian Sendmail 8.14.3-8. # * none # -# _FFR_ features are available in Debian Sendmail 8.14.3-7. +# _FFR_ features are available in Debian Sendmail 8.14.3-8. ifelse(sm_enable_milter, `yes',dnl `# * milter') # * sm_ffr diff --git a/debian/changelog b/debian/changelog index ed25cb0..ee1f5f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sendmail (8.14.3-8) unstable; urgency=low + + * Sigh, move some defines so the patches actually apply + + -- Richard A Nelson (Rick) <cowboy@debian.org> Sun, 01 Mar 2009 06:15:00 -0000 + sendmail (8.14.3-7) unstable; urgency=low * Use quilt for patch management diff --git a/debian/examples/Makefile b/debian/examples/Makefile index f0f391d..a73c395 100644 --- a/debian/examples/Makefile +++ b/debian/examples/Makefile @@ -226,7 +226,7 @@ sm_newdb_lib = -ldb-4.7 sm_praliases_envdef = sm_praliases_libs = -ldb-4.7 -lldap -llber sm_recommends = -sm_revision = -7 +sm_revision = -8 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 @@ -234,7 +234,7 @@ sm_sendmail_libs = -ldb-4.7 -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 = 22:32:11 +sm_time = 23:40:41 sm_utc = -0800 sm_vacation_envdef = sm_vacation_libs = -ldb-4.7 -lldap -llber @@ -259,13 +259,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # # examples/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.3-7(527875) +# Rules file for Sendmail 8.14.3-8(527875) # on Debian squeeze/sid # via Debhelper V4.1 # @@ -273,7 +273,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> 2009-02-28 22:32:11 (-0800) +# Richard Nelson <cowboy@debian.org> 2009-02-28 23:40:41 (-0800) #------------------------------------------------------------------------------ # # Shipped programs diff --git a/debian/examples/sasl/sasl.m4 b/debian/examples/sasl/sasl.m4 index 0407b3e..288b475 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: sasl.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2003-2009 Richard Nelson. All Rights Reserved. # @@ -15,7 +15,7 @@ divert(-1)dnl #----------------------------------------------------------------------------- # divert(0)dnl -VERSIONID(`$Id: sasl.m4, v 8.14.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: sasl.m4, v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/examples/tls/starttls.m4 b/debian/examples/tls/starttls.m4 index 25ae534..75ca5e4 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: starttls.m4,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 2002-2009 Richard Nelson. All Rights Reserved. # @@ -15,7 +15,7 @@ divert(-1)dnl #----------------------------------------------------------------------------- # divert(0)dnl -VERSIONID(`$Id: starttls.m4,v 8.14.3-7 2009-02-28 22:32:11 cowboy Exp $') +VERSIONID(`$Id: starttls.m4,v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp $') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/local/Makefile b/debian/local/Makefile index 723d809..5791493 100644 --- a/debian/local/Makefile +++ b/debian/local/Makefile @@ -241,7 +241,7 @@ sm_newdb_lib = -ldb-4.7 sm_praliases_envdef = sm_praliases_libs = -ldb-4.7 -lldap -llber sm_recommends = -sm_revision = -7 +sm_revision = -8 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 @@ -249,7 +249,7 @@ sm_sendmail_libs = -ldb-4.7 -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 = 22:32:11 +sm_time = 23:40:41 sm_utc = -0800 sm_vacation_envdef = sm_vacation_libs = -ldb-4.7 -lldap -llber @@ -274,13 +274,13 @@ top_srcdir = .. #------------------------------------------------------------------------------ # vim: syntax=make # -# $Sendmail: Makefile,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: Makefile,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # # local/Makefile. Generated from Makefile.in by configure. # -# Rules file for Sendmail 8.14.3-7(527875) +# Rules file for Sendmail 8.14.3-8(527875) # on Debian squeeze/sid # via Debhelper V4.1 # @@ -288,7 +288,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> 2009-02-28 22:32:11 (-0800) +# Richard Nelson <cowboy@debian.org> 2009-02-28 23:40:41 (-0800) #------------------------------------------------------------------------------ # # Shipped programs diff --git a/debian/local/Parse_conf.pm b/debian/local/Parse_conf.pm index 32f8799..22eb419 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: Parse_conf.pm,v 8.14.3 2009-02-28 23:40:41 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.3'; -$Parse_conf::program_date = '2009-02-28 22:32:11 cowboy'; +$Parse_conf::program_date = '2009-02-28 23:40:41 cowboy'; $Parse_conf::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/Parse_mc.pm b/debian/local/Parse_mc.pm index c1fa2ba..bed9d10 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: Parse_mc.pm,v 8.14.3 2009-02-28 23:40:41 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.3'; -$Parse_mc::program_date = '2009-02-28 22:32:11 cowboy'; +$Parse_mc::program_date = '2009-02-28 23:40:41 cowboy'; $Parse_mc::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/bug/sendmail/script b/debian/local/bug/sendmail/script index 9a9fa4d..ef8e937 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: sendmail.bug,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # diff --git a/debian/local/dynamic b/debian/local/dynamic index d00e6d5..6d5252f 100644 --- a/debian/local/dynamic +++ b/debian/local/dynamic @@ -1,7 +1,7 @@ #!/bin/sh #------------------------------------------------------------------------ # -# $Sendmail: dynamic,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: dynamic,v 8.14.3 2009-02-28 23:40:41 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 e60414f..067a636 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: parse_mc,v 8.14.3 2009-02-28 23:40:41 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.3'; -$main::program_date = '2009-02-28 22:32:11 cowboy'; +$main::program_date = '2009-02-28 23:40:41 cowboy'; $main::debug = 0; # diff --git a/debian/local/sendmail b/debian/local/sendmail index 4c41243..96b2c55 100644 --- a/debian/local/sendmail +++ b/debian/local/sendmail @@ -1,6 +1,6 @@ #!/bin/sh #----------------------------------------------------------------------------- -# $Sendmail: sm_helper.sh,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: sm_helper.sh,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # diff --git a/debian/local/sendmailconfig b/debian/local/sendmailconfig index 2621ea6..61c8ceb 100644 --- a/debian/local/sendmailconfig +++ b/debian/local/sendmailconfig @@ -1,6 +1,6 @@ #!/bin/sh -e #----------------------------------------------------------------------------- -# $Sendmail: sendmailconfig,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: sendmailconfig,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Interactively configure Sendmail for Debian # diff --git a/debian/local/update_auth b/debian/local/update_auth index 63bc5bd..dd1c7ec 100644 --- a/debian/local/update_auth +++ b/debian/local/update_auth @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_auth,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_auth,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Sendmail support for SMTP AUTH (SASL) # diff --git a/debian/local/update_authm4 b/debian/local/update_authm4 index a121386..261cd4f 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_auth,v 8.14.3 2009-02-28 23:40:41 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.3'; -$main::program_date = '2009-02-28 22:32:11 cowboy'; +$main::program_date = '2009-02-28 23:40:41 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.3-7 2009-02-28 22:32:11 cowboy Exp \$\') +VERSIONID(\`\$Id: sasl.m4,v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp \$\') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/local/update_conf b/debian/local/update_conf index 7dfd025..c547f3a 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_conf,v 8.14.3 2009-02-28 23:40:41 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.3'; -$main::program_date = '2009-02-28 22:32:11 cowboy'; +$main::program_date = '2009-02-28 23:40:41 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/update_db b/debian/local/update_db index 88b54cb..83a6c97 100644 --- a/debian/local/update_db +++ b/debian/local/update_db @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_db,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_db,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Update Sendmail databases for Debian # diff --git a/debian/local/update_ldap b/debian/local/update_ldap index 17453d2..ffd5fd7 100644 --- a/debian/local/update_ldap +++ b/debian/local/update_ldap @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_ldap,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_ldap,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Sendmail support for LDAP # diff --git a/debian/local/update_mc b/debian/local/update_mc index f6e80a2..e28ad29 100644 --- a/debian/local/update_mc +++ b/debian/local/update_mc @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_mc,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_mc,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Update Sendmail databases for Debian # diff --git a/debian/local/update_mk b/debian/local/update_mk index 92d7731..21c071d 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_mk,v 8.14.3 2009-02-28 23:40:41 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.3'; -$main::program_date = '2009-02-28 22:32:11 cowboy'; +$main::program_date = '2009-02-28 23:40:41 cowboy'; $main::debug = 0; my $interp_pgm = "$^X"; diff --git a/debian/local/update_smrsh b/debian/local/update_smrsh index 893c28a..779592b 100644 --- a/debian/local/update_smrsh +++ b/debian/local/update_smrsh @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_smrsh,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_smrsh,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Update MDA programs used by Sendmail for Debian # diff --git a/debian/local/update_sys b/debian/local/update_sys index 56161a6..db4ff59 100644 --- a/debian/local/update_sys +++ b/debian/local/update_sys @@ -1,7 +1,7 @@ #!/bin/sh #----------------------------------------------------------------------------- # -# $Sendmail: update_sys,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_sys,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Update system files used by Sendmail for Debian # diff --git a/debian/local/update_tls b/debian/local/update_tls index 77e0b7f..c9225d8 100644 --- a/debian/local/update_tls +++ b/debian/local/update_tls @@ -1,7 +1,7 @@ #!/bin/sh -e #----------------------------------------------------------------------------- # -# $Sendmail: update_tls,v 8.14.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_tls,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Sendmail support for TLS # diff --git a/debian/local/update_tlsm4 b/debian/local/update_tlsm4 index 6c124e3..af0fe64 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: update_tls,v 8.14.3 2009-02-28 23:40:41 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.3'; -$main::program_date = '2009-02-28 22:32:11 cowboy'; +$main::program_date = '2009-02-28 23:40:41 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.3-7 2009-02-28 22:32:11 cowboy Exp \$\') +VERSIONID(\`\$Id: starttls.m4,v 8.14.3-8 2009-02-28 23:40:41 cowboy Exp \$\') dnl # dnl #--------------------------------------------------------------------- dnl # Bring in Autoconf results diff --git a/debian/patches/8.14/8.14.3/control_c.patch b/debian/patches/8.14/8.14.3/control_c.patch deleted file mode 100644 index a78dfc8..0000000 --- a/debian/patches/8.14/8.14.3/control_c.patch +++ /dev/null @@ -1,52 +0,0 @@ -# Make control socket mode 0660 -# -# To apply this patch: -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'applypatch' program with this patch file as input. -# -# If you do not have 'applypatch', it is part of the 'makepatch' package -# that you can fetch from the Comprehensive Perl Archive Network: -# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz -# In the above URL, 'x' should be 2 or higher. -# -# To apply this patch without the use of 'applypatch': -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'patch' program with this file as input. -# -#### End of Preamble #### - -#### Patch data follows #### -diff -c 'sendmail/control.c' 'debian/patches/control.c' -Index: ./sendmail/control.c -Prereq: 8.128 -*** sendmail-8.14.3/sendmail/control.c Sat Nov 20 15:26:23 1999 ---- ./debian/patches/control.c Sat Nov 20 15:39:52 1999 -*************** -*** 92,98 **** - } - } - -! if (chmod(ControlSocketName, S_IRUSR|S_IWUSR) < 0) - { - save_errno = errno; - closecontrolsocket(TRUE); ---- 92,98 ---- - } - } - -! if (chmod(ControlSocketName, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) < 0) - { - save_errno = errno; - closecontrolsocket(TRUE); -#### End of Patch data #### - -#### ApplyPatch data follows #### -# Data version : 1.0 -# Date generated : Sat Nov 20 15:39:53 1999 -# Generated by : makepatch 2.00 -# Recurse directories : Yes -# p 'sendmail/control.c' 6165 -#### End of ApplyPatch data #### - -#### End of Patch kit [created: Sat Nov 20 15:39:53 1999] #### -#### Checksum: 51 1497 50060 #### diff --git a/debian/patches/8.14/8.14.3/cyrusv2.m4.debian b/debian/patches/8.14/8.14.3/cyrusv2.m4.debian index 29caf9b..a909db4 100644 --- a/debian/patches/8.14/8.14.3/cyrusv2.m4.debian +++ b/debian/patches/8.14/8.14.3/cyrusv2.m4.debian @@ -1,5 +1,5 @@ ---- sendmail-8.14.3/cf/mailer/cyrusv2.m4 Sat Jun 1 15:14:57 2002 -+++ cyrusv2.m4.new Wed Jun 5 04:21:34 2002 +--- ./cf/mailer/cyrusv2.m4 Sat Jun 1 15:14:57 2002 ++++ ./cf/mailer/cyrusv2.m4.new Wed Jun 5 04:21:34 2002 @@ -12,7 +12,7 @@ _DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz') diff --git a/debian/patches/8.14/8.14.3/cyrusv2.m4.debian.patch b/debian/patches/8.14/8.14.3/cyrusv2.m4.debian.patch deleted file mode 100644 index 29caf9b..0000000 --- a/debian/patches/8.14/8.14.3/cyrusv2.m4.debian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sendmail-8.14.3/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 @@ - - _DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz') - _DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `A@/:|m') --ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE /var/imap/socket/lmtp')') -+ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE /var/run/cyrus/socket/lmtp')') - define(`_CYRUSV2_QGRP', `ifelse(defn(`CYRUSV2_MAILER_QGRP'),`',`', ` Q=CYRUSV2_MAILER_QGRP,')')dnl - - POPDIVERT diff --git a/debian/patches/8.14/8.14.3/drac b/debian/patches/8.14/8.14.3/drac index 648a13d..f26145b 100644 --- a/debian/patches/8.14/8.14.3/drac +++ b/debian/patches/8.14/8.14.3/drac @@ -1,5 +1,5 @@ ---- sendmail-8.14.3/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900 -+++ sendmail-8.14.3/cf/m4/proto.m4 2003-03-30 13:22:18.731049640 +0900 +--- ./cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900 ++++ ./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 diff --git a/debian/patches/8.14/8.14.3/drac.patch b/debian/patches/8.14/8.14.3/drac.patch deleted file mode 100644 index 648a13d..0000000 --- a/debian/patches/8.14/8.14.3/drac.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- sendmail-8.14.3/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900 -+++ sendmail-8.14.3/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 - R$=R $* $@ RELAY relayable IP address -+ifdef(`_DRAC_', `dnl -+R$* $: <> $(drac $1 $: <?> $1 $) -+R<> <?> $+ $: $1 -+R<> $+ $@ RELAY authenticated IP address -+RIPv6:$* $: <> $(drac $1 $: <?> IPv6:$1 $) -+R<> <?> $+ $: $1 -+R<> $+ $@ RELAY authenticated IP address',`dnl') - ifdef(`_ACCESS_TABLE_', `dnl - R$* $: $>A <$1> <?> <+ Connect> <$1> - R<RELAY> $* $@ RELAY relayable IP address ---- /dev/null 2002-01-01 00:00:00.000000000 +0900 -+++ sendmail-8.14.3/cf/feature/drac.m4 2002-04-18 21:33:31.716576810 +0900 -@@ -0,0 +1,5 @@ -+define(`_DRAC_', `') -+ -+LOCAL_CONFIG -+Kdrac ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`drac', -+ `_ARG_') diff --git a/debian/patches/8.14/8.14.3/kerberos.patch b/debian/patches/8.14/8.14.3/kerberos.patch deleted file mode 100644 index 59cb0e7..0000000 --- a/debian/patches/8.14/8.14.3/kerberos.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Attempt to support Kerberos -#### Patch data follows #### -diff -c 'sendmail/conf.c' 'debian/patches.conf.c' -Index: ./sendmail/conf.c -Prereq: 8.1141 -*** ./sendmail/conf.c Mon May 26 19:55:54 2008 ---- ./debian/conf.c Mon May 26 20:02:22 2008 -*************** -*** 3891,3896 **** ---- 3891,3903 ---- - vendor_post_defaults(e) - ENVELOPE *e; - { -+ /* -+ * Kerberos V support -+ */ -+ sm_setuserenv("KRB5CCNAME", NULL); -+ sm_setuserenv("KRB5_KTNAME", NULL); -+ sm_setuserenv("KRB5_CONFIG", NULL); -+ - #ifdef __QNX__ - /* Makes sure the SOCK environment variable remains */ - sm_setuserenv("SOCK", NULL); -#### End of Patch data #### diff --git a/debian/patches/8.14/8.14.3/kfreebsd b/debian/patches/8.14/8.14.3/kfreebsd index 630840b..935d6dd 100644 --- a/debian/patches/8.14/8.14.3/kfreebsd +++ b/debian/patches/8.14/8.14.3/kfreebsd @@ -1,6 +1,6 @@ -diff -Nurd sendmail-8.14.3.orig/devtools/bin/Build sendmail-8.14.3/devtools/bin/Build ---- sendmail-8.14.3.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/devtools/bin/Build 2005-09-09 12:02:15.000000000 +0200 +diff -Nurd ./devtools/bin/Build ./devtools/bin/Build +--- ./devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200 ++++ ./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.3.orig/devtools/bin/Build sendmail-8.14.3/devtools/bin/ esac # get "base part" of operating system release -diff -Nurd sendmail-8.14.3.orig/include/sm/conf.h sendmail-8.14.3/include/sm/conf.h ---- sendmail-8.14.3.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/include/sm/conf.h 2005-09-09 11:57:33.000000000 +0200 +diff -Nurd ./include/sm/conf.h ./include/sm/conf.h +--- ./include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200 ++++ ./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.3.orig/include/sm/conf.h sendmail-8.14.3/include/sm/con ** DELL SVR4 Issue 2.2, and others ** From Kimmo Suominen <kim@grendel.lut.fi> ** -diff -Nurd sendmail-8.14.3.orig/include/sm/os/sm_os_linux.h sendmail-8.14.3/include/sm/os/sm_os_linux.h ---- sendmail-8.14.3.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/include/sm/os/sm_os_linux.h 2005-09-09 11:45:45.000000000 +0200 +diff -Nurd ./include/sm/os/sm_os_linux.h ./include/sm/os/sm_os_linux.h +--- ./include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200 ++++ ./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.3/kfreebsd.patch b/debian/patches/8.14/8.14.3/kfreebsd.patch deleted file mode 100644 index 630840b..0000000 --- a/debian/patches/8.14/8.14.3/kfreebsd.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -Nurd sendmail-8.14.3.orig/devtools/bin/Build sendmail-8.14.3/devtools/bin/Build ---- sendmail-8.14.3.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/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/'`;; - UNICOS*) rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\..*$/\1.\2/'`;; -+ GNU-kFreeBSD*) os=Linux;; - esac - - # get "base part" of operating system release -diff -Nurd sendmail-8.14.3.orig/include/sm/conf.h sendmail-8.14.3/include/sm/conf.h ---- sendmail-8.14.3.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/include/sm/conf.h 2005-09-09 11:57:33.000000000 +0200 -@@ -783,7 +783,7 @@ - ** See also BSD defines. - */ - --# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN) -+# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN) && !defined(__GLIBC__) - # include <paths.h> - # define HASUNSETENV 1 /* has unsetenv(3) call */ - # define USESETEUID 1 /* has usable seteuid(2) call */ -@@ -801,7 +801,7 @@ - # endif /* ! LA_TYPE */ - # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */ - # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */ --# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/ -+# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN) && !defined(__GLIBC__) */ - - - /* -@@ -1491,6 +1491,69 @@ - - - /* -+** GNU/kFreeBSD -+** From Aurelien Jarno <aurel32@debian.org> -+ */ -+ -+# if defined (__GLIBC__) && defined(__FreeBSD_kernel__) -+# define BSD 1 /* include BSD defines */ -+# define HASSETREGID 1 /* use setregid(2) to set saved gid */ -+# ifndef REQUIRES_DIR_FSYNC -+# define REQUIRES_DIR_FSYNC 1 /* requires fsync() on directory */ -+# endif /* REQUIRES_DIR_FSYNC */ -+# ifndef USESETEUID -+# define USESETEUID 0 /* has it due to POSIX, but doesn't work */ -+# endif /* USESETEUID */ -+# define SM_CONF_GETOPT 0 /* need a replacement for getopt(3) */ -+# define HASUNAME 1 /* use System V uname(2) system call */ -+# define HASUNSETENV 1 /* has unsetenv(3) call */ -+# define ERRLIST_PREDEFINED /* don't declare sys_errlist */ -+# define GIDSET_T gid_t /* from <linux/types.h> */ -+# ifndef HASGETUSERSHELL -+# define HASGETUSERSHELL 0 /* getusershell(3) broken in Slackware 2.0 */ -+# endif /* HASGETUSERSHELL */ -+# ifndef IP_SRCROUTE -+# define IP_SRCROUTE 0 /* linux <= 1.2.8 doesn't support IP_OPTIONS */ -+# endif /* ! IP_SRCROUTE */ -+# ifndef HAS_IN_H -+# define HAS_IN_H 1 /* use netinet/in.h */ -+# endif /* ! HAS_IN_H */ -+# ifndef USE_SIGLONGJMP -+# define USE_SIGLONGJMP 1 /* sigsetjmp needed for signal handling */ -+# endif /* ! USE_SIGLONGJMP */ -+# ifndef LA_TYPE -+# define LA_TYPE LA_PROCSTR -+# endif /* ! LA_TYPE */ -+# define SFS_TYPE SFS_VFS /* use <sys/vfs.h> statfs() impl */ -+# define SPT_PADCHAR '\0' /* pad process title with nulls */ -+# define HASSTRERROR 1 /* has strerror(3) */ -+# ifndef TZ_TYPE -+# define TZ_TYPE TZ_NONE /* no standard for GNU/kFreeBSD */ -+# endif /* ! TZ_TYPE */ -+# include <paths.h> -+# ifndef _PATH_SENDMAILPID -+# define _PATH_SENDMAILPID "/var/run/sendmail.pid" -+# endif /* ! _PATH_SENDMAILPID */ -+# include <sys/sysmacros.h> -+# undef atol /* wounded in <stdlib.h> */ -+# if NETINET6 -+ /* -+ ** Indirectly included from glibc's <feature.h>. IPv6 support is native -+ ** in 2.1 and later, but the APIs appear before the functions. -+ */ -+# undef IPPROTO_ICMPV6 -+# if (!defined(NEEDSGETIPNODE)) -+ /* Have APIs in <netdb.h>, but no support in glibc */ -+# define NEEDSGETIPNODE 1 -+# endif /* (!defined(NEEDSGETIPNODE)) */ -+# endif /* NETINET6 */ -+# ifndef HASFCHOWN -+# define HASFCHOWN 1 /* fchown(2) */ -+# endif /* ! HASFCHOWN */ -+# endif /* defined(__GLIBC__) && defined(__FreeBSD_kernel__*/ -+ -+ -+/* - ** DELL SVR4 Issue 2.2, and others - ** From Kimmo Suominen <kim@grendel.lut.fi> - ** -diff -Nurd sendmail-8.14.3.orig/include/sm/os/sm_os_linux.h sendmail-8.14.3/include/sm/os/sm_os_linux.h ---- sendmail-8.14.3.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200 -+++ sendmail-8.14.3/include/sm/os/sm_os_linux.h 2005-09-09 11:45:45.000000000 +0200 -@@ -15,23 +15,27 @@ - - #define SM_OS_NAME "linux" - --/* to get version number */ --#include <linux/version.h> -+#if defined(__linux__) - --# if !defined(KERNEL_VERSION) /* not defined in 2.0.x kernel series */ --# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) --# endif /* ! KERNEL_VERSION */ -+ /* to get version number */ -+# include <linux/version.h> - --/* doesn't seem to work on Linux */ --#ifndef SM_CONF_SETITIMER --# define SM_CONF_SETITIMER 0 --#endif /* SM_CONF_SETITIMER */ -+# if !defined(KERNEL_VERSION) /* not defined in 2.0.x kernel series */ -+# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -+# endif /* ! KERNEL_VERSION */ - --#ifndef SM_CONF_SHM --# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19)) --# define SM_CONF_SHM 1 --# endif /* LINUX_VERSION_CODE */ --#endif /* SM_CONF_SHM */ -+ /* doesn't seem to work on Linux */ -+# ifndef SM_CONF_SETITIMER -+# define SM_CONF_SETITIMER 0 -+# endif /* SM_CONF_SETITIMER */ -+ -+# ifndef SM_CONF_SHM -+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19)) -+# define SM_CONF_SHM 1 -+# endif /* LINUX_VERSION_CODE */ -+# endif /* SM_CONF_SHM */ -+ -+#endif /* (__linux__) */ - - #define SM_CONF_SYS_CDEFS_H 1 - #ifndef SM_CONF_SEM diff --git a/debian/patches/8.14/8.14.3/ldap_url_search b/debian/patches/8.14/8.14.3/ldap_url_search index 088e071..263c866 100644 --- a/debian/patches/8.14/8.14.3/ldap_url_search +++ b/debian/patches/8.14/8.14.3/ldap_url_search @@ -1,11 +1,11 @@ -Index: ldap.c +Index: libsm/ldap.c =================================================================== RCS file: /cvs/libsm/ldap.c,v retrieving revision 1.51 retrieving revision 1.53 diff -u -r1.51 -r1.53 ---- ./sendmail-8.14.3/libsm/ldap.c 30 Oct 2003 23:11:12 -0000 1.51 -+++ ldap.c 30 Oct 2003 23:33:10 -0000 1.53 +--- ./libsm/ldap.c 30 Oct 2003 23:11:12 -0000 1.51 ++++ ./libsm/ldap.c 30 Oct 2003 23:33:10 -0000 1.53 @@ -1043,6 +1043,7 @@ NULL : lmap->ldap_attr), lmap->ldap_attrsonly); diff --git a/debian/patches/8.14/8.14.3/ldap_url_search.patch b/debian/patches/8.14/8.14.3/ldap_url_search.patch deleted file mode 100644 index 088e071..0000000 --- a/debian/patches/8.14/8.14.3/ldap_url_search.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: ldap.c -=================================================================== -RCS file: /cvs/libsm/ldap.c,v -retrieving revision 1.51 -retrieving revision 1.53 -diff -u -r1.51 -r1.53 ---- ./sendmail-8.14.3/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), - lmap->ldap_attrsonly); - } -+#if SM_CONF_LDAP_URL_SEARCH - else if (rl->lr_type == SM_LDAP_ATTR_URL) - { - /* do new URL search */ -@@ -1051,6 +1052,7 @@ - lmap->ldap_attrsonly); - newflags |= SM_LDAP_USE_ALLATTR; - } -+#endif /* SM_CONF_LDAP_URL_SEARCH */ - else - { - /* unknown or illegal attribute type */ diff --git a/debian/patches/8.14/8.14.3/local_procmail.patch b/debian/patches/8.14/8.14.3/local_procmail.patch deleted file mode 100644 index 23afe4a..0000000 --- a/debian/patches/8.14/8.14.3/local_procmail.patch +++ /dev/null @@ -1,50 +0,0 @@ -# Remove -Y from procmail arguements -# -# To apply this patch: -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'applypatch' program with this patch file as input. -# -# If you do not have 'applypatch', it is part of the 'makepatch' package -# that you can fetch from the Comprehensive Perl Archive Network: -# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz -# In the above URL, 'x' should be 2 or higher. -# -# To apply this patch without the use of 'applypatch': -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'patch' program with this file as input. -# -#### End of Preamble #### - -#### Patch data follows #### -diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4' -Index: ./cf/feature/local_procmail.m4 -Prereq: 8.22 -*** sendmail-8.14.3/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 **** - `/usr/local/bin/procmail'), - _ARG_)) - define(`LOCAL_MAILER_ARGS', -! ifelse(len(X`'_ARG2_), `1', `procmail -Y -a $h -d $u', _ARG2_)) - define(`LOCAL_MAILER_FLAGS', - ifelse(len(X`'_ARG3_), `1', `SPfhn9', _ARG3_)) ---- 27,32 ---- - `/usr/local/bin/procmail'), - _ARG_)) - define(`LOCAL_MAILER_ARGS', -! ifelse(len(X`'_ARG2_), `1', `procmail -a $h -d $u', _ARG2_)) - define(`LOCAL_MAILER_FLAGS', - ifelse(len(X`'_ARG3_), `1', `SPfhn9', _ARG3_)) -#### End of Patch data #### - -#### ApplyPatch data follows #### -# Data version : 1.0 -# Date generated : Sat Nov 20 15:39:47 1999 -# Generated by : makepatch 2.00 -# Recurse directories : Yes -# p 'cf/feature/local_procmail.m4' 941 -#### End of ApplyPatch data #### - -#### End of Patch kit [created: Sat Nov 20 15:39:47 1999] #### -#### Checksum: 49 1730 1445 #### diff --git a/debian/patches/8.14/8.14.3/mailer_cyrus b/debian/patches/8.14/8.14.3/mailer_cyrus index d03727b..ff72c20 100644 --- a/debian/patches/8.14/8.14.3/mailer_cyrus +++ b/debian/patches/8.14/8.14.3/mailer_cyrus @@ -1,4 +1,4 @@ ---- sendmail-8.14.3/cf/mailer/cyrus.m4 Tue May 2 14:40:24 2000 +--- ./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.3/mailer_cyrus.patch b/debian/patches/8.14/8.14.3/mailer_cyrus.patch deleted file mode 100644 index d03727b..0000000 --- a/debian/patches/8.14/8.14.3/mailer_cyrus.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- sendmail-8.14.3/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 @@ - # - - _DEFIFNOT(`CYRUS_MAILER_FLAGS', `Ah5@/:|') --ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/cyrus/bin/deliver)') --ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `deliver -e -m $h -- $u')') -+ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/sbin/cyrdeliver)') -+ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `cyrdeliver -e -m $h -- $u')') - ifdef(`CYRUS_MAILER_USER',, `define(`CYRUS_MAILER_USER', `cyrus:mail')') - _DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `u') --ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `deliver -e -m $u')') -+ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `cyrdeliver -e -m $u')') - define(`_CYRUS_QGRP', `ifelse(defn(`CYRUS_MAILER_QGRP'),`',`', ` Q=CYRUS_MAILER_QGRP,')')dnl - - POPDIVERT - - diff --git a/debian/patches/8.14/8.14.3/mailer_fax.patch b/debian/patches/8.14/8.14.3/mailer_fax.patch deleted file mode 100644 index ac9d687..0000000 --- a/debian/patches/8.14/8.14.3/mailer_fax.patch +++ /dev/null @@ -1,54 +0,0 @@ -# /usr/bin/faxmail, !/usr/local/bin/faxmail -# -# To apply this patch: -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'applypatch' program with this patch file as input. -# -# If you do not have 'applypatch', it is part of the 'makepatch' package -# that you can fetch from the Comprehensive Perl Archive Network: -# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz -# In the above URL, 'x' should be 2 or higher. -# -# To apply this patch without the use of 'applypatch': -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'patch' program with this file as input. -# -#### End of Preamble #### - -#### Patch data follows #### -diff -c './cf/mailer/fax.m4' 'fax.m4' -Index: ./cf/mailer/fax.m4 -Prereq: 8.16 -*** sendmail-8.14.3/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999 ---- ./fax.m4 Wed Jan 3 14.36:13 2001 -*************** -*** 19,26 **** - ifdef(`FAX_MAILER_ARGS',, - `define(`FAX_MAILER_ARGS', faxmail -d $u@$h $f)') - ifdef(`FAX_MAILER_PATH',, -! `define(`FAX_MAILER_PATH', /usr/local/bin/faxmail)') - ifdef(`FAX_MAILER_MAX',, - `define(`FAX_MAILER_MAX', 100000)') - define(`_FAX_QGRP', `ifelse(defn(`FAX_MAILER_QGRP'),`',`', ` Q=FAX_MAILER_QGRP,')')dnl - POPDIVERT ---- 19,26 ---- - ifdef(`FAX_MAILER_ARGS',, - `define(`FAX_MAILER_ARGS', faxmail -d $u@$h $f)') - ifdef(`FAX_MAILER_PATH',, -! `define(`FAX_MAILER_PATH', /usr/bin/faxmail)') - ifdef(`FAX_MAILER_MAX',, - `define(`FAX_MAILER_MAX', 100000)') - define(`_FAX_QGRP', `ifelse(defn(`FAX_MAILER_QGRP'),`',`', ` Q=FAX_MAILER_QGRP,')')dnl - POPDIVERT -#### End of Patch data #### - -#### ApplyPatch data follows #### -# Data version : 1.0 -# Date generated : Wed Jan 3 14.37:33 2001 -# Generated by : makepatch 2.00 -# Recurse directories : Yes -# p '../../build-tree/sendmail-8.11.2/cf/mailer/fax.m4' 1062 -#### End of ApplyPatch data #### - -#### End of Patch kit [created: Wed Jan 3 14.37:33 2001] #### -#### Checksum: 51 1807 4852 #### diff --git a/debian/patches/8.14/8.14.3/maxseq b/debian/patches/8.14/8.14.3/maxseq index cb72a9a..913177a 100644 --- a/debian/patches/8.14/8.14.3/maxseq +++ b/debian/patches/8.14/8.14.3/maxseq @@ -19,7 +19,7 @@ diff -c 'conf.h' 'conf.h.new' Index: ./conf.h Prereq: 8.574 -*** ./sendmail-8.14.3/sendmail/conf.h Fri Sep 21 19:01:46 2001 +*** ./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/patches/8.14/8.14.3/maxseq.patch b/debian/patches/8.14/8.14.3/maxseq.patch deleted file mode 100644 index cb72a9a..0000000 --- a/debian/patches/8.14/8.14.3/maxseq.patch +++ /dev/null @@ -1,51 +0,0 @@ -# This is a patch for conf.h to update it to conf.h.new -# -# To apply this patch: -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'applypatch' program with this patch file as input. -# -# If you do not have 'applypatch', it is part of the 'makepatch' package -# that you can fetch from the Comprehensive Perl Archive Network: -# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz -# In the above URL, 'x' should be 2 or higher. -# -# To apply this patch without the use of 'applypatch': -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'patch' program with this file as input. -# -#### End of Preamble #### - -#### Patch data follows #### -diff -c 'conf.h' 'conf.h.new' -Index: ./conf.h -Prereq: 8.574 -*** ./sendmail-8.14.3/sendmail/conf.h Fri Sep 21 19:01:46 2001 ---- ./conf.h.new Wed Oct 10 09:24:41 2001 -*************** -*** 74,79 **** - #define MEMCHUNKSIZE 1024 /* chunk size for memory allocation */ - #define MAXUSERENVIRON 100 /* max envars saved, must be >= 3 */ -! #define MAXMAPSTACK 12 /* max # of stacked or sequenced maps */ - #if MILTER - # define MAXFILTERS 25 /* max # of milter filters */ - # define MAXFILTERMACROS 50 /* max # of macros per milter cmd */ ---- 74,79 ---- - #define MEMCHUNKSIZE 1024 /* chunk size for memory allocation */ - #define MAXUSERENVIRON 100 /* max envars saved, must be >= 3 */ -! #define MAXMAPSTACK 128 /* max # of stacked or sequenced maps */ - #if MILTER - # define MAXFILTERS 25 /* max # of milter filters */ - # define MAXFILTERMACROS 50 /* max # of macros per milter cmd */ -#### End of Patch data #### - -#### ApplyPatch data follows #### -# Data version : 1.0 -# Date generated : Wed Oct 10 09:25:12 2001 -# Generated by : makepatch 2.00_03 -# Recurse directories : Yes -# p 'conf.h' 6809 -#### End of ApplyPatch data #### - -#### End of Patch kit [created: Wed Oct 10 09:25:12 2001] #### -#### Patch checksum: 34 1333 28813 #### -#### Checksum: 52 2010 19538 #### diff --git a/debian/patches/8.14/8.14.3/rmail.odi.patch b/debian/patches/8.14/8.14.3/rmail.odi.patch deleted file mode 100644 index 189a47e..0000000 --- a/debian/patches/8.14/8.14.3/rmail.odi.patch +++ /dev/null @@ -1,52 +0,0 @@ -# Change sendmail call -obq to -obi -# -# To apply this patch: -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'applypatch' program with this patch file as input. -# -# If you do not have 'applypatch', it is part of the 'makepatch' package -# that you can fetch from the Comprehensive Perl Archive Network: -# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz -# In the above URL, 'x' should be 2 or higher. -# -# To apply this patch without the use of 'applypatch': -# STEP 1: Chdir to the source directory. -# STEP 2: Run the 'patch' program with this file as input. -# -#### End of Preamble #### - -#### Patch data follows #### -diff -c 'rmail/rmail.c' 'debian/patches/rmail.c' -Index: ./rmail/rmail.c -Prereq: 8.61 -*** sendmail-8.14.3/rmail/rmail.c Sat Sep 16 18:20:25 2000 ---- ./debian/patches/rmail.c Thu Sep 28 17:00:59 2000 -*************** -*** 318,324 **** - args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ - args[i++] = "-G"; /* relay submission */ - args[i++] = "-oee"; /* No errors, just status. */ -! args[i++] = "-odq"; /* Queue it, don't try to deliver. */ - args[i++] = "-oi"; /* Ignore '.' on a line by itself. */ - - /* set from system and protocol used */ ---- 318,324 ---- - args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ - args[i++] = "-G"; /* relay submission */ - args[i++] = "-oee"; /* No errors, just status. */ -! args[i++] = "-odi"; /* deliver in the foreground. */ - args[i++] = "-oi"; /* Ignore '.' on a line by itself. */ - - /* set from system and protocol used */ -#### End of Patch data #### - -#### ApplyPatch data follows #### -# Data version : 1.0 -# Date generated : Thu Sep 28 17:01:04 2000 -# Generated by : makepatch 2.00 -# Recurse directories : Yes -# p './build-tree/sendmail-8.11.1/rmail/rmail.c' 12072 -#### End of ApplyPatch data #### - -#### End of Patch kit [created: Thu Sep 28 17:01:04 2000] #### -#### Checksum: 51 2010 21691 #### diff --git a/debian/rules b/debian/rules index 996ed18..67204f6 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,6 @@ DEB_TAR_SRCDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION) DEB_SRCDIR := build-tree/$(DEB_TAR_SRCDIR) DEB_BUILDDIR := $(DEB_SRCDIR) DEB_DESTDIR = debian/$(DEB_SOURCE_PACKAGE) -DEB_PATCHDIRS = $(CURDIR)/debian/patches/${version_major}/${version_full} DEB_DBG_PACKAGES = libmilter$(sm_libmilter_version)-dbg DEB_DBG_PACKAGE_libmilter$(sm_libmilter_version) = libmilter$(sm_libmilter_version)-dbg DEB_DH_INSTALL_CRON_ARGS = --name=$(DEB_SOURCE_PACKAGE) @@ -117,6 +116,7 @@ else include /usr/share/cdbs/1/rules/tarball.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +DEB_PATCHDIRS = $(CURDIR)/debian/patches/${version_major}/${version_full} # Default rule all:: diff --git a/debian/sendmail.init.d b/debian/sendmail.init.d index 12b4e8d..62e9cc5 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.3 2009-02-28 22:32:11 cowboy Exp $ +# $Sendmail: sm_helper.sh,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $ # # Copyright (c) 1998-2009 Richard Nelson. All Rights Reserved. # diff --git a/debian/sensible_mda/Makefile b/debian/sensible_mda/Makefile index 5d840eb..fd9c3f8 100644 --- a/debian/sensible_mda/Makefile +++ b/debian/sensible_mda/Makefile @@ -228,7 +228,7 @@ sm_newdb_lib = -ldb-4.7 sm_praliases_envdef = sm_praliases_libs = -ldb-4.7 -lldap -llber sm_recommends = -sm_revision = -7 +sm_revision = -8 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 @@ -236,7 +236,7 @@ sm_sendmail_libs = -ldb-4.7 -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 = 22:32:11 +sm_time = 23:40:41 sm_utc = -0800 sm_vacation_envdef = sm_vacation_libs = -ldb-4.7 -lldap -llber diff --git a/debian/sensible_mda/sensible-mda.c b/debian/sensible_mda/sensible-mda.c index 4278f99..6774371 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.3 2009-02-28 22:32:11 cowboy Exp $ + * $Sendmail: sensible-mda.c,v 8.14.3 2009-02-28 23:40:41 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.3 2009-02-28 22:32:11 cowboy Exp $"; +static const char id[] = "@(#)$Id: sensible-mda.c,v 8.14.3 2009-02-28 23:40:41 cowboy Exp $"; #endif /* ! lint */ #include <stdio.h> |