rpms
/
sendmail
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version 

- Dropped hesiod patch (not needed)
- Dropped libdb5 patch (upstreamed)
- Rebased patches
This commit is contained in:
Jaroslav Škarvada 2014-12-08 15:51:51 +01:00
parent 8033acca5f
commit 144365ffb4
11 changed files with 53 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

12
sendmail-8.14.4-libdb5.patch
View File

@ -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 ,

26
sendmail-8.14.8-hesiod.patch
View File

@ -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))

18
sendmail-8.14.8-aliases_dir.patch → sendmail-8.15.1-aliases_dir.patch
View File

@ -1,5 +1,5 @@
diff --git a/cf/m4/cfhead.m4 b/cf/m4/cfhead.m4
index 5de5d23..1630440 100644
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/')')
@ -12,7 +12,7 @@ index 5de5d23..1630440 100644
define(`confFROM_LINE', `From $g $d')
define(`confOPERATORS', `.:%@!^/[]+')
diff --git a/sendmail/aliases.0 b/sendmail/aliases.0
index 80c310b..5bc4216 100644
index cfdbe17..5ea4c28 100644
--- a/sendmail/aliases.0
+++ b/sendmail/aliases.0
@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN
@ -25,7 +25,7 @@ index 80c310b..5bc4216 100644
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
index f09b49c..7b16db2 100644
--- a/sendmail/aliases.5
+++ b/sendmail/aliases.5
@@ -23,7 +23,7 @@ ID
@ -47,7 +47,7 @@ index 6715b51..836059d 100644
newaliases(1).
A
diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0
index 484e10d..52c943d 100644
index c77f401..e2a1670 100644
--- a/sendmail/newaliases.0
+++ b/sendmail/newaliases.0
@@ -10,7 +10,7 @@ SSYYNNOOPPSSIISS
@ -69,7 +69,7 @@ index 484e10d..52c943d 100644
SSEEEE AALLSSOO
aliases(5), sendmail(8)
diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1
index cae0041..a59207b 100644
index 59dc0de..9ba8752 100644
--- a/sendmail/newaliases.1
+++ b/sendmail/newaliases.1
@@ -20,7 +20,7 @@ newaliases
@ -91,10 +91,10 @@ index cae0041..a59207b 100644
.SH SEE ALSO
aliases(5), sendmail(8)
diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0
index 8346687..44082b4 100644
index 515d5f7..8236411 100644
--- a/sendmail/sendmail.0
+++ b/sendmail/sendmail.0
@@ -432,10 +432,10 @@ FFIILLEESS
@@ -434,10 +434,10 @@ FFIILLEESS
are only approximations.
@ -108,10 +108,10 @@ index 8346687..44082b4 100644
/etc/mail/sendmail.cf
diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
index db7eae4..aec7b5c 100644
index 0356839..1258c26 100644
--- a/sendmail/sendmail.8
+++ b/sendmail/sendmail.8
@@ -708,10 +708,10 @@ Thus,
@@ -711,10 +711,10 @@ Thus,
these values are only approximations.
.PP
.TP

4
sendmail-8.14.8-dynamic.patch → sendmail-8.15.1-dynamic.patch
View File

@ -39,8 +39,8 @@
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 ')
-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

4
sendmail-8.14.8-localdomain.patch → sendmail-8.15.1-localdomain.patch
View File

@ -1,8 +1,8 @@
diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4
index 79667c1..e7be2a4 100644
index 3bc4c77..74e62b5 100644
--- a/cf/m4/proto.m4
+++ b/cf/m4/proto.m4
@@ -1863,6 +1863,8 @@ R<@> < $* @ [127.0.0.1] >
@@ -1891,6 +1891,8 @@ R<@> < $* @ [127.0.0.1] >
$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
R<@> < $* @ localhost.$m >
$: < ? $&{client_name} > < $1 @ localhost.$m >

4
sendmail-8.14.8-manpage.patch → sendmail-8.15.1-manpage.patch
View File

@ -1,8 +1,8 @@
diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
index a3434d3..db7eae4 100644
index 9e0b9af..0356839 100644
--- a/sendmail/sendmail.8
+++ b/sendmail/sendmail.8
@@ -726,13 +726,11 @@ collected statistics
@@ -729,13 +729,11 @@ collected statistics
/var/spool/mqueue/*
temp files
.SH SEE ALSO

38
sendmail-8.14.8-qos.patch → sendmail-8.15.1-qos.patch
View File

@ -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 e7be2a4..7ffcad1 100644
index 74e62b5..8a412eb 100644
--- a/cf/m4/proto.m4
+++ b/cf/m4/proto.m4
@@ -251,6 +251,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False')
@ -26,22 +26,22 @@ index e7be2a4..7ffcad1 100644
_OPTION(AliasWait, `confALIAS_WAIT', `5m')
diff --git a/sendmail/conf.c b/sendmail/conf.c
index e9f0b02..a08ab1e 100644
index 760150f..47283e9 100644
--- a/sendmail/conf.c
+++ b/sendmail/conf.c
@@ -6407,6 +6407,10 @@ char *FFRCompileOptions[] =
@@ -6427,6 +6427,10 @@ char *FFRCompileOptions[] =
#if _FFR_QF_PARANOIA
"_FFR_QF_PARANOIA",
#endif /* _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_QUEUEDELAY
/* Exponential queue delay; disabled in 8.13 since it isn't used. */
"_FFR_QUEUEDELAY",
#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 e052101..fca3747 100644
index 7fe819f..83c888b 100644
--- a/sendmail/daemon.c
+++ b/sendmail/daemon.c
@@ -104,6 +104,10 @@ static int NDaemons = 0; /* actual number of daemons */
@ -55,7 +55,7 @@ index e052101..fca3747 100644
/*
** GETREQUESTS -- open mail IPC port and get requests.
**
@@ -1132,6 +1136,16 @@ opendaemonsocket(d, firsttime)
@@ -1139,6 +1143,16 @@ opendaemonsocket(d, firsttime)
(void) setsockopt(d->d_socket, SOL_SOCKET,
SO_KEEPALIVE, (char *)&on, sizeof(on));
@ -72,7 +72,7 @@ index e052101..fca3747 100644
#ifdef SO_RCVBUF
if (d->d_tcprcvbufsize > 0)
{
@@ -2568,6 +2582,16 @@ gothostent:
@@ -2571,6 +2585,16 @@ gothostent:
return EX_TEMPFAIL;
}
@ -90,10 +90,10 @@ index e052101..fca3747 100644
if (ClientSettings[family].d_tcpsndbufsize > 0)
{
diff --git a/sendmail/readcf.c b/sendmail/readcf.c
index cdc172c..482bdbd 100644
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 $")
@@ -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>
@ -101,7 +101,7 @@ index cdc172c..482bdbd 100644
#endif /* NETINET || NETINET6 */
@@ -2280,8 +2281,8 @@ static struct optioninfo
@@ -2453,8 +2454,8 @@ static struct optioninfo
# define O_RCPTTHROTDELAY 0xe6
{ "BadRcptThrottleDelay", O_RCPTTHROTDELAY, OI_SAFE },
#endif /* _FFR_RCPTTHROTDELAY */
@ -112,9 +112,9 @@ index cdc172c..482bdbd 100644
{ "InetQoS", O_INETQOS, OI_NONE },
#endif
#if STARTTLS && _FFR_FIPSMODE
@@ -2410,6 +2411,77 @@ static struct ssl_options
@@ -2594,6 +2595,77 @@ static struct ssl_options
};
#endif /* STARTTLS && _FFR_TLS_1 */
#endif /* STARTTLS */
+#ifdef O_INETQOS
+static struct qosmap
@ -190,9 +190,9 @@ index cdc172c..482bdbd 100644
# define CANONIFY(val)
@@ -4056,6 +4128,33 @@ setoption(opt, val, safe, sticky, e)
@@ -4278,6 +4350,33 @@ setoption(opt, val, safe, sticky, e)
break;
#endif /* _FFR_REJECT_NUL_BYTE */
#endif
+#ifdef O_INETQOS
+ case O_INETQOS:
@ -225,10 +225,10 @@ index cdc172c..482bdbd 100644
if (tTd(37, 1))
{
diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h
index 613d01e..40def81 100644
index e61f299..0e21b00 100644
--- a/sendmail/sendmail.h
+++ b/sendmail/sendmail.h
@@ -2484,7 +2484,14 @@ EXTERN struct termescape TermEscape; /* terminal escape codes */
@@ -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 */

4
sendmail-8.14.8-switchfile.patch → sendmail-8.15.1-switchfile.patch
View File

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

30
sendmail.spec
View File

@ -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

2
sources
View File

@ -1 +1 @@
6a3bdceffa592316f830be289a4bd783 sendmail.8.14.9.tar.gz
a45308a08d8ce64be91b7d86a7523e4f sendmail.8.15.1.tar.gz