From f0c9110ec82b6a5e267f0f5e2c564c3140ad9f3c Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Tue, 2 May 2006 10:53:54 +0000
Subject: [PATCH] update to 4.62

---
 .cvsignore                 |  2 +-
 exim-4.61-c-before-d.patch | 34 ----------------------------------
 exim.spec                  |  9 +++++----
 sources                    |  2 +-
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 exim-4.61-c-before-d.patch

diff --git a/.cvsignore b/.cvsignore
index 36869af..e97e64e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.61.tar.bz2
+exim-4.62.tar.bz2
diff --git a/exim-4.61-c-before-d.patch b/exim-4.61-c-before-d.patch
deleted file mode 100644
index fb12f4b..0000000
--- a/exim-4.61-c-before-d.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: src/acl.c
-===================================================================
-RCS file: /home/cvs/exim/exim-src/src/acl.c,v
-retrieving revision 1.57
-retrieving revision 1.58
-diff -u -p -r1.57 -r1.58
---- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
-+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
-@@ -1,4 +1,4 @@
--/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
-+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
- 
- /*************************************************
- *     Exim - an Internet mail transport agent    *
-@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
- checking functions. */
- 
- static uschar cond_expand_at_top[] = {
--  TRUE,    /* add_header */
-   TRUE,    /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
-@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
- /* Flags to identify the modifiers */
- 
- static uschar cond_modifiers[] = {
--  TRUE,    /* add_header */
-   FALSE,   /* acl */
-+  TRUE,    /* add_header */
-   FALSE,   /* authenticated */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-   TRUE,    /* bmi_optin */
diff --git a/exim.spec b/exim.spec
index c5a7a7e..d707d61 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.61
-Release: 2%{?dist}
+Version: 4.62
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,6 @@ Patch12: exim-4.33-cyrus.patch
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.61-c-before-d.patch
 Patch17: exim-4.61-ldap-deprecated.patch
 
 Requires: /etc/aliases
@@ -81,7 +80,6 @@ cp exim_monitor/EDITME Local/eximon.conf
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p0
 %patch17 -p1 -b .ldap
 
 %build
@@ -291,6 +289,9 @@ fi
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue May  2 2006 David Woodhouse <dwmw2@redhat.com> 4.62-1
+- Update to 4.62
+
 * Fri Apr  7 2006 David Woodhouse <dwmw2@redhat.com> 4.61-2
 - Define LDAP_DEPRECATED to ensure ldap functions are all declared.
 
diff --git a/sources b/sources
index 7a3ac9a..6c5d80f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2
+a8efc92427192fd3b7b5e71decc8cc31  exim-4.62.tar.bz2