fix gcc4 build issue.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 38 insertions, 14 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index c8906af9bda1..24c2f0827c29 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.109 2006/06/24 13:41:04 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.110 2006/09/04 23:50:32 humpback Exp $
+
+  04 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/gcc4-mod_quotatab_sql.patch, proftpd-1.2.10-r7.ebuild:
+  Added patch to solve issue while building with gcc 4. Close bug #145940.
+  Thanks to everyone in that bug.
 
   24 Jun 2006; Gustavo Felisberto <humpback@gentoo.org>;
   proftpd-1.3.0-r1.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index f81ddab7b6e6..7bf1ec50f966 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -13,6 +13,10 @@ AUX ftp.pamd-include 592 RMD160 b69cd9acfa99b89deddf88239321af39f6a3d1b2 SHA1 f0
 MD5 3f7725dfa4ff0f5b632ddf41104ba44b files/ftp.pamd-include 592
 RMD160 b69cd9acfa99b89deddf88239321af39f6a3d1b2 files/ftp.pamd-include 592
 SHA256 800d591dcf9eb1c6cab3b4bafeb0ac7acb20d6704425da3d89180797468beba2 files/ftp.pamd-include 592
+AUX gcc4-mod_quotatab_sql.patch 472 RMD160 0f430cf7b13523ac4a6d742e2bc733b825552578 SHA1 e68ba4a250c68823ef912fe43f7bc0938cf73d47 SHA256 07c74456e8951c4248e4893f0469fae5b163623685ad74039bbaade52a1d50d1
+MD5 cf9d29cb128107c4f6a803176613125d files/gcc4-mod_quotatab_sql.patch 472
+RMD160 0f430cf7b13523ac4a6d742e2bc733b825552578 files/gcc4-mod_quotatab_sql.patch 472
+SHA256 07c74456e8951c4248e4893f0469fae5b163623685ad74039bbaade52a1d50d1 files/gcc4-mod_quotatab_sql.patch 472
 AUX mod_sql_mysql.diff 1902 RMD160 0a00efe985eb7026f5cab1a2b07804c064abece1 SHA1 1ad7502337e20251fe711f68281a04e152c2f6e6 SHA256 a1dee2545df1c00331c6c2ebd613a215a44c7f78f2f603b5c3371e80c29bc03f
 MD5 2524305e432b908452a334889e47e347 files/mod_sql_mysql.diff 1902
 RMD160 0a00efe985eb7026f5cab1a2b07804c064abece1 files/mod_sql_mysql.diff 1902
@@ -60,18 +64,18 @@ DIST proftpd-1.3.0.tar.bz2 1386086 RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2
 DIST proftpd-mod-shaper-0.5.5.tar.gz 18090
 DIST proftpd-mod-shaper-0.5.6.tar.gz 18099 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 SHA1 33af13cf95374e0118fd6fece63d5fa55779810a SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827
 DIST proftpd-mod-vroot-0.7.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1
-EBUILD proftpd-1.2.10-r7.ebuild 4574 RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 SHA1 5e2d550670dbef122ab9a6c890007c9728e61d6e SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47
-MD5 611edc7465c5c640b305903b21819046 proftpd-1.2.10-r7.ebuild 4574
-RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 proftpd-1.2.10-r7.ebuild 4574
-SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47 proftpd-1.2.10-r7.ebuild 4574
+EBUILD proftpd-1.2.10-r7.ebuild 4664 RMD160 1c5b47cabf4d0135fa26467557dfc96ec52a2f16 SHA1 2a7e9e16b28f2a4584486e79f1ad7dfa258bb5b1 SHA256 4678e7ef2b2e7e661f82f5d84d230fb87f56f110c1bc8e0f81d860993dc23b3a
+MD5 71b03d1903b7d93a9588bd4b3207905a proftpd-1.2.10-r7.ebuild 4664
+RMD160 1c5b47cabf4d0135fa26467557dfc96ec52a2f16 proftpd-1.2.10-r7.ebuild 4664
+SHA256 4678e7ef2b2e7e661f82f5d84d230fb87f56f110c1bc8e0f81d860993dc23b3a proftpd-1.2.10-r7.ebuild 4664
 EBUILD proftpd-1.3.0-r1.ebuild 5409 RMD160 499db27ea75856ca54dd77b631d082c78a8a6dfd SHA1 2acdb8b664b103ad1c969563ccbda52c1a57b146 SHA256 f16b972e8a07b153cb6fb918970b0888d9042fda0f352ee53a1e638c1e683211
 MD5 dbf98fe2f32dca9a40682f8faea1154b proftpd-1.3.0-r1.ebuild 5409
 RMD160 499db27ea75856ca54dd77b631d082c78a8a6dfd proftpd-1.3.0-r1.ebuild 5409
 SHA256 f16b972e8a07b153cb6fb918970b0888d9042fda0f352ee53a1e638c1e683211 proftpd-1.3.0-r1.ebuild 5409
-MISC ChangeLog 17434 RMD160 9007d8d2c018e8af491a28e7f9d79f24d9cd80e2 SHA1 e7c28337b80754f87efee42046199e2e4d948993 SHA256 5896de610c973ab367688a741e81eae9f5e90702cf0ac0ee99c857a26683d8c7
-MD5 d1a80bebb445b1c8352851e1b82fb216 ChangeLog 17434
-RMD160 9007d8d2c018e8af491a28e7f9d79f24d9cd80e2 ChangeLog 17434
-SHA256 5896de610c973ab367688a741e81eae9f5e90702cf0ac0ee99c857a26683d8c7 ChangeLog 17434
+MISC ChangeLog 17665 RMD160 ab7772c40cb8b83ec5c41aa7ea4ee9c4a1e492c6 SHA1 8822b1a3d90b7030d9cc899fb1af879d0956949c SHA256 19680d6eef7d0b0100fe5a2f15cca55ae5ea0c5cce7788ecaabb5d6b10ff8551
+MD5 24bad79bd408e4c93966afff0e43dc5e ChangeLog 17665
+RMD160 ab7772c40cb8b83ec5c41aa7ea4ee9c4a1e492c6 ChangeLog 17665
+SHA256 19680d6eef7d0b0100fe5a2f15cca55ae5ea0c5cce7788ecaabb5d6b10ff8551 ChangeLog 17665
 MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99423d6ea2dc602310a18e89e6f889aafe972 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f
 MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401
 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401
@@ -83,9 +87,9 @@ MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0-r1 1214
 RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0-r1 1214
 SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0-r1 1214
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEnUD+8zY1VwezZiERAhLjAJoCvKpzeonhEkChOPGjTH/b8wcMJwCghkgC
-sWVrbKcLuCPAJb6H2EKG928=
-=rYtP
+iD8DBQFE/Lvq8zY1VwezZiERApmXAJ9/xoOD2e+rToaFU5gfLRISpbOTZQCfXBR0
+bkMtre6HdxhJrw6VrNCbeIA=
+=MrCE
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch b/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch
new file mode 100644
index 000000000000..8cfdd22a04ad
--- /dev/null
+++ b/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch
@@ -0,0 +1,12 @@
+--- proftpd-1.2.10/contrib/mod_quotatab_sql.c.orig	2006-09-04 11:21:09.000000000 +0000
++++ proftpd-1.2.10/contrib/mod_quotatab_sql.c	2006-09-04 11:22:27.000000000 +0000
+@@ -684,8 +684,7 @@
+       return NULL;
+     }
+ 
+-    tab->tab_data = pcalloc(tab->tab_pool, sizeof(char));
+-    ((char *) tab->tab_data) = pstrdup(tab->tab_pool, select_query);
++    tab->tab_data = (void *) pstrdup(tab->tab_pool, select_query);
+   }
+ 
+   /* Set all the necessary function pointers. */
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
index 9885fc6be423..555fcd7246e9 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.8 2006/05/27 14:24:49 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.9 2006/09/04 23:50:32 humpback Exp $
 
 inherit flag-o-matic eutils
 
@@ -43,6 +43,9 @@ src_unpack() {
 	# Fix ftpshut and SqlShowInfo, bug #100364
 	epatch "${FILESDIR}/proftpd-ftpshut.patch"
 	epatch "${FILESDIR}/proftpd-sqlshowinfo.patch"
+
+	# Fix gcc4 compile error, bug #145940
+	epatch "${FILESDIR}/gcc4-mod_quotatab_sql.patch"
 }
 
 src_compile() {