Fix regression bug introduced by the new site.config.m4 (#283277).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 0 insertions, 86 deletions

diff --git a/mail-mta/sendmail/files/errata-8.13.7-1.patch b/mail-mta/sendmail/files/errata-8.13.7-1.patch
deleted file mode 100644
index 35c7ad8fd201..000000000000
--- a/mail-mta/sendmail/files/errata-8.13.7-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r8.954 -r8.954.2.2
---- sendmail/queue.c	22 Apr 2006 01:07:00 -0000	8.954
-+++ sendmail/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/mail-mta/sendmail/files/errata-8.13.7-2.patch b/mail-mta/sendmail/files/errata-8.13.7-2.patch
deleted file mode 100644
index c48d84c580be..000000000000
--- a/mail-mta/sendmail/files/errata-8.13.7-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -u -r8.944 main.c
---- sendmail/main.c	21 Apr 2006 23:56:42 -0000	8.944
-+++ sendmail/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/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch b/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch
deleted file mode 100644
index 5866d7aba5d4..000000000000
--- a/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- sendmail/mime.c	24 Mar 2006 03:17:06 -0000	8.140
-+++ sendmail/mime.c	27 Apr 2006 22:56:16 -0000	8.141
-@@ -242,7 +242,9 @@
- 	*/
-
- 	if (sm_strcasecmp(type, "multipart") == 0 &&
--	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)))
-+	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)) &&
-+	    !bitset(EF_TOODEEP, e->e_flags)
-+	   )
- 	{
-
- 		if (sm_strcasecmp(subtype, "digest") == 0)
-@@ -286,10 +288,13 @@
- 		}
- 		if (i >= MAXMIMENESTING)
- 		{
--			usrerr("mime8to7: multipart nesting boundary too deep");
-+			if (tTd(43, 4))
-+				sm_dprintf("mime8to7: too deep, i=%d\n", i);
-+			if (!bitset(EF_TOODEEP, e->e_flags))
-+				usrerr("mime8to7: multipart nesting boundary too deep");
-
- 			/* avoid bounce loops */
--			e->e_flags |= EF_DONT_MIME;
-+			e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
- 		}
- 		else
- 		{
-@@ -374,7 +379,8 @@
-
- 	if (sm_strcasecmp(type, "message") == 0)
- 	{
--		if (!wordinclass(subtype, 's'))
-+		if (!wordinclass(subtype, 's') ||
-+		    bitset(EF_TOODEEP, e->e_flags))
- 		{
- 			flags |= M87F_NO8BIT;
- 		}
---- sendmail/sendmail.h	22 Mar 2006 22:58:39 -0000	8.1007
-+++ sendmail/sendmail.h	27 Apr 2006 22:56:16 -0000	8.1008
-@@ -942,6 +942,7 @@
- #define EF_TOOBIG	0x02000000L	/* message is too big */
- #define EF_SPLIT	0x04000000L	/* envelope has been split */
- #define EF_UNSAFE	0x08000000L	/* unsafe: read from untrusted source */
-+#define EF_TOODEEP	0x10000000L	/* message is nested too deep */
-
- #define DLVR_NOTIFY	0x01
- #define DLVR_RETURN	0x02
-