Clean old vulnerabe versions (bug #546644).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

10 files changed, 13 insertions, 1093 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 26016e39f97b..230c9256a999 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.343 2015/07/24 10:29:56 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.344 2015/07/25 08:46:47 slyfox Exp $
+
+  25 Jul 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/proftpd-1.3.4d-memset-fix.patch,
+  -files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch,
+  -files/proftpd-1.3.4e-link-tests.patch,
+  -files/proftpd-1.3.5-netaddr-segv.patch, -proftpd-1.3.4d.ebuild,
+  -proftpd-1.3.4e.ebuild, -proftpd-1.3.5-r1.ebuild, -proftpd-1.3.5.ebuild:
+  Clean old vulnerabe versions (bug #546644).
 
   24 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> proftpd-1.3.5a.ebuild:
   ia64 stable wrt bug #546644
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 4b6bf0046689..ec0ef7d92a9f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX proftpd-1.3.4d-memset-fix.patch 1271 SHA256 814c230120772449a055479447db2684cbeeacea1c709070ebaf21071e8b2b45 SHA512 bb744eee680b8c7c612c09a04bf3b85d643629e043e6a6f178e80108470b7e1324547188b31f7a7854fbca4fe8af08b4ec3918fb7a0d819194bd1f2303f977fe WHIRLPOOL 0c2e770830b70f9ca6acd9b50eee2b3e8b3b567b6ef53d32972edd9e5fd8d1e60b6c3952055a932ede11341d105c4d7662f8bf06e3c72c4ad60633dc11cf4faf
-AUX proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch 1492 SHA256 00f90994dc0514d906de68d96cc798a8158ae50a50a4719a6b070de1ef669c42 SHA512 835976728f0a3d72766c8a2da192d009b30ec5f1d6dedb711e985409708275fe250f14cde168017e5c78ed339b028186e5eecf51a6b183dd0ea85294fa609bb3 WHIRLPOOL fae4ff0ec20dcc83c6be7e2eb73d44785ac95cf4bebbec5f91228864ebd744baaecb9c9ab185eab7ac5ecfdbec0f86c073a8e316e5196f0138dd550b4a4ca00a
-AUX proftpd-1.3.4e-link-tests.patch 344 SHA256 75c5c0568144c9af6fa48b6dfdf1d91b46964d4cc2020140d3acf20bea21ca95 SHA512 8a01081351f1bd198c801e3bfc91e6f97bf9082590690e02689d8446bba643457816ee55620898d97048246e73d828d6aa4f65517a14a1c95be77cdfbaa97c87 WHIRLPOOL 8aecb44b8fba1ed9d107e86107bc4c86075b5a9b9fbcf59d01b30f1b0d88a0ee3806f4d604871385a49a4e862093dcffdd090774b2490fb35222090817c0e568
-AUX proftpd-1.3.5-netaddr-segv.patch 760 SHA256 3faedd12f10645ca90bee3f27d55f7953b0ae5eaf6357e2c17c5a43e8e2df31e SHA512 dac30225ad73e9367eb1106ebce0e04edfcd2e3eeb5fc46751eac15dcdf30ff993279742ba4cd9616c3bb099f904900cf0ea6679177b3cfe2e78e97b7e613e80 WHIRLPOOL a0a8c8ab73e1d5e542e47666ab770e5265010fe446473c1556bbbb0285060504437c666234ef063a4012d2e2ff4615eceae26004e7f3153974a540f43b1b9cdb
 AUX proftpd-tmpfiles.d.conf 34 SHA256 75288bb0c76392ae10e7ef3ff27e7b665742cdac8ce4c70dff9f29d645d0f0f3 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 WHIRLPOOL d3ef47f4e2abc178c2d153599e7b13148345a470c76410b499e41912f9e90a48c1217e7fdee3d6777b1598dd09840f8bffbd208fa9addbeaaaf9c64058d8df93
 AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1
 AUX proftpd.initd 1544 SHA256 aed3dd4cbbf1db8a1bd0cbadee66a808b430bbbcc436610407a9911df208f668 SHA512 f11ce49440341633ea4287e8887f8127d954207c5c25b0ae08b6ca1b8f42e90e693f657e45abc465c2c86c1b43a04776c9fb68b04c97a5a43fa17a05ff5ef5c6 WHIRLPOOL 0a8fe89a575491954fa177d6db85792eb5b6639abc9fd2c88358c0a7b64dc300602f5b75e4d90ba984e5d21831d2a5c2d39e98230f138cba463f3680eba49948
@@ -13,26 +9,17 @@ AUX proftpd.xinetd 295 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1
 DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636 WHIRLPOOL b15024d1011a83a10ce52fb676f1f2162d67750dc137600b624cd04ebd498bb3c9242e4889fd7b73c18224eb483286cb543fc627b27e6a8ff4c9bf35468218b9
 DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80
 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0
-DIST proftpd-1.3.4d.tar.gz 7697046 SHA256 c198b53991ce641eae6b3237e856e59f0bfe8330794145b49cae33f85b6f5370 SHA512 29d6d231a1ac2889dd90f64ab27e1db3e7b28b111f3c935be4611689a3808df15e87092da49ef2adf581e0c8165c0cfd8eb58e88434319286ad91d861c5b0d4d WHIRLPOOL 52fad9428329c38800412a1e9852caa436405904346c5ef04b4078accb4f4f9358e152f1b4d8501f0f3111d2417df100df4c5e87b3113546050d2d6a66c12386
-DIST proftpd-1.3.4e.tar.gz 7721545 SHA256 985f040dacced450b5b49a89efedf383eca9ab4fbd3a1e9d8ab4c61a6a19f2ba SHA512 56a1cfae9003485c8f93c3d9fcd2cd7a2d98ae06a477580e9f5eb4a1d2654c6384b7a808ba2f12ee2a3059e9a7f99e14aece927fecdc8466219a08378deb5477 WHIRLPOOL 294b99fc308ea706d68674ed1b4c490da6488080fb5d43354794edee36284331a6825bb308b768cdfd12dcfe05d53bafd906b244337408421a8f8ef7cb35f086
-DIST proftpd-1.3.5.tar.gz 7594509 SHA256 c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715 SHA512 fabc10606f2f6a33c7cbe117e774ed6eba8ef062cb792723f00cc235d4ade6499621f5d546b9b176f76780271c1c881c9e57f9cad67d288b5119fe6ca58c46dd WHIRLPOOL 2e663d8ebf05d36cb8e5fe97be66a39ee5d152bddc3b1ae38aba1d711480be3bb6b58408eff86aa893b808e5c3f8efaac70280d32c69848d861e672f6571f031
 DIST proftpd-1.3.5a.tar.gz 29988477 SHA256 a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 SHA512 d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c WHIRLPOOL 19b361b0481d5a2eab7fbe40de7bb8c9cd320a2ac04343d2fe858fdc9a62a747f89a5d4a619808bd252f6cfd9f15353df28405eb9bdc10c7c9f0162ab093bc1e
 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 WHIRLPOOL aabd1dc23d6c38d308e859ff778beffd0dabfe70d3530c093cf2f95e80b5e9c94b97b6b5ae5109d031f76ff94dffc3822a7aa60fa30df04523d37ebed99730d6
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906
-EBUILD proftpd-1.3.4d.ebuild 7744 SHA256 6fb2c0b72b30a7d3a4c5d680e606d81e5afd23d82de049d199b37ef43b2523b8 SHA512 cf40a11f3dcfae981d195cd45b051bfea5c915758536e351943b11085247592abdb7f2c5c762c1ec792f0246a598bdd104c139c88b5634747e8c3bc3e0141e1f WHIRLPOOL ed5be1ea7923c767a7fdbefbe873107fb50b8cdb1417a9317079f261712908a9adf81ba0bcabe0d15b4d91d5310fd558ef4d8a074188cffa86e16dda31d07ac3
-EBUILD proftpd-1.3.4e.ebuild 7761 SHA256 7025ab23d5b1e4832bc44f6701ec40a980e427a02cc0db26a75bd48c70c16fc0 SHA512 6bf296b13142fe152d0e01732a8fca066886960f3d75ebfdbd7573442bcbd57b12d7787e0ea06ae7d1373ab7c6babf179ee10a8f35f7c85c67ba97ab011d52be WHIRLPOOL d9c5748457161dbd13d42d454f54b63c94f48d3057cabc461ad9af3ee059f326c778386d69fc947b34d65e54cf969b06d9bd0d2849537d0d6d9c8d3236c61d6a
-EBUILD proftpd-1.3.5-r1.ebuild 7595 SHA256 cb13d7b257445956f949fec661ca39d5ba0fdaf066898732f0668a2aad32d30f SHA512 788dcf95e1d717dc660615b51c840aef3f173529159c45aa43f60b98ae3c740b3ac3b27ecb6ae15e74414cc150b0d1b124e335da6e294caaad5d91ea9e041f4a WHIRLPOOL 21c54afd0d60623932147673abeff29d8b8be76580d18d79462efb37d207d80baf128630cda40a57726ac834de2c7a55379f09d5606fe29a69a8fe3ededcd170
-EBUILD proftpd-1.3.5.ebuild 7588 SHA256 48e07644e8dee46ac15deca105cf3b0420f4f16a8053eeaefd57c8382f6710fa SHA512 b9efadf7d7fb2f38d968f73cf822a95fde7db51dbb4d51363b6a8b28cf4ab6472621a842a6892c363c9e066b4022b988c09c7159d6c9985033ece62ff5115fd9 WHIRLPOOL fdb272a3802d7fbbec849d3f1a65960bb6807dfea166b664e558d0c90046e44b48aef0eaccace2136225b8ff6351995835571b94e7da69196050a75815792c4c
 EBUILD proftpd-1.3.5a.ebuild 7540 SHA256 23228f9e0224e065d462f14cf7b2e454e2237b37041f89a1999644990459dc15 SHA512 28962e15ac5dd819f19d71046025991fb30e71f5e9c29d7e84700687e89773f9a85a2bc1123efca097205be9f81b6ead1f1d537e7885431e28b373caa6495799 WHIRLPOOL c5132731e9f8c4fb09b6c9fa80b63d3284d344c46fc13d261abf798e2faa5a5074b9a5c19c59302534ffdc7563d43093e8559e3b280efdd1c34ffb30344fb8fb
-MISC ChangeLog 58420 SHA256 4fb1134d7e9a846ef933a26101262cd393df787811d8a58bb7bdbf87eaf81932 SHA512 3357ef2c57373e21ca48323a9e6a9f0005c80418feb6fd643f32c9318be76ef2b44d01e61ae2097a49c5942c20bae959240befc1cc423ba3e52738dbc34530f7 WHIRLPOOL 6c41978788dea68aaab5458a111e3383455a03f8290c2ae27c58b24fd813de5c4dffcc2b27c98d2e40b5e3d0e0860e08e0e64c6b2b04fe01bb38c0a9d4a52157
+MISC ChangeLog 58811 SHA256 f9097cb46f926a9b8651e9887c7e0183fc01a5f294068a953e8b417db4eecf52 SHA512 d2ffc47c806eac41920b570d8cbcc7e7770c36730a0ff121d5e4ec4262eae4bed726de1d41fcf95ba868bd550c51cb73c6fe43cab34873b254f426a065acb0bb WHIRLPOOL e066bcd5de25953acb23a857f403765c52c6601a14a58326dbf015e5aebe7a56b24e98ac3a3f2e52ba3496d0caac9d6fba82f0ceac51b38ed0daa413db9973f9
 MISC metadata.xml 3599 SHA256 63b78dac63233c6a1cda80fff237bc1d0475fa9ac14f87141c4118219bdfea36 SHA512 6ec8dbee52b3cdb76a33860f7be28ccf44c7f4f87401f6dacc87bf2535e8a186fe7a651d106419029ac6bbe9e2b824172856d102aa8a3a51cc892741b396c01f WHIRLPOOL 64b80cd5462cc0768b34de3b3a476b00cfa48813902828e6ac6174c4d7ac66060d01932f6b548fdf07f955eef22c21e271f2288315e7a8e356cf51ef4f5dc915
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWyExoACgkQG9wOWsQutdb5AwP/Q6hvZ4EDbhmemW53hq9PWDHF
-c+JAzM1MvuIJPjs5tPQJgyjFFRX82iSxC8JfEtcgx8GiZKEOp9BVRm/6udqrC8z2
-KNANDttjFK8lLDk/aoJyG1ppesA5Bg970lDVC+X6UnthWuqfp23QEcdFBl6AxI9i
-sjSpNpsszBz8Lc7mr6Q=
-=MpKs
+iEYEAREIAAYFAlWzTPoACgkQcaHudmEf86pPNwCaA8nhgfe62YoUhS+px2dA/Uyn
+y9sAn2rrNP7jh3CXmCgkrqZCPxCTps7H
+=mZ4Y
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
deleted file mode 100644
index 9bec4d4d5804..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From dfab55028b4282a8e8769e108518405a93cf3d87 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 12 Sep 2013 22:58:35 +0300
-Subject: [PATCH] contrib/mod_sftp_pam.c: fix size argument for memset
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Pass something string size related insteal of 'sizeof(void*)'
-(which might overflow).
-
-Found by gcc 4.8:
-> mod_sftp_pam.c:327:36: warning: argument to ‘sizeof’ in ‘memset’
-> call is the same expression as the destination; did you mean to
-> provide an explicit length? [-Wsizeof-pointer-memaccess]
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- contrib/mod_sftp_pam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/mod_sftp_pam.c b/contrib/mod_sftp_pam.c
-index 0a9de72..ba8f1c5 100644
---- a/contrib/mod_sftp_pam.c
-+++ b/contrib/mod_sftp_pam.c
-@@ -324,7 +324,7 @@ static int sftppam_driver_open(sftp_kbdint_driver_t *driver, const char *user) {
-     exit(1);
-   }
- 
--  memset(sftppam_user, '\0', sizeof(sftppam_user));
-+  memset(sftppam_user, '\0', sftppam_userlen);
-   sstrncpy(sftppam_user, user, sftppam_userlen);
- 
-   c = find_config(main_server->conf, CONF_PARAM, "SFTPPAMOptions", FALSE);
--- 
-1.8.3.2
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch
deleted file mode 100644
index bc314b74e2cb..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Patch picked from upstream bugzilla:
-
-Upstream-bug: http://bugs.proftpd.org/show_bug.cgi?id=3973
-Gentoo-bug: https://bugs.gentoo.org/484614
-Index: contrib/mod_sftp/kbdint.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/kbdint.c,v
-retrieving revision 1.5
-diff -u -r1.5 kbdint.c
---- contrib/mod_sftp/kbdint.c	15 Feb 2012 23:50:51 -0000	1.5
-+++ contrib/mod_sftp/kbdint.c	12 Sep 2013 16:35:34 -0000
-@@ -31,6 +31,11 @@
- #include "utf8.h"
- #include "kbdint.h"
- 
-+/* The maximum number of keyboard-interactive responses we will handle
-+ * from the client.
-+ */
-+#define SSH2_AUTH_KBDINT_MAX_RESPONSES		500
-+
- struct kbdint_driver {
-   struct kbdint_driver *next, *prev;
- 
-@@ -299,6 +304,20 @@
- 
-   resp_count = sftp_msg_read_int(pkt->pool, &buf, &buflen);
- 
-+  /* Impose an upper limit on the number of responses sent by the client,
-+   * lest a malicious client attempt to trick us into allocating too
-+   * much memory (Bug#3973).
-+   */
-+  if (resp_count > SSH2_AUTH_KBDINT_MAX_RESPONSES) {
-+    (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
-+      "received response count (%lu) which exceeds max allowed response "
-+      "count (%lu), rejecting", (unsigned long) resp_count,
-+      (unsigned long) SSH2_AUTH_KBDINT_MAX_RESPONSES);
-+    destroy_pool(pkt->pool);
-+    errno = EPERM;
-+    return -1;
-+  }
-+
-   list = make_array(p, resp_count, sizeof(char *));
-   for (i = 0; i < resp_count; i++) {
-     char *resp;
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
deleted file mode 100644
index d19c98a41849..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/api/stubs.c b/tests/api/stubs.c
-index 9f49c9d..7f1e898 100644
---- a/tests/api/stubs.c
-+++ b/tests/api/stubs.c
-@@ -46,6 +46,10 @@ char *pr_fs_encode_path(pool *p, const char *path) {
-   return (char *) path;
- }
- 
-+int pr_fs_get_usable_fd(int fd) {
-+  return -1;
-+}
-+
- void pr_log_debug(int level, const char *fmt, ...) {
- }
- 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch b/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch
deleted file mode 100644
index 3efd6c0681fb..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip addressless interfaces.
-
-Caught by api-tests as:
-> 99%: Checks: 197, Failures: 0, Errors: 1
-> api/netaddr.c:146:E:base:netaddr_get_addr2_test:0: (after this point) Received signal 11 (Segmentation fault)
-diff --git a/src/netaddr.c b/src/netaddr.c
-index 2657ca7..0029c7e 100644
---- a/src/netaddr.c
-+++ b/src/netaddr.c
-@@ -761,7 +761,10 @@ static pr_netaddr_t *get_addr_by_device(pool *p, const char *name,
-     int found_device = FALSE;
- 
-     for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
--
-+      if (ifa->ifa_addr == NULL) {
-+        /* returns NULL for uninitialized 'tun0' for example. */
-+        continue;
-+      }
-       /* We're only looking for addresses, not stats. */
-       if (ifa->ifa_addr->sa_family != AF_INET
- #ifdef PR_USE_IPV6
diff --git a/net-ftp/proftpd/proftpd-1.3.4d.ebuild b/net-ftp/proftpd/proftpd-1.3.4d.ebuild
deleted file mode 100644
index 3ca99a6af36a..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4d.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.13 2014/12/28 16:21:57 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-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 dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="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 )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sftp-kbdint-max-responses-bug3973.patch
-	epatch "${FILESDIR}"/${P}-memset-fix.patch
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	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"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && mym="${mym}:mod_dynmasq"
-	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
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use msg && mym="${mym}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		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 && 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"
-	if use sftp ; then
-		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 && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		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
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -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 ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(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) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4e.ebuild b/net-ftp/proftpd/proftpd-1.3.4e.ebuild
deleted file mode 100644
index 4fbd01b418e7..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4e.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild,v 1.4 2014/12/28 16:21:57 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-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 dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="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 )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-link-tests.patch
-	epatch "${FILESDIR}"/${PN}-1.3.4d-memset-fix.patch
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	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"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && mym="${mym}:mod_dynmasq"
-	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
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use msg && mym="${mym}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		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 && 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"
-	if use sftp ; then
-		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 && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		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
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -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 ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(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) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild
deleted file mode 100644
index 65dc0c3b71ea..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild,v 1.2 2014/12/28 16:21:57 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-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 dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="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 )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-netaddr-segv.patch
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	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"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && m="${m}:mod_dynmasq"
-	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
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
-	use msg && m="${m}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		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 && 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"
-	if use sftp ; then
-		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 && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		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
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique_id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -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 ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(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) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.5.ebuild b/net-ftp/proftpd/proftpd-1.3.5.ebuild
deleted file mode 100644
index 4eaca8944ced..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.5.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5.ebuild,v 1.12 2015/03/11 09:16:03 slyfox Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-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 dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="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 )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-netaddr-segv.patch
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	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"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && mym="${mym}:mod_dynmasq"
-	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
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
-	use msg && mym="${mym}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		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 && 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"
-	if use sftp ; then
-		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 && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		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
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique_id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -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 ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(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) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}