New version

Resolves: rhbz#1239185
- Dropped ipv6-bad-helo patch (upstreamed)
- Updated/defuzzified patches

.gitignore

@@ -1,2 +1,3 @@
 /sendmail.8.14.?.tar.gz
 /sendmail.8.15.1.tar.gz
+/sendmail.8.15.2.tar.gz

sendmail-8.14.9-pid.patch

@@ -16,5 +16,5 @@
 +dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
 +FEATURE(`use_ct_file')dnl
  dnl
- dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+ dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
  FEATURE(`msp', `[127.0.0.1]')dnl

sendmail-8.15.1-ipv6-bad-helo.patch

@@ -1,17 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for sendmail >= 8.15.1 which ensures that the
-loopback IPv6 address is handled the same way like the IPv4 one. However since sendmail >= 8.15.1
-uncompressed IPv6 addresses are used by default thus the previously used IPv6:::1 gets changed to
-now IPv6:0:0:0:0:0:0:0:1 (if not compiled with -DIPV6_FULL=0 for the prior format). For further
-information see also:
-
-- https://bugzilla.redhat.com/show_bug.cgi?id=549217
-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618570
- 
---- sendmail-8.15.1/cf/feature/block_bad_helo.m4		2014-03-24 15:29:09.000000000 +0100
-+++ sendmail-8.15.1/cf/feature/block_bad_helo.m4.ipv6-bad-helo	2015-03-20 01:22:42.000000000 +0100
-@@ -16,3 +16,5 @@
- define(`_BLOCK_BAD_HELO_', `')dnl
- RELAY_DOMAIN(`127.0.0.1')dnl
- LOCAL_DOMAIN(`[127.0.0.1]')dnl
-+RELAY_DOMAIN(`IPv6:0:0:0:0:0:0:0:1')dnl
-+LOCAL_DOMAIN(`[IPv6:0:0:0:0:0:0:0:1]')dnl

sendmail-8.15.2-localdomain.patch

@@ -1,9 +1,9 @@
 diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4
-index 3bc4c77..74e62b5 100644
+index 696bf36..5a5963b 100644
 --- a/cf/m4/proto.m4
 +++ b/cf/m4/proto.m4
-@@ -1891,6 +1891,8 @@ R<@> < $* @ [127.0.0.1] >
- 			$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
+@@ -1898,6 +1898,8 @@ R<@> < $* @ [IPv6:::1] >
+ 			$: < ? $&{client_name} > < $1 @ [IPv6:::1] >
  R<@> < $* @ localhost.$m >
  			$: < ? $&{client_name} > < $1 @ localhost.$m >
 +R<@> < $* @ localhost.localdomain >

sendmail-8.15.2-qos.patch

@@ -1,5 +1,5 @@
 diff --git a/cf/cf/submit.mc b/cf/cf/submit.mc
-index ac19210..d180a09 100644
+index b9dfb16..cb325cc 100644
 --- a/cf/cf/submit.mc
 +++ b/cf/cf/submit.mc
 @@ -22,6 +22,8 @@ define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
@@ -12,7 +12,7 @@ index ac19210..d180a09 100644
  dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
  FEATURE(`use_ct_file')dnl
 diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4
-index 74e62b5..8a412eb 100644
+index 5a5963b..0df3416 100644
 --- a/cf/m4/proto.m4
 +++ b/cf/m4/proto.m4
 @@ -251,6 +251,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False')
@@ -26,10 +26,10 @@ index 74e62b5..8a412eb 100644
  _OPTION(AliasWait, `confALIAS_WAIT', `5m')
  
 diff --git a/sendmail/conf.c b/sendmail/conf.c
-index 760150f..47283e9 100644
+index cbb9c76..1b55533 100644
 --- a/sendmail/conf.c
 +++ b/sendmail/conf.c
-@@ -6427,6 +6427,10 @@ char	*FFRCompileOptions[] =
+@@ -6430,6 +6430,10 @@ char	*FFRCompileOptions[] =
  #if _FFR_QF_PARANOIA
  	"_FFR_QF_PARANOIA",
  #endif
@@ -41,7 +41,7 @@ index 760150f..47283e9 100644
  	/* Allow QueueSortOrder per queue group. */
  /* XXX: Still need to actually use qgrp->qg_sortorder */
 diff --git a/sendmail/daemon.c b/sendmail/daemon.c
-index 7fe819f..83c888b 100644
+index 4288365..86fe319 100644
 --- a/sendmail/daemon.c
 +++ b/sendmail/daemon.c
 @@ -104,6 +104,10 @@ static int	NDaemons = 0;			/* actual number of daemons */
@@ -90,7 +90,7 @@ index 7fe819f..83c888b 100644
  		if (ClientSettings[family].d_tcpsndbufsize > 0)
  		{
 diff --git a/sendmail/readcf.c b/sendmail/readcf.c
-index 9768c45..6a04f3f 100644
+index 2b0fbf7..86892f5 100644
 --- a/sendmail/readcf.c
 +++ b/sendmail/readcf.c
 @@ -18,6 +18,7 @@ SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013-11-22 20:51:56 ca Exp $")
@@ -101,7 +101,7 @@ index 9768c45..6a04f3f 100644
  #endif /* NETINET || NETINET6 */
  
  
-@@ -2453,8 +2454,8 @@ static struct optioninfo
+@@ -2888,8 +2889,8 @@ static struct optioninfo
  # define O_RCPTTHROTDELAY	0xe6
  	{ "BadRcptThrottleDelay",	O_RCPTTHROTDELAY,	OI_SAFE	},
  #endif /* _FFR_RCPTTHROTDELAY */
@@ -112,9 +112,9 @@ index 9768c45..6a04f3f 100644
  	{ "InetQoS",			O_INETQOS,	OI_NONE },
  #endif
  #if STARTTLS && _FFR_FIPSMODE
-@@ -2594,6 +2595,77 @@ static struct ssl_options
+@@ -2914,6 +2915,77 @@ static struct optioninfo
+ 	{ NULL,				'\0',		OI_NONE	}
  };
- #endif /* STARTTLS */
  
 +#ifdef O_INETQOS
 +static struct qosmap
@@ -187,12 +187,12 @@ index 9768c45..6a04f3f 100644
 +};
 +#endif
 +
- 
  # define CANONIFY(val)
  
-@@ -4278,6 +4350,33 @@ setoption(opt, val, safe, sticky, e)
+ # define SET_OPT_DEFAULT(opt, val)	opt = val
+@@ -4540,6 +4612,33 @@ setoption(opt, val, safe, sticky, e)
+ 		UseCompressedIPv6Addresses = atobool(val);
  		break;
- #endif
  
 +#ifdef O_INETQOS
 +	  case O_INETQOS:
@@ -225,10 +225,10 @@ index 9768c45..6a04f3f 100644
  		if (tTd(37, 1))
  		{
 diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h
-index e61f299..0e21b00 100644
+index b2d0211..3bcc2e2 100644
 --- a/sendmail/sendmail.h
 +++ b/sendmail/sendmail.h
-@@ -2531,7 +2531,14 @@ EXTERN struct termescape	TermEscape;	/* terminal escape codes */
+@@ -2537,7 +2537,14 @@ EXTERN struct termescape	TermEscape;	/* terminal escape codes */
  EXTERN SOCKADDR	ConnectOnlyTo;	/* override connection address (for testing) */
  EXTERN SOCKADDR RealHostAddr;	/* address of host we are talking to */
  extern const SM_EXC_TYPE_T EtypeQuickAbort; /* type of a QuickAbort exception */

sendmail-8.15.2-switchfile.patch

@@ -1,8 +1,8 @@
 diff --git a/sendmail/conf.c b/sendmail/conf.c
-index 9520bd8..760150f 100644
+index c73334e..cbb9c76 100644
 --- a/sendmail/conf.c
 +++ b/sendmail/conf.c
-@@ -983,7 +983,7 @@ switch_map_find(service, maptype, mapreturn)
+@@ -986,7 +986,7 @@ switch_map_find(service, maptype, mapreturn)
  				if (p != NULL)
  					*p = '\0';
  #ifndef SM_NSSWITCH_DELIMS

sendmail.spec

@@ -20,8 +20,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.15.1
-Release: 6%{?dist}
+Version: 8.15.2
+Release: 1%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -77,18 +77,16 @@ Patch14: sendmail-8.14.9-vacation.patch
 # remove version information from sendmail helpfile
 Patch15: sendmail-8.14.9-noversion.patch
 # do not accept localhost.localdomain as valid address from SMTP
-Patch16: sendmail-8.15.1-localdomain.patch
+Patch16: sendmail-8.15.2-localdomain.patch
 # build libmilter as DSO
 Patch17: sendmail-8.14.3-sharedmilter.patch
 # skip colon separator when parsing service name in ServiceSwitchFile
-Patch18: sendmail-8.15.1-switchfile.patch
-# handle IPv6:::1 in block_bad_helo.m4 like 127.0.0.1, #549217
-Patch21: sendmail-8.15.1-ipv6-bad-helo.patch
+Patch18: sendmail-8.15.2-switchfile.patch
 # silence warning about missing sasl2 config in /usr/lib*, now in /etc/sasl2
 Patch23: sendmail-8.14.8-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.15.1-qos.patch
+Patch25: sendmail-8.15.2-qos.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -208,7 +206,6 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch17 -p1 -b .sharedmilter
 
 %patch18 -p1 -b .switchfile
-%patch21 -p1 -b .ipv6-bad-helo
 %patch23 -p1 -b .sasl2-in-etc
 %patch25 -p1 -b .qos
 
@@ -704,6 +701,12 @@ fi
 %endif
 
 %changelog
+* Tue Jul  7 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 8.15.2-1
+- New version
+  Resolves: rhbz#1239185
+- Dropped ipv6-bad-helo patch (upstreamed)
+- Updated/defuzzified patches
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.15.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a45308a08d8ce64be91b7d86a7523e4f  sendmail.8.15.1.tar.gz
+a824fa7dea4d3341efb6462ccd816f00  sendmail.8.15.2.tar.gz