diff --git a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff deleted file mode 100644 index 0af5b71..0000000 --- a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 337e3505b0e6cd4309db6bf6062b33fa56e06cf8 Mon Sep 17 00:00:00 2001 -From: Tom Kistner -Date: Sat, 30 Apr 2011 13:20:17 +0100 -Subject: [PATCH] Bugzilla #1106: Don't pass DKIM compound log line as format string - ---- - src/src/dkim.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/src/dkim.c b/src/src/dkim.c -index e25ff8c..2318cc3 100644 ---- a/src/src/dkim.c -+++ b/src/src/dkim.c -@@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) { - /* Log a line for each signature */ - uschar *logmsg = string_append(NULL, &size, &ptr, 5, - -- string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ", -+ string_sprintf( "d=%s s=%s c=%s/%s a=%s ", - sig->domain, - sig->selector, - (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed", -@@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) { - } - - logmsg[ptr] = '\0'; -- log_write(0, LOG_MAIN, (char *)logmsg); -+ log_write(0, LOG_MAIN, "DKIM: %s", logmsg); - - /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */ - dkim_signers = string_append(dkim_signers, --- -1.6.3.2 - diff --git a/aa097c4c00f62487128d74f65c521f9e877b184f.diff b/aa097c4c00f62487128d74f65c521f9e877b184f.diff deleted file mode 100644 index 13634b0..0000000 --- a/aa097c4c00f62487128d74f65c521f9e877b184f.diff +++ /dev/null @@ -1,45 +0,0 @@ -commit aa097c4c00f62487128d74f65c521f9e877b184f -Author: Nigel Metheringham -Date: Wed Jan 26 11:04:32 2011 +0000 - - Workround compile error with old PCRE versions - - Fixes bug #1073 - -Index: exim-4.74/doc/ChangeLog -=================================================================== ---- exim-4.74.orig/doc/ChangeLog -+++ exim-4.74/doc/ChangeLog -@@ -3,6 +3,13 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v - Change log file for Exim from version 4.21 - ------------------------------------------- - -+Exim version 4.75 -+----------------- -+ -+NM/01 Workround for PCRE version dependancy in version reporting -+ Bugzilla 1073 -+ -+ - Exim version 4.74 - ----------------- - -Index: exim-4.74/src/exim.c -=================================================================== ---- exim-4.74.orig/src/exim.c -+++ exim-4.74/src/exim.c -@@ -931,8 +931,13 @@ DEBUG(D_any) do { - " Runtime: %s\n", - PCRE_MAJOR, PCRE_MINOR, - /* PRE_PRERELEASE is either defined and empty or a string. -- * This should work: */ -+ * unless its an ancient version of PCRE in which case it -+ * is not defined */ -+#ifdef PCRE_PRERELEASE - PCRE_PRERELEASE "", -+#else -+ "", -+#endif - pcre_version()); - - init_lookup_list(); diff --git a/exim-4.74.tar.bz2 b/exim-4.74.tar.bz2 deleted file mode 100644 index d8cc7ce..0000000 --- a/exim-4.74.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e55b51c87e0be920f7f5aee830261566a4def8820f318d14a822fe2ae2ff8e40 -size 1588636 diff --git a/exim-4.75.tar.bz2 b/exim-4.75.tar.bz2 new file mode 100644 index 0000000..fe69675 --- /dev/null +++ b/exim-4.75.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6ef216dcf5b44b6c43f00a3ccb16c4b22e1cb2a414e324df22e991fd490ded +size 1600867 diff --git a/exim.changes b/exim.changes index 8c309d5..fc0148c 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Fri May 6 19:14:37 UTC 2011 - lars@samba.org + +- update to 4.75 + - Workround for PCRE version dependency in version reporting + Bugzilla 1073 + - Permit LOOKUP_foo enabling on the make command-line. + Also via indented variable definition in the Makefile. + - Restore caching of spamd results with expanded spamd_address. + - Build issue: lookups-Makefile now exports LC_ALL=C + Improves build reliability. + - Fix wide character breakage in the rfc2047 coding; Fixes bug 1064. + - Allow underscore in dnslist lookups; Fixes bug 1026. + - Bugzilla 230: Support TLS-enabled LDAP (in addition to ldaps). + - Fixed exiqgrep to cope with mailq missing size issue + Fixes bug 943. + - Bugzilla 1083: when lookup expansion defers, escape the output which + is logged, to avoid truncation. + - Bugzilla 1042: implement freeze_signal on pipe transports. + - Bugzilla 1061: restrict error messages sent over SMTP to not reveal + SQL string expansion failure details. + - Bugzilla 486: implement %M datestamping in log filenames. + - New lookups functionality failed to compile on old gcc which rejects + extern declarations in function scope. + - Use sig_atomic_t for flags set from signal handlers. + Check getgroups() return and improve debugging. + Fixed developed for diagnosis in bug 927 (which turned out to be + a kernel bug). + - Bugzilla 1055: Update $message_linecount for maildir_tag. + - Bugzilla 1056: Improved spamd server selection. + - Bugzilla 1086: Deal with maildir quota file races. + - Bugzilla 1019: DKIM multiple signature generation fix. + - Fix to spam.c to accommodate older gcc versions which dislike + variable declaration deep within a block. + - Make DISABLE_DKIM build knob functional. + - Bugzilla 968: child_open_uid: restore default SIGPIPE handler + ------------------------------------------------------------------- Fri May 6 18:18:00 UTC 2011 - lars@samba.org diff --git a/exim.spec b/exim.spec index a44038a..61cfb23 100644 --- a/exim.spec +++ b/exim.spec @@ -40,8 +40,8 @@ Provides: smtp_daemon Requires: logrotate PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils %endif -Version: 4.74 -Release: 8 +Version: 4.75 +Release: 0 %if %{?build_with_mysql:1}0 BuildRequires: mysql-devel Provides: exim = %version @@ -62,8 +62,6 @@ Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exi Source30: eximstats-html-update.py Source31: eximstats.conf Patch: exim-4.12-tail.patch -Patch1: aa097c4c00f62487128d74f65c521f9e877b184f.diff -Patch2: 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon @@ -130,8 +128,6 @@ Authors: %prep %setup -q -n exim-%{version} %patch -%patch1 -p1 -%patch2 -p2 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930 fPIE="-fPIE"