diff options
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch | 11 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.2.ebuild | 4 |
4 files changed, 24 insertions, 3 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 019e1b0f8b49..323cf5f91c26 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.190 2009/02/18 18:24:36 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.191 2009/02/19 20:29:16 voyageur Exp $ + + 19 Feb 2009; Bernard Cafarelli <voyageur@gentoo.org> + +files/proftpd-1.3.2-mysql-include.patch, proftpd-1.3.2.ebuild, + proftpd-1.3.2-r1.ebuild: + Fix mysql include when both SQL backends are enabled, thanks to jer for + the patch, bug #259610 18 Feb 2009; Brent Baude <ranger@gentoo.org> proftpd-1.3.2-r1.ebuild: Marking proftpd-1.3.2-r1 ppc64 for bug 258450 diff --git a/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch b/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch new file mode 100644 index 000000000000..d6699d8ddda1 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch @@ -0,0 +1,11 @@ +--- proftpd-1.3.2/contrib/mod_sql_mysql.c.orig 2009-02-05 19:53:54.000000000 +0100 ++++ proftpd-1.3.2/contrib/mod_sql_mysql.c 2009-02-19 18:39:07.000000000 +0100 +@@ -135,7 +135,7 @@ + #include "conf.h" + #include "../contrib/mod_sql.h" + +-#include <mysql.h> ++#include <mysql/mysql.h> + + /* + * timer-handling code adds the need for a couple of forward declarations diff --git a/net-ftp/proftpd/proftpd-1.3.2-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.2-r1.ebuild index 193421e973d1..7eb68318efdd 100644 --- a/net-ftp/proftpd/proftpd-1.3.2-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.2-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.2-r1.ebuild,v 1.3 2009/02/18 18:24:36 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2-r1.ebuild,v 1.4 2009/02/19 20:29:16 voyageur Exp $ inherit eutils flag-o-matic toolchain-funcs autotools @@ -63,6 +63,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-upstream-bug-3183.patch # Fix parallel build epatch "${FILESDIR}"/${P}-parallel-build.patch + # Fix mysql include when both backends are enabled + epatch "${FILESDIR}"/${P}-mysql-include.patch # Fix stripping of files sed -e "s| @INSTALL_STRIP@||g" -i Make* diff --git a/net-ftp/proftpd/proftpd-1.3.2.ebuild b/net-ftp/proftpd/proftpd-1.3.2.ebuild index 57022e88ec81..b05e646598c2 100644 --- a/net-ftp/proftpd/proftpd-1.3.2.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.2.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.2.ebuild,v 1.1 2009/02/17 13:12:04 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2.ebuild,v 1.2 2009/02/19 20:29:16 voyageur Exp $ inherit eutils flag-o-matic toolchain-funcs autotools @@ -62,6 +62,8 @@ src_unpack() { # Fix upstream bug 3183 (incorrect logging to wtmp) epatch "${FILESDIR}/${P}-upstream-bug-3183.patch" + # Fix mysql include when both backends are enabled + epatch "${FILESDIR}"/${P}-mysql-include.patch # Fix stripping of files sed -e "s| @INSTALL_STRIP@||g" -i Make* |