diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/8.14/8.14.3/control_c.patch | 52 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/cyrusv2.m4.debian | 4 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/cyrusv2.m4.debian.patch | 11 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/drac | 4 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/drac.patch | 24 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/kerberos.patch | 24 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/kfreebsd | 18 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/kfreebsd.patch | 147 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/ldap_url_search | 6 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/ldap_url_search.patch | 24 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/local_procmail.patch | 50 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/mailer_cyrus | 2 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/mailer_cyrus.patch | 19 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/mailer_fax.patch | 54 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/maxseq | 2 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/maxseq.patch | 51 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.3/rmail.odi.patch | 52 |
17 files changed, 18 insertions, 526 deletions
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 #### |