diff --git a/sendmail-8.12.7-manpage.patch b/sendmail-8.12.7-manpage.patch deleted file mode 100644 index 8a38b6b..0000000 --- a/sendmail-8.12.7-manpage.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- sendmail-8.12.7/sendmail/sendmail.8.manpage 2003-01-13 11:17:32.000000000 +0100 -+++ sendmail-8.12.7/sendmail/sendmail.8 2003-01-13 11:17:59.000000000 +0100 -@@ -687,13 +687,11 @@ - /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.4-aliases_dir.patch b/sendmail-8.14.8-aliases_dir.patch similarity index 63% rename from sendmail-8.14.4-aliases_dir.patch rename to sendmail-8.14.8-aliases_dir.patch index 3dfb2aa..1a27d21 100644 --- a/sendmail-8.14.4-aliases_dir.patch +++ b/sendmail-8.14.8-aliases_dir.patch @@ -1,7 +1,8 @@ -diff -up sendmail-8.14.3/cf/m4/cfhead.m4.movefiles sendmail-8.14.3/cf/m4/cfhead.m4 ---- sendmail-8.14.3/cf/m4/cfhead.m4.movefiles 2004-01-28 23:02:22.000000000 +0100 -+++ sendmail-8.14.3/cf/m4/cfhead.m4 2008-12-02 18:07:06.000000000 +0100 -@@ -259,7 +259,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MA +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 @@ -10,9 +11,10 @@ diff -up sendmail-8.14.3/cf/m4/cfhead.m4.movefiles sendmail-8.14.3/cf/m4/cfhead. define(`confMAILER_NAME', ``MAILER-DAEMON'') define(`confFROM_LINE', `From $g $d') define(`confOPERATORS', `.:%@!^/[]+') -diff -up ./sendmail/aliases.0.orig ./sendmail/aliases.0 ---- ./sendmail/aliases.0.orig 2009-12-23 05:48:32.000000000 +0100 -+++ ./sendmail/aliases.0 2010-02-01 10:49:56.093920068 +0100 +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. @@ -22,10 +24,11 @@ diff -up ./sendmail/aliases.0.orig ./sendmail/aliases.0 program newaliases(1). A newaliases command should be executed each time the aliases file is changed for the change to take effect. -diff -up ./sendmail/aliases.5.orig ./sendmail/aliases.5 ---- ./sendmail/aliases.5.orig 2004-07-12 07:39:21.000000000 +0200 -+++ ./sendmail/aliases.5 2010-02-01 10:45:46.407921946 +0100 -@@ -23,7 +23,7 @@ ID +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 @@ -43,9 +46,10 @@ diff -up ./sendmail/aliases.5.orig ./sendmail/aliases.5 using the program newaliases(1). A -diff -up ./sendmail/newaliases.0.orig ./sendmail/newaliases.0 ---- ./sendmail/newaliases.0.orig 2009-12-23 05:48:32.000000000 +0100 -+++ ./sendmail/newaliases.0 2010-02-01 10:49:46.527918883 +0100 +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 @@ -64,9 +68,10 @@ diff -up ./sendmail/newaliases.0.orig ./sendmail/newaliases.0 SSEEEE AALLSSOO aliases(5), sendmail(8) -diff -up ./sendmail/newaliases.1.orig ./sendmail/newaliases.1 ---- ./sendmail/newaliases.1.orig 2001-10-10 05:23:17.000000000 +0200 -+++ ./sendmail/newaliases.1 2010-02-01 10:49:36.194921433 +0100 +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 @@ -76,7 +81,7 @@ diff -up ./sendmail/newaliases.1.orig ./sendmail/newaliases.1 in order for the change to take effect. .PP .B Newaliases -@@ -40,7 +40,7 @@ puts a special token into the data base +@@ -40,7 +40,7 @@ puts a special token into the data base that is required by .B sendmail. .SH FILES .TP 2i @@ -85,10 +90,11 @@ diff -up ./sendmail/newaliases.1.orig ./sendmail/newaliases.1 The mail aliases file .SH SEE ALSO aliases(5), sendmail(8) -diff -up ./sendmail/sendmail.0.orig ./sendmail/sendmail.0 ---- ./sendmail/sendmail.0.orig 2009-12-23 05:48:32.000000000 +0100 -+++ ./sendmail/sendmail.0 2010-02-01 10:49:04.494920283 +0100 -@@ -430,10 +430,10 @@ FFIILLEESS +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. @@ -101,10 +107,11 @@ diff -up ./sendmail/sendmail.0.orig ./sendmail/sendmail.0 data base of alias names /etc/mail/sendmail.cf -diff -up ./sendmail/sendmail.8.orig ./sendmail/sendmail.8 ---- ./sendmail/sendmail.8.orig 2009-04-10 19:49:19.000000000 +0200 -+++ ./sendmail/sendmail.8 2010-02-01 10:50:04.993920355 +0100 -@@ -706,10 +706,10 @@ Thus, +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 diff --git a/sendmail-8.14.4-dynamic.patch b/sendmail-8.14.8-dynamic.patch similarity index 95% rename from sendmail-8.14.4-dynamic.patch rename to sendmail-8.14.8-dynamic.patch index 652a75c..723e694 100644 --- a/sendmail-8.14.4-dynamic.patch +++ b/sendmail-8.14.8-dynamic.patch @@ -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 ') -+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 ') +-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.12.7-hesiod.patch b/sendmail-8.14.8-hesiod.patch similarity index 50% rename from sendmail-8.12.7-hesiod.patch rename to sendmail-8.14.8-hesiod.patch index ad3de30..84a8bc2 100644 --- a/sendmail-8.12.7-hesiod.patch +++ b/sendmail-8.14.8-hesiod.patch @@ -1,17 +1,8 @@ ---- sendmail-8.12.7/sendmail/recipient.c -+++ sendmail-8.12.7/sendmail/recipient.c -@@ -1146,7 +1146,7 @@ - - *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)) ---- sendmail-8.12.7/libsm/mbdb.c -+++ sendmail-8.12.7/libsm/mbdb.c -@@ -315,7 +315,7 @@ +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; @@ -20,3 +11,16 @@ /* 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.13.1-localdomain.patch b/sendmail-8.14.8-localdomain.patch similarity index 65% rename from sendmail-8.13.1-localdomain.patch rename to sendmail-8.14.8-localdomain.patch index 1fd344b..c559dd3 100644 --- a/sendmail-8.13.1-localdomain.patch +++ b/sendmail-8.14.8-localdomain.patch @@ -1,6 +1,8 @@ ---- sendmail-8.13.1/cf/m4/proto.m4.localdomain 2007-01-22 16:35:19.000000000 +0100 -+++ sendmail-8.13.1/cf/m4/proto.m4 2007-01-22 16:36:47.000000000 +0100 -@@ -1840,6 +1840,8 @@ +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 > diff --git a/sendmail-8.14.8-manpage.patch b/sendmail-8.14.8-manpage.patch new file mode 100644 index 0000000..6de74b2 --- /dev/null +++ b/sendmail-8.14.8-manpage.patch @@ -0,0 +1,18 @@ +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.3-milterfdleaks.patch b/sendmail-8.14.8-milterfdleaks.patch similarity index 73% rename from sendmail-8.14.3-milterfdleaks.patch rename to sendmail-8.14.8-milterfdleaks.patch index 7154394..adcf31b 100644 --- a/sendmail-8.14.3-milterfdleaks.patch +++ b/sendmail-8.14.8-milterfdleaks.patch @@ -1,9 +1,40 @@ -Patches by Paul Howarth -https://bugzilla.redhat.com/show_bug.cgi?id=485426 - ---- sendmail-8.14.3/sendmail/milter.c 2008-09-19 15:51:03.000000000 +0100 -+++ sendmail-8.14.3/sendmail/milter.c 2008-09-19 16:37:57.000000000 +0100 -@@ -30,6 +30,9 @@ +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 @@ -13,7 +44,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=485426 static void milter_connect_timeout __P((int)); static void milter_error __P((struct milter *, ENVELOPE *)); static int milter_open __P((struct milter *, bool, ENVELOPE *)); -@@ -650,6 +653,7 @@ +@@ -655,6 +658,7 @@ milter_open(m, parseonly, e) SOCKADDR_LEN_T addrlen = 0; int addrno = 0; int save_errno; @@ -21,7 +52,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=485426 char *p; char *colon; char *at; -@@ -1186,6 +1190,21 @@ +@@ -1191,6 +1195,21 @@ milter_open(m, parseonly, e) (char *)&nodelay, sizeof(nodelay)); } # endif /* MILTER_NO_NAGLE && !defined(TCP_CORK) */ @@ -43,33 +74,3 @@ https://bugzilla.redhat.com/show_bug.cgi?id=485426 return sock; } ---- sendmail-8.14.3/libmilter/listener.c 2007-04-23 23:22:50.000000000 +0100 -+++ sendmail-8.14.3/libmilter/listener.c 2008-06-18 16:36:38.000000000 +0100 -@@ -728,6 +728,7 @@ - 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 */ -@@ -807,6 +808,19 @@ - (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-8.14.1-noversion.patch b/sendmail-8.14.8-noversion.patch similarity index 88% rename from sendmail-8.14.1-noversion.patch rename to sendmail-8.14.8-noversion.patch index c500898..b9a0a87 100644 --- a/sendmail-8.14.1-noversion.patch +++ b/sendmail-8.14.8-noversion.patch @@ -4,7 +4,7 @@ cpyr forth in the LICENSE file which can be found at the top level of cpyr the sendmail distribution. cpyr --cpyr $$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$ +-cpyr $$Id: helpfile,v 8.49 2013/11/22 20:51:55 ca Exp $$ -cpyr -smtp This is sendmail version $v +smtp This is sendmail diff --git a/sendmail-8.13.7-pid.patch b/sendmail-8.14.8-pid.patch similarity index 92% rename from sendmail-8.13.7-pid.patch rename to sendmail-8.14.8-pid.patch index 4e22c85..d324d5e 100644 --- a/sendmail-8.13.7-pid.patch +++ b/sendmail-8.14.8-pid.patch @@ -4,7 +4,7 @@ # divert(0)dnl --VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $') +-VERSIONID(`$Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +sinclude(`/usr/share/sendmail-cf/m4/cf.m4')dnl +VERSIONID(`linux setup')dnl define(`confCF_VERSION', `Submit')dnl diff --git a/sendmail-8.14.7-qos.patch b/sendmail-8.14.8-qos.patch similarity index 78% rename from sendmail-8.14.7-qos.patch rename to sendmail-8.14.8-qos.patch index 721d81e..2acda76 100644 --- a/sendmail-8.14.7-qos.patch +++ b/sendmail-8.14.8-qos.patch @@ -1,6 +1,21 @@ ---- sendmail-8.14.4/cf/m4/proto.m4.orig 2011-01-11 20:02:14.000000000 -0700 -+++ sendmail-8.14.4/cf/m4/proto.m4 2011-01-11 20:02:14.000000000 -0700 -@@ -251,6 +251,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_IN +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') @@ -10,38 +25,11 @@ # wait for alias file rebuild (default units: minutes) _OPTION(AliasWait, `confALIAS_WAIT', `5m') ---- sendmail-8.14.4/cf/cf/submit.mc.orig 2011-01-11 20:02:14.000000000 -0700 -+++ sendmail-8.14.4/cf/cf/submit.mc 2011-01-11 20:02:14.000000000 -0700 -@@ -22,6 +22,8 @@ define(`__OSTYPE__',`')dnl dirty hack to - 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 ---- sendmail-8.14.4/sendmail/sendmail.h.orig 2009-12-18 10:08:01.000000000 -0700 -+++ sendmail-8.14.4/sendmail/sendmail.h 2011-01-11 20:39:35.000000000 -0700 -@@ -2387,7 +2387,14 @@ EXTERN struct termescape TermEscape; /* - 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 ---- sendmail-8.14.4/sendmail/conf.c.orig 2011-01-11 20:02:14.000000000 -0700 -+++ sendmail-8.14.4/sendmail/conf.c 2011-01-11 20:24:29.000000000 -0700 -@@ -6298,6 +6298,10 @@ char *FFRCompileOptions[] = +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 */ @@ -52,9 +40,11 @@ #if _FFR_QUEUEDELAY /* Exponential queue delay; disabled in 8.13 since it isn't used. */ "_FFR_QUEUEDELAY", ---- sendmail-8.14.4/sendmail/daemon.c.orig 2009-12-17 18:12:40.000000000 -0700 -+++ sendmail-8.14.4/sendmail/daemon.c 2011-01-11 20:46:37.000000000 -0700 -@@ -104,6 +104,10 @@ static int NDaemons = 0; /* actual num +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; @@ -65,7 +55,7 @@ /* ** GETREQUESTS -- open mail IPC port and get requests. ** -@@ -1131,6 +1135,16 @@ opendaemonsocket(d, firsttime) +@@ -1132,6 +1136,16 @@ opendaemonsocket(d, firsttime) (void) setsockopt(d->d_socket, SOL_SOCKET, SO_KEEPALIVE, (char *)&on, sizeof(on)); @@ -82,7 +72,7 @@ #ifdef SO_RCVBUF if (d->d_tcprcvbufsize > 0) { -@@ -2565,6 +2579,16 @@ gothostent: +@@ -2568,6 +2582,16 @@ gothostent: return EX_TEMPFAIL; } @@ -99,9 +89,11 @@ #ifdef SO_SNDBUF if (ClientSettings[family].d_tcpsndbufsize > 0) { ---- 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 @@ +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 @@ -109,7 +101,7 @@ #endif /* NETINET || NETINET6 */ -@@ -2280,8 +2281,8 @@ +@@ -2280,8 +2281,8 @@ static struct optioninfo # define O_RCPTTHROTDELAY 0xe6 { "BadRcptThrottleDelay", O_RCPTTHROTDELAY, OI_SAFE }, #endif /* _FFR_RCPTTHROTDELAY */ @@ -120,7 +112,7 @@ { "InetQoS", O_INETQOS, OI_NONE }, #endif #if STARTTLS && _FFR_FIPSMODE -@@ -2389,6 +2390,77 @@ +@@ -2410,6 +2411,77 @@ static struct ssl_options }; #endif /* STARTTLS && _FFR_TLS_1 */ @@ -198,7 +190,7 @@ # define CANONIFY(val) -@@ -4035,6 +4107,33 @@ +@@ -4056,6 +4128,33 @@ setoption(opt, val, safe, sticky, e) break; #endif /* _FFR_REJECT_NUL_BYTE */ @@ -217,8 +209,8 @@ + + /* + ** we could allow writing it as a hex value, but -+ ** we don't at this time. -+ **/ ++ ** 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", @@ -232,3 +224,23 @@ 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.4-sasl2-in-etc.patch b/sendmail-8.14.8-sasl2-in-etc.patch similarity index 74% rename from sendmail-8.14.4-sasl2-in-etc.patch rename to sendmail-8.14.8-sasl2-in-etc.patch index c7f1a6f..fe8f353 100644 --- a/sendmail-8.14.4-sasl2-in-etc.patch +++ b/sendmail-8.14.8-sasl2-in-etc.patch @@ -1,6 +1,8 @@ ---- sendmail-8.14.4/sendmail/usersmtp.c 2009-06-17 18:26:51.000000000 +0100 -+++ sendmail-8.14.4/sendmail/usersmtp.c 2010-06-11 13:13:52.150312505 +0100 -@@ -1323,9 +1323,7 @@ +diff --git a/sendmail/usersmtp.c b/sendmail/usersmtp.c +index c217ffa..e4dadd3 100644 +--- a/sendmail/usersmtp.c ++++ b/sendmail/usersmtp.c +@@ -1331,9 +1331,7 @@ safesaslfile(context, file) { long sff; int r; @@ -10,7 +12,7 @@ char *p; if (file == NULL || *file == '\0') -@@ -1361,9 +1359,16 @@ +@@ -1369,9 +1367,16 @@ safesaslfile(context, file) #endif /* SASL <= 10515 */ p = (char *) file; diff --git a/sendmail-8.14.4-switchfile.patch b/sendmail-8.14.8-switchfile.patch similarity index 55% rename from sendmail-8.14.4-switchfile.patch rename to sendmail-8.14.8-switchfile.patch index 2be8c2b..c6f245b 100644 --- a/sendmail-8.14.4-switchfile.patch +++ b/sendmail-8.14.8-switchfile.patch @@ -1,6 +1,8 @@ ---- sendmail-8.14.4/sendmail/conf.c 2009-12-18 18:25:12.000000000 +0100 -+++ sendmail-8.14.4/sendmail/conf.c.switchfile 2010-01-03 23:08:27.000000000 +0100 -@@ -972,7 +972,7 @@ +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 diff --git a/sendmail.spec b/sendmail.spec index acb8df1..ba1f584 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -22,8 +22,8 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail -Version: 8.14.7 -Release: 5%{?dist} +Version: 8.14.8 +Release: 1%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -65,38 +65,38 @@ Patch3: sendmail-8.14.4-makemapman.patch # fix smrsh paths Patch4: sendmail-8.14.3-smrsh_paths.patch # fix sm-client.pid path -Patch7: sendmail-8.13.7-pid.patch +Patch7: sendmail-8.14.8-pid.patch # do not reject all numeric login names if hesiod support is compiled in, #80060 -Patch9: sendmail-8.12.7-hesiod.patch +Patch9: sendmail-8.14.8-hesiod.patch # fix sendmail man page -Patch10: sendmail-8.12.7-manpage.patch +Patch10: sendmail-8.14.8-manpage.patch # compile with -fpie -Patch11: sendmail-8.14.4-dynamic.patch +Patch11: sendmail-8.14.8-dynamic.patch # fix cyrus path Patch12: sendmail-8.13.0-cyrus.patch # fix aliases.db path -Patch13: sendmail-8.14.4-aliases_dir.patch +Patch13: sendmail-8.14.8-aliases_dir.patch # fix vacation Makefile Patch14: sendmail-8.13.7-vacation.patch # remove version information from sendmail helpfile -Patch15: sendmail-8.14.1-noversion.patch +Patch15: sendmail-8.14.8-noversion.patch # do not accept localhost.localdomain as valid address from SMTP -Patch16: sendmail-8.13.1-localdomain.patch +Patch16: sendmail-8.14.8-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.4-switchfile.patch +Patch18: sendmail-8.14.8-switchfile.patch # fix milter file descriptors leaks, #485426 -Patch20: sendmail-8.14.3-milterfdleaks.patch +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 Patch22: sendmail-8.14.4-libdb5.patch # silence warning about missing sasl2 config in /usr/lib*, now in /etc/sasl2 -Patch23: sendmail-8.14.4-sasl2-in-etc.patch +Patch23: sendmail-8.14.8-sasl2-in-etc.patch # add QoS support, patch from Philip Prindeville # upstream reserved option ID 0xe7 for testing of this new feature, #576643 -Patch25: sendmail-8.14.7-qos.patch +Patch25: sendmail-8.14.8-qos.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel BuildRequires: libdb-devel @@ -706,6 +706,11 @@ fi %{_initrddir}/sendmail %changelog +* Tue Feb 11 2014 Jaroslav Škarvada - 8.14.8-1 +- New version + Resolves: rhbz#1059665 +- Updated/defuzzified patches + * Tue Aug 6 2013 Jaroslav Škarvada - 8.14.7-5 - Used unversioned doc directory Resolves: rhbz#994090 diff --git a/sources b/sources index c6fc78b..6fa65b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -348eedfab0ed00931f2df94e78f22c43 sendmail.8.14.7.tar.gz +73bfc621c75dbdd3d719e54685d92577 sendmail.8.14.8.tar.gz