Fixes bug #178866.

Package-Manager: portage-2.1.2.7

5 files changed, 99 insertions, 14 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 0fcf9d5c1fb1..4494f6c12aca 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.156 2007/05/16 20:21:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.157 2007/06/10 19:34:49 chtekk Exp $
+
+*proftpd-1.3.1_rc2-r2 (10 Jun 2007)
+
+  10 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1_rc2-bug178866.patch, -proftpd-1.3.1_rc2.ebuild,
+  +proftpd-1.3.1_rc2-r2.ebuild:
+  Fixes bug #178866.
 
   16 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   proftpd-1.3.1_rc2-r1.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 7506f4a41867..f18ad3d53602 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -10,6 +10,10 @@ AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a
 MD5 27caaabf6c9b0517a59365e4ba11be82 files/proftpd-1.3.1_rc2-bug175082.patch 9671
 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c files/proftpd-1.3.1_rc2-bug175082.patch 9671
 SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc files/proftpd-1.3.1_rc2-bug175082.patch 9671
+AUX proftpd-1.3.1_rc2-bug178866.patch 1731 RMD160 11d06f7d5ea2ad4678ff989514daaa10d1b92c2c SHA1 7b15937e55b13985ece4a6275cae4c6487b834cb SHA256 658f2e71e1e062e94e8437b10443576432fbc4dd342d297473aef603c6b450aa
+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.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd
 MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671
 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671
@@ -31,21 +35,21 @@ 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.ebuild 6062 RMD160 b155d26a382666dd5329a637433c70366eed3b34 SHA1 bbe3a15c8c6bbbafef67813783264d183b1aa4be SHA256 322a9dc796966a7fc7aab980a729e3a4c9b053c1fc735105439d38aee719fcc7
-MD5 ccf70c4a479d3193477a19fb7b8ba726 proftpd-1.3.1_rc2.ebuild 6062
-RMD160 b155d26a382666dd5329a637433c70366eed3b34 proftpd-1.3.1_rc2.ebuild 6062
-SHA256 322a9dc796966a7fc7aab980a729e3a4c9b053c1fc735105439d38aee719fcc7 proftpd-1.3.1_rc2.ebuild 6062
-MISC ChangeLog 25394 RMD160 ea979027b743fc558be5e5ad7d4527d994f1809c SHA1 43567d1cee508a031b217e941aedad3095c7c6de SHA256 b959f610d5bbdef204afd72d1cb5c111571963e6d6b6303aec754edf31480b61
-MD5 6410c6b92de08d1277f6d150095fff4d ChangeLog 25394
-RMD160 ea979027b743fc558be5e5ad7d4527d994f1809c ChangeLog 25394
-SHA256 b959f610d5bbdef204afd72d1cb5c111571963e6d6b6303aec754edf31480b61 ChangeLog 25394
+EBUILD proftpd-1.3.1_rc2-r2.ebuild 6295 RMD160 a533f390e973dcb2323f1d79d769b7e5bec9c04c SHA1 43f623933b7286fcebe1e0886fc1b760a70768d8 SHA256 2839abede223ca0daa142edbe6a5bca38cd21e890ef08fb8720605474d829a2c
+MD5 3e388b2d3de0785e62602f718ce109c2 proftpd-1.3.1_rc2-r2.ebuild 6295
+RMD160 a533f390e973dcb2323f1d79d769b7e5bec9c04c proftpd-1.3.1_rc2-r2.ebuild 6295
+SHA256 2839abede223ca0daa142edbe6a5bca38cd21e890ef08fb8720605474d829a2c proftpd-1.3.1_rc2-r2.ebuild 6295
+MISC ChangeLog 25603 RMD160 30736defe34223f7e3f055b4c33cb8fdde50a455 SHA1 575b93a7f7c02afb5804bcc3e3fe5689dc12fda4 SHA256 6d92be939e46de8bb6e969deb10ba54b7ef0b15112578be58d29c8618b6ef679
+MD5 7e92c6624b5e22d0bb2d738315ba7127 ChangeLog 25603
+RMD160 30736defe34223f7e3f055b4c33cb8fdde50a455 ChangeLog 25603
+SHA256 6d92be939e46de8bb6e969deb10ba54b7ef0b15112578be58d29c8618b6ef679 ChangeLog 25603
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata.xml 397
-MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2 1247
-RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2 1247
-SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2 1247
 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
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r2
index b18daddb66a6..b18daddb66a6 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r2
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug178866.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug178866.patch
new file mode 100644
index 000000000000..206ffb0d6384
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug178866.patch
@@ -0,0 +1,68 @@
+--- src/auth.c	2007/04/17 21:33:40	1.48
++++ src/auth.c	2007/05/21 15:19:41	1.49
+@@ -442,6 +442,32 @@
+ 
+   cmd = make_cmd(p, 2, name, pw);
+ 
++  /* First, check for the mod_auth_pam.c module.
++   *
++   * PAM is a bit of hack in this Auth API, because PAM only provides
++   * yes/no checks, and is not a source of user information.
++   */
++  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)) {
++      res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
++
++      if (cmd->tmp_pool) {
++        destroy_pool(cmd->tmp_pool);
++        cmd->tmp_pool = NULL;
++      }
++
++      return res;
++    }
++
++    m = NULL;
++  }
++
+   if (auth_tab) {
+ 
+     /* Fetch the specific module to be used for authenticating this user. */
+@@ -479,6 +505,32 @@
+ 
+   cmd = make_cmd(p, 3, cpw, name, pw);
+ 
++  /* First, check for the mod_auth_pam.c module.  
++   *
++   * PAM is a bit of hack in this Auth API, because PAM only provides
++   * yes/no checks, and is not a source of user information.
++   */
++  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)) {
++      res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
++
++      if (cmd->tmp_pool) {
++        destroy_pool(cmd->tmp_pool);
++        cmd->tmp_pool = NULL;
++      }
++
++      return res;
++    }
++
++    m = NULL;
++  }
++
+   if (auth_tab) {
+ 
+     /* Fetch the specific module to be used for authenticating this user. */
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc2-r2.ebuild
index 7fb172f04ad5..9ae2ab1bdd49 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc2-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.2 2007/05/08 22:34:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc2-r2.ebuild,v 1.1 2007/06/10 19:34:49 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
 
@@ -53,6 +53,12 @@ src_unpack() {
 
 	cd "${S}"
 
+	# Fix bugs #164612, #167003, #175082 and #178866
+	epatch "${FILESDIR}/${P}-bug164612.patch"
+	epatch "${FILESDIR}/${P}-bug167003.patch"
+	epatch "${FILESDIR}/${P}-bug175082.patch"
+	epatch "${FILESDIR}/${P}-bug178866.patch"
+
 	# Fix stripping of files
 	sed -e "s| @INSTALL_STRIP@||g" -i Make*