Incorporate upstream patch fixing trivial quoting mistake, bug #190316

Package-Manager: portage-2.1.3.9

4 files changed, 36 insertions, 10 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 3fe6284504c6..c8c6f7ed1e66 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.164 2007/08/26 12:39:36 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.165 2007/09/23 10:11:53 stefaan Exp $
+
+  23 Sep 2007; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/proftpd-1.3.1_rc3-mod_mysql.patch, proftpd-1.3.1_rc3.ebuild:
+  Incorporate upstream patch fixing trivial quoting mistake, bug #190316
 
 *proftpd-1.3.1_rc3 (26 Aug 2007)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 383a90422e93..87e3334ec306 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,6 +18,10 @@ AUX proftpd-1.3.1_rc2-bug181712.patch 1098 RMD160 1c4a77dfb401c6d888fabc259e21f5
 MD5 ef33b6758743fb82aeb09b410d0badd7 files/proftpd-1.3.1_rc2-bug181712.patch 1098
 RMD160 1c4a77dfb401c6d888fabc259e21f5022828335b files/proftpd-1.3.1_rc2-bug181712.patch 1098
 SHA256 bdb1364ae5a518f5d50b8a232e94bd83b2d3f846d51566c7ed63550ac3858698 files/proftpd-1.3.1_rc2-bug181712.patch 1098
+AUX proftpd-1.3.1_rc3-mod_mysql.patch 690 RMD160 068e8452fef1be66834d484fcc4fc1c53cf6963b SHA1 3740e68d54989a3f058c18503545fee9671a2f59 SHA256 fddc261dc4aeb09980ff73ac645a4f066f42abb89de4c1eb34373e871897ad4d
+MD5 30fc7cdda90aed5cd704c0ded25c3cf4 files/proftpd-1.3.1_rc3-mod_mysql.patch 690
+RMD160 068e8452fef1be66834d484fcc4fc1c53cf6963b files/proftpd-1.3.1_rc3-mod_mysql.patch 690
+SHA256 fddc261dc4aeb09980ff73ac645a4f066f42abb89de4c1eb34373e871897ad4d files/proftpd-1.3.1_rc3-mod_mysql.patch 690
 AUX proftpd.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd
 MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671
 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671
@@ -41,14 +45,14 @@ EBUILD proftpd-1.3.1_rc2-r3.ebuild 6340 RMD160 f199bb8c2b239237e50020d6c06b9f55b
 MD5 d3957fcaabaf545818272d74bf850b89 proftpd-1.3.1_rc2-r3.ebuild 6340
 RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 proftpd-1.3.1_rc2-r3.ebuild 6340
 SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f proftpd-1.3.1_rc2-r3.ebuild 6340
-EBUILD proftpd-1.3.1_rc3.ebuild 6094 RMD160 efd227d0ef1672b1b005b51e01828a1147fe71c8 SHA1 80b8afefa92427992a89203155e1180c4278b961 SHA256 c542e23e2d1652a23d1e74a22fd022731702f9ede6fb2c9079ff869e0a4064dd
-MD5 6b7e894f5b1bab28fa119ad9742367a8 proftpd-1.3.1_rc3.ebuild 6094
-RMD160 efd227d0ef1672b1b005b51e01828a1147fe71c8 proftpd-1.3.1_rc3.ebuild 6094
-SHA256 c542e23e2d1652a23d1e74a22fd022731702f9ede6fb2c9079ff869e0a4064dd proftpd-1.3.1_rc3.ebuild 6094
-MISC ChangeLog 26712 RMD160 0debc947a64e5259bd12321b917688fcf7e4d421 SHA1 86fc91f46d17eea6b36eb8d2387d2b9da3cb045b SHA256 4bd6a6451bd7259c7d0c82f1a2a0810caba2751c100a52b09194ec27a96fa752
-MD5 31cfeb99efa3aebea32c76bfe88d1c8b ChangeLog 26712
-RMD160 0debc947a64e5259bd12321b917688fcf7e4d421 ChangeLog 26712
-SHA256 4bd6a6451bd7259c7d0c82f1a2a0810caba2751c100a52b09194ec27a96fa752 ChangeLog 26712
+EBUILD proftpd-1.3.1_rc3.ebuild 6137 RMD160 fb1af4fa5399c9018266bc4b504606fbdee4bdce SHA1 2ff33e22131c2622f9d3f8e87336bf45ae9a4c63 SHA256 ea8c67fe405777171fbd70c26e4a6b7d70f62d3f7c7375906343a7d7bb14d1a9
+MD5 c70455e7d79072b8555fe6fa4e0db209 proftpd-1.3.1_rc3.ebuild 6137
+RMD160 fb1af4fa5399c9018266bc4b504606fbdee4bdce proftpd-1.3.1_rc3.ebuild 6137
+SHA256 ea8c67fe405777171fbd70c26e4a6b7d70f62d3f7c7375906343a7d7bb14d1a9 proftpd-1.3.1_rc3.ebuild 6137
+MISC ChangeLog 26910 RMD160 7e0df502d9eae4323a9528b123060ea9c97c9f49 SHA1 996cd15e6ab64ef134c4629b9d7375662c854aab SHA256 ecf6b84761aae421decaae734dc52e0e4ad1cd3bde02913c84491f408bf21247
+MD5 ad3955a3941f8f52c428228b1c3cb447 ChangeLog 26910
+RMD160 7e0df502d9eae4323a9528b123060ea9c97c9f49 ChangeLog 26910
+SHA256 ecf6b84761aae421decaae734dc52e0e4ad1cd3bde02913c84491f408bf21247 ChangeLog 26910
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch
new file mode 100644
index 000000000000..000f6934ff72
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch
@@ -0,0 +1,16 @@
+Index: contrib/mod_sql_mysql.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_mysql.c,v
+retrieving revision 1.44
+diff -u -r1.44 mod_sql_mysql.c
+--- contrib/mod_sql_mysql.c	9 May 2007 17:15:18 -0000	1.44
++++ contrib/mod_sql_mysql.c	6 Jul 2007 16:48:24 -0000
+@@ -595,7 +595,7 @@
+   }
+ 
+   if (!conn_pool) {
+-    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been
++    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been "
+       "properly intialized.  Please make sure your --with-modules configure "
+       "option lists mod_sql *before* mod_sql_mysql, and recompile.");
+ 
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
index 90d835c1ad90..f82ea3928bfc 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild,v 1.1 2007/08/26 12:39:36 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild,v 1.2 2007/09/23 10:11:53 stefaan Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -71,6 +71,8 @@ src_unpack() {
 		cp -f mod_vroot/mod_vroot.c contrib/
 		cp -f mod_vroot/mod_vroot.html doc/
 	fi
+
+	epatch ${FILESDIR}/${P}-mod_mysql.patch
 }
 
 src_compile() {