rpms/exim/devel exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.15, 1.16

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8302

Modified Files:
	exim.spec 
Added Files:
	exim-4.60-mon-overflow.patch 
Log Message:
fix #186303

exim-4.60-mon-overflow.patch:

--- NEW FILE exim-4.60-mon-overflow.patch ---
--- exim-4.60/exim_monitor/em_queue.c~	2005-11-28 10:57:32.000000000 +0000
+++ exim-4.60/exim_monitor/em_queue.c	2006-03-23 12:23:20.000000000 +0000
@@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++)
       uschar basename[SPOOL_NAME_LENGTH];
       stripchart_total[0]++;
       if (!eximon_initialized) { printf("."); fflush(stdout); }
-      Ustrcpy(basename, name);
+      Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2);
       basename[SPOOL_NAME_LENGTH - 2] = 0;
       if (full) find_queue(basename, queue_add, subdirchar);
       }


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- exim.spec	21 Mar 2006 10:29:09 -0000	1.15
+++ exim.spec	23 Mar 2006 12:28:38 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.60
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,6 +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
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -79,6 +80,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
+%patch16 -p1
 
 %build
 %ifnarch s390 s390x
@@ -287,6 +289,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
+- Fix eximon buffer overflow (#186303)
+
 * Tue Mar 21 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-4
 - Actually enable Postgres