diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-18 23:13:26 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-18 23:13:26 +0000 |
| commit | cf54f62aa5ccf80f8c3b9009fced60ae16fa4184 (patch) | |
| tree | 4bef531b698e3966a884c59e7054aee8698c9ca3 /net-ftp | |
| parent | Add missing prefix keywords (diff) | |
| download | gentoo-2-cf54f62aa5ccf80f8c3b9009fced60ae16fa4184.tar.gz gentoo-2-cf54f62aa5ccf80f8c3b9009fced60ae16fa4184.tar.bz2 gentoo-2-cf54f62aa5ccf80f8c3b9009fced60ae16fa4184.zip | |
Fix segfault on configuration checking, bug #297310
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 9 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch | 18 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild (renamed from net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild) | 5 |
3 files changed, 30 insertions, 2 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/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 |