rpms/proftpd/devel proftpd-1.3.0-mod_tls.patch, NONE, 1.1 proftpd.spec, 1.21, 1.22

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-mod_tls.patch 
Log Message:
Include mod_tls patch (#214820 too).


proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall <rse+openpkg-security at openpkg.org>
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proftpd.spec	13 Nov 2006 18:10:35 -0000	1.21
+++ proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
 Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +69,7 @@
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
 %patch2 -p0 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -188,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-9
+- Include mod_tls patch (#214820 too).
+
 * Mon Nov 13 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-8
 - Include cmdbufsize patch (#214820).