diff --git a/.gitignore b/.gitignore index acc43ec..d010e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -sendmail.8.14.4.tar.gz -/sendmail.8.14.5.tar.gz +/sendmail.8.14.?.tar.gz diff --git a/sendmail-8.14.5-auth2.patch b/sendmail-8.14.5-auth2.patch deleted file mode 100644 index 1116442..0000000 --- a/sendmail-8.14.5-auth2.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sendmail-8.14.5/sendmail/sendmail.h- Tue May 24 16:24:39 2011 -+++ sendmail-8.14.5/sendmail/sendmail.h Tue May 24 16:25:29 2011 -@@ -721,9 +721,9 @@ - #if STARTTLS - #define MCIF_TLS 0x00100000 /* STARTTLS supported */ - #define MCIF_TLSACT 0x00200000 /* STARTTLS active */ --#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS) - #else /* STARTTLS */ --#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT) -+#define MCIF_TLS 0 -+#define MCIF_TLSACT 0 - #endif /* STARTTLS */ - #define MCIF_DLVR_BY 0x00400000 /* DELIVERBY */ - #if _FFR_IGNORE_EXT_ON_HELO -@@ -732,6 +732,8 @@ - #define MCIF_INLONGLINE 0x01000000 /* in the middle of a long line */ - #define MCIF_AUTH2 0x02000000 /* got 2 AUTH lines */ - #define MCIF_ONLY_EHLO 0x10000000 /* use only EHLO in smtpinit */ -+ -+#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2) - - /* states */ - #define MCIS_CLOSED 0 /* no traffic on this connection */ diff --git a/sendmail.spec b/sendmail.spec index b5b81b3..0a59039 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -22,8 +22,8 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail -Version: 8.14.5 -Release: 15%{?dist} +Version: 8.14.6 +Release: 1%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -97,8 +97,6 @@ Patch23: sendmail-8.14.4-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.5-qos.patch -# fix SMTP AUTH over TLS in case of two AUTH lines, #716628 -Patch26: sendmail-8.14.5-auth2.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel BuildRequires: libdb-devel @@ -220,7 +218,6 @@ cp devtools/M4/UNIX/{,shared}library.m4 %patch22 -p1 -b .libdb5 %patch23 -p1 -b .sasl2-in-etc %patch25 -p1 -b .qos -%patch26 -p1 -b .auth2 for f in RELEASE_NOTES contrib/etrn.0; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -719,6 +716,9 @@ fi %{_initrddir}/sendmail %changelog +* Mon Dec 24 2012 Robert Scheck - 8.14.6-1 +- Upgrade to 8.14.6 + * Sat Jul 21 2012 Fedora Release Engineering - 8.14.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index d3c25b6..5df96d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02ccfc331cc81ed00ec8bb5ecfc69018 sendmail.8.14.5.tar.gz +9eeed3d1baecbf4e17d829d2ec005553 sendmail.8.14.6.tar.gz