Fix bugs #164612, #167003 and #175082.

Package-Manager: portage-2.1.2.7

7 files changed, 656 insertions, 15 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 06dd140d19d2..d8f27c19ff3b 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.148 2007/05/08 22:34:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.149 2007/05/11 22:01:04 chtekk Exp $
+
+*proftpd-1.3.1_rc2-r1 (11 May 2007)
+
+  11 May 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1_rc2-bug164612.patch,
+  +files/proftpd-1.3.1_rc2-bug167003.patch,
+  +files/proftpd-1.3.1_rc2-bug175082.patch, +proftpd-1.3.1_rc2-r1.ebuild:
+  Fix bugs #164612, #167003 and #175082.
 
   08 May 2007; Marius Mauch <genone@gentoo.org> proftpd-1.3.1_rc2.ebuild:
   Replacing einfo with elog
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 217dc463c5a4..6bf5c9c05038 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,15 @@
------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
+SHA256 68b0bb47c3f46b931ff1887f299028803a15888641dfaad47865615bb0d6952c files/proftpd-1.3.1_rc2-bug164612.patch 779
+AUX proftpd-1.3.1_rc2-bug167003.patch 316 RMD160 7fcade6de378727081d0a14775b2e240f2a5aa31 SHA1 14439ace9c84932c460df3baace3fcbb10968c03 SHA256 55b87a0da8df2c4f257cbeb090d7a6fafda142a9db88c97728281358ac4792ff
+MD5 af8be355b32a5166a7b92c6bdf784dd0 files/proftpd-1.3.1_rc2-bug167003.patch 316
+RMD160 7fcade6de378727081d0a14775b2e240f2a5aa31 files/proftpd-1.3.1_rc2-bug167003.patch 316
+SHA256 55b87a0da8df2c4f257cbeb090d7a6fafda142a9db88c97728281358ac4792ff files/proftpd-1.3.1_rc2-bug167003.patch 316
+AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c SHA1 65ea3a861dc493439a8b2e2d3271dba57825bbac SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc
+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.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd
 MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671
 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671
@@ -18,14 +27,18 @@ DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SH
 DIST proftpd-1.3.1rc2.tar.bz2 1516464 RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 SHA1 7db6435707983fe8e865064661cedb159ebc1cf6 SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
+EBUILD proftpd-1.3.1_rc2-r1.ebuild 6243 RMD160 eafb57f60bc58c812ce20d62c28e55e7a703444e SHA1 fae5126ae6155dabb801e699751b0e979c7d6232 SHA256 03fdb69c0cc4c7cb201574bf2a8e85ab708f669320ce51a68bb405c5a0ca9435
+MD5 12a0df7f888f581de29fd6681e3f6393 proftpd-1.3.1_rc2-r1.ebuild 6243
+RMD160 eafb57f60bc58c812ce20d62c28e55e7a703444e proftpd-1.3.1_rc2-r1.ebuild 6243
+SHA256 03fdb69c0cc4c7cb201574bf2a8e85ab708f669320ce51a68bb405c5a0ca9435 proftpd-1.3.1_rc2-r1.ebuild 6243
 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 24280 RMD160 5a4388691c5d6b33bc0da3c6ecea5145ba40924c SHA1 009404d3ffb2364d93e1101d20e035063d5e4603 SHA256 57590c0a9de2340503b53c33ec02c8894d6b06271b0899df95cabaa639049dcb
-MD5 014607bf3cadb05d65ce6a7d000a836b ChangeLog 24280
-RMD160 5a4388691c5d6b33bc0da3c6ecea5145ba40924c ChangeLog 24280
-SHA256 57590c0a9de2340503b53c33ec02c8894d6b06271b0899df95cabaa639049dcb ChangeLog 24280
+MISC ChangeLog 24572 RMD160 eed3498c7879e04ca58aedb40e87b31f40545454 SHA1 0d27b919fafbd21b1d53ef33caf1495ac979e8bb SHA256 1bdf69994a493993507423da2e5cc78cdcbb038b6c4a086f810d28ad3d045e35
+MD5 941d5e82eaa47a3cc225640d371d1f93 ChangeLog 24572
+RMD160 eed3498c7879e04ca58aedb40e87b31f40545454 ChangeLog 24572
+SHA256 1bdf69994a493993507423da2e5cc78cdcbb038b6c4a086f810d28ad3d045e35 ChangeLog 24572
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -33,10 +46,6 @@ SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFGQPv26J2i8a8J4okRAgBeAJ9JDrZLQyeXNxUV6IWXHaInb+8gNgCdF6+u
-uPuYlu9FVS8jE8Og58SmDGc=
-=Iuso
------END PGP SIGNATURE-----
+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
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r1 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r1
new file mode 100644
index 000000000000..b18daddb66a6
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r1
@@ -0,0 +1,15 @@
+MD5 da279361d5a34b37ce1f64d3830c4c17 mod_clamav_new.c 7399
+RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb mod_clamav_new.c 7399
+SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clamav_new.c 7399
+MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645
+RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645
+SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645
+MD5 b117abb8fa7df8bc6d5e2ee85d97b4e0 proftpd-1.3.1rc2.tar.bz2 1516464
+RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 proftpd-1.3.1rc2.tar.bz2 1516464
+SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da proftpd-1.3.1rc2.tar.bz2 1516464
+MD5 74fbdcac94cde09c67bc033e22324c8c proftpd-mod-shaper-0.6.2.tar.gz 19002
+RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 proftpd-mod-shaper-0.6.2.tar.gz 19002
+SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e proftpd-mod-shaper-0.6.2.tar.gz 19002
+MD5 7abc595e45ce13e38edd6110d1745436 proftpd-mod-vroot-0.7.2.tar.gz 6071
+RMD160 b152162b3714910d5b9378611313041c3e7e17d4 proftpd-mod-vroot-0.7.2.tar.gz 6071
+SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a proftpd-mod-vroot-0.7.2.tar.gz 6071
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug164612.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug164612.patch
new file mode 100644
index 000000000000..060fc9518456
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug164612.patch
@@ -0,0 +1,23 @@
+--- modules/mod_lang.c	2007/01/19 21:59:44	1.4
++++ modules/mod_lang.c	2007/01/19 23:01:25	1.5
+@@ -262,10 +262,19 @@
+ 
+ static int lang_init(void) {
+   if (setlocale(LC_ALL, "") == NULL) {
+-    pr_log_pri(PR_LOG_NOTICE, "unable to set locale: %s", strerror(errno));
++    pr_log_pri(PR_LOG_NOTICE, "unable to set LC_ALL: %s", strerror(errno));
+     return -1;
+   }
+ 
++  /* Preserve the POSIX/portable handling of number formatting; local
++   * formatting of decimal points, for example, can cause problems with
++   * numbers in SQL queries.
++   */
++  if (setlocale(LC_NUMERIC, "C") == NULL) {
++    pr_log_pri(PR_LOG_NOTICE, "unable to set LC_NUMERIC: %s",
++      strerror(errno));
++  }
++
+   lang_pool = make_sub_pool(permanent_pool);
+   pr_pool_tag(lang_pool, MOD_LANG_VERSION);
+ 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug167003.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug167003.patch
new file mode 100644
index 000000000000..d6ce55a148b0
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug167003.patch
@@ -0,0 +1,15 @@
+--- modules/mod_facl.c	2007/04/18 15:31:28	1.6
++++ modules/mod_facl.c	2007/04/30 17:47:34	1.7
+@@ -826,10 +826,10 @@
+   "facl",
+ 
+   /* Module configuration directive handlers */
+-  NULL,
++  facl_conftab,
+ 
+   /* Module command handlers */
+-  facl_conftab,
++  NULL,
+ 
+   /* Module authentication handlers */
+   NULL,
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug175082.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug175082.patch
new file mode 100644
index 000000000000..7e3b6cf6f4ac
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1_rc2-bug175082.patch
@@ -0,0 +1,354 @@
+--- include/auth.h	2005/06/10 17:21:10	1.4
++++ include/auth.h	2007/04/17 21:33:40	1.5
+@@ -86,6 +86,7 @@
+ config_rec *pr_auth_get_anon_config(pool *p, char **, char **, char **);
+ 
+ /* For internal use only. */
++int init_auth(void);
+ int set_groups(pool *, gid_t, array_header *);
+ 
+ #endif /* PR_MODULES_H */
+--- modules/mod_core.c	2007/03/09 16:20:54	1.298
++++ modules/mod_core.c	2007/04/17 21:33:40	1.299
+@@ -4418,6 +4418,8 @@
+   config_rec *c = NULL;
+   unsigned int *debug_level = NULL;
+ 
++  init_auth();
++
+   /* Check for a server-specific TimeoutIdle. */
+   c = find_config(main_server->conf, CONF_PARAM, "TimeoutIdle", FALSE);
+   if (c != NULL)
+--- src/auth.c	2007/01/08 22:59:28	1.47
++++ src/auth.c	2007/04/17 21:33:40	1.48
+@@ -30,6 +30,10 @@
+ 
+ #include "conf.h"
+ 
++static pool *auth_pool = NULL;
++static pr_table_t *auth_tab = NULL;
++static const char *trace_channel = "auth";
++
+ /* The difference between this function, and pr_cmd_alloc(), is that this
+  * allocates the cmd_rec directly from the given pool, whereas pr_cmd_alloc()
+  * will allocate a subpool from the given pool, and allocate its cmd_rec
+@@ -63,7 +67,7 @@
+   return c;
+ }
+ 
+-static modret_t *dispatch_auth(cmd_rec *cmd, char *match) {
++static modret_t *dispatch_auth(cmd_rec *cmd, char *match, module **m) {
+   authtable *start_tab = NULL, *iter_tab = NULL;
+   modret_t *mr = NULL;
+ 
+@@ -74,7 +78,12 @@
+   while (iter_tab) {
+     pr_signals_handle();
+ 
+-    pr_trace_msg("auth", 6, "dispatching auth request \"%s\" to module mod_%s",
++    if (m && *m && *m != iter_tab->m) {
++      goto next;
++    }
++
++    pr_trace_msg(trace_channel, 6,
++      "dispatching auth request \"%s\" to module mod_%s",
+       match, iter_tab->m->name);
+ 
+     mr = call_module(iter_tab->m, iter_tab->handler, cmd);
+@@ -83,9 +92,19 @@
+       break;
+ 
+     if (MODRET_ISHANDLED(mr) ||
+-        MODRET_ISERROR(mr))
++        MODRET_ISERROR(mr)) {
++
++      /* Return a pointer, if requested, to the module which answered the
++       * auth request.  This is used, for example, by auth_getpwnam() for
++       * associating the answering auth module with the data looked up.
++       */
++      if (m)
++        *m = iter_tab->m;
++
+       break;
++    }
+ 
++  next:
+     iter_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, iter_tab,
+       &cmd->stash_index);
+ 
+@@ -106,7 +125,7 @@
+   modret_t *mr = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "setpwent");
++  mr = dispatch_auth(cmd, "setpwent", NULL);
+ 
+   if (cmd->tmp_pool) {
+     destroy_pool(cmd->tmp_pool);
+@@ -121,13 +140,20 @@
+   modret_t *mr = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "endpwent");
++  mr = dispatch_auth(cmd, "endpwent", NULL);
+ 
+   if (cmd->tmp_pool) {
+     destroy_pool(cmd->tmp_pool);
+     cmd->tmp_pool = NULL;
+   }
+ 
++  if (auth_tab) {
++    pr_trace_msg(trace_channel, 5, "emptying authcache");
++    (void) pr_table_empty(auth_tab);
++    (void) pr_table_free(auth_tab);
++    auth_tab = NULL;
++  }
++
+   return;
+ }
+ 
+@@ -136,7 +162,7 @@
+   modret_t *mr = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "setgrent");
++  mr = dispatch_auth(cmd, "setgrent", NULL);
+ 
+   if (cmd->tmp_pool) {
+     destroy_pool(cmd->tmp_pool);
+@@ -151,7 +177,7 @@
+   modret_t *mr = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "endgrent");
++  mr = dispatch_auth(cmd, "endgrent", NULL);
+ 
+   if (cmd->tmp_pool) {
+     destroy_pool(cmd->tmp_pool);
+@@ -167,7 +193,7 @@
+   struct passwd *res = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "getpwent");
++  mr = dispatch_auth(cmd, "getpwent", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+     res = mr->data;
+@@ -201,7 +227,7 @@
+   struct group *res = NULL;
+ 
+   cmd = make_cmd(p, 0);
+-  mr = dispatch_auth(cmd, "getgrent");
++  mr = dispatch_auth(cmd, "getgrent", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+     res = mr->data;
+@@ -228,11 +254,13 @@
+   cmd_rec *cmd = NULL;
+   modret_t *mr = NULL;
+   struct passwd *res = NULL;
++  module *m = NULL;
+ 
+   cmd = make_cmd(p, 1, name);
+-  mr = dispatch_auth(cmd, "getpwnam");
++  mr = dispatch_auth(cmd, "getpwnam", &m);
+ 
+-  if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
++  if (MODRET_ISHANDLED(mr) &&
++      MODRET_HASDATA(mr))
+     res = mr->data;
+ 
+   if (cmd->tmp_pool) {
+@@ -257,6 +285,46 @@
+     return NULL;
+   }
+ 
++  if (!auth_tab && auth_pool) {
++    auth_tab = pr_table_alloc(auth_pool, 0);
++  }
++
++  if (m && auth_tab) {
++    int count = 0;
++    void *value = NULL;
++
++    value = palloc(auth_pool, sizeof(module *));
++    *((module **) value) = m;
++
++    count = pr_table_exists(auth_tab, name);
++    if (count <= 0) {
++      if (pr_table_add(auth_tab, pstrdup(auth_pool, name), value,
++          sizeof(module *)) < 0) {
++        pr_trace_msg(trace_channel, 3,
++          "error adding module 'mod_%s.c' for user '%s' to the authcache: %s",
++          m->name, name, strerror(errno));
++
++      } else {
++        pr_trace_msg(trace_channel, 5,
++          "stashed module 'mod_%s.c' for user '%s' in the authcache",
++          m->name, name);
++      }
++
++    } else {
++      if (pr_table_set(auth_tab, pstrdup(auth_pool, name), value,
++          sizeof(module *)) < 0) {
++        pr_trace_msg(trace_channel, 3,
++          "error setting module 'mod_%s.c' for user '%s' in the authcache: %s",
++          m->name, name, strerror(errno));
++
++      } else {
++        pr_trace_msg(trace_channel, 5,
++          "stashed module 'mod_%s.c' for user '%s' in the authcache",
++          m->name, name);
++      }
++    }
++  }
++
+   pr_log_debug(DEBUG10, "retrieved UID %lu for user '%s'",
+     (unsigned long) res->pw_uid, name);
+   return res;
+@@ -268,7 +336,7 @@
+   struct passwd *res = NULL;
+ 
+   cmd = make_cmd(p, 1, (void *) &uid);
+-  mr = dispatch_auth(cmd, "getpwuid");
++  mr = dispatch_auth(cmd, "getpwuid", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+     res = mr->data;
+@@ -306,7 +374,7 @@
+   struct group *res = NULL;
+ 
+   cmd = make_cmd(p, 1, name);
+-  mr = dispatch_auth(cmd, "getgrnam");
++  mr = dispatch_auth(cmd, "getgrnam", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+     res = mr->data;
+@@ -339,7 +407,7 @@
+   struct group *res = NULL;
+ 
+   cmd = make_cmd(p, 1, (void *) &gid);
+-  mr = dispatch_auth(cmd, "getgrgid");
++  mr = dispatch_auth(cmd, "getgrgid", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
+     res = mr->data;
+@@ -369,10 +437,25 @@
+ int pr_auth_authenticate(pool *p, const char *name, const char *pw) {
+   cmd_rec *cmd = NULL;
+   modret_t *mr = NULL;
++  module *m = NULL;
+   int res = PR_AUTH_NOPWD;
+ 
+   cmd = make_cmd(p, 2, name, pw);
+-  mr = dispatch_auth(cmd, "auth");
++
++  if (auth_tab) {
++
++    /* Fetch the specific module to be used for authenticating this user. */
++    void *v = pr_table_get(auth_tab, name, NULL);
++    if (v) {
++      m = *((module **) v);
++
++      pr_trace_msg(trace_channel, 4,
++        "using module 'mod_%s.c' from authcache to authenticate user '%s'",
++        m->name, name);
++    }
++  }
++
++  mr = dispatch_auth(cmd, "auth", m ? &m : NULL);
+ 
+   if (MODRET_ISHANDLED(mr))
+     res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
+@@ -391,10 +474,25 @@
+ int pr_auth_check(pool *p, const char *cpw, const char *name, const char *pw) {
+   cmd_rec *cmd = NULL;
+   modret_t *mr = NULL;
++  module *m = NULL;
+   int res = PR_AUTH_BADPWD;
+ 
+   cmd = make_cmd(p, 3, cpw, name, pw);
+-  mr = dispatch_auth(cmd, "check");
++
++  if (auth_tab) {
++
++    /* Fetch the specific module to be used for authenticating this user. */
++    void *v = pr_table_get(auth_tab, name, NULL);
++    if (v) {
++      m = *((module **) v);
++
++      pr_trace_msg(trace_channel, 4,
++        "using module 'mod_%s.c' from authcache to authenticate user '%s'",
++        m->name, name);
++    }
++  }
++
++  mr = dispatch_auth(cmd, "check", m ? &m : NULL);
+ 
+   if (MODRET_ISHANDLED(mr))
+     res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
+@@ -413,7 +511,7 @@
+   int res = TRUE;
+ 
+   cmd = make_cmd(p, 1, name);
+-  mr = dispatch_auth(cmd, "requires_pass");
++  mr = dispatch_auth(cmd, "requires_pass", NULL);
+ 
+   if (MODRET_ISHANDLED(mr))
+     res = FALSE;
+@@ -438,7 +536,7 @@
+   memset(namebuf, '\0', sizeof(namebuf));
+ 
+   cmd = make_cmd(p, 1, (void *) &uid);
+-  mr = dispatch_auth(cmd, "uid2name");
++  mr = dispatch_auth(cmd, "uid2name", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
+     res = mr->data;
+@@ -463,7 +561,7 @@
+   memset(namebuf, '\0', sizeof(namebuf));
+ 
+   cmd = make_cmd(p, 1, (void *) &gid);
+-  mr = dispatch_auth(cmd, "gid2name");
++  mr = dispatch_auth(cmd, "gid2name", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
+     res = mr->data;
+@@ -485,7 +583,7 @@
+   uid_t res = (uid_t) -1;
+ 
+   cmd = make_cmd(p, 1, name);
+-  mr = dispatch_auth(cmd, "name2uid");
++  mr = dispatch_auth(cmd, "name2uid", NULL);
+ 
+   if (MODRET_ISHANDLED(mr))
+     res = *((uid_t *) mr->data);
+@@ -506,7 +604,7 @@
+   gid_t res = (gid_t) -1;
+ 
+   cmd = make_cmd(p, 1, name);
+-  mr = dispatch_auth(cmd, "name2gid");
++  mr = dispatch_auth(cmd, "name2gid", NULL);
+ 
+   if (MODRET_ISHANDLED(mr))
+     res = *((gid_t *) mr->data);
+@@ -538,7 +636,7 @@
+   cmd = make_cmd(p, 3, name, group_ids ? *group_ids : NULL,
+     group_names ? *group_names : NULL);
+ 
+-  mr = dispatch_auth(cmd, "getgroups");
++  mr = dispatch_auth(cmd, "getgroups", NULL);
+ 
+   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
+     res = *((int *) mr->data);
+@@ -832,3 +930,10 @@
+   return res;
+ }
+ 
++/* Internal use only.  To be called in the session process. */
++int init_auth(void) {
++  auth_pool = make_sub_pool(permanent_pool);
++  pr_pool_tag(auth_pool, "Auth API");
++
++  return 0;
++}
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc2-r1.ebuild
new file mode 100644
index 000000000000..5e3698495111
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc2-r1.ebuild
@@ -0,0 +1,217 @@
+# 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-r1.ebuild,v 1.1 2007/05/11 22:01:04 chtekk Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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"
+
+SHAPER_VER="0.6.2"
+VROOT_VER="0.7.2"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
+		clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html )
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+HOMEPAGE="http://www.proftpd.org/
+		http://www.castaglia.org/proftpd/
+		http://www.uglyboxindustries.com/open-source.php"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+		clamav? ( app-antivirus/clamav )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		ncurses? ( sys-libs/ncurses )
+		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-7.3 )
+		ssl? ( >=dev-libs/openssl-0.9.6f )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+		xinetd? ( sys-apps/xinetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+	# Add the proftpd user to make the default config
+	# work out-of-the-box
+	enewgroup proftpd
+	enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+	unpack ${P/_/}.tar.bz2
+
+	cd "${S}"
+
+	# Fix bugs #164612, #167003 and #175082
+	epatch "${FILESDIR}/${P}-bug164612.patch"
+	epatch "${FILESDIR}/${P}-bug167003.patch"
+	epatch "${FILESDIR}/${P}-bug175082.patch"
+
+	# Fix stripping of files
+	sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+	if use shaper ; then
+		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+		cp -f mod_shaper/mod_shaper.c contrib/
+	fi
+
+	if use clamav ; then
+		cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c
+		cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html
+	fi
+
+	if use vroot ; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp -f mod_vroot/mod_vroot.c contrib/
+		cp -f mod_vroot/mod_vroot.html doc/
+	fi
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use acl && modules="${modules}:mod_facl"
+	use clamav && modules="${modules}:mod_clamav"
+	use pam && modules="${modules}:mod_auth_pam"
+	use radius && modules="${modules}:mod_radius"
+	use rewrite && modules="${modules}:mod_rewrite"
+	use shaper && modules="${modules}:mod_shaper"
+	use sitemisc && modules="${modules}:mod_site_misc"
+	use ssl && modules="${modules}:mod_tls"
+	use tcpd && modules="${modules}:mod_wrap"
+	use vroot && modules="${modules}:mod_vroot"
+
+	# pam needs to be explicitely disabled
+	use pam || myconf="${myconf} --enable-auth-pam=no"
+
+	if use ldap ; then
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+	fi
+
+	if use opensslcrypt ; then
+		append-ldflags "-lcrypto"
+		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} --enable-nls"
+	fi
+
+	if use mysql && use postgres ; then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with:"
+		ewarn "USE='-mysql postgres' emerge proftpd"
+		epause 5
+	fi
+
+	if use mysql ; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="${myconf} --with-includes=/usr/include/mysql"
+	elif use postgres ; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	if use softquota ; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres ; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use ldap ; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# mod_ifsession should be the last module in the --with-modules list
+	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+	use ifsession && modules="${modules}:mod_ifsession"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	gcc-specs-pie && echo > lib/libcap/cap_sys.c
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /var/run/proftpd
+
+	dodoc "${FILESDIR}/proftpd.conf" \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/license.txt
+	dohtml doc/*.html
+
+	use shaper && dohtml mod_shaper/mod_shaper.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
+
+	insinto /etc/proftpd
+	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/proftpd.xinetd" proftpd
+	fi
+
+	newinitd "${FILESDIR}/proftpd.rc6" proftpd
+}
+
+pkg_postinst() {
+	elog
+	elog "You can find the config files in /etc/proftpd"
+	elog
+	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+	ewarn "Remember to change that in the configuration file."
+	ewarn
+	if use clamav ; then
+		ewarn "mod_clamav was updated to a new version, which uses Clamd"
+		ewarn "only for virus scanning, so you'll have to set Clamd up"
+		ewarn "and start it, also re-check the mod_clamav docs."
+		ewarn
+	fi
+}