summaryrefslogtreecommitdiff
path: root/debian/patches/8.13
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/8.13')
-rw-r--r--debian/patches/8.13/8.13.7/main.c.DaemonPid.p027
-rw-r--r--debian/patches/8.13/8.13.7/queue.c.2006061418
-rw-r--r--debian/patches/8.13/8.13.8/client_helo.patch (renamed from debian/patches/8.13/8.13.7/client_helo.patch)6
-rw-r--r--debian/patches/8.13/8.13.8/cyrusv2.m4.debian-patch (renamed from debian/patches/8.13/8.13.7/cyrusv2.m4.debian-patch)2
-rw-r--r--debian/patches/8.13/8.13.8/dpatch.001 (renamed from debian/patches/8.13/8.13.7/dpatch.001)2
-rw-r--r--debian/patches/8.13/8.13.8/dpatch.002 (renamed from debian/patches/8.13/8.13.7/dpatch.002)2
-rw-r--r--debian/patches/8.13/8.13.8/dpatch.003 (renamed from debian/patches/8.13/8.13.7/dpatch.003)2
-rw-r--r--debian/patches/8.13/8.13.8/dpatch.004 (renamed from debian/patches/8.13/8.13.7/dpatch.004)2
-rw-r--r--debian/patches/8.13/8.13.8/dpatch.005 (renamed from debian/patches/8.13/8.13.7/dpatch.005)2
-rw-r--r--debian/patches/8.13/8.13.8/drac.patch (renamed from debian/patches/8.13/8.13.7/drac.patch)6
-rw-r--r--debian/patches/8.13/8.13.8/kfreebsd.patch (renamed from debian/patches/8.13/8.13.7/kfreebsd.patch)18
-rw-r--r--debian/patches/8.13/8.13.8/ldap_url_search.p0 (renamed from debian/patches/8.13/8.13.7/ldap_url_search.p0)2
-rw-r--r--debian/patches/8.13/8.13.8/maxseq.patch (renamed from debian/patches/8.13/8.13.7/maxseq.patch)2
-rw-r--r--debian/patches/8.13/8.13.8/qtool.patch (renamed from debian/patches/8.13/8.13.7/qtool.patch)4
14 files changed, 25 insertions, 70 deletions
diff --git a/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0 b/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0
deleted file mode 100644
index 1fae8a0..0000000
--- a/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /cvs/sendmail/main.c,v
-retrieving revision 8.944
-diff -u -r8.944 main.c
---- sendmail-8.13.7/sendmail/main.c 21 Apr 2006 23:56:42 -0000 8.944
-+++ main.c 15 Jun 2006 18:38:35 -0000
-@@ -2408,6 +2408,8 @@
- {
- char dtype[200];
-
-+ /* avoid cleanup in finis(), DaemonPid will be set below */
-+ DaemonPid = 0;
- if (!run_in_foreground && !tTd(99, 100))
- {
- /* put us in background */
-@@ -2440,7 +2442,10 @@
-
- dtype[0] = '\0';
- if (OpMode == MD_DAEMON)
-+ {
- (void) sm_strlcat(dtype, "+SMTP", sizeof dtype);
-+ DaemonPid = CurrentPid;
-+ }
- if (QueueIntvl > 0)
- {
- (void) sm_strlcat2(dtype,
diff --git a/debian/patches/8.13/8.13.7/queue.c.20060614 b/debian/patches/8.13/8.13.7/queue.c.20060614
deleted file mode 100644
index 6a0c85d..0000000
--- a/debian/patches/8.13/8.13.7/queue.c.20060614
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: queue.c
-===================================================================
-RCS file: /cvs/sendmail/queue.c,v
-retrieving revision 8.954
-retrieving revision 8.954.2.2
-diff -u -r8.954 -r8.954.2.2
---- sendmail-8.13.7/sendmail/queue.c 22 Apr 2006 01:07:00 -0000 8.954
-+++ queue.c 14 Jun 2006 21:50:56 -0000 8.954.2.2
-@@ -6695,8 +6695,7 @@
- static time_t nextupdate = 0;
-
- #if SM_CONF_SHM
-- /* only the daemon updates this structure */
-- if (ShmId == SM_SHM_NO_ID || DaemonPid != CurrentPid)
-+ if (ShmId == SM_SHM_NO_ID && DaemonPid != CurrentPid)
- return;
- #endif /* SM_CONF_SHM */
- now = curtime();
diff --git a/debian/patches/8.13/8.13.7/client_helo.patch b/debian/patches/8.13/8.13.8/client_helo.patch
index 7bf5cc2..557603c 100644
--- a/debian/patches/8.13/8.13.7/client_helo.patch
+++ b/debian/patches/8.13/8.13.8/client_helo.patch
@@ -69,7 +69,7 @@
diff -c 'deliver.orig' 'deliver.c'
Index: ./deliver.orig
Prereq: 8.1003.2.1
-*** ./sendmail-8.13.7/sendmail/deliver.c Tue Aug 10 17:50:11 2004
+*** ./sendmail-8.13.8/sendmail/deliver.c Tue Aug 10 17:50:11 2004
--- ./deliver.c Tue Aug 10 17:44:04 2004
***************
*** 1363,1368 ****
@@ -83,8 +83,8 @@ Prereq: 8.1003.2.1
SM_TRY
diff -c 'srvrsmtp.orig' 'srvrsmtp.c'
Index: ./srvrsmtp.orig
-Prereq: 8.924.2.2
-*** ./sendmail-8.13.7/sendmail/srvrsmtp.c Tue Aug 10 17:50:23 2004
+Prereq: 8.924.2.5
+*** ./sendmail-8.13.8/sendmail/srvrsmtp.c Tue Aug 10 17:50:23 2004
--- ./srvrsmtp.c Tue Aug 10 17:42:54 2004
***************
*** 444,449 ****
diff --git a/debian/patches/8.13/8.13.7/cyrusv2.m4.debian-patch b/debian/patches/8.13/8.13.8/cyrusv2.m4.debian-patch
index fcb1b8b..513b312 100644
--- a/debian/patches/8.13/8.13.7/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.13/8.13.8/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.13.7/cf/mailer/cyrusv2.m4 Sat Jun 1 15:14:57 2002
+--- sendmail-8.13.8/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 @@
diff --git a/debian/patches/8.13/8.13.7/dpatch.001 b/debian/patches/8.13/8.13.8/dpatch.001
index f60aaf6..b222f89 100644
--- a/debian/patches/8.13/8.13.7/dpatch.001
+++ b/debian/patches/8.13/8.13.8/dpatch.001
@@ -19,7 +19,7 @@
diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4'
Index: ./cf/feature/local_procmail.m4
Prereq: 8.22
-*** sendmail-8.13.7/cf/feature/local_procmail.m4 Sat Nov 20 15:26:21 1999
+*** sendmail-8.13.8/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 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.002 b/debian/patches/8.13/8.13.8/dpatch.002
index a73f33c..8a71d57 100644
--- a/debian/patches/8.13/8.13.7/dpatch.002
+++ b/debian/patches/8.13/8.13.8/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.13.7/cf/mailer/cyrus.m4 Tue May 2 14:40:24 2000
+--- sendmail-8.13.8/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.13/8.13.7/dpatch.003 b/debian/patches/8.13/8.13.8/dpatch.003
index 07c1a75..803ea5c 100644
--- a/debian/patches/8.13/8.13.7/dpatch.003
+++ b/debian/patches/8.13/8.13.8/dpatch.003
@@ -19,7 +19,7 @@
diff -c 'rmail/rmail.c' 'debian/patches/rmail.c'
Index: ./rmail/rmail.c
Prereq: 8.61
-*** sendmail-8.13.7/rmail/rmail.c Sat Sep 16 18:20:25 2000
+*** sendmail-8.13.8/rmail/rmail.c Sat Sep 16 18:20:25 2000
--- ./debian/patches/rmail.c Thu Sep 28 17:00:59 2000
***************
*** 318,324 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.004 b/debian/patches/8.13/8.13.8/dpatch.004
index 3c71838..f73d47e 100644
--- a/debian/patches/8.13/8.13.7/dpatch.004
+++ b/debian/patches/8.13/8.13.8/dpatch.004
@@ -19,7 +19,7 @@
diff -c 'sendmail/control.c' 'debian/patches/control.c'
Index: ./sendmail/control.c
Prereq: 8.126
-*** sendmail-8.13.7/sendmail/control.c Sat Nov 20 15:26:23 1999
+*** sendmail-8.13.8/sendmail/control.c Sat Nov 20 15:26:23 1999
--- ./debian/patches/control.c Sat Nov 20 15:39:52 1999
***************
*** 92,98 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.005 b/debian/patches/8.13/8.13.8/dpatch.005
index 5cd0699..40be5b4 100644
--- a/debian/patches/8.13/8.13.7/dpatch.005
+++ b/debian/patches/8.13/8.13.8/dpatch.005
@@ -19,7 +19,7 @@
diff -c './cf/mailer/fax.m4' 'fax.m4'
Index: ./cf/mailer/fax.m4
Prereq: 8.16
-*** sendmail-8.13.7/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999
+*** sendmail-8.13.8/cf/mailer/fax.m4 Mon Oct 18 02:35:28 1999
--- ./fax.m4 Wed Jan 3 14:26:13 2001
***************
*** 19,26 ****
diff --git a/debian/patches/8.13/8.13.7/drac.patch b/debian/patches/8.13/8.13.8/drac.patch
index 861bf57..a096cab 100644
--- a/debian/patches/8.13/8.13.7/drac.patch
+++ b/debian/patches/8.13/8.13.8/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.13.7/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.13.7/cf/m4/proto.m4 2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.13.8/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.13.8/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
@@ -15,7 +15,7 @@
R$* $: $>A <$1> <?> <+ Connect> <$1>
R<RELAY> $* $@ RELAY relayable IP address
--- /dev/null 2002-01-01 00:00:00.000000000 +0900
-+++ sendmail-8.13.7/cf/feature/drac.m4 2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.13.8/cf/feature/drac.m4 2002-04-18 21:33:31.716576810 +0900
@@ -0,0 +1,5 @@
+define(`_DRAC_', `')
+
diff --git a/debian/patches/8.13/8.13.7/kfreebsd.patch b/debian/patches/8.13/8.13.8/kfreebsd.patch
index d7d1a79..53850c5 100644
--- a/debian/patches/8.13/8.13.7/kfreebsd.patch
+++ b/debian/patches/8.13/8.13.8/kfreebsd.patch
@@ -1,6 +1,6 @@
-diff -Nurd sendmail-8.13.7.orig/devtools/bin/Build sendmail-8.13.7/devtools/bin/Build
---- sendmail-8.13.7.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/devtools/bin/Build 2005-09-09 12:02:15.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/devtools/bin/Build sendmail-8.13.8/devtools/bin/Build
+--- sendmail-8.13.8.orig/devtools/bin/Build 2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/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.13.7.orig/devtools/bin/Build sendmail-8.13.7/devtools/bin/
esac
# get "base part" of operating system release
-diff -Nurd sendmail-8.13.7.orig/include/sm/conf.h sendmail-8.13.7/include/sm/conf.h
---- sendmail-8.13.7.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/include/sm/conf.h 2005-09-09 11:57:33.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/include/sm/conf.h sendmail-8.13.8/include/sm/conf.h
+--- sendmail-8.13.8.orig/include/sm/conf.h 2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/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.13.7.orig/include/sm/conf.h sendmail-8.13.7/include/sm/con
** DELL SVR4 Issue 2.2, and others
** From Kimmo Suominen <kim@grendel.lut.fi>
**
-diff -Nurd sendmail-8.13.7.orig/include/sm/os/sm_os_linux.h sendmail-8.13.7/include/sm/os/sm_os_linux.h
---- sendmail-8.13.7.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/include/sm/os/sm_os_linux.h 2005-09-09 11:45:45.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/include/sm/os/sm_os_linux.h sendmail-8.13.8/include/sm/os/sm_os_linux.h
+--- sendmail-8.13.8.orig/include/sm/os/sm_os_linux.h 2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/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.13/8.13.7/ldap_url_search.p0 b/debian/patches/8.13/8.13.8/ldap_url_search.p0
index 63f5436..98b06b2 100644
--- a/debian/patches/8.13/8.13.7/ldap_url_search.p0
+++ b/debian/patches/8.13/8.13.8/ldap_url_search.p0
@@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v
retrieving revision 1.51
retrieving revision 1.53
diff -u -r1.51 -r1.53
---- ./sendmail-8.13.7/libsm/ldap.c 30 Oct 2003 23:11:12 -0000 1.51
+--- ./sendmail-8.13.8/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),
diff --git a/debian/patches/8.13/8.13.7/maxseq.patch b/debian/patches/8.13/8.13.8/maxseq.patch
index 1e678e8..0181b02 100644
--- a/debian/patches/8.13/8.13.7/maxseq.patch
+++ b/debian/patches/8.13/8.13.8/maxseq.patch
@@ -19,7 +19,7 @@
diff -c 'conf.h' 'conf.h.new'
Index: ./conf.h
Prereq: 8.570
-*** ./sendmail-8.13.7/sendmail/conf.h Fri Sep 21 19:01:46 2001
+*** ./sendmail-8.13.8/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.13/8.13.7/qtool.patch b/debian/patches/8.13/8.13.8/qtool.patch
index dc288b2..c0e98d3 100644
--- a/debian/patches/8.13/8.13.7/qtool.patch
+++ b/debian/patches/8.13/8.13.8/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.13.7/contrib/qtool.pl Wed Mar 5 16:11:54 2003
---- ./sendmail-8.13.7/contrib/qtool.pl Wed Mar 5 15:59:10 2003
+*** ./sendmail-8.13.8/contrib/qtool.pl Wed Mar 5 16:11:54 2003
+--- ./sendmail-8.13.8/contrib/qtool.pl Wed Mar 5 15:59:10 2003
***************
*** 355,373 ****
sub lock_file