From 056437d81a2f263cc322dc6e9da6cdd7110c90e4 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jun 02 2014 12:18:45 +0000
Subject: Dropped milterfdleaks patch (not needed)


---

diff --git a/sendmail-8.14.8-milterfdleaks.patch b/sendmail-8.14.8-milterfdleaks.patch
deleted file mode 100644
index adcf31b..0000000
--- a/sendmail-8.14.8-milterfdleaks.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/libmilter/listener.c b/libmilter/listener.c
-index cd3f6e8..c45683c 100644
---- a/libmilter/listener.c
-+++ b/libmilter/listener.c
-@@ -728,6 +728,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
- 	int acnt = 0;	/* error count for accept() failures */
- 	int scnt = 0;	/* error count for select() failures */
- 	int save_errno = 0;
-+	int fdflags;
- #if !_FFR_WORKERS_POOL
- 	sthread_t thread_id;
- #endif /* !_FFR_WORKERS_POOL */
-@@ -808,6 +809,19 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
- 		(void) smutex_unlock(&L_Mutex);
- 
- 		/*
-+		** Need to set close-on-exec for connfd in case a user's
-+		** filter starts other applications
-+		*/
-+		if ((fdflags = fcntl(connfd, F_GETFD, 0)) == -1 ||
-+		    fcntl(connfd, F_SETFD, fdflags | FD_CLOEXEC) == -1)
-+		{
-+			smi_log(SMI_LOG_WARN,
-+				"%s: Unable to set close-on-exec on connfd (%s)",
-+				smfi->xxfi_name, sm_errstring(errno));
-+			/* XXX: continue? */
-+		}
-+
-+		/*
- 		**  If remote side closes before accept() finishes,
- 		**  sockaddr might not be fully filled in.
- 		*/
-diff --git a/sendmail/milter.c b/sendmail/milter.c
-index 88f8b60..f9de6b1 100644
---- a/sendmail/milter.c
-+++ b/sendmail/milter.c
-@@ -30,6 +30,9 @@ SM_RCSID("@(#)$Id: milter.c,v 8.281 2013/11/22 20:51:56 ca Exp $")
- 
- # include <sm/fdset.h>
- 
-+# include <unistd.h>
-+# include <fcntl.h>
-+
- static void	milter_connect_timeout __P((int));
- static void	milter_error __P((struct milter *, ENVELOPE *));
- static int	milter_open __P((struct milter *, bool, ENVELOPE *));
-@@ -655,6 +658,7 @@ milter_open(m, parseonly, e)
- 	SOCKADDR_LEN_T addrlen = 0;
- 	int addrno = 0;
- 	int save_errno;
-+	int fdflags;
- 	char *p;
- 	char *colon;
- 	char *at;
-@@ -1191,6 +1195,21 @@ milter_open(m, parseonly, e)
- 			   (char *)&nodelay, sizeof(nodelay));
- 	}
- # endif /* MILTER_NO_NAGLE && !defined(TCP_CORK) */
-+
-+	/*
-+	** Need to set close-on-exec for sock to prevent it
-+	** leaking to the local delivery process
-+	*/
-+	if ((fdflags = fcntl(sock, F_GETFD, 0)) == -1 ||
-+	    fcntl(sock, F_SETFD, fdflags | FD_CLOEXEC) == -1)
-+	{
-+		save_errno = errno;
-+		if (MilterLogLevel > 0)
-+			sm_syslog(LOG_WARNING, e->e_id,
-+				"Milter (%s): Unable to set close-on-exec on sock (%s)",
-+					m->mf_name, sm_errstring(save_errno = errno));
-+	}
-+
- 	return sock;
- }
- 
diff --git a/sendmail.spec b/sendmail.spec
index d277707..01897be 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -23,7 +23,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -86,8 +86,6 @@ Patch16: sendmail-8.14.8-localdomain.patch
 Patch17: sendmail-8.14.3-sharedmilter.patch
 # skip colon separator when parsing service name in ServiceSwitchFile
 Patch18: sendmail-8.14.8-switchfile.patch
-# fix milter file descriptors leaks, #485426
-Patch20: sendmail-8.14.8-milterfdleaks.patch
 # handle IPv6:::1 in block_bad_helo.m4 like 127.0.0.1, #549217
 Patch21: sendmail-8.14.3-ipv6-bad-helo.patch
 # fix compilation with libdb5
@@ -213,7 +211,6 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch17 -p1 -b .sharedmilter
 
 %patch18 -p1 -b .switchfile
-%patch20 -p1 -b .milterfdleaks
 %patch21 -p1 -b .ipv6-bad-helo
 %patch22 -p1 -b .libdb5
 %patch23 -p1 -b .sasl2-in-etc
@@ -706,6 +703,9 @@ fi
 %{_initrddir}/sendmail
 
 %changelog
+* Mon Jun  2 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.9-2
+- Dropped milterfdleaks patch (not needed)
+
 * Wed May 21 2014 Robert Scheck <robert@fedoraproject.org> - 8.14.9-1
 - Upgrade to 8.14.9