Fix bug #181712.

Package-Manager: portage-2.1.2.7

5 files changed, 61 insertions, 24 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 85523db39da6..88461aabd1cc 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.161 2007/06/11 13:22:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.162 2007/06/26 23:24:09 chtekk Exp $
+
+*proftpd-1.3.1_rc2-r3 (26 Jun 2007)
+
+  26 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1_rc2-bug181712.patch, -proftpd-1.3.1_rc2-r2.ebuild,
+  +proftpd-1.3.1_rc2-r3.ebuild:
+  Fix bug #181712.
 
   11 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   proftpd-1.3.1_rc2-r2.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index e1ba7a053cb0..9e927eaba603 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX proftpd-1.3.1_rc2-bug164612.patch 779 RMD160 3bb73beff421ff27d153a6051299ada6bc532330 SHA1 cbf74c1c6a2ed794b1558e39cc85a41650bac21d SHA256 68b0bb47c3f46b931ff1887f299028803a15888641dfaad47865615bb0d6952c
 MD5 2b98e7dc4e8ff464c8cc99c60fb0d744 files/proftpd-1.3.1_rc2-bug164612.patch 779
 RMD160 3bb73beff421ff27d153a6051299ada6bc532330 files/proftpd-1.3.1_rc2-bug164612.patch 779
@@ -17,6 +14,10 @@ AUX proftpd-1.3.1_rc2-bug178866.patch 1731 RMD160 11d06f7d5ea2ad4678ff989514daaa
 MD5 c72562e412243ccba24f234743fffbe9 files/proftpd-1.3.1_rc2-bug178866.patch 1731
 RMD160 11d06f7d5ea2ad4678ff989514daaa10d1b92c2c files/proftpd-1.3.1_rc2-bug178866.patch 1731
 SHA256 658f2e71e1e062e94e8437b10443576432fbc4dd342d297473aef603c6b450aa files/proftpd-1.3.1_rc2-bug178866.patch 1731
+AUX proftpd-1.3.1_rc2-bug181712.patch 1098 RMD160 1c4a77dfb401c6d888fabc259e21f5022828335b SHA1 387e079c66df054909a2c7d94485189aa1b09afc SHA256 bdb1364ae5a518f5d50b8a232e94bd83b2d3f846d51566c7ed63550ac3858698
+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.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd
 MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671
 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671
@@ -38,14 +39,14 @@ EBUILD proftpd-1.3.1_rc2-r1.ebuild 6240 RMD160 502eb0b89cb36c6aa44d7fd8fd3a1769d
 MD5 88980909ce06367304e5d0f5fd354e6a proftpd-1.3.1_rc2-r1.ebuild 6240
 RMD160 502eb0b89cb36c6aa44d7fd8fd3a1769dbc502d0 proftpd-1.3.1_rc2-r1.ebuild 6240
 SHA256 cb477527e8c736d4f19bb7ffe445ccc8a57558cb6c7d950ceb92742f81e4060e proftpd-1.3.1_rc2-r1.ebuild 6240
-EBUILD proftpd-1.3.1_rc2-r2.ebuild 6292 RMD160 40be172871d491c9f81e97ac217ead6036a49060 SHA1 889538d8a95bd1a66caf5c0788d3d0fba583f1f4 SHA256 536fa18ef3b6c6de6b7b71d2ef12182a8e492d3a11010d685575239b7320ed79
-MD5 568ad4f1f9bcc4d6a8c8beebb81f241d proftpd-1.3.1_rc2-r2.ebuild 6292
-RMD160 40be172871d491c9f81e97ac217ead6036a49060 proftpd-1.3.1_rc2-r2.ebuild 6292
-SHA256 536fa18ef3b6c6de6b7b71d2ef12182a8e492d3a11010d685575239b7320ed79 proftpd-1.3.1_rc2-r2.ebuild 6292
-MISC ChangeLog 26070 RMD160 30810a25b14c01ec8e554ef6a0843c47d3a7951a SHA1 31b1025223dbd342d5c5021a1d31ab32d50a1ee9 SHA256 8e62c018336f521c34756c9630f34a86fc1a80d48ee2ecb39400982bc5adfb06
-MD5 f47a31e878924352bcabfc86d9cf6954 ChangeLog 26070
-RMD160 30810a25b14c01ec8e554ef6a0843c47d3a7951a ChangeLog 26070
-SHA256 8e62c018336f521c34756c9630f34a86fc1a80d48ee2ecb39400982bc5adfb06 ChangeLog 26070
+EBUILD proftpd-1.3.1_rc2-r3.ebuild 6342 RMD160 16fc3118ff89d81e99852280450b92a38b743ade SHA1 e18d7de8a6367c908d90f5bd2da7a414f9402934 SHA256 08e17e9410720602cf91510d3c705dc90c35b13a6d592766707b887d80eae12b
+MD5 daff08205ec230b952c3b20644959af6 proftpd-1.3.1_rc2-r3.ebuild 6342
+RMD160 16fc3118ff89d81e99852280450b92a38b743ade proftpd-1.3.1_rc2-r3.ebuild 6342
+SHA256 08e17e9410720602cf91510d3c705dc90c35b13a6d592766707b887d80eae12b proftpd-1.3.1_rc2-r3.ebuild 6342
+MISC ChangeLog 26282 RMD160 e6535a027b31910a8c49ab15f9b8fcd2e9b80023 SHA1 2b5caa5ed67edb1d208e053aa82b8fd86ecf3769 SHA256 58204bb52a72056426f6f1c9fcc129f14c9a43164f0e95ba9ea1e2777496c554
+MD5 596f8f7748850d0eb94176c87dd4558c ChangeLog 26282
+RMD160 e6535a027b31910a8c49ab15f9b8fcd2e9b80023 ChangeLog 26282
+SHA256 58204bb52a72056426f6f1c9fcc129f14c9a43164f0e95ba9ea1e2777496c554 ChangeLog 26282
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -53,13 +54,6 @@ SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata
 MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2-r1 1247
 RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2-r1 1247
 SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2-r1 1247
-MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2-r2 1247
-RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2-r2 1247
-SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2-r2 1247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGbUyNKRy60XGEcJIRAqmZAKCtSHrxQu26bnCwIaqLYuN69z21KgCeIYUH
-MB33WvgGfBfUALygokT4fSE=
-=diPm
------END PGP SIGNATURE-----
+MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2-r3 1247
+RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2-r3 1247
+SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2-r3 1247
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r2 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r3
index b18daddb66a6..b18daddb66a6 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r2
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r3
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug181712.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug181712.patch
new file mode 100644
index 000000000000..fbe8fed1f1f0
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug181712.patch
@@ -0,0 +1,35 @@
+--- src/auth.c	21 May 2007 15:19:41 -0000	1.49
++++ src/auth.c	12 Jun 2007 18:54:15 -0000
+@@ -449,12 +449,12 @@
+    */
+   m = pr_module_get("mod_auth_pam.c");
+   if (m) {
+-    pr_trace_msg(trace_channel, 4,
+-      "using module 'mod_auth_pam.c' to authenticate user '%s'", name);
+-
+     mr = dispatch_auth(cmd, "auth", &m);
+ 
+     if (MODRET_ISHANDLED(mr)) {
++      pr_trace_msg(trace_channel, 4,
++        "module 'mod_auth_pam.c' used for authenticating user '%s'", name);
++
+       res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
+ 
+       if (cmd->tmp_pool) {
+@@ -512,12 +512,12 @@
+    */
+   m = pr_module_get("mod_auth_pam.c");
+   if (m) {
+-    pr_trace_msg(trace_channel, 4,
+-      "using module 'mod_auth_pam.c' to authenticate user '%s'", name);
+-
+-    mr = dispatch_auth(cmd, "auth", &m);
++    mr = dispatch_auth(cmd, "check", &m);
+ 
+     if (MODRET_ISHANDLED(mr)) {
++      pr_trace_msg(trace_channel, 4,
++        "module 'mod_auth_pam.c' used for authenticating user '%s'", name);
++
+       res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
+ 
+       if (cmd->tmp_pool) {
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild
index e081bb00393b..d40cf0767d10 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.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_rc2-r2.ebuild,v 1.5 2007/06/11 13:22:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild,v 1.1 2007/06/26 23:24:09 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -53,11 +53,12 @@ src_unpack() {
 
 	cd "${S}"
 
-	# Fix bugs #164612, #167003, #175082 and #178866
+	# Fix bugs #164612, #167003, #175082, #178866 and #181712
 	epatch "${FILESDIR}/${P}-bug164612.patch"
 	epatch "${FILESDIR}/${P}-bug167003.patch"
 	epatch "${FILESDIR}/${P}-bug175082.patch"
 	epatch "${FILESDIR}/${P}-bug178866.patch"
+	epatch "${FILESDIR}/${P}-bug181712.patch"
 
 	# Fix stripping of files
 	sed -e "s| @INSTALL_STRIP@||g" -i Make*