Fix segfault on configuration checking, bug #297310

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 33 insertions, 4 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 0bb35289d39d..477b54c37b70 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.219 2009/12/15 18:57:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.220 2009/12/18 23:13:25 voyageur Exp $
+
+*proftpd-1.3.3_rc3-r1 (18 Dec 2009)
+
+  18 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -proftpd-1.3.3_rc3.ebuild, +proftpd-1.3.3_rc3-r1.ebuild,
+  +files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch:
+  Fix segfault on configuration checking, bug #297310
 
 *proftpd-1.3.3_rc3 (15 Dec 2009)
 *proftpd-1.3.2c (15 Dec 2009)
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index b52402fd944f..a52c2dcee4aa 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,7 @@
 AUX proftpd-1.3.2-mysql-include.patch 363 RMD160 4406e4ff522580962662f9aa00310a75f4984cbd SHA1 979f0c1272c25e34fe489ac4227f2dce2db35804 SHA256 5be06884923c23ff4e44e5e9e87d27a88aaee2d10bc341daba6cd21d26543330
 AUX proftpd-1.3.2-parallel-build.patch 786 RMD160 ff9df4ca01c5d95664bc00650996896300ada1d7 SHA1 c0d6d23c8da22cf6b9b882d01ab6e562d51dd1b3 SHA256 a429b3f7c79d46a279d77357481208f962b6e93fcea5424b2b030e366fe3c662
 AUX proftpd-1.3.2-system-libltdl.patch 1932 RMD160 135045db34d87dfdb62ff643864778c3884fa013 SHA1 6e1fe98fd9e3b92aaa2886536646b7bb58765c89 SHA256 74bcb197a66b7767d8b5d327e955d979d5676be6bc3d17794be8ddc09879f2b4
+AUX proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch 581 RMD160 82170fc75ffd9a41bea7cec2e157ed50f63c2745 SHA1 12b4507c43c45c8448f37d76359bf59e327879f2 SHA256 2bdc2a215242f440902995bc9533ff9d42972535550d0cedaf25b7594f39ac19
 AUX proftpd.conf 1968 RMD160 10394bf0fcaa201c59873c1a518a75f7f9d7b53c SHA1 6d3c932efa5a16c3772b49d68bc46e0239472b0b SHA256 82ebf842526eb5b1e6ac2126511063b8242ad66a271095b2ab5d1f18f908c192
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
 AUX proftpd.rc6 1192 RMD160 09e2e7b9429b123da51331c5cb29b7f79fe03989 SHA1 b7605beebe10749e1adc3204f7a48e45f653690a SHA256 674d614bfaaea90cf9444d84688b8c77e9af482b148bf460919783627ad17918
@@ -18,6 +19,6 @@ DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28f
 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
 EBUILD proftpd-1.3.2b.ebuild 8239 RMD160 6b7bf9da71617d2498e31ba5d367bf63c5c65760 SHA1 29a7288885dae9b010485b98582c673058b74c58 SHA256 0ae557d3d679af92471592a144f8eb31f77a9878a590c6e47d859fd6fc5c6a9f
 EBUILD proftpd-1.3.2c.ebuild 8248 RMD160 9c535f463b6c7612be770547ab8746f474b34fc8 SHA1 b0b35908036f6389e431f433f6443d23fe02f428 SHA256 82e49468c8b453a2140f47455feceee11885598b819e473e3289dcfd584a1d40
-EBUILD proftpd-1.3.3_rc3.ebuild 7143 RMD160 8f9b2542010f4d8fe19d5b581478ac376072ea69 SHA1 926c3b49593993e49f2198494c64ad4f27e3beb7 SHA256 fe95428974efa5bd5dae7a25c797e9619dd3360ccf00ba51e53f750294000707
-MISC ChangeLog 37166 RMD160 52901d028350920e134f4b34819d43d33f5e7ab5 SHA1 ef0ea3e357c839f0ead8a1d62b15fa717da967bd SHA256 029c8d02f48bed28e213110b89666a77632e03c4f9e35d026a372522e8064c8a
+EBUILD proftpd-1.3.3_rc3-r1.ebuild 7251 RMD160 5f9caf219713db906515a50816c0deb11ad08a08 SHA1 ae260e2cdd3ec5a136184d09c59b5bce278a3e74 SHA256 e169ccec382a8ff65cef03510caf538f2d31525087c57eead500eabbb137af61
+MISC ChangeLog 37427 RMD160 28a34489da670e38386aea714afa8a82c589d2a1 SHA1 110a02726fdb6c52f607f88e56472e0dd999d372 SHA256 d8ed755729eec2a579a33f030dfc71a588adc3410a0536f12f41ad33f7888a93
 MISC metadata.xml 1903 RMD160 a15236976f8f0d3f1102ca97f5d9ee1d3e9abe42 SHA1 7cad7067da6c4fe1a5e882792f1516b8a0bb53a6 SHA256 0283e9ccb80ad1b1892a1ee84074210add15433c59b6e4daad5a55d39ff30fd7
diff --git a/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch b/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch
new file mode 100644
index 000000000000..417bf82df448
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch
@@ -0,0 +1,18 @@
+Index: contrib/mod_tls_shmcache.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls_shmcache.c,v
+retrieving revision 1.5
+diff -u -r1.5 mod_tls_shmcache.c
+--- contrib/mod_tls_shmcache.c	7 Nov 2009 20:11:41 -0000	1.5
++++ contrib/mod_tls_shmcache.c	18 Dec 2009 17:34:47 -0000
+@@ -1240,6 +1240,10 @@
+   struct shmid_ds ds;
+   const char *cache_file;
+ 
++  if (shmcache_fh == NULL) {
++    return 0;
++  }
++
+   pr_trace_msg(trace_channel, 9, "removing shmcache cache %p", cache); 
+ 
+   cache_file = shmcache_fh->fh_path;
diff --git a/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild
index 818caac4911d..513558c25289 100644
--- a/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild,v 1.1 2009/12/15 18:57:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild,v 1.1 2009/12/18 23:13:25 voyageur Exp $
 
 EAPI="2"
 inherit eutils
@@ -75,6 +75,9 @@ src_prepare() {
 	use deflate && __prepare_module mod_deflate
 	use vroot && __prepare_module mod_vroot
 
+	# Fix segfault on conf check, Gentoo bug #297310
+	epatch "${FILESDIR}"/${P}-tls-shmcache-bug3359.patch
+
 	# Fix MySQL includes
 	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c