- up to 4.76; fixes CVE-2011-1764 and some other minor bugs

Changed files:
    exim-CVE-2011-1764.patch -> 1.2
    exim.spec -> 1.327
    exim_463_dsn_1_3.patch -> 1.4

diff --git a/exim-CVE-2011-1764.patch b/exim-CVE-2011-1764.patch
deleted file mode 100644 (file)
index 2a2afd2..0000000
--- a/exim-CVE-2011-1764.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur exim-4.75-orig/src/dkim.c exim-4.75/src/dkim.c
---- exim-4.75-orig/src/dkim.c  2011-03-22 09:00:51.000000000 +0100
-+++ exim-4.75/src/dkim.c       2011-05-06 14:09:06.715883520 +0200
-@@ -108,7 +108,7 @@
-     /* 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 @@
-     }
- 
-     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,
-Tylko w exim-4.75/src: dkim.c~

diff --git a/exim.spec b/exim.spec
index dd085bddc894897ff83922cec02da6293306a206..11601efda1afcad1dae06ab66fc81f74492d247d 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -13,15 +13,15 @@ Summary:    University of Cambridge Mail Transfer Agent
 Summary(pl.UTF-8):     Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
-Version:       4.75
-Release:       2
+Version:       4.76
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 427fb74bbd2afbea759e6da38f25af17
+# Source0-md5: 58e784b33c7a2ab335ec6400346d6362
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 51744a0fc94ef403cb049dfc9f059ada
+# Source1-md5: 28c005871f82b8a52ef9dc9fb480ec84
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -52,7 +52,6 @@ Patch7:               %{name}_463_dsn_1_3.patch
 Patch8:                %{name}-spam-timeout.patch
 Patch9:                %{name}-dkim.patch
 Patch10:       %{name}-force-sigalrm.patch
-Patch11:       %{name}-CVE-2011-1764.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
 BuildRequires: db-devel
@@ -165,7 +164,6 @@ Pliki nagłówkowe dla Exima.
 %patch8 -p1
 #%patch9 -p0
 %patch10 -p1
-%patch11 -p1
 
 install %{SOURCE13} doc/FAQ.txt.bz2
 install %{SOURCE14} doc/config.samples.tar.bz2

diff --git a/exim_463_dsn_1_3.patch b/exim_463_dsn_1_3.patch
index 67a6e15c9ff9d9d50dd55ab23ae1d7ce13d70b92..f765da519b05bfb473506789076aef470f3bea43 100644 (file)
--- a/exim_463_dsn_1_3.patch
+++ b/exim_463_dsn_1_3.patch
@@ -523,9 +523,9 @@ diff -urN exim-4.64.org/src/readconf.c exim-4.64/src/readconf.c
 --- exim-4.64.org/src/readconf.c       2006-12-20 10:46:04.000000000 +0100
 +++ exim-4.64/src/readconf.c   2006-12-21 16:43:20.820509000 +0100
 @@ -203,6 +203,9 @@
-   { "dns_ipv4_lookup",          opt_stringptr,   &dns_ipv4_lookup },
    { "dns_retrans",              opt_time,        &dns_retrans },
    { "dns_retry",                opt_int,         &dns_retry },
+   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },
 +#ifdef SUPPORT_DSN
 +  { "dsn",                      opt_bool,        &dsn },
 +#endif