Drop patches included in 4.76.

svn path=/exim/trunk/; revision=2614

5 files changed, 3 insertions, 111 deletions

diff --git a/debian/changelog b/debian/changelog
index f7bd82e..77b6da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 exim4 (4.76~RC1-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream version.
+  * Drop superfluous patches. 80_ldap_require_cert-work.diff
+    81_negatebool.diff 82_dkimpercent.diff
 
  -- Andreas Metzler <ametzler@debian.org>  Fri, 06 May 2011 20:27:56 +0200
 
diff --git a/debian/patches/80_ldap_require_cert-work.diff b/debian/patches/80_ldap_require_cert-work.diff
deleted file mode 100644
index 4738db1..0000000
--- a/debian/patches/80_ldap_require_cert-work.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-From 109066729a54f6ba5c4e8bc174133da33242e930 Mon Sep 17 00:00:00 2001
-From: Phil Pennock <pdp@exim.org>
-Date: Tue, 22 Mar 2011 06:43:34 -0400
-Subject: [PATCH] Make ldap_require_cert work (not segfault).
-
-The clang complaint, which also triggered a gcc complaint, was
-legitimate. My first test, which suggested no problem, was flawed.
-
-This:
-  ldap_start_tls
-  ldap_require_cert = demand
-would cause a segfault on LDAP lookup.
-
-fixes bug 230
----
- doc/doc-txt/ChangeLog  |    6 ++++++
- src/src/lookups/ldap.c |    2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/doc/ChangeLog b/doc/ChangeLog
-index 853f3a5..94952af 100644
---- a/doc/ChangeLog
-+++ b/doc/ChangeLog
-@@ -3,6 +3,12 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $
- Change log file for Exim from version 4.21
- -------------------------------------------
- 
-+Exim version 4.76
-+-----------------
-+
-+PP/01 The new ldap_require_cert option would segfault if used.  Fixed.
-+
-+
- Exim version 4.75
- -----------------
- 
-diff --git a/src/lookups/ldap.c b/src/lookups/ldap.c
-index ddf803e..06b7494 100644
---- a/src/lookups/ldap.c
-+++ b/src/lookups/ldap.c
-@@ -481,7 +481,7 @@ if (lcp == NULL)
-       {
-       cert_option = LDAP_OPT_X_TLS_TRY;
-       }
--    ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option);
-+    ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
-     }
-   #endif
- 
--- 
-1.7.2.5
-
diff --git a/debian/patches/81_negatebool.diff b/debian/patches/81_negatebool.diff
deleted file mode 100644
index 9b77439..0000000
--- a/debian/patches/81_negatebool.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-From 5ee6f336ce27e7887fdc07ef45e0f3052d3893b0 Mon Sep 17 00:00:00 2001
-From: Phil Pennock <pdp@exim.org>
-Date: Tue, 26 Apr 2011 15:02:09 -0400
-Subject: [PATCH 1/2] Cond !bool{}/!bool_lax{} did not negate. Fixed.
-
-Fixes bug: 1104
- -----------------
-diff --git a/src/expand.c b/src/expand.c
-index fece8c1..2e59c40 100644
---- a/src/expand.c
-+++ b/src/expand.c
-@@ -2558,7 +2558,7 @@ switch(cond_type)
-        "value \"%s\"", t);
-       return NULL;
-       }
--    if (yield != NULL) *yield = (boolvalue != 0);
-+    if (yield != NULL) *yield = (boolvalue == testfor);
-     return s;
-     }
- 
diff --git a/debian/patches/82_dkimpercent.diff b/debian/patches/82_dkimpercent.diff
deleted file mode 100644
index 59e88ac..0000000
--- a/debian/patches/82_dkimpercent.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From 337e3505b0e6cd4309db6bf6062b33fa56e06cf8 Mon Sep 17 00:00:00 2001
-From: Tom Kistner <tom@tahini.csx.cam.ac.uk>
-Date: Sat, 30 Apr 2011 13:20:17 +0100
-Subject: [PATCH 2/2] Bugzilla #1106: Don't pass DKIM compound log line as format string
-Bug-Debian: http://bugs.debian.org/624670
-
----
- src/dkim.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dkim.c b/src/dkim.c
-index e25ff8c..2318cc3 100644
---- a/src/dkim.c
-+++ b/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.7.2.5
-
diff --git a/debian/patches/series b/debian/patches/series
index 16487f4..cfc6970 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,3 @@
 66_enlarge-dh-parameters-size.dpatch
 67_unnecessaryCopt.diff
 70_remove_exim-users_references.dpatch
-80_ldap_require_cert-work.diff
-81_negatebool.diff
-82_dkimpercent.diff