From 75bf1e7da1db08146f0711056b826e658eb883aa Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Nov 16 2006 11:02:41 +0000
Subject: Include mod_tls patch (#214820 too).


---

diff --git a/proftpd-1.3.0-mod_tls.patch b/proftpd-1.3.0-mod_tls.patch
new file mode 100644
index 0000000..de5bd94
--- /dev/null
+++ b/proftpd-1.3.0-mod_tls.patch
@@ -0,0 +1,15 @@
+This is a possible fix Ralf S. Engelschall <rse+openpkg-security@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';
diff --git a/proftpd.spec b/proftpd.spec
index 9f7d6ae..7ffc334 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -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 @@ Source6: proftpd.pam
 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 @@ Module to add PostgreSQL support to the ProFTPD FTP server.
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
 %patch2 -p0 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -188,6 +190,9 @@ fi
 
 
 %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).