Fix mysql include when both SQL backends are enabled, thanks to jer for the patch, bug #259610

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

5 files changed, 28 insertions, 6 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/Manifest b/net-ftp/proftpd/Manifest
index 8bf1e89e1dcd..7dfc721fb0bf 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -6,6 +6,7 @@ AUX proftpd-1.3.1_rc2-bug167003.patch 316 RMD160 7fcade6de378727081d0a14775b2e24
 AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c SHA1 65ea3a861dc493439a8b2e2d3271dba57825bbac SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc
 AUX proftpd-1.3.1_rc2-bug178866.patch 1731 RMD160 11d06f7d5ea2ad4678ff989514daaa10d1b92c2c SHA1 7b15937e55b13985ece4a6275cae4c6487b834cb SHA256 658f2e71e1e062e94e8437b10443576432fbc4dd342d297473aef603c6b450aa
 AUX proftpd-1.3.1_rc2-bug181712.patch 1098 RMD160 1c4a77dfb401c6d888fabc259e21f5022828335b SHA1 387e079c66df054909a2c7d94485189aa1b09afc SHA256 bdb1364ae5a518f5d50b8a232e94bd83b2d3f846d51566c7ed63550ac3858698
+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-upstream-bug-3183.patch 3032 RMD160 b3acacfadca5a0a8f35a3ca7f16561bc4271f27b SHA1 a967187a682a955369715782409cfd1de2e057bd SHA256 b2f16611b753e4c5d7874d544462217b2e44dc308b45d6a127bb17566c264403
 AUX proftpd-1.3.2_rc2-CVE-2008-4242.patch 5522 RMD160 a0f73525f1b6b9f06fd6b6ff0b5eb6112a8abe5b SHA1 6f51a0653ce994c6a0f4e447f152b5676b213a19 SHA256 4d77366e9bc08058f906d7e93c9ec8427fb5d36ba85db9cec74c510ca40ba728
@@ -32,10 +33,10 @@ DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28f
 EBUILD proftpd-1.3.1-r1.ebuild 7268 RMD160 325241cc3f68e24e73c8f627daee64b42490ca7b SHA1 cea90842c97883ed1804db2ae0502430fe98ca89 SHA256 45305301330d44ba4796d40e72d29b56d00679f0942b0d1e9172c1b25dfba7b7
 EBUILD proftpd-1.3.1.ebuild 6951 RMD160 f2d030f82d5c73d2312d413aa9ba2f9f8174219d SHA1 69618caa7299ec3a9b4ae935aa71b0096b937b62 SHA256 f8b1ba70aba8cbb6c5b296731e0ed748c7659eac3935ffe2758df0c3363dab1f
 EBUILD proftpd-1.3.1_rc2-r3.ebuild 6338 RMD160 5af01205da38a4e4cdf4ad4ddfbb8f979b42cfdc SHA1 993a40f69700583842aa7c1d1527ee97f7292cc3 SHA256 5977e86165767799cd4123e14bd391b04cbd14f29c563ecc6081d014f9fadbb2
-EBUILD proftpd-1.3.2-r1.ebuild 7300 RMD160 3f2d90942a4878e3476b70f4fe382f3855883d22 SHA1 1391fad2ceb185d1e45e98dc2ac547089201a4e9 SHA256 9a7bf68d6993249166be67a063685cd7f923ed9b4f9e98b50c45d6e8ea7b84ea
-EBUILD proftpd-1.3.2.ebuild 7201 RMD160 086002839d7119029c2192292edac109dc447e1e SHA1 30061a0de67829b29a4f3cc6e814feca5ac0f183 SHA256 14ea9bdf300072ff91b4f7867f6456d19ccb8c3301c1249ddbb2e746e8d48d01
+EBUILD proftpd-1.3.2-r1.ebuild 7401 RMD160 870eb3a61134e4e75d59cce2f049ffbea246dee9 SHA1 ef0242b147b66d09ad96f612f86bf268375759a7 SHA256 72622188653a2d79eb5088e3d4212409101181ce84b18375d6a0b8c0f0f79845
+EBUILD proftpd-1.3.2.ebuild 7300 RMD160 490a1b707353b5fb04dbf8508ef0cb3dadb50314 SHA1 d41a0183d0d2119b8444dc01130c9b34f57fa2ca SHA256 940a50c3663a570eae970fd5307bc5db31990d6a5093332b766153f376ced26e
 EBUILD proftpd-1.3.2_rc2-r1.ebuild 6866 RMD160 957abaf1d215e283cf6fba9596c99b38bc0f280b SHA1 7c383e52874c514a07949a103b6492b9379909c5 SHA256 9bd1c563370a5238f7ec4e76bfd35ec62b7ee4bda75e197b058d8a4a58391a63
 EBUILD proftpd-1.3.2_rc2-r2.ebuild 7140 RMD160 4dfff1c4625569484d79c6e6f94e09443d1a65ee SHA1 db8a58e69ac73990534b03775a04a3d60fb0c932 SHA256 2243bba7f96ef569c67598885a0585642c6d4cd87337a2d3f1c3ef33942fa30e
 EBUILD proftpd-1.3.2_rc2.ebuild 6117 RMD160 cc531c8dd2e471301b60968cb8d20dfa90790e1c SHA1 7eabe46dc93f9cbaf850b4c31c1dc7cd17b5cb84 SHA256 76600e594fb69342e0f30f4ea636a3c47020cb3c8268fc2ea96685b587f58039
-MISC ChangeLog 31978 RMD160 133e5580071984e04cba61162c2c2e5b0410fb21 SHA1 e9d704d5f27d22d4f111bdecb963e8161db3df35 SHA256 2b824bb023f72c1a02e217805cd7821daec87bff929edd03b45cdff5eed7aac2
+MISC ChangeLog 32228 RMD160 769a6f12e55273ec37b2281e34ea29a7158dc3ce SHA1 1e1243960a9298e648b81cd8dac7c0f5fc2c6d2f SHA256 1d487516404c4fe07887eded5d804756db6421daef2bd66b4230abc6757c9c5d
 MISC metadata.xml 1266 RMD160 2eb6ab3b7a7c68eca09e193daaea833a2dc08362 SHA1 86bf2fc8f6b6c944bf384e97e9bcdec7d7ec8d77 SHA256 ffe716530aba4cf0ec4069d86c2b09f9a4dbfca541d7f467c579f871cf78c0de
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*