rpms/exim/FC-4 exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 exim.spec, 1.11, 1.12 sources, 1.7, 1.8 exim-4.60-mon-overflow.patch, 1.1, NONE

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/exim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
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 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2005 10:13:18 -0000	1.6
+++ .cvsignore	4 Apr 2006 20:27:21 -0000	1.7
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.54.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- exim.spec	23 Mar 2006 12:26:42 -0000	1.11
+++ exim.spec	4 Apr 2006 20:27:21 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -79,7 +79,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -288,6 +288,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2006 11:57:24 -0000	1.7
+++ sources	4 Apr 2006 20:27:21 -0000	1.8
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---