From 144365ffb4ddfa7bf9f57b1ae9a3f1850b3ebf29 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Dec 08 2014 14:51:51 +0000
Subject: New version


- Dropped hesiod patch (not needed)
- Dropped libdb5 patch (upstreamed)
- Rebased patches

---

diff --git a/.gitignore b/.gitignore
index d010e7e..b032315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sendmail.8.14.?.tar.gz
+/sendmail.8.15.1.tar.gz
diff --git a/sendmail-8.14.4-libdb5.patch b/sendmail-8.14.4-libdb5.patch
deleted file mode 100644
index 9bd5e50..0000000
--- a/sendmail-8.14.4-libdb5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sendmail-8.14.4/include/sm/bdb.h.old	2003-03-06 17:30:05.000000000 +0100
-+++ sendmail-8.14.4/include/sm/bdb.h		2010-04-15 16:02:41.029169004 +0200
-@@ -19,7 +19,8 @@ 
- #  define DB_VERSION_MAJOR 1
- # endif /* ! DB_VERSION_MAJOR */
- 
--# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1) || \
-+  (DB_VERSION_MAJOR >= 5)
- 
- #  define DBTXN	NULL ,
- 
diff --git a/sendmail-8.14.8-aliases_dir.patch b/sendmail-8.14.8-aliases_dir.patch
deleted file mode 100644
index 1a27d21..0000000
--- a/sendmail-8.14.8-aliases_dir.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/cf/m4/cfhead.m4 b/cf/m4/cfhead.m4
-index 5de5d23..1630440 100644
---- a/cf/m4/cfhead.m4
-+++ b/cf/m4/cfhead.m4
-@@ -260,7 +260,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MAIL_SETTINGS_DIR', `/etc/mail/')')
- define(`DATABASE_MAP_TYPE', `hash')
- 
- # set up default values for options
--define(`ALIAS_FILE', `MAIL_SETTINGS_DIR`'aliases')
-+define(`ALIAS_FILE', `/etc/aliases')
- define(`confMAILER_NAME', ``MAILER-DAEMON'')
- define(`confFROM_LINE', `From $g $d')
- define(`confOPERATORS', `.:%@!^/[]+')
-diff --git a/sendmail/aliases.0 b/sendmail/aliases.0
-index 80c310b..5bc4216 100644
---- a/sendmail/aliases.0
-+++ b/sendmail/aliases.0
-@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN
-        the list of users defined in that file.
- 
-        This  is  only  the  raw  data file; the actual aliasing information is
--       placed into a binary format in the file /etc/mail/aliases.db using  the
-+       placed into a binary format in the file /etc/aliases.db using  the
-        program  newaliases(1).   A  newaliases command should be executed each
-        time the aliases file is changed for the change to take effect.
- 
-diff --git a/sendmail/aliases.5 b/sendmail/aliases.5
-index 6715b51..836059d 100644
---- a/sendmail/aliases.5
-+++ b/sendmail/aliases.5
-@@ -23,7 +23,7 @@ ID
- aliases used by 
- sendmail.
- The file resides in 
--/etc/mail 
-+/etc
- and 
- is formatted as a series of lines of the form
- .IP
-@@ -96,7 +96,7 @@ list of users defined in that file.
- .PP
- This is only the raw data file; the actual aliasing information is
- placed into a binary format in the file 
--/etc/mail/aliases.db
-+/etc/aliases.db
- using the program 
- newaliases(1).  
- A 
-diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0
-index 484e10d..52c943d 100644
---- a/sendmail/newaliases.0
-+++ b/sendmail/newaliases.0
-@@ -10,7 +10,7 @@ SSYYNNOOPPSSIISS
- 
- DDEESSCCRRIIPPTTIIOONN
-        NNeewwaalliiaasseess  rebuilds  the  random access data base for the mail aliases
--       file /etc/mail/aliases.  It must be run each time this file is  changed
-+       file /etc/aliases.  It must be run each time this file is  changed
-        in order for the change to take effect.
- 
-        NNeewwaalliiaasseess is identical to ``sendmail -bi''.
-@@ -22,7 +22,7 @@ DDEESSCCRRIIPPTTIIOONN
-        sseennddmmaaiill..
- 
- FFIILLEESS
--       /etc/mail/aliases   The mail aliases file
-+       /etc/aliases   The mail aliases file
- 
- SSEEEE AALLSSOO
-        aliases(5), sendmail(8)
-diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1
-index cae0041..a59207b 100644
---- a/sendmail/newaliases.1
-+++ b/sendmail/newaliases.1
-@@ -20,7 +20,7 @@ newaliases
- .SH DESCRIPTION
- .B Newaliases
- rebuilds the random access data base for the mail aliases file
--/etc/mail/aliases.  It must be run each time this file is changed
-+/etc/aliases.  It must be run each time this file is changed
- in order for the change to take effect.
- .PP
- .B Newaliases
-@@ -40,7 +40,7 @@ puts a special token into the data base that is required by
- .B sendmail.
- .SH FILES
- .TP 2i
--/etc/mail/aliases
-+/etc/aliases
- The mail aliases file
- .SH SEE ALSO
- aliases(5), sendmail(8)
-diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0
-index 8346687..44082b4 100644
---- a/sendmail/sendmail.0
-+++ b/sendmail/sendmail.0
-@@ -432,10 +432,10 @@ FFIILLEESS
-        are only approximations.
- 
- 
--        /etc/mail/aliases
-+        /etc/aliases
-               raw data for alias names
- 
--        /etc/mail/aliases.db
-+        /etc/aliases.db
-               data base of alias names
- 
-         /etc/mail/sendmail.cf
-diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
-index db7eae4..aec7b5c 100644
---- a/sendmail/sendmail.8
-+++ b/sendmail/sendmail.8
-@@ -708,10 +708,10 @@ Thus,
- these values are only approximations.
- .PP
- .TP
-- /etc/mail/aliases
-+ /etc/aliases
- raw data for alias names
- .TP
-- /etc/mail/aliases.db
-+ /etc/aliases.db
- data base of alias names
- .TP
-  /etc/mail/sendmail.cf
diff --git a/sendmail-8.14.8-dynamic.patch b/sendmail-8.14.8-dynamic.patch
deleted file mode 100644
index 723e694..0000000
--- a/sendmail-8.14.8-dynamic.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- sendmail-8.14.4/devtools/OS/Linux		2010-01-03 22:55:35.000000000 +0100
-+++ sendmail-8.14.4/devtools/OS/Linux.dynamic	2010-01-03 22:59:03.000000000 +0100
-@@ -7,7 +7,7 @@
- define(`confCCOPTS_SO', `-fPIC')
- define(`confSM_OS_HEADER', `sm_os_linux')
- define(`confMANROOT', `/usr/share/man/man')
--define(`confLIBS', `-ldl')
-+define(`confLIBS', `-pie -ldl')
- define(`confEBINDIR', `/usr/sbin')
- APPENDDEF(`confLIBSEARCH', `crypt nsl')
- 
-@@ -22,19 +22,19 @@
- ifelse(confBLDVARIANT, `DEBUG',
- dnl Debug build
- `
--	define(`confOPTIMIZE',`-g -Wall')
-+	define(`confOPTIMIZE',`-g -Wall -fpie')
- ',
- dnl Optimized build
- confBLDVARIANT, `OPTIMIZED',
- `
--	define(`confOPTIMIZE',`-O2')
-+	define(`confOPTIMIZE',`-O2 -fpie')
- ',
- dnl Purify build
- confBLDVARIANT, `PURIFY',
- `
--	define(`confOPTIMIZE',`-g')
-+	define(`confOPTIMIZE',`-g -fpie')
- ',
- dnl default
- `
--	define(`confOPTIMIZE',`-O2')
-+	define(`confOPTIMIZE',`-O2 -fpie')
- ')
---- sendmail-8.14.4/libsm/Makefile.m4		2006-08-16 23:06:31.000000000 +0200
-+++ sendmail-8.14.4/libsm/Makefile.m4.dynamic	2010-01-03 23:01:36.000000000 +0100
-@@ -6,7 +6,7 @@
- define(`confREQUIRE_SM_OS_H', `true')
- PREPENDDEF(`confENVDEF', `confMAPDEF')
- bldPRODUCT_START(`library', `libsm')
--define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
-+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
- bldPRODUCT_END
- dnl msg.c
- dnl syslogio.c
diff --git a/sendmail-8.14.8-hesiod.patch b/sendmail-8.14.8-hesiod.patch
deleted file mode 100644
index 84a8bc2..0000000
--- a/sendmail-8.14.8-hesiod.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libsm/mbdb.c b/libsm/mbdb.c
-index 482ed70..62811a7 100644
---- a/libsm/mbdb.c
-+++ b/libsm/mbdb.c
-@@ -315,7 +315,7 @@ mbdb_pw_lookup(name, user)
- {
- 	struct passwd *pw;
- 
--#ifdef HESIOD
-+#ifdef disableHESIOD
- 	/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
- 	{
- 		char *p;
-diff --git a/sendmail/recipient.c b/sendmail/recipient.c
-index 84d2f87..6f29f78 100644
---- a/sendmail/recipient.c
-+++ b/sendmail/recipient.c
-@@ -1174,7 +1174,7 @@ finduser(name, fuzzyp, user)
- 
- 	*fuzzyp = false;
- 
--#if HESIOD
-+#if disableHESIOD
- 	/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
- 	for (p = name; *p != '\0'; p++)
- 		if (!isascii(*p) || !isdigit(*p))
diff --git a/sendmail-8.14.8-localdomain.patch b/sendmail-8.14.8-localdomain.patch
deleted file mode 100644
index c559dd3..0000000
--- a/sendmail-8.14.8-localdomain.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4
-index 79667c1..e7be2a4 100644
---- a/cf/m4/proto.m4
-+++ b/cf/m4/proto.m4
-@@ -1863,6 +1863,8 @@ R<@> < $* @ [127.0.0.1] >
- 			$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
- R<@> < $* @ localhost.$m >
- 			$: < ? $&{client_name} > < $1 @ localhost.$m >
-+R<@> < $* @ localhost.localdomain >
-+			$: < ? $&{client_name} > < $1 @ localhost.localdomain >
- ifdef(`_NO_UUCP_', `dnl',
- `R<@> < $* @ localhost.UUCP >
- 			$: < ? $&{client_name} > < $1 @ localhost.UUCP >')
diff --git a/sendmail-8.14.8-manpage.patch b/sendmail-8.14.8-manpage.patch
deleted file mode 100644
index 6de74b2..0000000
--- a/sendmail-8.14.8-manpage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
-index a3434d3..db7eae4 100644
---- a/sendmail/sendmail.8
-+++ b/sendmail/sendmail.8
-@@ -726,13 +726,11 @@ collected statistics
-  /var/spool/mqueue/*
- temp files
- .SH SEE ALSO
--binmail(1),
- mail(1),
- rmail(1),
- syslog(3),
- aliases(5),
- mailaddr(7),
--rc(8)
- .PP
- DARPA 
- Internet Request For Comments
diff --git a/sendmail-8.14.8-qos.patch b/sendmail-8.14.8-qos.patch
deleted file mode 100644
index 2acda76..0000000
--- a/sendmail-8.14.8-qos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff --git a/cf/cf/submit.mc b/cf/cf/submit.mc
-index ac19210..d180a09 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
- define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
- define(`confTIME_ZONE', `USE_TZ')dnl
- define(`confDONT_INIT_GROUPS', `True')dnl
-+dnl # If you're operating in a DSCP/RFC-4594 environment with QoS
-+dnl define(`confINET_QOS', `AF11')dnl
- define(`confPID_FILE', `/run/sm-client.pid')dnl
- 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 e7be2a4..7ffcad1 100644
---- a/cf/m4/proto.m4
-+++ b/cf/m4/proto.m4
-@@ -251,6 +251,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False')
- # 8-bit data handling
- _OPTION(EightBitMode, `confEIGHT_BIT_HANDLING', `pass8')
- 
-+# DSCP marking of traffic (IP_TOS)
-+_OPTION(InetQoS, `confINET_QOS', `none')
-+
- # wait for alias file rebuild (default units: minutes)
- _OPTION(AliasWait, `confALIAS_WAIT', `5m')
- 
-diff --git a/sendmail/conf.c b/sendmail/conf.c
-index e9f0b02..a08ab1e 100644
---- a/sendmail/conf.c
-+++ b/sendmail/conf.c
-@@ -6407,6 +6407,10 @@ char	*FFRCompileOptions[] =
- #if _FFR_QF_PARANOIA
- 	"_FFR_QF_PARANOIA",
- #endif /* _FFR_QF_PARANOIA */
-+#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
-+	/* QoS */
-+	"_FFR_QOS",
-+#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
- #if _FFR_QUEUEDELAY
- 	/* Exponential queue delay; disabled in 8.13 since it isn't used. */
- 	"_FFR_QUEUEDELAY",
-diff --git a/sendmail/daemon.c b/sendmail/daemon.c
-index e052101..fca3747 100644
---- a/sendmail/daemon.c
-+++ b/sendmail/daemon.c
-@@ -104,6 +104,10 @@ static int	NDaemons = 0;			/* actual number of daemons */
- 
- static time_t	NextDiskSpaceCheck = 0;
- 
-+#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
-+int		InetQoS = 0;			/* none by default */
-+#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
-+
- /*
- **  GETREQUESTS -- open mail IPC port and get requests.
- **
-@@ -1132,6 +1136,16 @@ opendaemonsocket(d, firsttime)
- 			(void) setsockopt(d->d_socket, SOL_SOCKET,
- 					  SO_KEEPALIVE, (char *)&on, sizeof(on));
- 
-+#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
-+			if (InetQoS != 0x00
-+			 && (d->d_addr.sa.sa_family == AF_INET
-+			  || (d->d_addr.sin6.sin6_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(d->d_addr.sin6.sin6_addr.s6_addr32)))) {
-+				if (setsockopt(d->d_socket, SOL_IP,
-+						  IP_TOS, (char *)&InetQoS, sizeof(InetQoS)) < 0)
-+					syserr("opendaemonsock: daemon %s: setsockopt(IP_TOS)", d->d_name);
-+			}
-+#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
-+
- #ifdef SO_RCVBUF
- 			if (d->d_tcprcvbufsize > 0)
- 			{
-@@ -2568,6 +2582,16 @@ gothostent:
- 			return EX_TEMPFAIL;
- 		}
- 
-+#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
-+		if (InetQoS != 0x00
-+		 && (family == AF_INET
-+		  || (family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(addr.sin6.sin6_addr.s6_addr32))))
-+		{
-+			if (setsockopt(s, SOL_IP, IP_TOS,
-+					  (char *)&InetQoS, sizeof(InetQoS)) < 0)
-+				syserr("makeconnection: setsockopt(IP_TOS)");
-+		}
-+#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
- #ifdef SO_SNDBUF
- 		if (ClientSettings[family].d_tcpsndbufsize > 0)
- 		{
-diff --git a/sendmail/readcf.c b/sendmail/readcf.c
-index cdc172c..482bdbd 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 $")
- 
- #if NETINET || NETINET6
- # include <arpa/inet.h>
-+# include <netinet/ip.h>
- #endif /* NETINET || NETINET6 */
- 
- 
-@@ -2280,8 +2281,8 @@ static struct optioninfo
- # define O_RCPTTHROTDELAY	0xe6
- 	{ "BadRcptThrottleDelay",	O_RCPTTHROTDELAY,	OI_SAFE	},
- #endif /* _FFR_RCPTTHROTDELAY */
--#if 0 && _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
--# define O_INETQOS	0xe7	/* reserved for FFR_QOS */
-+#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
-+# define O_INETQOS		0xe7
- 	{ "InetQoS",			O_INETQOS,	OI_NONE },
- #endif
- #if STARTTLS && _FFR_FIPSMODE
-@@ -2410,6 +2411,77 @@ static struct ssl_options
- };
- #endif /* STARTTLS && _FFR_TLS_1 */
- 
-+#ifdef O_INETQOS
-+static struct qosmap
-+{
-+	char	*name;		/* name of the setting */
-+	int	value;		/* corresponding setsockopt() value */
-+} QoSMap[] = {
-+#ifdef IPTOS_CLASS_CS0
-+	{ "CS0",	IPTOS_CLASS_CS0 },
-+#endif
-+#ifdef IPTOS_CLASS_CS1
-+	{ "CS1",	IPTOS_CLASS_CS1 },
-+#endif
-+#ifdef IPTOS_DSCP_AF11
-+	{ "AF11",	IPTOS_DSCP_AF11 },
-+#endif
-+#ifdef IPTOS_DSCP_AF12
-+	{ "AF12",	IPTOS_DSCP_AF12 },
-+#endif
-+#ifdef IPTOS_DSCP_AF13
-+	{ "AF13",	IPTOS_DSCP_AF13 },
-+#endif
-+#ifdef IPTOS_CLASS_CS2
-+	{ "CS2",	IPTOS_CLASS_CS2 },
-+#endif
-+#ifdef IPTOS_DSCP_AF21
-+	{ "AF21",	IPTOS_DSCP_AF21 },
-+#endif
-+#ifdef IPTOS_DSCP_AF22
-+	{ "AF22",	IPTOS_DSCP_AF22 },
-+#endif
-+#ifdef IPTOS_DSCP_AF23
-+	{ "AF23",	IPTOS_DSCP_AF23 },
-+#endif
-+#ifdef IPTOS_CLASS_CS3
-+	{ "CS3",	IPTOS_CLASS_CS3 },
-+#endif
-+#ifdef IPTOS_DSCP_AF31
-+	{ "AF31",	IPTOS_DSCP_AF31 },
-+#endif
-+#ifdef IPTOS_DSCP_AF32
-+	{ "AF32",	IPTOS_DSCP_AF32 },
-+#endif
-+#ifdef IPTOS_DSCP_AF33
-+	{ "AF33",	IPTOS_DSCP_AF33 },
-+#endif
-+#ifdef IPTOS_CLASS_CS4
-+	{ "CS4",	IPTOS_CLASS_CS4 },
-+#endif
-+#ifdef IPTOS_DSCP_AF41
-+	{ "AF41",	IPTOS_DSCP_AF41 },
-+#endif
-+#ifdef IPTOS_DSCP_AF42
-+	{ "AF42",	IPTOS_DSCP_AF42 },
-+#endif
-+#ifdef IPTOS_DSCP_AF43
-+	{ "AF43",	IPTOS_DSCP_AF43 },
-+#endif
-+#ifdef IPTOS_CLASS_CS5
-+	{ "CS5",	IPTOS_CLASS_CS5 },
-+#endif
-+#ifdef IPTOS_CLASS_CS6
-+	{ "CS6",	IPTOS_CLASS_CS6 },
-+#endif
-+#ifdef IPTOS_CLASS_CS7
-+	{ "CS7",	IPTOS_CLASS_CS7 },
-+#endif
-+	{ "none",	0x00 },
-+	{ NULL,		0    }
-+};
-+#endif
-+
- 
- # define CANONIFY(val)
- 
-@@ -4056,6 +4128,33 @@ setoption(opt, val, safe, sticky, e)
- 		break;
- #endif /* _FFR_REJECT_NUL_BYTE */
- 
-+#ifdef O_INETQOS
-+	  case O_INETQOS:
-+		{
-+			struct qosmap *qmp;
-+			InetQoS = -1;
-+
-+			for (qmp = QoSMap; qmp->name != NULL; ++qmp) {
-+				if (!strcmp(val, qmp->name)) {
-+					InetQoS = qmp->value;
-+					break;
-+				}
-+			}
-+
-+			/*
-+			** we could allow writing it as a hex value, but
-+			** we don't at this time.
-+			**/
-+			if (qmp->name == NULL) {
-+				(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
-+						     "Warning: Option: %s unknown parameter '%s'\n",
-+						     OPTNAME, val);
-+				break;
-+			}
-+			break;
-+		}
-+#endif
-+
- 	  default:
- 		if (tTd(37, 1))
- 		{
-diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h
-index 613d01e..40def81 100644
---- a/sendmail/sendmail.h
-+++ b/sendmail/sendmail.h
-@@ -2484,7 +2484,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 */
--
-+#if _FFR_QOS
-+# if !defined(SOL_IP) && defined(IPPROTO_IP)
-+#  define SOL_IP IPPROTO_IP
-+# endif
-+# if defined(SOL_IP) && defined(IP_TOS)
-+EXTERN int	InetQoS;	/* QoS mapping */
-+# endif
-+#endif
- 
- EXTERN int ConnectionRateWindowSize;
- #if STARTTLS && USE_OPENSSL_ENGINE
diff --git a/sendmail-8.14.8-switchfile.patch b/sendmail-8.14.8-switchfile.patch
deleted file mode 100644
index c6f245b..0000000
--- a/sendmail-8.14.8-switchfile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sendmail/conf.c b/sendmail/conf.c
-index 7c0ea39..e9f0b02 100644
---- a/sendmail/conf.c
-+++ b/sendmail/conf.c
-@@ -982,7 +982,7 @@ switch_map_find(service, maptype, mapreturn)
- 				if (p != NULL)
- 					*p = '\0';
- #ifndef SM_NSSWITCH_DELIMS
--# define SM_NSSWITCH_DELIMS	" \t"
-+# define SM_NSSWITCH_DELIMS	" \t:"
- #endif /* SM_NSSWITCH_DELIMS */
- 				p = strpbrk(buf, SM_NSSWITCH_DELIMS);
- 				if (p != NULL)
diff --git a/sendmail-8.15.1-aliases_dir.patch b/sendmail-8.15.1-aliases_dir.patch
new file mode 100644
index 0000000..808e298
--- /dev/null
+++ b/sendmail-8.15.1-aliases_dir.patch
@@ -0,0 +1,126 @@
+diff --git a/cf/m4/cfhead.m4 b/cf/m4/cfhead.m4
+index 714a3ec..3fd6c1c 100644
+--- a/cf/m4/cfhead.m4
++++ b/cf/m4/cfhead.m4
+@@ -260,7 +260,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MAIL_SETTINGS_DIR', `/etc/mail/')')
+ define(`DATABASE_MAP_TYPE', `hash')
+ 
+ # set up default values for options
+-define(`ALIAS_FILE', `MAIL_SETTINGS_DIR`'aliases')
++define(`ALIAS_FILE', `/etc/aliases')
+ define(`confMAILER_NAME', ``MAILER-DAEMON'')
+ define(`confFROM_LINE', `From $g $d')
+ define(`confOPERATORS', `.:%@!^/[]+')
+diff --git a/sendmail/aliases.0 b/sendmail/aliases.0
+index cfdbe17..5ea4c28 100644
+--- a/sendmail/aliases.0
++++ b/sendmail/aliases.0
+@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN
+        the list of users defined in that file.
+ 
+        This  is  only  the  raw  data file; the actual aliasing information is
+-       placed into a binary format in the file /etc/mail/aliases.db using  the
++       placed into a binary format in the file /etc/aliases.db using  the
+        program  newaliases(1).   A  newaliases command should be executed each
+        time the aliases file is changed for the change to take effect.
+ 
+diff --git a/sendmail/aliases.5 b/sendmail/aliases.5
+index f09b49c..7b16db2 100644
+--- a/sendmail/aliases.5
++++ b/sendmail/aliases.5
+@@ -23,7 +23,7 @@ ID
+ aliases used by 
+ sendmail.
+ The file resides in 
+-/etc/mail 
++/etc
+ and 
+ is formatted as a series of lines of the form
+ .IP
+@@ -96,7 +96,7 @@ list of users defined in that file.
+ .PP
+ This is only the raw data file; the actual aliasing information is
+ placed into a binary format in the file 
+-/etc/mail/aliases.db
++/etc/aliases.db
+ using the program 
+ newaliases(1).  
+ A 
+diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0
+index c77f401..e2a1670 100644
+--- a/sendmail/newaliases.0
++++ b/sendmail/newaliases.0
+@@ -10,7 +10,7 @@ SSYYNNOOPPSSIISS
+ 
+ DDEESSCCRRIIPPTTIIOONN
+        NNeewwaalliiaasseess  rebuilds  the  random access data base for the mail aliases
+-       file /etc/mail/aliases.  It must be run each time this file is  changed
++       file /etc/aliases.  It must be run each time this file is  changed
+        in order for the change to take effect.
+ 
+        NNeewwaalliiaasseess is identical to ``sendmail -bi''.
+@@ -22,7 +22,7 @@ DDEESSCCRRIIPPTTIIOONN
+        sseennddmmaaiill..
+ 
+ FFIILLEESS
+-       /etc/mail/aliases   The mail aliases file
++       /etc/aliases   The mail aliases file
+ 
+ SSEEEE AALLSSOO
+        aliases(5), sendmail(8)
+diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1
+index 59dc0de..9ba8752 100644
+--- a/sendmail/newaliases.1
++++ b/sendmail/newaliases.1
+@@ -20,7 +20,7 @@ newaliases
+ .SH DESCRIPTION
+ .B Newaliases
+ rebuilds the random access data base for the mail aliases file
+-/etc/mail/aliases.  It must be run each time this file is changed
++/etc/aliases.  It must be run each time this file is changed
+ in order for the change to take effect.
+ .PP
+ .B Newaliases
+@@ -40,7 +40,7 @@ puts a special token into the data base that is required by
+ .B sendmail.
+ .SH FILES
+ .TP 2i
+-/etc/mail/aliases
++/etc/aliases
+ The mail aliases file
+ .SH SEE ALSO
+ aliases(5), sendmail(8)
+diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0
+index 515d5f7..8236411 100644
+--- a/sendmail/sendmail.0
++++ b/sendmail/sendmail.0
+@@ -434,10 +434,10 @@ FFIILLEESS
+        are only approximations.
+ 
+ 
+-        /etc/mail/aliases
++        /etc/aliases
+               raw data for alias names
+ 
+-        /etc/mail/aliases.db
++        /etc/aliases.db
+               data base of alias names
+ 
+         /etc/mail/sendmail.cf
+diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
+index 0356839..1258c26 100644
+--- a/sendmail/sendmail.8
++++ b/sendmail/sendmail.8
+@@ -711,10 +711,10 @@ Thus,
+ these values are only approximations.
+ .PP
+ .TP
+- /etc/mail/aliases
++ /etc/aliases
+ raw data for alias names
+ .TP
+- /etc/mail/aliases.db
++ /etc/aliases.db
+ data base of alias names
+ .TP
+  /etc/mail/sendmail.cf
diff --git a/sendmail-8.15.1-dynamic.patch b/sendmail-8.15.1-dynamic.patch
new file mode 100644
index 0000000..bf6ceed
--- /dev/null
+++ b/sendmail-8.15.1-dynamic.patch
@@ -0,0 +1,46 @@
+--- sendmail-8.14.4/devtools/OS/Linux		2010-01-03 22:55:35.000000000 +0100
++++ sendmail-8.14.4/devtools/OS/Linux.dynamic	2010-01-03 22:59:03.000000000 +0100
+@@ -7,7 +7,7 @@
+ define(`confCCOPTS_SO', `-fPIC')
+ define(`confSM_OS_HEADER', `sm_os_linux')
+ define(`confMANROOT', `/usr/share/man/man')
+-define(`confLIBS', `-ldl')
++define(`confLIBS', `-pie -ldl')
+ define(`confEBINDIR', `/usr/sbin')
+ APPENDDEF(`confLIBSEARCH', `crypt nsl')
+ 
+@@ -22,19 +22,19 @@
+ ifelse(confBLDVARIANT, `DEBUG',
+ dnl Debug build
+ `
+-	define(`confOPTIMIZE',`-g -Wall')
++	define(`confOPTIMIZE',`-g -Wall -fpie')
+ ',
+ dnl Optimized build
+ confBLDVARIANT, `OPTIMIZED',
+ `
+-	define(`confOPTIMIZE',`-O2')
++	define(`confOPTIMIZE',`-O2 -fpie')
+ ',
+ dnl Purify build
+ confBLDVARIANT, `PURIFY',
+ `
+-	define(`confOPTIMIZE',`-g')
++	define(`confOPTIMIZE',`-g -fpie')
+ ',
+ dnl default
+ `
+-	define(`confOPTIMIZE',`-O2')
++	define(`confOPTIMIZE',`-O2 -fpie')
+ ')
+--- sendmail-8.14.4/libsm/Makefile.m4		2006-08-16 23:06:31.000000000 +0200
++++ sendmail-8.14.4/libsm/Makefile.m4.dynamic	2010-01-03 23:01:36.000000000 +0100
+@@ -6,7 +6,7 @@
+ define(`confREQUIRE_SM_OS_H', `true')
+ PREPENDDEF(`confENVDEF', `confMAPDEF')
+ bldPRODUCT_START(`library', `libsm')
+-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
++define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
+ bldPRODUCT_END
+ dnl msg.c
+ dnl syslogio.c
diff --git a/sendmail-8.15.1-localdomain.patch b/sendmail-8.15.1-localdomain.patch
new file mode 100644
index 0000000..e41d028
--- /dev/null
+++ b/sendmail-8.15.1-localdomain.patch
@@ -0,0 +1,13 @@
+diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4
+index 3bc4c77..74e62b5 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] >
+ R<@> < $* @ localhost.$m >
+ 			$: < ? $&{client_name} > < $1 @ localhost.$m >
++R<@> < $* @ localhost.localdomain >
++			$: < ? $&{client_name} > < $1 @ localhost.localdomain >
+ ifdef(`_NO_UUCP_', `dnl',
+ `R<@> < $* @ localhost.UUCP >
+ 			$: < ? $&{client_name} > < $1 @ localhost.UUCP >')
diff --git a/sendmail-8.15.1-manpage.patch b/sendmail-8.15.1-manpage.patch
new file mode 100644
index 0000000..4cf5fff
--- /dev/null
+++ b/sendmail-8.15.1-manpage.patch
@@ -0,0 +1,18 @@
+diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
+index 9e0b9af..0356839 100644
+--- a/sendmail/sendmail.8
++++ b/sendmail/sendmail.8
+@@ -729,13 +729,11 @@ collected statistics
+  /var/spool/mqueue/*
+ temp files
+ .SH SEE ALSO
+-binmail(1),
+ mail(1),
+ rmail(1),
+ syslog(3),
+ aliases(5),
+ mailaddr(7),
+-rc(8)
+ .PP
+ DARPA 
+ Internet Request For Comments
diff --git a/sendmail-8.15.1-qos.patch b/sendmail-8.15.1-qos.patch
new file mode 100644
index 0000000..ca54cf7
--- /dev/null
+++ b/sendmail-8.15.1-qos.patch
@@ -0,0 +1,246 @@
+diff --git a/cf/cf/submit.mc b/cf/cf/submit.mc
+index ac19210..d180a09 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
+ define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
+ define(`confTIME_ZONE', `USE_TZ')dnl
+ define(`confDONT_INIT_GROUPS', `True')dnl
++dnl # If you're operating in a DSCP/RFC-4594 environment with QoS
++dnl define(`confINET_QOS', `AF11')dnl
+ define(`confPID_FILE', `/run/sm-client.pid')dnl
+ 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
+--- a/cf/m4/proto.m4
++++ b/cf/m4/proto.m4
+@@ -251,6 +251,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False')
+ # 8-bit data handling
+ _OPTION(EightBitMode, `confEIGHT_BIT_HANDLING', `pass8')
+ 
++# DSCP marking of traffic (IP_TOS)
++_OPTION(InetQoS, `confINET_QOS', `none')
++
+ # wait for alias file rebuild (default units: minutes)
+ _OPTION(AliasWait, `confALIAS_WAIT', `5m')
+ 
+diff --git a/sendmail/conf.c b/sendmail/conf.c
+index 760150f..47283e9 100644
+--- a/sendmail/conf.c
++++ b/sendmail/conf.c
+@@ -6427,6 +6427,10 @@ char	*FFRCompileOptions[] =
+ #if _FFR_QF_PARANOIA
+ 	"_FFR_QF_PARANOIA",
+ #endif
++#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
++	/* QoS */
++	"_FFR_QOS",
++#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
+ #if _FFR_QUEUE_GROUP_SORTORDER
+ 	/* 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
+--- a/sendmail/daemon.c
++++ b/sendmail/daemon.c
+@@ -104,6 +104,10 @@ static int	NDaemons = 0;			/* actual number of daemons */
+ 
+ static time_t	NextDiskSpaceCheck = 0;
+ 
++#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
++int		InetQoS = 0;			/* none by default */
++#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
++
+ /*
+ **  GETREQUESTS -- open mail IPC port and get requests.
+ **
+@@ -1139,6 +1143,16 @@ opendaemonsocket(d, firsttime)
+ 			(void) setsockopt(d->d_socket, SOL_SOCKET,
+ 					  SO_KEEPALIVE, (char *)&on, sizeof(on));
+ 
++#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
++			if (InetQoS != 0x00
++			 && (d->d_addr.sa.sa_family == AF_INET
++			  || (d->d_addr.sin6.sin6_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(d->d_addr.sin6.sin6_addr.s6_addr32)))) {
++				if (setsockopt(d->d_socket, SOL_IP,
++						  IP_TOS, (char *)&InetQoS, sizeof(InetQoS)) < 0)
++					syserr("opendaemonsock: daemon %s: setsockopt(IP_TOS)", d->d_name);
++			}
++#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
++
+ #ifdef SO_RCVBUF
+ 			if (d->d_tcprcvbufsize > 0)
+ 			{
+@@ -2571,6 +2585,16 @@ gothostent:
+ 			return EX_TEMPFAIL;
+ 		}
+ 
++#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
++		if (InetQoS != 0x00
++		 && (family == AF_INET
++		  || (family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(addr.sin6.sin6_addr.s6_addr32))))
++		{
++			if (setsockopt(s, SOL_IP, IP_TOS,
++					  (char *)&InetQoS, sizeof(InetQoS)) < 0)
++				syserr("makeconnection: setsockopt(IP_TOS)");
++		}
++#endif /* _FFR_QOS && defined(SOL_IP) && defined(IP_TOS) */
+ #ifdef SO_SNDBUF
+ 		if (ClientSettings[family].d_tcpsndbufsize > 0)
+ 		{
+diff --git a/sendmail/readcf.c b/sendmail/readcf.c
+index 9768c45..6a04f3f 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 $")
+ 
+ #if NETINET || NETINET6
+ # include <arpa/inet.h>
++# include <netinet/ip.h>
+ #endif /* NETINET || NETINET6 */
+ 
+ 
+@@ -2453,8 +2454,8 @@ static struct optioninfo
+ # define O_RCPTTHROTDELAY	0xe6
+ 	{ "BadRcptThrottleDelay",	O_RCPTTHROTDELAY,	OI_SAFE	},
+ #endif /* _FFR_RCPTTHROTDELAY */
+-#if 0 && _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
+-# define O_INETQOS	0xe7	/* reserved for FFR_QOS */
++#if _FFR_QOS && defined(SOL_IP) && defined(IP_TOS)
++# define O_INETQOS		0xe7
+ 	{ "InetQoS",			O_INETQOS,	OI_NONE },
+ #endif
+ #if STARTTLS && _FFR_FIPSMODE
+@@ -2594,6 +2595,77 @@ static struct ssl_options
+ };
+ #endif /* STARTTLS */
+ 
++#ifdef O_INETQOS
++static struct qosmap
++{
++	char	*name;		/* name of the setting */
++	int	value;		/* corresponding setsockopt() value */
++} QoSMap[] = {
++#ifdef IPTOS_CLASS_CS0
++	{ "CS0",	IPTOS_CLASS_CS0 },
++#endif
++#ifdef IPTOS_CLASS_CS1
++	{ "CS1",	IPTOS_CLASS_CS1 },
++#endif
++#ifdef IPTOS_DSCP_AF11
++	{ "AF11",	IPTOS_DSCP_AF11 },
++#endif
++#ifdef IPTOS_DSCP_AF12
++	{ "AF12",	IPTOS_DSCP_AF12 },
++#endif
++#ifdef IPTOS_DSCP_AF13
++	{ "AF13",	IPTOS_DSCP_AF13 },
++#endif
++#ifdef IPTOS_CLASS_CS2
++	{ "CS2",	IPTOS_CLASS_CS2 },
++#endif
++#ifdef IPTOS_DSCP_AF21
++	{ "AF21",	IPTOS_DSCP_AF21 },
++#endif
++#ifdef IPTOS_DSCP_AF22
++	{ "AF22",	IPTOS_DSCP_AF22 },
++#endif
++#ifdef IPTOS_DSCP_AF23
++	{ "AF23",	IPTOS_DSCP_AF23 },
++#endif
++#ifdef IPTOS_CLASS_CS3
++	{ "CS3",	IPTOS_CLASS_CS3 },
++#endif
++#ifdef IPTOS_DSCP_AF31
++	{ "AF31",	IPTOS_DSCP_AF31 },
++#endif
++#ifdef IPTOS_DSCP_AF32
++	{ "AF32",	IPTOS_DSCP_AF32 },
++#endif
++#ifdef IPTOS_DSCP_AF33
++	{ "AF33",	IPTOS_DSCP_AF33 },
++#endif
++#ifdef IPTOS_CLASS_CS4
++	{ "CS4",	IPTOS_CLASS_CS4 },
++#endif
++#ifdef IPTOS_DSCP_AF41
++	{ "AF41",	IPTOS_DSCP_AF41 },
++#endif
++#ifdef IPTOS_DSCP_AF42
++	{ "AF42",	IPTOS_DSCP_AF42 },
++#endif
++#ifdef IPTOS_DSCP_AF43
++	{ "AF43",	IPTOS_DSCP_AF43 },
++#endif
++#ifdef IPTOS_CLASS_CS5
++	{ "CS5",	IPTOS_CLASS_CS5 },
++#endif
++#ifdef IPTOS_CLASS_CS6
++	{ "CS6",	IPTOS_CLASS_CS6 },
++#endif
++#ifdef IPTOS_CLASS_CS7
++	{ "CS7",	IPTOS_CLASS_CS7 },
++#endif
++	{ "none",	0x00 },
++	{ NULL,		0    }
++};
++#endif
++
+ 
+ # define CANONIFY(val)
+ 
+@@ -4278,6 +4350,33 @@ setoption(opt, val, safe, sticky, e)
+ 		break;
+ #endif
+ 
++#ifdef O_INETQOS
++	  case O_INETQOS:
++		{
++			struct qosmap *qmp;
++			InetQoS = -1;
++
++			for (qmp = QoSMap; qmp->name != NULL; ++qmp) {
++				if (!strcmp(val, qmp->name)) {
++					InetQoS = qmp->value;
++					break;
++				}
++			}
++
++			/*
++			** we could allow writing it as a hex value, but
++			** we don't at this time.
++			**/
++			if (qmp->name == NULL) {
++				(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
++						     "Warning: Option: %s unknown parameter '%s'\n",
++						     OPTNAME, val);
++				break;
++			}
++			break;
++		}
++#endif
++
+ 	  default:
+ 		if (tTd(37, 1))
+ 		{
+diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h
+index e61f299..0e21b00 100644
+--- a/sendmail/sendmail.h
++++ b/sendmail/sendmail.h
+@@ -2531,7 +2531,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 */
+-
++#if _FFR_QOS
++# if !defined(SOL_IP) && defined(IPPROTO_IP)
++#  define SOL_IP IPPROTO_IP
++# endif
++# if defined(SOL_IP) && defined(IP_TOS)
++EXTERN int	InetQoS;	/* QoS mapping */
++# endif
++#endif
+ 
+ EXTERN int ConnectionRateWindowSize;
+ #if STARTTLS && USE_OPENSSL_ENGINE
diff --git a/sendmail-8.15.1-switchfile.patch b/sendmail-8.15.1-switchfile.patch
new file mode 100644
index 0000000..f49f31c
--- /dev/null
+++ b/sendmail-8.15.1-switchfile.patch
@@ -0,0 +1,13 @@
+diff --git a/sendmail/conf.c b/sendmail/conf.c
+index 9520bd8..760150f 100644
+--- a/sendmail/conf.c
++++ b/sendmail/conf.c
+@@ -983,7 +983,7 @@ switch_map_find(service, maptype, mapreturn)
+ 				if (p != NULL)
+ 					*p = '\0';
+ #ifndef SM_NSSWITCH_DELIMS
+-# define SM_NSSWITCH_DELIMS	" \t"
++# define SM_NSSWITCH_DELIMS	" \t:"
+ #endif /* SM_NSSWITCH_DELIMS */
+ 				p = strpbrk(buf, SM_NSSWITCH_DELIMS);
+ 				if (p != NULL)
diff --git a/sendmail.spec b/sendmail.spec
index e983e16..75ddc3c 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -22,8 +22,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.14.9
-Release: 5%{?dist}
+Version: 8.15.1
+Release: 1%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -66,35 +66,31 @@ Patch3: sendmail-8.14.4-makemapman.patch
 Patch4: sendmail-8.14.3-smrsh_paths.patch
 # fix sm-client.pid path
 Patch7: sendmail-8.14.9-pid.patch
-# do not reject all numeric login names if hesiod support is compiled in, #80060
-Patch9: sendmail-8.14.8-hesiod.patch
 # fix sendmail man page
-Patch10: sendmail-8.14.8-manpage.patch
+Patch10: sendmail-8.15.1-manpage.patch
 # compile with -fpie
-Patch11: sendmail-8.14.8-dynamic.patch
+Patch11: sendmail-8.15.1-dynamic.patch
 # fix cyrus path
 Patch12: sendmail-8.13.0-cyrus.patch
 # fix aliases.db path
-Patch13: sendmail-8.14.8-aliases_dir.patch
+Patch13: sendmail-8.15.1-aliases_dir.patch
 # fix vacation Makefile
 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.14.8-localdomain.patch
+Patch16: sendmail-8.15.1-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.14.8-switchfile.patch
+Patch18: sendmail-8.15.1-switchfile.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
-Patch22: sendmail-8.14.4-libdb5.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.14.8-qos.patch
+Patch25: sendmail-8.15.1-qos.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -198,7 +194,6 @@ This package includes the milter shared library.
 %patch3 -p1 -b .makemapman
 %patch4 -p1 -b .smrsh_paths
 %patch7 -p1 -b .pid
-%patch9 -p1 -b .hesiod
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
@@ -212,7 +207,6 @@ cp devtools/M4/UNIX/{,shared}library.m4
 
 %patch18 -p1 -b .switchfile
 %patch21 -p1 -b .ipv6-bad-helo
-%patch22 -p1 -b .libdb5
 %patch23 -p1 -b .sasl2-in-etc
 %patch25 -p1 -b .qos
 
@@ -228,7 +222,7 @@ sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' contrib/*.pl
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''')
-define(\`confENVDEF', \`-I%{_includedir}/libdb -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1 -D_FFR_LINUX_MHNL -D_FFR_QOS -D_FFR_TLS_EC -D_FILE_OFFSET_BITS=64')
+define(\`confENVDEF', \`-I%{_includedir}/libdb -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1 -D_FFR_LINUX_MHNL -D_FFR_QOS -D_FFR_TLS_EC -D_FILE_OFFSET_BITS=64 -DHESIOD_ALLOW_NUMERIC_LOGIN')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb -lresolv %{?relro:%{relro}}')
 define(\`confMANOWN', \`root')
@@ -703,6 +697,12 @@ fi
 %{_initrddir}/sendmail
 
 %changelog
+* Mon Dec  8 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 8.15.1-1
+- New version
+- Dropped hesiod patch (not needed)
+- Dropped libdb5 patch (upstreamed)
+- Rebased patches
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 8.14.9-5
 - Rebuild for rpm bug 1131960
 
diff --git a/sources b/sources
index d3cae0b..757a30f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a3bdceffa592316f830be289a4bd783  sendmail.8.14.9.tar.gz
+a45308a08d8ce64be91b7d86a7523e4f  sendmail.8.15.1.tar.gz