From 707c52d8b133fc703ff3621c7c0d83265a7c9e0c Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sun, 21 Apr 2013 18:07:50 +0200
Subject: [PATCH] Upgrade to 8.14.7

---
 sendmail-8.14.6-milter-helo-fix.patch              | 12 ------------
 ...l-8.14.5-qos.patch => sendmail-8.14.7-qos.patch | 14 +++++++-------
 sendmail.spec                                      | 12 ++++++------
 sources                                            |  2 +-
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 sendmail-8.14.6-milter-helo-fix.patch
 rename sendmail-8.14.5-qos.patch => sendmail-8.14.7-qos.patch (95%)

diff --git a/sendmail-8.14.6-milter-helo-fix.patch b/sendmail-8.14.6-milter-helo-fix.patch
deleted file mode 100644
index 03a6959..0000000
--- a/sendmail-8.14.6-milter-helo-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./sendmail/milter.c.orig ./sendmail/milter.c
---- a/sendmail/milter.c	2013-01-02 10:15:08.000000000 +0100
-+++ b/sendmail/milter.c	2013-01-16 18:58:19.440497919 +0100
-@@ -4067,7 +4067,7 @@ milter_helo(helo, e, state)
- 	}
- 
- 	response = milter_command(SMFIC_HELO, helo, strlen(helo) + 1,
--				  SMFIM_EOH, e, state, "helo", false);
-+				  SMFIM_HELO, e, state, "helo", false);
- 	milter_per_connection_check(e);
- 	return response;
- }
diff --git a/sendmail-8.14.5-qos.patch b/sendmail-8.14.7-qos.patch
similarity index 95%
rename from sendmail-8.14.5-qos.patch
rename to sendmail-8.14.7-qos.patch
index a758b0f..721d81e 100644
--- a/sendmail-8.14.5-qos.patch
+++ b/sendmail-8.14.7-qos.patch
@@ -99,8 +99,8 @@
  #ifdef SO_SNDBUF
  		if (ClientSettings[family].d_tcpsndbufsize > 0)
  		{
---- sendmail-8.14.4/sendmail/readcf.c.orig	2009-10-26 11:47:00.000000000 -0600
-+++ sendmail-8.14.4/sendmail/readcf.c	2011-01-11 20:37:35.000000000 -0700
+--- sendmail-8.14.7/sendmail/readcf.c.orig	2013-03-15 18:54:12.000000000 +0100
++++ sendmail-8.14.7/sendmail/readcf.c	2013-04-21 17:58:19.000000000 +0200
 @@ -18,6 +18,7 @@
  
  #if NETINET || NETINET6
@@ -109,7 +109,7 @@
  #endif /* NETINET || NETINET6 */
  
  
-@@ -2271,8 +2271,8 @@ static struct optioninfo
+@@ -2280,8 +2281,8 @@
  # define O_RCPTTHROTDELAY	0xe6
  	{ "BadRcptThrottleDelay",	O_RCPTTHROTDELAY,	OI_SAFE	},
  #endif /* _FFR_RCPTTHROTDELAY */
@@ -119,8 +119,8 @@
 +# define O_INETQOS		0xe7
  	{ "InetQoS",			O_INETQOS,	OI_NONE },
  #endif
- 
-@@ -2351,6 +2355,77 @@ static struct ssl_options
+ #if STARTTLS && _FFR_FIPSMODE
+@@ -2389,6 +2390,77 @@
  };
  #endif /* STARTTLS && _FFR_TLS_1 */
  
@@ -198,9 +198,9 @@
  
  # define CANONIFY(val)
  
-@@ -3985,6 +4060,33 @@ setoption(opt, val, safe, sticky, e)
+@@ -4035,6 +4107,33 @@
  		break;
- #endif /* _FFR_BADRCPT_SHUTDOWN */
+ #endif /* _FFR_REJECT_NUL_BYTE */
  
 +#ifdef O_INETQOS
 +	  case O_INETQOS:
diff --git a/sendmail.spec b/sendmail.spec
index ffcb5e6..69a260c 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -22,8 +22,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.14.6
-Release: 4%{?dist}
+Version: 8.14.7
+Release: 1%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -96,9 +96,7 @@ Patch22: sendmail-8.14.4-libdb5.patch
 Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 # add QoS support, patch from Philip Prindeville <philipp@fedoraproject.org>
 # upstream reserved option ID 0xe7 for testing of this new feature, #576643
-Patch25: sendmail-8.14.5-qos.patch
-# accepted upstream
-Patch26: sendmail-8.14.6-milter-helo-fix.patch
+Patch25: sendmail-8.14.7-qos.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -220,7 +218,6 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch22 -p1 -b .libdb5
 %patch23 -p1 -b .sasl2-in-etc
 %patch25 -p1 -b .qos
-%patch26 -p1 -b .milter-helo-fix
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -709,6 +706,9 @@ fi
 %{_initrddir}/sendmail
 
 %changelog
+* Sun Apr 21 2013 Robert Scheck <robert@fedoraproject.org> - 8.14.7-1
+- Upgrade to 8.14.7
+
 * Mon Feb 25 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.6-4
 - Switched to systemd-rpm macros
   Resolves: rhbz#850310
diff --git a/sources b/sources
index 5df96d5..c6fc78b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9eeed3d1baecbf4e17d829d2ec005553  sendmail.8.14.6.tar.gz
+348eedfab0ed00931f2df94e78f22c43  sendmail.8.14.7.tar.gz