diff options
Diffstat (limited to 'debian/patches/8.12')
21 files changed, 1225 insertions, 0 deletions
diff --git a/debian/patches/8.12/8.12.3/CAN-2003-0681.patch b/debian/patches/8.12/8.12.3/CAN-2003-0681.patch new file mode 100644 index 0000000..de31a60 --- /dev/null +++ b/debian/patches/8.12/8.12.3/CAN-2003-0681.patch @@ -0,0 +1,87 @@ +Index: parseaddr.c +=================================================================== +RCS file: /cvs/sendmail/parseaddr.c,v +retrieving revision 8.359.2.6 +diff -u -r8.359.2.6 parseaddr.c +--- parseaddr.c 27 Mar 2003 02:39:53 -0000 8.359.2.6 ++++ sendmail-8.12.3/sendmail/parseaddr.c 30 Mar 2003 16:41:50 -0000 +@@ -1000,6 +1008,8 @@ + } + if (pvp == NULL) + return EX_USAGE; ++ if (maxatom <= 0) ++ return EX_USAGE; + + /* + ** Run through the list of rewrite rules, applying +@@ -1866,6 +1880,7 @@ + register ENVELOPE *e; + { + bool tempfail = false; ++ int maxatom; + struct mailer **mp; + register struct mailer *m; + register char *p; +@@ -1880,6 +1895,7 @@ + printav(tv); + } + ++ maxatom = MAXATOM; + if (a == NULL) + a = (ADDRESS *) sm_rpool_malloc_x(e->e_rpool, sizeof *a); + memset((char *) a, '\0', sizeof *a); +@@ -1919,14 +1935,22 @@ + return a; + } + mname = *++tv; ++ --maxatom; + + /* extract host and user portions */ + if (*++tv != NULL && (**tv & 0377) == CANONHOST) ++ { + hostp = ++tv; ++ --maxatom; ++ } + else + hostp = NULL; ++ --maxatom; + while (*tv != NULL && (**tv & 0377) != CANONUSER) ++ { + tv++; ++ --maxatom; ++ } + if (*tv == NULL) + { + syserr("554 5.3.5 buildaddr: no user"); +@@ -1937,6 +1961,7 @@ + else if (hostp != NULL) + cataddr(hostp, tv - 1, hbuf, sizeof hbuf, '\0'); + cataddr(++tv, NULL, ubuf, sizeof ubuf, ' '); ++ --maxatom; + + /* save away the host name */ + if (sm_strcasecmp(mname, "error") == 0) +@@ -2041,6 +2066,7 @@ + { + p++; + tv++; ++ --maxatom; + a->q_flags |= QNOTREMOTE; + } + +@@ -2071,11 +2097,11 @@ + !bitset(RF_SENDERADDR|RF_HEADERADDR, flags)) + { + /* sender addresses done later */ +- (void) REWRITE(tv, 2, e); ++ (void) rewrite(tv, 2, 0, e, maxatom); + if (m->m_re_rwset > 0) +- (void) REWRITE(tv, m->m_re_rwset, e); ++ (void) rewrite(tv, m->m_re_rwset, 0, e, maxatom); + } +- (void) REWRITE(tv, 4, e); ++ (void) rewrite(tv, 4, 0, e, maxatom); + + /* save the result for the command line/RCPT argument */ + cataddr(tv, NULL, ubuf, sizeof ubuf, '\0'); + diff --git a/debian/patches/8.12/8.12.3/CAN-2003-0694.patch b/debian/patches/8.12/8.12.3/CAN-2003-0694.patch new file mode 100644 index 0000000..bdba504 --- /dev/null +++ b/debian/patches/8.12/8.12.3/CAN-2003-0694.patch @@ -0,0 +1,15 @@ +diff -ru build-tree.orig/sendmail-8.12.3/sendmail/parseaddr.c build-tree/sendmail-8.12.3/sendmail/parseaddr.c +--- build-tree.orig/sendmail-8.12.3/sendmail/parseaddr.c 2003-09-17 10:43:53.000000000 -0400 ++++ sendmail-8.12.3/sendmail/parseaddr.c 2003-09-17 10:45:06.000000000 -0400 +@@ -700,7 +700,11 @@ + addr[MAXNAME] = '\0'; + returnnull: + if (delimptr != NULL) ++ { ++ if (p > addr) ++ p--; + *delimptr = p; ++ } + CurEnv->e_to = saveto; + return NULL; + } diff --git a/debian/patches/8.12/8.12.3/bf.c.8.51 b/debian/patches/8.12/8.12.3/bf.c.8.51 new file mode 100644 index 0000000..fec8d59 --- /dev/null +++ b/debian/patches/8.12/8.12.3/bf.c.8.51 @@ -0,0 +1,30 @@ +Index: sendmail/bf.c +diff -u sendmail/bf.c:8.51 sendmail/bf.c:8.52 +--- sendmail/bf.c:8.51 Mon Mar 4 13:51:25 2002 ++++ ./sendmail-8.12.3/sendmail/bf.c Thu Apr 11 14:00:15 2002 +@@ -202,12 +202,24 @@ + ** any value of errno specified by sm_io_setinfo() + */ + ++#ifdef __STDC__ ++/* ++** XXX This is a temporary hack since MODE_T on HP-UX 10.x is short. ++** If we use K&R here, the compiler will complain about ++** Inconsistent parameter list declaration ++** due to the change from short to int. ++*/ ++ + SM_FILE_T * ++bfopen(char *filename, MODE_T fmode, size_t bsize, long flags) ++#else /* __STDC__ */ ++SM_FILE_T * + bfopen(filename, fmode, bsize, flags) + char *filename; + MODE_T fmode; + size_t bsize; + long flags; ++#endif /* __STDC__ */ + { + MODE_T omask; + SM_FILE_T SM_IO_SET_TYPE(vector, BF_FILE_TYPE, sm_bfopen, sm_bfclose, + diff --git a/debian/patches/8.12/8.12.3/domain.c.8.181 b/debian/patches/8.12/8.12.3/domain.c.8.181 new file mode 100644 index 0000000..da6a59f --- /dev/null +++ b/debian/patches/8.12/8.12.3/domain.c.8.181 @@ -0,0 +1,16 @@ +Index: domain.c +=================================================================== +RCS file: /cvs/sendmail/domain.c,v +retrieving revision 8.181 +diff -u -r8.181 domain.c +--- domain.c 2002/05/24 23:48:42 8.181 ++++ ./sendmail-8.12.3/sendmail/domain.c 2002/06/27 15:45:27 +@@ -737,7 +737,7 @@ + #endif /* _FFR_BESTMX_BETTER_TRUNCATION */ + + _res.options &= ~(RES_DNSRCH|RES_DEFNAMES); +- nmx = getmxrr(name, mxhosts, NULL, false, statp, true, NULL); ++ nmx = getmxrr(name, mxhosts, NULL, false, statp, false, NULL); + _res.options = saveopts; + if (nmx <= 0) + return NULL; diff --git a/debian/patches/8.12/8.12.3/dpatch.001 b/debian/patches/8.12/8.12.3/dpatch.001 new file mode 100644 index 0000000..972c1c2 --- /dev/null +++ b/debian/patches/8.12/8.12.3/dpatch.001 @@ -0,0 +1,50 @@ +# 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.21 +*** sendmail-8.12.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.12/8.12.3/dpatch.002 b/debian/patches/8.12/8.12.3/dpatch.002 new file mode 100644 index 0000000..6f569d9 --- /dev/null +++ b/debian/patches/8.12/8.12.3/dpatch.002 @@ -0,0 +1,19 @@ +--- sendmail-8.12.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.12/8.12.3/dpatch.003 b/debian/patches/8.12/8.12.3/dpatch.003 new file mode 100644 index 0000000..511d2b0 --- /dev/null +++ b/debian/patches/8.12/8.12.3/dpatch.003 @@ -0,0 +1,52 @@ +# 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.12.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/patches/8.12/8.12.3/dpatch.004 b/debian/patches/8.12/8.12.3/dpatch.004 new file mode 100644 index 0000000..867a195 --- /dev/null +++ b/debian/patches/8.12/8.12.3/dpatch.004 @@ -0,0 +1,52 @@ +# 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.118 +*** sendmail-8.12.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.12/8.12.3/dpatch.005 b/debian/patches/8.12/8.12.3/dpatch.005 new file mode 100644 index 0000000..c4ba0c5 --- /dev/null +++ b/debian/patches/8.12/8.12.3/dpatch.005 @@ -0,0 +1,54 @@ +# /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.12.3/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999 +--- ./fax.m4 Wed Jan 3 14:26: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:27: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:27:33 2001] #### +#### Checksum: 51 1807 4852 #### diff --git a/debian/patches/8.12/8.12.3/dsa-doublebounce.patch b/debian/patches/8.12/8.12.3/dsa-doublebounce.patch new file mode 100644 index 0000000..f920d0a --- /dev/null +++ b/debian/patches/8.12/8.12.3/dsa-doublebounce.patch @@ -0,0 +1,20 @@ +diff -u doublebounce.pl.old doublebounce.pl +--- doublebounce.pl.old Sun Feb 7 05:44:09 1999 ++++ ./sendmail-8.12.3/contrib/doublebounce.pl Mon Apr 14 08:46:02 2003 +@@ -26,6 +26,7 @@ + + + use Socket; ++use Fcntl; + + # look for debug flag + # +@@ -45,7 +46,7 @@ + # I thought about reading it into a buffer here, but some messages + # are 10+Mb so a buffer may not be a good idea + # +-if (! open(MSG, "+> $tmp")) { ++if (! sysopen(MSG, "$tmp", O_RDWR|O_CREAT|O_EXCL, 0600)) { + # can't open temp file -- send message to local postmaster + # open(MAIL, "| /usr/sbin/sendmail -oeq postmaster"); + print MAIL <STDIN>; diff --git a/debian/patches/8.12/8.12.3/dsa-expn.patch b/debian/patches/8.12/8.12.3/dsa-expn.patch new file mode 100644 index 0000000..c24bfaa --- /dev/null +++ b/debian/patches/8.12/8.12.3/dsa-expn.patch @@ -0,0 +1,20 @@ +diff -u expn.old expn +--- expn.old Sat Apr 5 00:07:36 2003 ++++ ./sendmail-8.12.3/contrib/expn.pl Mon Apr 14 08:37:41 2003 +@@ -8,6 +8,7 @@ + + use 5.001; + use IO::Socket; ++use Fcntl; + + # system requirements: + # must have 'nslookup' and 'hostname' programs. +@@ -999,7 +1000,7 @@ + } + + $0 = "$av0 - nslookup of $server"; +- open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n"; ++ sysopen(T,"/tmp/expn$$",O_RDWR|O_CREAT|O_EXCL,0600) || die "open > /tmp/expn$$: $!\n"; + print T "set querytype=MX\n"; + print T "$server\n"; + close(T); diff --git a/debian/patches/8.12/8.12.3/main.c.8.876 b/debian/patches/8.12/8.12.3/main.c.8.876 new file mode 100644 index 0000000..9be7994 --- /dev/null +++ b/debian/patches/8.12/8.12.3/main.c.8.876 @@ -0,0 +1,17 @@ +Index: main.c +=================================================================== +RCS file: /cvs/sendmail/main.c,v +retrieving revision 8.876 +diff -u -r8.876 main.c +--- ./sendmail-8.12.3/sendmail/main.c 2002/02/27 23:49:52 8.876 ++++ main.c 2002/04/10 23:59:28 +@@ -726,6 +726,8 @@ + (void) sm_signal(SIGPIPE, SIG_IGN); + OldUmask = umask(022); + FullName = getextenv("NAME"); ++ if (FullName != NULL) ++ FullName = newstr(FullName); + + /* + ** Initialize name server if it is going to be used. + diff --git a/debian/patches/8.12/8.12.3/maxseq.patch b/debian/patches/8.12/8.12.3/maxseq.patch new file mode 100644 index 0000000..3b2009b --- /dev/null +++ b/debian/patches/8.12/8.12.3/maxseq.patch @@ -0,0 +1,51 @@ +# 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.560 +*** ./sendmail-8.12.3/sendmail/conf.h Fri Sep 21 19:01:46 2001 +--- ./conf.h.new Wed Oct 10 09:24:41 2001 +*************** +*** 71,76 **** + #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 */ +--- 71,76 ---- + #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.12/8.12.3/patch.milter.replbody b/debian/patches/8.12/8.12.3/patch.milter.replbody new file mode 100644 index 0000000..6321210 --- /dev/null +++ b/debian/patches/8.12/8.12.3/patch.milter.replbody @@ -0,0 +1,63 @@ +Index: sendmail/bf.c +diff -u sendmail/bf.c:8.52 sendmail/bf.c:8.53 +--- sendmail/bf.c:8.52 Thu Apr 11 14:00:15 2002 ++++ ./sendmail-8.12.3/sendmail/bf.c Sat Apr 13 20:55:07 2002 +@@ -795,11 +795,12 @@ + errno = EINVAL; + return -1; + #else /* NOFTRUNCATE */ ++ if (lseek(bfp->bf_disk_fd, 0, SEEK_SET) < 0) ++ return -1; + return ftruncate(bfp->bf_disk_fd, 0); + #endif /* NOFTRUNCATE */ + } +- else +- return 0; ++ return 0; + } + + /* + +------------------------------------ +Index: sendmail/milter.c +diff -u sendmail/milter.c:8.195 sendmail/milter.c:8.196 +--- sendmail/milter.c:8.195 Thu Apr 11 10:30:29 2002 ++++ ./sendmail-8.12.3/sendmail/milter.c Sat Apr 13 20:55:07 2002 +@@ -2903,8 +2903,6 @@ + { + int err; + +-# if NOFTRUNCATE +- /* XXX: Not much we can do except rewind it */ + err = sm_io_error(e->e_dfp); + (void) sm_io_flush(e->e_dfp, SM_TIME_DEFAULT); + +@@ -2920,16 +2918,26 @@ + /* errno is set implicitly by fseek() before return */ + err = sm_io_seek(e->e_dfp, SM_TIME_DEFAULT, + 0, SEEK_SET); ++ if (err < 0) ++ { ++ MILTER_DF_ERROR("milter_replbody: sm_io_seek %s: %s"); ++ return -1; ++ } ++# if NOFTRUNCATE ++ /* XXX: Not much we can do except rewind it */ ++ errno = EINVAL; ++ MILTER_DF_ERROR("milter_replbody: ftruncate not available on this platform (%s:%s)"); ++ return -1; + # else /* NOFTRUNCATE */ + err = ftruncate(sm_io_getinfo(e->e_dfp, + SM_IO_WHAT_FD, NULL), + 0); +-# endif /* NOFTRUNCATE */ + if (err < 0) + { + MILTER_DF_ERROR("milter_replbody: sm_io ftruncate %s: %s"); + return -1; + } ++# endif /* NOFTRUNCATE */ + } + + if (prevsize > e->e_msgsize) + diff --git a/debian/patches/8.12/8.12.3/proto.m4.8.646 b/debian/patches/8.12/8.12.3/proto.m4.8.646 new file mode 100644 index 0000000..395cbb0 --- /dev/null +++ b/debian/patches/8.12/8.12.3/proto.m4.8.646 @@ -0,0 +1,11 @@ +--- proto.m4- Thu Nov 14 17:01:56 2002 ++++ ./sendmail-8.12.3/cf/m4/proto.m4 Thu Nov 14 17:02:19 2002 +@@ -2228,7 +2228,7 @@ + dnl ${client_resolve} should be OK, so go ahead + R$* $: <@> $&{client_name} + dnl should not be necessary since it has been done for client_addr already +-R<@> $@ RELAY ++#R<@> $@ RELAY + dnl workspace: <@> ${client_name} (not empty) + # pass to name server to make hostname canonical + R<@> $* $=P $:<?> $1 $2 diff --git a/debian/patches/8.12/8.12.3/proto.m4.8.649.2.13 b/debian/patches/8.12/8.12.3/proto.m4.8.649.2.13 new file mode 100644 index 0000000..2c3a283 --- /dev/null +++ b/debian/patches/8.12/8.12.3/proto.m4.8.649.2.13 @@ -0,0 +1,18 @@ +Index: proto.m4 +=================================================================== +RCS file: /cvs/cf/m4/proto.m4,v +retrieving revision 8.649.2.12 +retrieving revision 8.649.2.13 +diff -u -r8.649.2.12 -r8.649.2.13 +--- proto.m4 3 Dec 2002 16:48:37 -0000 8.649.2.12 ++++ ./sendmail-8.12.3/cf/m4/proto.m4 4 Dec 2002 00:12:18 -0000 8.649.2.13 +@@ -1761,6 +1761,9 @@ + dnl workspace: {client_name} $| {client_addr} + R$+ $| $+ $: $>D < $1 > <?> <+ Connect> < $2 > + dnl workspace: <result-of-lookup> <{client_addr}> ++dnl OR $| $+ if client_name is empty ++R $| $+ $: $>A < $1 > <?> <+ Connect> <> empty client_name ++dnl workspace: <result-of-lookup> <{client_addr}> + R<?> <$+> $: $>A < $1 > <?> <+ Connect> <> no: another lookup + dnl workspace: <result-of-lookup> (<>|<{client_addr}>) + R<?> <$*> $: OK found nothing diff --git a/debian/patches/8.12/8.12.3/recipient.c.8.330.2.1 b/debian/patches/8.12/8.12.3/recipient.c.8.330.2.1 new file mode 100644 index 0000000..10516b0 --- /dev/null +++ b/debian/patches/8.12/8.12.3/recipient.c.8.330.2.1 @@ -0,0 +1,17 @@ +Index: recipient.c +=================================================================== +RCS file: /cvs/sendmail/recipient.c,v +retrieving revision 8.330 +retrieving revision 8.330.2.1 +diff -u -r8.330 -r8.330.2.1 +--- ./sendmail-8.12.3/sendmail/recipient.c 29 May 2002 18:20:03 -0000 8.330 ++++ recipient.c 27 Aug 2002 20:21:02 -0000 8.330.2.1 +@@ -679,7 +679,7 @@ + ** the current recipient is marked expensive. + */ + +- if (WILL_BE_QUEUED(e->e_sendmode) || ++ if (UseMSP || WILL_BE_QUEUED(e->e_sendmode) || + (!bitset(EF_SPLIT, e->e_flags) && e->e_ntries == 0 && + FastSplit > 0)) + sortfn = sorthost; diff --git a/debian/patches/8.12/8.12.3/security.parsaddr b/debian/patches/8.12/8.12.3/security.parsaddr new file mode 100644 index 0000000..90daf45 --- /dev/null +++ b/debian/patches/8.12/8.12.3/security.parsaddr @@ -0,0 +1,58 @@ +diff -u -Nur --exclude CVS sendmail-8.12.3.orig/sendmail/parseaddr.c sendmail-8.12.3/sendmail/parseaddr.c +--- sendmail-8.12.3.orig/sendmail/parseaddr.c 2003-04-01 20:52:13.000000000 +0200 ++++ sendmail-8.12.3/sendmail/parseaddr.c 2003-04-04 15:59:07.000000000 +0200 +@@ -608,7 +608,7 @@ + }; + + +-#define NOCHAR -1 /* signal nothing in lookahead token */ ++#define NOCHAR (-1) /* signal nothing in lookahead token */ + + char ** + prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab) +@@ -694,6 +694,7 @@ + /* see if there is room */ + if (q >= &pvpbuf[pvpbsize - 5]) + { ++ addrtoolong: + usrerr("553 5.1.1 Address too long"); + if (strlen(addr) > MAXNAME) + addr[MAXNAME] = '\0'; +@@ -705,11 +706,15 @@ + } + + /* squirrel it away */ ++#if !ALLOW_255 ++ if ((char) c == (char) -1 && !tTd(82, 101)) ++ c &= 0x7f; ++#endif /* !ALLOW_255 */ + *q++ = c; + } + + /* read a new input character */ +- c = *p++; ++ c = (unsigned char)*p++; + if (c == '\0') + { + /* diagnose and patch up bad syntax */ +@@ -764,6 +769,9 @@ + } + else if (c != '!' || state == QST) + { ++ /* see if there is room */ ++ if (q >= &pvpbuf[pvpbsize - 5]) ++ goto addrtoolong; + *q++ = '\\'; + continue; + } +@@ -849,6 +857,10 @@ + /* new token */ + if (tok != q) + { ++ /* see if there is room */ ++ if (q >= &pvpbuf[pvpbsize - 5]) ++ goto addrtoolong; ++ + *q++ = '\0'; + if (tTd(22, 36)) + { diff --git a/debian/patches/8.12/8.12.3/sendmail.8.12.security.cr.patch b/debian/patches/8.12/8.12.3/sendmail.8.12.security.cr.patch new file mode 100644 index 0000000..0e62081 --- /dev/null +++ b/debian/patches/8.12/8.12.3/sendmail.8.12.security.cr.patch @@ -0,0 +1,462 @@ +--- sendmail/headers.c 13 Jan 2003 19:30:28 -0000 8.266.4.3 ++++ ./sendmail-8.12.3/sendmail/headers.c 16 Jan 2003 23:31:17 -0000 +@@ -676,8 +676,8 @@ + if (buf[0] != '\0') + { + if (bitset(H_FROM, h->h_flags)) +- expand(crackaddr(buf), buf, sizeof buf, +- e); ++ expand(crackaddr(buf, e), ++ buf, sizeof buf, e); + h->h_value = sm_rpool_strdup_x(e->e_rpool, buf); + h->h_flags &= ~H_DEFAULT; + } +@@ -998,7 +998,11 @@ + ** it and replaces it with "$g". The parse is totally ad hoc + ** and isn't even guaranteed to leave something syntactically + ** identical to what it started with. However, it does leave +-** something semantically identical. ++** something semantically identical if possible, else at least ++** syntactically correct. ++** ++** For example, it changes "Real Name <real@example.com> (Comment)" ++** to "Real Name <$g> (Comment)". + ** + ** This algorithm has been cleaned up to handle a wider range + ** of cases -- notably quoted and backslash escaped strings. +@@ -1007,6 +1011,7 @@ + ** + ** Parameters: + ** addr -- the address to be cracked. ++** e -- the current envelope. + ** + ** Returns: + ** a pointer to the new version. +@@ -1019,28 +1024,50 @@ + ** be copied if it is to be reused. + */ + ++#define SM_HAVE_ROOM ((bp < buflim) && (buflim <= bufend)) ++ ++/* ++** Append a character to bp if we have room. ++** If not, punt and return $g. ++*/ ++ ++#define SM_APPEND_CHAR(c) \ ++ do \ ++ { \ ++ if (SM_HAVE_ROOM) \ ++ *bp++ = (c); \ ++ else \ ++ goto returng; \ ++ } while (0) ++ ++#if MAXNAME < 10 ++ERROR MAXNAME must be at least 10 ++#endif /* MAXNAME < 10 */ ++ + char * +-crackaddr(addr) ++crackaddr(addr, e) + register char *addr; ++ ENVELOPE *e; + { + register char *p; + register char c; +- int cmtlev; +- int realcmtlev; +- int anglelev, realanglelev; +- int copylev; +- int bracklev; +- bool qmode; +- bool realqmode; +- bool skipping; +- bool putgmac = false; +- bool quoteit = false; +- bool gotangle = false; +- bool gotcolon = false; ++ int cmtlev; /* comment level in input string */ ++ int realcmtlev; /* comment level in output string */ ++ int anglelev; /* angle level in input string */ ++ int copylev; /* 0 == in address, >0 copying */ ++ int bracklev; /* bracket level for IPv6 addr check */ ++ bool addangle; /* put closing angle in output */ ++ bool qmode; /* quoting in original string? */ ++ bool realqmode; /* quoting in output string? */ ++ bool putgmac = false; /* already wrote $g */ ++ bool quoteit = false; /* need to quote next character */ ++ bool gotangle = false; /* found first '<' */ ++ bool gotcolon = false; /* found a ':' */ + register char *bp; + char *buflim; + char *bufhead; + char *addrhead; ++ char *bufend; + static char buf[MAXNAME + 1]; + + if (tTd(33, 1)) +@@ -1055,25 +1082,22 @@ + ** adjusted later if we find them. + */ + ++ buflim = bufend = &buf[sizeof(buf) - 1]; + bp = bufhead = buf; +- buflim = &buf[sizeof buf - 7]; + p = addrhead = addr; +- copylev = anglelev = realanglelev = cmtlev = realcmtlev = 0; ++ copylev = anglelev = cmtlev = realcmtlev = 0; + bracklev = 0; +- qmode = realqmode = false; ++ qmode = realqmode = addangle = false; + + while ((c = *p++) != '\0') + { + /* +- ** If the buffer is overful, go into a special "skipping" +- ** mode that tries to keep legal syntax but doesn't actually +- ** output things. ++ ** Try to keep legal syntax using spare buffer space ++ ** (maintained by buflim). + */ + +- skipping = bp >= buflim; +- +- if (copylev > 0 && !skipping) +- *bp++ = c; ++ if (copylev > 0) ++ SM_APPEND_CHAR(c); + + /* check for backslash escapes */ + if (c == '\\') +@@ -1088,8 +1112,8 @@ + p--; + goto putg; + } +- if (copylev > 0 && !skipping) +- *bp++ = c; ++ if (copylev > 0) ++ SM_APPEND_CHAR(c); + goto putg; + } + +@@ -1097,8 +1121,14 @@ + if (c == '"' && cmtlev <= 0) + { + qmode = !qmode; +- if (copylev > 0 && !skipping) ++ if (copylev > 0 && SM_HAVE_ROOM) ++ { ++ if (realqmode) ++ buflim--; ++ else ++ buflim++; + realqmode = !realqmode; ++ } + continue; + } + if (qmode) +@@ -1110,15 +1140,15 @@ + cmtlev++; + + /* allow space for closing paren */ +- if (!skipping) ++ if (SM_HAVE_ROOM) + { + buflim--; + realcmtlev++; + if (copylev++ <= 0) + { + if (bp != bufhead) +- *bp++ = ' '; +- *bp++ = c; ++ SM_APPEND_CHAR(' '); ++ SM_APPEND_CHAR(c); + } + } + } +@@ -1128,7 +1158,7 @@ + { + cmtlev--; + copylev--; +- if (!skipping) ++ if (SM_HAVE_ROOM) + { + realcmtlev--; + buflim++; +@@ -1139,7 +1169,7 @@ + else if (c == ')') + { + /* syntax error: unmatched ) */ +- if (copylev > 0 && !skipping) ++ if (copylev > 0 && SM_HAVE_ROOM) + bp--; + } + +@@ -1157,7 +1187,7 @@ + + /* + ** Check for DECnet phase IV ``::'' (host::user) +- ** or ** DECnet phase V ``:.'' syntaxes. The latter ++ ** or DECnet phase V ``:.'' syntaxes. The latter + ** covers ``user@DEC:.tay.myhost'' and + ** ``DEC:.tay.myhost::user'' syntaxes (bletch). + */ +@@ -1166,10 +1196,10 @@ + { + if (cmtlev <= 0 && !qmode) + quoteit = true; +- if (copylev > 0 && !skipping) ++ if (copylev > 0) + { +- *bp++ = c; +- *bp++ = *p; ++ SM_APPEND_CHAR(c); ++ SM_APPEND_CHAR(*p); + } + p++; + goto putg; +@@ -1180,41 +1210,43 @@ + bp = bufhead; + if (quoteit) + { +- *bp++ = '"'; ++ SM_APPEND_CHAR('"'); + + /* back up over the ':' and any spaces */ + --p; +- while (isascii(*--p) && isspace(*p)) ++ while (p > addr && ++ isascii(*--p) && isspace(*p)) + continue; + p++; + } + for (q = addrhead; q < p; ) + { + c = *q++; +- if (bp < buflim) ++ if (quoteit && c == '"') + { +- if (quoteit && c == '"') +- *bp++ = '\\'; +- *bp++ = c; ++ SM_APPEND_CHAR('\\'); ++ SM_APPEND_CHAR(c); + } ++ else ++ SM_APPEND_CHAR(c); + } + if (quoteit) + { + if (bp == &bufhead[1]) + bp--; + else +- *bp++ = '"'; ++ SM_APPEND_CHAR('"'); + while ((c = *p++) != ':') +- { +- if (bp < buflim) +- *bp++ = c; +- } +- *bp++ = c; ++ SM_APPEND_CHAR(c); ++ SM_APPEND_CHAR(c); + } + + /* any trailing white space is part of group: */ +- while (isascii(*p) && isspace(*p) && bp < buflim) +- *bp++ = *p++; ++ while (isascii(*p) && isspace(*p)) ++ { ++ SM_APPEND_CHAR(*p); ++ p++; ++ } + copylev = 0; + putgmac = quoteit = false; + bufhead = bp; +@@ -1223,10 +1255,7 @@ + } + + if (c == ';' && copylev <= 0 && !ColonOkInAddr) +- { +- if (bp < buflim) +- *bp++ = c; +- } ++ SM_APPEND_CHAR(c); + + /* check for characters that may have to be quoted */ + if (strchr(MustQuoteChars, c) != NULL) +@@ -1254,42 +1283,45 @@ + + /* oops -- have to change our mind */ + anglelev = 1; +- if (!skipping) +- realanglelev = 1; ++ if (SM_HAVE_ROOM) ++ { ++ if (!addangle) ++ buflim--; ++ addangle = true; ++ } + + bp = bufhead; + if (quoteit) + { +- *bp++ = '"'; ++ SM_APPEND_CHAR('"'); + + /* back up over the '<' and any spaces */ + --p; +- while (isascii(*--p) && isspace(*p)) ++ while (p > addr && ++ isascii(*--p) && isspace(*p)) + continue; + p++; + } + for (q = addrhead; q < p; ) + { + c = *q++; +- if (bp < buflim) ++ if (quoteit && c == '"') + { +- if (quoteit && c == '"') +- *bp++ = '\\'; +- *bp++ = c; ++ SM_APPEND_CHAR('\\'); ++ SM_APPEND_CHAR(c); + } ++ else ++ SM_APPEND_CHAR(c); + } + if (quoteit) + { + if (bp == &buf[1]) + bp--; + else +- *bp++ = '"'; ++ SM_APPEND_CHAR('"'); + while ((c = *p++) != '<') +- { +- if (bp < buflim) +- *bp++ = c; +- } +- *bp++ = c; ++ SM_APPEND_CHAR(c); ++ SM_APPEND_CHAR(c); + } + copylev = 0; + putgmac = quoteit = false; +@@ -1301,13 +1333,14 @@ + if (anglelev > 0) + { + anglelev--; +- if (!skipping) ++ if (SM_HAVE_ROOM) + { +- realanglelev--; +- buflim++; ++ if (addangle) ++ buflim++; ++ addangle = false; + } + } +- else if (!skipping) ++ else if (SM_HAVE_ROOM) + { + /* syntax error: unmatched > */ + if (copylev > 0) +@@ -1316,7 +1349,7 @@ + continue; + } + if (copylev++ <= 0) +- *bp++ = c; ++ SM_APPEND_CHAR(c); + continue; + } + +@@ -1324,30 +1357,42 @@ + putg: + if (copylev <= 0 && !putgmac) + { +- if (bp > bufhead && bp[-1] == ')') +- *bp++ = ' '; +- *bp++ = MACROEXPAND; +- *bp++ = 'g'; ++ if (bp > buf && bp[-1] == ')') ++ SM_APPEND_CHAR(' '); ++ SM_APPEND_CHAR(MACROEXPAND); ++ SM_APPEND_CHAR('g'); + putgmac = true; + } + } + + /* repair any syntactic damage */ +- if (realqmode) ++ if (realqmode && bp < bufend) + *bp++ = '"'; +- while (realcmtlev-- > 0) ++ while (realcmtlev-- > 0 && bp < bufend) + *bp++ = ')'; +- while (realanglelev-- > 0) ++ if (addangle && bp < bufend) + *bp++ = '>'; +- *bp++ = '\0'; ++ *bp = '\0'; ++ if (bp < bufend) ++ goto success; ++ ++ returng: ++ /* String too long, punt */ ++ buf[0] = '<'; ++ buf[1] = MACROEXPAND; ++ buf[2]= 'g'; ++ buf[3] = '>'; ++ buf[4]= '\0'; ++ sm_syslog(LOG_ALERT, e->e_id, ++ "Dropped invalid comments from header address"); + ++ success: + if (tTd(33, 1)) + { + sm_dprintf("crackaddr=>`"); + xputs(buf); + sm_dprintf("'\n"); + } +- + return buf; + } + /* +--- sendmail/main.c 8 Jan 2003 23:09:59 -0000 8.887.2.17 ++++ ./sendmail-8.12.3/sendmail/main.c 14 Jan 2003 02:38:58 -0000 +@@ -4423,7 +4423,7 @@ + "Usage: /parse address\n"); + return; + } +- q = crackaddr(p); ++ q = crackaddr(p, e); + (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, + "Cracked address = "); + xputs(q); +--- sendmail/parseaddr.c 26 Sep 2002 23:03:39 -0000 8.359.2.3 ++++ ./sendmail-8.12.3/sendmail/parseaddr.c 14 Jan 2003 02:38:58 -0000 +@@ -2509,7 +2509,7 @@ + if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags)) + fancy = "\201g"; + else +- fancy = crackaddr(name); ++ fancy = crackaddr(name, e); + + /* + ** Turn the name into canonical form. +--- sendmail/sendmail.h 12 Dec 2002 22:46:35 -0000 8.919.2.15 ++++ ./sendmail-8.12.3/sendmail/sendmail.h 14 Jan 2003 02:38:58 -0000 +@@ -394,7 +394,7 @@ + + /* functions */ + extern void cataddr __P((char **, char **, char *, int, int)); +-extern char *crackaddr __P((char *)); ++extern char *crackaddr __P((char *, ENVELOPE *)); + extern bool emptyaddr __P((ADDRESS *)); + extern ADDRESS *getctladdr __P((ADDRESS *)); + extern int include __P((char *, bool, ADDRESS *, ADDRESS **, int, ENVELOPE *)); + diff --git a/debian/patches/8.12/8.12.3/smrsh-20020924.patch b/debian/patches/8.12/8.12.3/smrsh-20020924.patch new file mode 100644 index 0000000..d9f4c93 --- /dev/null +++ b/debian/patches/8.12/8.12.3/smrsh-20020924.patch @@ -0,0 +1,63 @@ +Index: smrsh.c +=================================================================== +RCS file: /cvs/smrsh/smrsh.c,v +retrieving revision 8.58 +diff -u -r8.58 smrsh.c +--- ./sendmail-8.12.3/smrsh/smrsh.c 25 May 2002 02:41:31 -0000 8.58 ++++ smrsh.c 24 Sep 2002 23:58:16 -0000 +@@ -57,6 +57,8 @@ + #include <sm/limits.h> + #include <sm/string.h> + #include <sys/file.h> ++#include <sys/types.h> ++#include <sys/stat.h> + #include <string.h> + #include <ctype.h> + #include <errno.h> +@@ -145,6 +147,7 @@ + char *newenv[2]; + char pathbuf[1000]; + char specialbuf[32]; ++ struct stat st; + + #ifndef DEBUG + # ifndef LOG_MAIL +@@ -302,6 +305,38 @@ + (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, + "Trying %s\n", cmdbuf); + #endif /* DEBUG */ ++ if (stat(cmdbuf, &st) < 0) ++ { ++ /* can't stat it */ ++ (void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT, ++ "%s: %s not available for sendmail programs (stat failed)\n", ++ prg, cmd); ++ if (p != NULL) ++ *p = ' '; ++#ifndef DEBUG ++ syslog(LOG_CRIT, "uid %d: attempt to use %s (stat failed)", ++ (int) getuid(), cmd); ++#endif /* ! DEBUG */ ++ exit(EX_UNAVAILABLE); ++ } ++ if (!S_ISREG(st.st_mode) ++#ifdef S_ISLNK ++ && !S_ISLNK(st.st_mode) ++#endif /* S_ISLNK */ ++ ) ++ { ++ /* can't stat it */ ++ (void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT, ++ "%s: %s not available for sendmail programs (not a file)\n", ++ prg, cmd); ++ if (p != NULL) ++ *p = ' '; ++#ifndef DEBUG ++ syslog(LOG_CRIT, "uid %d: attempt to use %s (not a file)", ++ (int) getuid(), cmd); ++#endif /* ! DEBUG */ ++ exit(EX_UNAVAILABLE); ++ } + if (access(cmdbuf, X_OK) < 0) + { + /* oops.... crack attack possiblity */ diff --git a/debian/patches/8.12/8.12.3/socks.patch b/debian/patches/8.12/8.12.3/socks.patch new file mode 100644 index 0000000..61b3046 --- /dev/null +++ b/debian/patches/8.12/8.12.3/socks.patch @@ -0,0 +1,50 @@ +# This is a patch for conf.c to update it to conf.c.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.c' 'conf.c.new' +Index: ./conf.c +Prereq: 8.961 +*** ./sendmail-8.12.3/sendmail/conf.c Thu May 17 14:19:41 2001 +--- ./sendmail/conf.c.new Wed May 23 13:01:15 2001 +*************** +*** 3760,3765 **** +--- 3760,3770 ---- + vendor_post_defaults(e) + ENVELOPE *e; + { ++ char *p; ++ if ((p = getenv("LD_PRELOAD"))) ++ setuserenv("LD_PRELOAD", p); ++ if ((p = getenv("LD_LIBRARY_PATH"))) ++ setuserenv("LD_LIBRARY_PATH", p); + #ifdef __QNX__ + char *p; + +#### End of Patch data #### + +#### ApplyPatch data follows #### +# Data version : 1.0 +# Date generated : Wed May 23 13:02:56 2001 +# Generated by : makepatch 2.00_03 +# Recurse directories : Yes +# p 'conf.c' 130464 +#### End of ApplyPatch data #### + +#### End of Patch kit [created: Wed May 23 13:02:56 2001] #### +#### Patch checksum: 30 772 52154 #### +#### Checksum: 48 1448 42818 #### |