Fix init script depecrated variables, version bumps

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

7 files changed, 91 insertions, 263 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index a12d46b0cd84..f4b509cb9302 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.275 2011/08/18 14:40:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.276 2011/09/28 09:47:22 voyageur Exp $
+
+*proftpd-1.3.4_rc3 (28 Sep 2011)
+*proftpd-1.3.3f (28 Sep 2011)
+
+  28 Sep 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -proftpd-1.3.3d-r1.ebuild, +proftpd-1.3.3f.ebuild,
+  -proftpd-1.3.4_rc2-r2.ebuild, +proftpd-1.3.4_rc3.ebuild,
+  -files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch,
+  -files/proftpd-bug3586.patch, files/proftpd.initd:
+  Proxy commit:
+  * Remove init script deprecated --oknodo (bug #384393)
+  * Readd memcache support (bug #378881)
+  * Add support of ProFTPD's api test suite
+  * Remove trivial mod_exec warning
 
 *proftpd-1.3.4_rc2-r2 (18 Aug 2011)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index a8cad4d223ed..94b3f63133de 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,31 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch 802 RMD160 1df65b4ec9a8fee9ca1fe7c87415e59ce1dae6fd SHA1 2749f5e949dc50b89651baca911b679ddf27f492 SHA256 6d793222b2d128ce963722894fb7d0743f5328cd7849c6218f6329f7c43f325f
-AUX proftpd-bug3586.patch 5507 RMD160 8843d2f0d4378151b34263834f7bfd88271eaece SHA1 70af05ef5c852c590a50551e7d72a16a6cd1b7ba SHA256 4e748700d4262c2340e485844d3dff76715853f3c27db877298c8eda098a4ed8
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
-AUX proftpd.initd 1563 RMD160 c30ab2c000ca31a348e0c9d92e07d93c5cba8d4e SHA1 7462aaec25c6f44928339458d450f7e386b147d4 SHA256 fe36a50fcf1a2d7b820edde94349cd68204e7b14c8a5d34f710af68ed1ce8315
+AUX proftpd.initd 1565 RMD160 efa4d3a98202666ba55e91c711fa03832ad5e320 SHA1 18ff1ec4d34d7442d06ab2201deea40548116d51 SHA256 52ee854ddd402b251b483450a26001a4d8d72706870040d0a866347440e0c395
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
-DIST proftpd-1.3.3d.tar.bz2 4177511 RMD160 8aa4e1c0456c771ae77e8682bd612b1229d05f4b SHA1 b2ee3ffdaa971c24327ad66412f2d71b628eddab SHA256 667fdf757f426517cb5fd69c3830f2b9f996febff51f59a208e46f5f1bd66606
 DIST proftpd-1.3.3e.tar.bz2 4180369 RMD160 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07 SHA1 b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f SHA256 f6c65fe9fea6577ac309f4e9e36c80def271fa5c91c4053fb0758824506127b6
-DIST proftpd-1.3.4rc2.tar.bz2 6748120 RMD160 c0c5d5b447486e636c8c1de0cc62d1fc393182ac SHA1 693abfc85aa93729c87cf87f53221e95dc0f86d7 SHA256 72f3e85b2bc59b3cb94128065901f95c13c0150da1390a79864abf8d5c94e2ca
+DIST proftpd-1.3.3f.tar.bz2 4202825 RMD160 1f371ff14fb8c777dc8432f5a8d18fa5584a22cd SHA1 55083ab9bbe1e9ef83084ca9dc9d8cdeac5f6a1c SHA256 3494c1902234bbcdb33b058340e73e9745a0d7f8bbbd60d5941ce2b752421b0b
+DIST proftpd-1.3.4rc3.tar.bz2 6797444 RMD160 7095ab3c00d9079c4c48945702f098984491e8a1 SHA1 2be68af15b1e09d9dba06ef03d8426a320956fa8 SHA256 a0b981d50d72ad797d2ae0482feb45661f4874cd9f7029c0ee559cdffafb5ed6
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-case-0.7.tar.gz 13184 RMD160 9514b003b21999a97df59b2fe8b24a71d585047b SHA1 665b25a1673edc34faac87bd48fb193687c131bc SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036
-DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
 DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf
-EBUILD proftpd-1.3.3d-r1.ebuild 7245 RMD160 e99c7e74adb60a3d4130943497a6e519b4e09bca SHA1 f11326ac34ee44f117c0c991ca16bb82f6be09c9 SHA256 0656968ac511d2cb18a249b0fe9439b9088d1e84a4506882c919061ca14004a3
 EBUILD proftpd-1.3.3e.ebuild 7183 RMD160 4c009e8f89baef255c123f204c8bfec5d09196d9 SHA1 fd7eb7e51c817b07445287db1ed293fb87b76cf8 SHA256 bcd90c24d29af48fefdb4b63aa7928e54a9c1075e4c6cf0ee8dbd4e0786273b8
-EBUILD proftpd-1.3.4_rc2-r2.ebuild 7060 RMD160 20e85a839bf8d234b9fa5247856d84baa0a0b255 SHA1 1377d503568db5b3ce84fda5312553469e3fa4e7 SHA256 67016b5a2cc3001ffbdce699e667a5f6a70f33f43b0f0d10273be07c3e8bbb42
-MISC ChangeLog 47372 RMD160 7eca324cf1c9ef0abd664a002322ad9a9a009dda SHA1 c475378ce9f48ddc61eff7ea493cab776fda1631 SHA256 2b6cc3910c657027d452de9cab2f761f8328e80d64d364b607108f15a30189fe
+EBUILD proftpd-1.3.3f.ebuild 7190 RMD160 fa45fc702ef2a7d26b3cd8aef5c873a15da35d90 SHA1 19ffdf0fa804870693a6e005a103955bea40fdd3 SHA256 68b5ce24ec8f470f00fb321e79895b663791c546254ff141d60fc11a11304c3d
+EBUILD proftpd-1.3.4_rc3.ebuild 6580 RMD160 463d7d9d65e2365dedad0b5797aa9af41f55a947 SHA1 38d4e7fad5dd27abb24004114ac39c97b3c09fca SHA256 889d27a7999ff3c3590175ba5d09be22813aed9909b0efe072669af6951f02e7
+MISC ChangeLog 47915 RMD160 c3dbb7c605382bc0d139f61ed683717bf514c86c SHA1 71a92529e8cd29c2718fbe33af73b92fd89b4724 SHA256 0ec06086f505d57f5a8268f06c1a0124a16a88f848b8c3f4b75825d3ee95ca81
 MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5NJH8ACgkQFYEBGcdFJfLlXwD/eku48NcfwSLsUv6uFdtkybfR
-OirebARevKFssE1Yf8oA/iIYA33vuG/HbRkSm7hoqxchjlYuk667TsYtxmNnCDk4
-=ogwN
+iF4EAREIAAYFAk6C7TkACgkQFYEBGcdFJfL8ZQD/ahdyV+aO2LsEBhYcJDA0BTV5
+6dYKA6RmMNQ9pv7iqTsA/ijEibJLCrFx/lJGNBzmV+Y5c8acpZKaGn1mQhRd67my
+=6+WP
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch b/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch
deleted file mode 100644
index 7393495e617b..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: contrib/mod_sql.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql.c,v
-retrieving revision 1.210
-diff -u -r1.210 mod_sql.c
---- contrib/mod_sql.c	26 Mar 2011 00:43:27 -0000	1.210
-+++ contrib/mod_sql.c	12 Apr 2011 22:07:41 -0000
-@@ -4045,8 +4045,8 @@
-     if (!cmap.groupcustomgroupsetfast) {
-       where = sql_prepare_where(0, cmd, 1, cmap.groupwhere, NULL);
- 
--      mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 6, MOD_SQL_DEF_CONN_NAME,
--        cmap.grptable, cmap.grpfields, where, NULL), "sql_select");
-+      mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 5, MOD_SQL_DEF_CONN_NAME,
-+        cmap.grptable, cmap.grpfields, where, "1"), "sql_select");
-       if (check_response(mr) < 0) {
-         return mr;
-       }
diff --git a/net-ftp/proftpd/files/proftpd-bug3586.patch b/net-ftp/proftpd/files/proftpd-bug3586.patch
deleted file mode 100644
index 529da12f1aff..000000000000
--- a/net-ftp/proftpd/files/proftpd-bug3586.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Index: contrib/mod_sftp/mod_sftp.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/mod_sftp.c,v
-retrieving revision 1.42
-diff -u -r1.42 mod_sftp.c
---- contrib/mod_sftp/mod_sftp.c	15 Dec 2010 00:58:59 -0000	1.42
-+++ contrib/mod_sftp/mod_sftp.c	25 Jan 2011 01:58:01 -0000
-@@ -85,12 +85,12 @@
-     memset(buf, '\0', sizeof(buf));
- 
-     for (i = 0; i < sizeof(buf) - 1; i++) {
--      res = sftp_ssh2_packet_sock_read(conn->rfd, &buf[i], 1);
-+      res = sftp_ssh2_packet_sock_read(conn->rfd, &buf[i], 1, 0);
-       while (res <= 0) {
-         if (errno == EINTR) {
-           pr_signals_handle();
- 
--          res = sftp_ssh2_packet_sock_read(conn->rfd, &buf[i], 1);
-+          res = sftp_ssh2_packet_sock_read(conn->rfd, &buf[i], 1, 0);
-           continue;
-         }
- 
-Index: contrib/mod_sftp/packet.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/packet.c,v
-retrieving revision 1.22
-diff -u -r1.22 packet.c
---- contrib/mod_sftp/packet.c	16 Dec 2010 21:31:16 -0000	1.22
-+++ contrib/mod_sftp/packet.c	25 Jan 2011 01:58:01 -0000
-@@ -46,6 +46,12 @@
- static uint32_t packet_client_seqno = 0;
- static uint32_t packet_server_seqno = 0;
- 
-+/* Maximum length of the payload data of an SSH2 packet we're willing to
-+ * accept.  Any packets reporting a payload length longer than this will be
-+ * ignored/dropped.
-+ */
-+#define SFTP_PACKET_MAX_PAYLOAD_LEN	(256 * 1024)
-+
- /* RFC4344 recommends 2^31 for the client packet sequence number at which
-  * we should request a rekey, and 2^32 for the server packet sequence number.
-  *
-@@ -169,7 +175,8 @@
-  * It is the caller's responsibility to ensure that buf is large enough to
-  * hold reqlen bytes.
-  */
--int sftp_ssh2_packet_sock_read(int sockfd, void *buf, size_t reqlen) {
-+int sftp_ssh2_packet_sock_read(int sockfd, void *buf, size_t reqlen,
-+    int flags) {
-   void *ptr;
-   size_t remainlen;
- 
-@@ -252,6 +259,13 @@
-     if (res == remainlen)
-       break;
- 
-+    if (flags & SFTP_PACKET_READ_FL_PESSIMISTIC) {
-+      pr_trace_msg(trace_channel, 20, "read %lu bytes, expected %lu bytes; "
-+        "pessimistically returning", (unsigned long) res,
-+        (unsigned long) remainlen);
-+      break;
-+    }
-+
-     pr_trace_msg(trace_channel, 20, "read %lu bytes, expected %lu bytes; "
-       "reading more", (unsigned long) res, (unsigned long) remainlen);
-     ptr = ((char *) ptr + res);
-@@ -477,7 +491,12 @@
-     (unsigned long) buflen);
- 
-   if (buflen > 0) {
--    sftp_ssh2_packet_sock_read(sockfd, buf, buflen);
-+    int flags = SFTP_PACKET_READ_FL_PESSIMISTIC;
-+
-+    /* We don't necessary want to wait for the entire random amount of data
-+     * to be read in.
-+     */
-+    sftp_ssh2_packet_sock_read(sockfd, buf, buflen, flags);
-   }
- 
-   return;
-@@ -497,7 +516,7 @@
-    * how many more bytes there are in the packet.
-    */
- 
--  res = sftp_ssh2_packet_sock_read(sockfd, buf, blocksz);
-+  res = sftp_ssh2_packet_sock_read(sockfd, buf, blocksz, 0);
-   if (res < 0)
-     return res;
- 
-@@ -555,8 +574,26 @@
-   if (payload_len + padding_len == 0)
-     return 0;
- 
--  if (payload_len > 0)
-+  if (payload_len > 0) {
-+    /* We don't want to reject the packet outright yet; but we can ignore
-+     * the payload data we're going to read in.  This packet will fail
-+     * eventually anyway.
-+     */
-+    if (payload_len > SFTP_PACKET_MAX_PAYLOAD_LEN) {
-+      pr_trace_msg(trace_channel, 20,
-+        "payload len (%lu bytes) exceeds max payload len (%lu), "
-+        "ignoring payload", (unsigned long) payload_len,
-+        (unsigned long) SFTP_PACKET_MAX_PAYLOAD_LEN);
-+
-+      pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
-+        "client sent buggy/malicious packet payload length, ignoring");
-+
-+      errno = EPERM;
-+      return -1;
-+    }
-+
-     pkt->payload = pcalloc(pkt->pool, payload_len);
-+  }
- 
-   /* If there's data in the buffer we received, it's probably already part
-    * of the payload, unencrypted.  That will leave the remaining payload
-@@ -617,7 +654,7 @@
-     return -1;
-   }
- 
--  res = sftp_ssh2_packet_sock_read(sockfd, buf + *offset, data_len);
-+  res = sftp_ssh2_packet_sock_read(sockfd, buf + *offset, data_len, 0);
-   if (res < 0) {
-     return res;
-   }
-@@ -645,7 +682,7 @@
-   if (mac_len == 0)
-     return 0;
- 
--  res = sftp_ssh2_packet_sock_read(sockfd, buf, mac_len);
-+  res = sftp_ssh2_packet_sock_read(sockfd, buf, mac_len, 0);
-   if (res < 0)
-     return res;
- 
-Index: contrib/mod_sftp/packet.h
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/packet.h,v
-retrieving revision 1.4
-diff -u -r1.4 packet.h
---- contrib/mod_sftp/packet.h	15 Sep 2010 17:29:51 -0000	1.4
-+++ contrib/mod_sftp/packet.h	25 Jan 2011 01:58:01 -0000
-@@ -78,7 +78,15 @@
- int sftp_ssh2_packet_get_last_sent(time_t *);
- 
- int sftp_ssh2_packet_read(int, struct ssh2_packet *);
--int sftp_ssh2_packet_sock_read(int, void *, size_t);
-+int sftp_ssh2_packet_sock_read(int, void *, size_t, int);
-+
-+/* This sftp_ssh2_packet_sock_read() flag is used to tell the function to
-+ * read in as many of the requested length of data as it can, but to NOT
-+ * keep polling until that length has been acquired (i.e. to read the
-+ * requested length pessimistically, assuming that it will not all appear).
-+ */
-+#define SFTP_PACKET_READ_FL_PESSIMISTIC		0x001
-+
- int sftp_ssh2_packet_write(int, struct ssh2_packet *);
- 
- int sftp_ssh2_packet_handle(void);
diff --git a/net-ftp/proftpd/files/proftpd.initd b/net-ftp/proftpd/files/proftpd.initd
index ff03b411488b..fe399a71d91e 100644
--- a/net-ftp/proftpd/files/proftpd.initd
+++ b/net-ftp/proftpd/files/proftpd.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.3 2010/11/16 13:00:29 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.4 2011/09/28 09:47:22 voyageur Exp $
 
-opts="reload"
+extra_started_commands="reload"
 
 depend() {
 	need net
@@ -46,7 +46,7 @@ stop() {
 reload() {
 	check_configuration || return 1
 	ebegin "Reloading ProFTPD"
-	start-stop-daemon --stop --quiet --signal HUP --oknodo \
+	start-stop-daemon --quiet --signal HUP \
 		--pidfile /var/run/proftpd/proftpd.pid
 	eend $?
 }
diff --git a/net-ftp/proftpd/proftpd-1.3.3d-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.3f.ebuild
index 08ed27b9ea22..fb1f12b855ba 100644
--- a/net-ftp/proftpd/proftpd-1.3.3d-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3d-r1.ebuild,v 1.8 2011/07/21 17:16:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3f.ebuild,v 1.1 2011/09/28 09:47:22 voyageur Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -9,7 +9,7 @@ CASE_VER="0.4"
 CLAMAV_VER="0.11rc"
 DEFLATE_VER="0.5.4"
 GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
+VROOT_VER="0.9.2"
 
 DESCRIPTION="An advanced and very configurable FTP server."
 HOMEPAGE="http://www.proftpd.org/
@@ -25,7 +25,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
@@ -75,9 +75,6 @@ src_prepare() {
 	use deflate && __prepare_module mod_deflate
 	use vroot && __prepare_module mod_vroot
 
-	# Fix ProFTPD Bug #3586
-	epatch "${FILESDIR}"/proftpd-bug3586.patch
-
 	# Fix MySQL includes
 	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
 
@@ -101,7 +98,7 @@ src_configure() {
 	use ban && mym="${mym}:mod_ban"
 	use case && mym="${mym}:mod_case"
 	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
+	if use ctrls || use ban || use shaper ; then
 		myc="${myc} --enable-ctrls"
 		mym="${mym}:mod_ctrls_admin"
 	fi
diff --git a/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild
index d29f02291c82..f7db14b15d68 100644
--- a/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild,v 1.1 2011/08/18 14:40:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild,v 1.1 2011/09/28 09:47:22 voyageur Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -27,14 +27,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident
-	ipv6 kerberos ldap mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux
-	sftp shaper sitemisc softquota sqlite ssl tcpd trace vroot xinetd"
+	ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite
+	selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
 
-DEPEND="acl? ( virtual/acl )
+COMMON_DEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
 	mysql? ( virtual/mysql )
 	nls? ( virtual/libiconv )
 	ncurses? ( sys-libs/ncurses )
@@ -45,7 +46,10 @@ DEPEND="acl? ( virtual/acl )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl )
 	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
+
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${COMMON_DEPEND}
 	net-ftp/ftpbase
 	selinux? ( sec-policy/selinux-ftpd )"
 
@@ -67,10 +71,6 @@ src_prepare() {
 	use vroot && __prepare_module mod_vroot
 
 	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Fix Gentoo Bug #363293 / ProFTPD Bug #3642
-	epatch "${FILESDIR}"/${P}-sql-groupsetfast-null-pointer.patch
 
 	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
 	if use kerberos ; then
@@ -82,18 +82,18 @@ src_prepare() {
 }
 
 src_configure() {
-	local myc myl mym
+	local c m
 
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	use copy && mym="${mym}:mod_copy"
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
 	if use ctrls || use ban || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
+		c="${c} --enable-ctrls"
+		m="${m}:mod_ctrls_admin"
 	fi
-	use deflate && mym="${mym}:mod_deflate"
+	use deflate && m="${m}:mod_deflate"
 	if use diskuse ; then
 		cd "${WORKDIR}"/mod_diskuse
 		econf
@@ -101,11 +101,11 @@ src_configure() {
 		mv mod_diskuse.html "${S}"/doc/contrib
 		cd "${S}"
 		rm -rf "${WORKDIR}"/mod_diskuse
-		mym="${mym}:mod_diskuse"
+		m="${m}:mod_diskuse"
 	fi
-	use exec && mym="${mym}:mod_exec"
-	use ifsession && mym="${mym}:mod_ifsession"
-	use ifversion && mym="${mym}:mod_ifversion"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
 	if use kerberos ; then
 		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
 		if has_version app-crypt/mit-krb5 ; then
@@ -120,59 +120,65 @@ src_configure() {
 		mv rfc{1509,2228}.txt "${S}"/doc/rfc
 		cd "${S}"
 		rm -rf "${WORKDIR}"/mod_gss-${MOD_GSS}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		use elibc_glibc && myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
+		m="${m}:mod_gss:mod_auth_gss"
 	fi
+	use ldap && m="${m}:mod_ldap"
 	if use mysql || use postgres || use sqlite ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		use mysql && mym="${mym}:mod_sql_mysql"
-		use postgres && mym="${mym}:mod_sql_postgres"
-		use sqlite && mym="${mym}:mod_sql_sqlite"
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
 	fi
-	use qos && mym="${mym}:mod_qos"
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	use sftp || use ssl && myc="${myc} --enable-openssl"
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	use sftp || use ssl && c="${c} --enable-openssl"
 	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && mym="${mym}:mod_sftp_sql"
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
 	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
 	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && mym="${mym}:mod_quotatab_sql"
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
 	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
 	if use tcpd ; then
-		mym="${mym}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && mym="${mym}:mod_wrap2_sql"
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
 	fi
-	use vroot && mym="${mym}:mod_vroot"
+	use vroot && m="${m}:mod_vroot"
 
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd \
+	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
+	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
 		$(use_enable acl facl) \
 		$(use_enable authfile auth-file) \
 		$(use_enable caps cap) \
 		$(use_enable ident) \
 		$(use_enable ipv6) \
+		$(use_enable memcache) \
 		$(use_enable ncurses) \
 		$(use_enable nls) \
 		$(use_enable pam auth-pam) \
 		$(use_enable pcre) \
+		$(use_enable test tests) \
 		$(use_enable trace) \
 		$(use_enable userland_GNU shadow) \
 		$(use_enable userland_GNU autoshadow) \
-		${myc:1}
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
 }
 
 src_install() {
@@ -195,15 +201,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
 	if use tcpd ; then
 		ewarn
 		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"