Fix bug #181712.

(Portage version: 2.1.2.7)

4 files changed, 46 insertions, 3 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/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*