diff --git a/.gitignore b/.gitignore index 7580918..acc43ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ sendmail.8.14.4.tar.gz +/sendmail.8.14.5.tar.gz diff --git a/sendmail-8.14.4-m4-ldap-routing.patch b/sendmail-8.14.4-m4-ldap-routing.patch deleted file mode 100644 index 70d425d..0000000 --- a/sendmail-8.14.4-m4-ldap-routing.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- sendmail-bak/cf/feature/ldap_routing.m4 2009-06-26 23:11:08.000000000 +0200 -+++ sendmail/cf/feature/ldap_routing.m4 2010-01-05 01:57:27.000000000 +0100 -@@ -35,40 +35,12 @@ - _ARG6_, `tempfail', `define(`_LDAP_ROUTE_MAPTEMP_', `_TEMPFAIL_')', - _ARG6_, `queue', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')') - --define(`_ATMPF_', `')dnl --dnl check whether arg contains -T`'_ATMPF_ --dnl unless it is a sequence map or just LDAP --dnl note: this does not work if ARG1 begins with space(s), however, as --dnl we issue a warning, hopefully the user will fix it... --ifelse(defn(`_ARG1_'), `', `', -- defn(`_ARG1_'), `LDAP', `', -- `ifelse(index(_ARG1_, `sequence '), `0', `', -- `ifelse(index(_ARG1_, _ATMPF_), `-1', -- `errprint(`*** WARNING: missing -T'_ATMPF_` in first argument of FEATURE(`ldap_routing') --') -- define(`_ABP_', index(_ARG1_, ` ')) -- define(`_NARG1_', `substr(_ARG1_, 0, _ABP_) -T'_ATMPF_` substr(_ARG1_, _ABP_)') -- ') -- ') -- ') --ifelse(defn(`_ARG2_'), `', `', -- defn(`_ARG2_'), `LDAP', `', -- `ifelse(index(_ARG2_, `sequence '), `0', `', -- `ifelse(index(_ARG2_, _ATMPF_), `-1', -- `errprint(`*** WARNING: missing -T'_ATMPF_` in second argument of FEATURE(`ldap_routing') --') -- define(`_ABP_', index(_ARG2_, ` ')) -- define(`_NARG2_', `substr(_ARG2_, 0, _ABP_) -T'_ATMPF_` substr(_ARG2_, _ABP_)') -- ') -- ') -- ') -- - LOCAL_CONFIG - # LDAP routing maps - Kldapmh ifelse(len(X`'_ARG1_), `1', - `ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', -- defn(`_NARG1_'), `', `_ARG1_', `_NARG1_') -+ `_ARG1_') - - Kldapmra ifelse(len(X`'_ARG2_), `1', - `ldap -1 -T -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', -- defn(`_NARG2_'), `', `_ARG2_', `_NARG2_') -+ `_ARG2_') diff --git a/sendmail-8.14.4-man-i-option-fix.patch b/sendmail-8.14.4-man-i-option-fix.patch deleted file mode 100644 index ecaceb2..0000000 --- a/sendmail-8.14.4-man-i-option-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- sendmail-8.14.4/sendmail/sendmail.8.old 2011-03-03 11:13:10.000000000 +0100 -+++ sendmail-8.14.4/sendmail/sendmail.8 2011-03-03 11:18:22.938108268 +0100 -@@ -224,8 +224,9 @@ - ``Received:'' lines in the message are counted. - .TP - .B \-i --Ignore dots alone on lines by themselves in incoming messages. --This should be set if you are reading data from a file. -+Do not strip a leading dot from lines in incoming messages, and -+do not treat a dot on a line by itself as the end of an incoming -+message. This should be set if you are reading data from a file. - .TP - .BI "\-L " tag - Set the identifier used in syslog messages to the supplied diff --git a/sendmail-8.14.4-milter-fix-negativeid.patch b/sendmail-8.14.4-milter-fix-negativeid.patch deleted file mode 100644 index de6ee2d..0000000 --- a/sendmail-8.14.4-milter-fix-negativeid.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- sendmail-8.14.4/libmilter/engine.c.old 2009-11-06 01:57:07.000000000 +0100 -+++ sendmail-8.14.4/libmilter/engine.c 2011-02-22 18:40:52.405037566 +0100 -@@ -284,7 +284,7 @@ - if (mi_stop() == MILTER_ABRT) - { - if (ctx->ctx_dbg > 3) -- sm_dprintf("[%ld] milter_abort\n", -+ sm_dprintf("[%lu] milter_abort\n", - (long) ctx->ctx_id); - ret = MI_FAILURE; - break; -@@ -315,7 +315,7 @@ - cmd < SMFIC_VALIDCMD) - { - if (ctx->ctx_dbg > 5) -- sm_dprintf("[%ld] mi_engine: mi_rd_cmd error (%x)\n", -+ sm_dprintf("[%lu] mi_engine: mi_rd_cmd error (%x)\n", - (long) ctx->ctx_id, (int) cmd); - - /* -@@ -328,7 +328,7 @@ - break; - } - if (ctx->ctx_dbg > 4) -- sm_dprintf("[%ld] got cmd '%c' len %d\n", -+ sm_dprintf("[%lu] got cmd '%c' len %d\n", - (long) ctx->ctx_id, cmd, (int) len); - for (i = 0; i < ncmds; i++) - { -@@ -339,7 +339,7 @@ - { - /* unknown command */ - if (ctx->ctx_dbg > 1) -- sm_dprintf("[%ld] cmd '%c' unknown\n", -+ sm_dprintf("[%lu] cmd '%c' unknown\n", - (long) ctx->ctx_id, cmd); - ret = MI_FAILURE; - break; -@@ -348,7 +348,7 @@ - { - /* stop for now */ - if (ctx->ctx_dbg > 1) -- sm_dprintf("[%ld] cmd '%c' not impl\n", -+ sm_dprintf("[%lu] cmd '%c' not impl\n", - (long) ctx->ctx_id, cmd); - ret = MI_FAILURE; - break; -@@ -357,14 +357,14 @@ - /* is new state ok? */ - newstate = cmds[i].cm_next; - if (ctx->ctx_dbg > 5) -- sm_dprintf("[%ld] cur %x new %x nextmask %x\n", -+ sm_dprintf("[%lu] cur %x new %x nextmask %x\n", - (long) ctx->ctx_id, - curstate, newstate, next_states[curstate]); - - if (newstate != ST_NONE && !trans_ok(curstate, newstate)) - { - if (ctx->ctx_dbg > 1) -- sm_dprintf("[%ld] abort: cur %d (%x) new %d (%x) next %x\n", -+ sm_dprintf("[%lu] abort: cur %d (%x) new %d (%x) next %x\n", - (long) ctx->ctx_id, - curstate, MI_MASK(curstate), - newstate, MI_MASK(newstate), -@@ -434,7 +434,7 @@ - else if (r == _SMFIS_ABORT) - { - if (ctx->ctx_dbg > 5) -- sm_dprintf("[%ld] function returned abort\n", -+ sm_dprintf("[%lu] function returned abort\n", - (long) ctx->ctx_id); - ret = MI_FAILURE; - break; -@@ -1122,7 +1122,7 @@ - fix_stm(ctx); - - if (ctx->ctx_dbg > 3) -- sm_dprintf("[%ld] milter_negotiate:" -+ sm_dprintf("[%lu] milter_negotiate:" - " mta_actions=0x%lx, mta_flags=0x%lx" - " actions=0x%lx, flags=0x%lx\n" - , (long) ctx->ctx_id -@@ -1131,7 +1131,7 @@ - - #if _FFR_MILTER_CHECK - if (ctx->ctx_dbg > 3) -- sm_dprintf("[%ld] milter_negotiate:" -+ sm_dprintf("[%lu] milter_negotiate:" - " testmode=%d, pflags2mta=%X, internal_pflags=%X\n" - , (long) ctx->ctx_id, testmode - , ctx->ctx_pflags2mta, internal_pflags); diff --git a/sendmail-8.14.4-qos.patch b/sendmail-8.14.5-qos.patch similarity index 96% rename from sendmail-8.14.4-qos.patch rename to sendmail-8.14.5-qos.patch index 4b41a27..0d8e856 100644 --- a/sendmail-8.14.4-qos.patch +++ b/sendmail-8.14.5-qos.patch @@ -38,7 +38,7 @@ +#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[] = @@ -108,18 +108,18 @@ +# include #endif /* NETINET || NETINET6 */ - #define SECONDS -@@ -2271,6 +2271,10 @@ static struct optioninfo + +@@ -2271,8 +2271,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 + { "InetQoS", O_INETQOS, OI_NONE }, + #endif - { NULL, '\0', OI_NONE } - }; @@ -2351,6 +2355,77 @@ static struct ssl_options }; #endif /* STARTTLS && _FFR_TLS_1 */ diff --git a/sendmail.spec b/sendmail.spec index 1652cf3..3a10942 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -13,8 +13,8 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail -Version: 8.14.4 -Release: 21%{?dist} +Version: 8.14.5 +Release: 1%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -81,15 +81,9 @@ Patch21: sendmail-8.14.3-ipv6-bad-helo.patch 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 -# fix m4 ldap routing macro, #650366 -Patch24: sendmail-8.14.4-m4-ldap-routing.patch # add QoS support, patch from Philip Prindeville # upstream reserved option ID 0xe7 for testing of this new feature, #576643 -Patch25: sendmail-8.14.4-qos.patch -# fix negative ctx_id in milter debug output (#577558), accepted upstream -Patch26: sendmail-8.14.4-milter-fix-negativeid.patch -# fix incomplete description of the -i option in man page (#676824) -Patch27: sendmail-8.14.4-man-i-option-fix.patch +Patch25: sendmail-8.14.5-qos.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel BuildRequires: libdb-devel @@ -198,10 +192,7 @@ cp devtools/M4/UNIX/{,shared}library.m4 %patch21 -p1 -b .ipv6-bad-helo %patch22 -p1 -b .libdb5 %patch23 -p1 -b .sasl2-in-etc -%patch24 -p1 -b .m4-ldap-routing %patch25 -p1 -b .qos -%patch26 -p1 -b .milter-fix-negativeid -%patch27 -p1 -b .man-i-option-fix for f in RELEASE_NOTES contrib/etrn.0; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -654,6 +645,11 @@ exit 0 %changelog +* Tue May 17 2011 Jaroslav Škarvada - 8.14.5-1 +- New version 8.14.5 +- Removed m4-ldap-routing, milter-fix-negativeid, man-i-option-fix + patches (upstreamed) + * Thu Mar 03 2011 Jaroslav Škarvada - 8.14.4-21 - fix negative ctx_id in milter debug output (#577558) - fix incomplete description of the -i option in man page (#676824) diff --git a/sources b/sources index 90121f8..d3c25b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b23d5000c8e7bfe82ec1a27f2f5fdc5 sendmail.8.14.4.tar.gz +02ccfc331cc81ed00ec8bb5ecfc69018 sendmail.8.14.5.tar.gz