From 94e37991484013ea2358b12bd683728d431971c3 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Thu, 25 Jan 2007 13:04:00 +0000 Subject: [PATCH] Bump, fix bugs #159066 and #159772. Package-Manager: portage-2.1.2_rc4-r8 --- net-ftp/proftpd/Manifest | 74 +----- .../proftpd/files/digest-proftpd-1.2.10-r7 | 6 - net-ftp/proftpd/files/digest-proftpd-1.3.0a | 15 -- .../proftpd/files/digest-proftpd-1.3.1_rc1 | 15 -- .../files/proftpd-1.2.10-ftpshut.patch | 24 -- ...proftpd-1.2.10-gcc4_mod_quotatab_sql.patch | 12 - .../files/proftpd-1.2.10-openssl_0.9.8.patch | 21 -- .../files/proftpd-1.2.10-sqlshowinfo.patch | 38 --- .../files/proftpd-1.3.0-main_commandbuf.patch | 45 ---- .../proftpd-1.3.0-mod_ctrls_sighup.patch | 99 -------- .../files/proftpd-1.3.0-mod_sql_mysql.patch | 128 ---------- .../proftpd-1.3.0-mod_tls_overflow.patch | 11 - net-ftp/proftpd/proftpd-1.2.10-r7.ebuild | 175 -------------- net-ftp/proftpd/proftpd-1.3.0a.ebuild | 218 ------------------ net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild | 212 ----------------- 15 files changed, 12 insertions(+), 1081 deletions(-) delete mode 100644 net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 delete mode 100644 net-ftp/proftpd/files/digest-proftpd-1.3.0a delete mode 100644 net-ftp/proftpd/files/digest-proftpd-1.3.1_rc1 delete mode 100644 net-ftp/proftpd/files/proftpd-1.2.10-ftpshut.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.2.10-openssl_0.9.8.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.2.10-sqlshowinfo.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.0-main_commandbuf.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.0-mod_sql_mysql.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.0-mod_tls_overflow.patch delete mode 100644 net-ftp/proftpd/proftpd-1.2.10-r7.ebuild delete mode 100644 net-ftp/proftpd/proftpd-1.3.0a.ebuild delete mode 100644 net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 58339807d533..0e2465f41f84 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,35 +1,3 @@ -AUX proftpd-1.2.10-ftpshut.patch 897 RMD160 5044b188c400160b1c22c85ea91099b1b4280898 SHA1 2b18239d4742ddb18727aaf08e1c72ea5ba96b1d SHA256 9759256452dacf7c7b197e9b038fd939ade0459ba089536b67d15a01c124ad76 -MD5 f739a48054eabaf69f819f6e31bad069 files/proftpd-1.2.10-ftpshut.patch 897 -RMD160 5044b188c400160b1c22c85ea91099b1b4280898 files/proftpd-1.2.10-ftpshut.patch 897 -SHA256 9759256452dacf7c7b197e9b038fd939ade0459ba089536b67d15a01c124ad76 files/proftpd-1.2.10-ftpshut.patch 897 -AUX proftpd-1.2.10-gcc4_mod_quotatab_sql.patch 472 RMD160 0f430cf7b13523ac4a6d742e2bc733b825552578 SHA1 e68ba4a250c68823ef912fe43f7bc0938cf73d47 SHA256 07c74456e8951c4248e4893f0469fae5b163623685ad74039bbaade52a1d50d1 -MD5 cf9d29cb128107c4f6a803176613125d files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch 472 -RMD160 0f430cf7b13523ac4a6d742e2bc733b825552578 files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch 472 -SHA256 07c74456e8951c4248e4893f0469fae5b163623685ad74039bbaade52a1d50d1 files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch 472 -AUX proftpd-1.2.10-openssl_0.9.8.patch 612 RMD160 066c9821e8452024cfdf4749289abfb0c28bff37 SHA1 9e02ffab52017f2e97efc7c817a7fd3ec66856e5 SHA256 f3997cd5be7a095116a888dd8fada2c519d84ddb1e07b0db43928e8963c84080 -MD5 0ff3251054f1ab76e4e9090397abbaf6 files/proftpd-1.2.10-openssl_0.9.8.patch 612 -RMD160 066c9821e8452024cfdf4749289abfb0c28bff37 files/proftpd-1.2.10-openssl_0.9.8.patch 612 -SHA256 f3997cd5be7a095116a888dd8fada2c519d84ddb1e07b0db43928e8963c84080 files/proftpd-1.2.10-openssl_0.9.8.patch 612 -AUX proftpd-1.2.10-sqlshowinfo.patch 1191 RMD160 c29fd8866760a34ff835bfaadc3d7bb2bb10c3b3 SHA1 eac809b868b2a5aeb9efe4ba18c4818b12c84995 SHA256 f2b862eb2af71b2102d577290b3adec40ff9ea9000e8727e50b353d9567aa4d1 -MD5 098337e85fc8b71a16e91114ff54ece1 files/proftpd-1.2.10-sqlshowinfo.patch 1191 -RMD160 c29fd8866760a34ff835bfaadc3d7bb2bb10c3b3 files/proftpd-1.2.10-sqlshowinfo.patch 1191 -SHA256 f2b862eb2af71b2102d577290b3adec40ff9ea9000e8727e50b353d9567aa4d1 files/proftpd-1.2.10-sqlshowinfo.patch 1191 -AUX proftpd-1.3.0-main_commandbuf.patch 1528 RMD160 e7b930de4ee1d9d009c000149eb1ad2332f72873 SHA1 3eee2f3eec0ef2c83851f80f30f6fddc7bcfd703 SHA256 784cd5869a729c53bf185d936ba5ddad0344a26850466b86f649b6779b63a046 -MD5 ea1352f3f5449fe63deb1df0a7b05554 files/proftpd-1.3.0-main_commandbuf.patch 1528 -RMD160 e7b930de4ee1d9d009c000149eb1ad2332f72873 files/proftpd-1.3.0-main_commandbuf.patch 1528 -SHA256 784cd5869a729c53bf185d936ba5ddad0344a26850466b86f649b6779b63a046 files/proftpd-1.3.0-main_commandbuf.patch 1528 -AUX proftpd-1.3.0-mod_ctrls_sighup.patch 3071 RMD160 f19bb9368bb4512b5a2ce568d6544475d22e3eaa SHA1 243e2223cef4a92a030d29258113fc05df1b2059 SHA256 e134b169f36b874e4e0374fcd4ef4abac58c8644db61e612a0a68ea743946fb1 -MD5 e401d4e10b95e09d9262ad66ec9d95e4 files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071 -RMD160 f19bb9368bb4512b5a2ce568d6544475d22e3eaa files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071 -SHA256 e134b169f36b874e4e0374fcd4ef4abac58c8644db61e612a0a68ea743946fb1 files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071 -AUX proftpd-1.3.0-mod_sql_mysql.patch 4101 RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 SHA1 f8598cf9c166d7f631829192b8ce056e7bfd71f2 SHA256 01875eb931a7aaa97d585e34ce8b90e882eaea04bd08cfb2b264b4fbf0964aa2 -MD5 e4b0f779fd34bb8e3f5d77e8aec6120b files/proftpd-1.3.0-mod_sql_mysql.patch 4101 -RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 files/proftpd-1.3.0-mod_sql_mysql.patch 4101 -SHA256 01875eb931a7aaa97d585e34ce8b90e882eaea04bd08cfb2b264b4fbf0964aa2 files/proftpd-1.3.0-mod_sql_mysql.patch 4101 -AUX proftpd-1.3.0-mod_tls_overflow.patch 349 RMD160 2ef8070a7c33006176175a613c9f4b919cc97a57 SHA1 5c4d85786585c57397c5cab32d19482bead71be6 SHA256 4650f392974ddd6cf17ab05a9bc3d36783504f75002e1f16115bc59af797eda7 -MD5 4e25b6a66e3a8feecd53014cb24ec62b files/proftpd-1.3.0-mod_tls_overflow.patch 349 -RMD160 2ef8070a7c33006176175a613c9f4b919cc97a57 files/proftpd-1.3.0-mod_tls_overflow.patch 349 -SHA256 4650f392974ddd6cf17ab05a9bc3d36783504f75002e1f16115bc59af797eda7 files/proftpd-1.3.0-mod_tls_overflow.patch 349 AUX proftpd.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671 @@ -44,39 +12,21 @@ RMD160 c5c829319e901f478fe58b920347cc1b8706a366 files/proftpd.xinetd 295 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/proftpd.xinetd 295 DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e -DIST proftpd-1.2.10.tar.bz2 920337 RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b SHA1 5e3a4d7ae65429a5e3c2934db4ed36a19f41eb0b SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25 -DIST proftpd-1.3.0a.tar.bz2 1386956 RMD160 406998669e798e1af253fd822d4d09dbeb75c98a SHA1 03573bfe342e1e9dbfec2983efe2265d3c0c5a12 SHA256 02f614586ff692a67299510064100b0537fd53b4ed0d238d7aaa5b723bf7a0aa -DIST proftpd-1.3.1rc1.tar.bz2 1484138 RMD160 5d27844da7483973f273db6abf3947f99096b2b4 SHA1 39c9804a76c8a2c75421a7d2896eae45ee0ca1cf SHA256 32cf852535c2ec55c5833c2766cbd0c6aba950ab2967565606e1df334736a766 -DIST proftpd-mod-shaper-0.5.5.tar.gz 18090 RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 SHA1 667b59184aa08e6f5ad7a2edc3c949b8534cf5af SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696 +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.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a -EBUILD proftpd-1.2.10-r7.ebuild 4691 RMD160 473d95e56e567df989b0bb02fa4a8e9d3bb94467 SHA1 e9c3c8e473da8ec3499e5a18addf967f284baf21 SHA256 687b309d95e9c7c0f2759475cc87423f52da66656771847c160d945ea8deb085 -MD5 2b18c7dddb0f2239ba204e8d9d7d59dd proftpd-1.2.10-r7.ebuild 4691 -RMD160 473d95e56e567df989b0bb02fa4a8e9d3bb94467 proftpd-1.2.10-r7.ebuild 4691 -SHA256 687b309d95e9c7c0f2759475cc87423f52da66656771847c160d945ea8deb085 proftpd-1.2.10-r7.ebuild 4691 -EBUILD proftpd-1.3.0a.ebuild 6324 RMD160 bb8c7ef49740421565f367a878f9317663c0ee4f SHA1 188b94aa709b2c451217d8c729906372b35dc55a SHA256 657b825e022ced3d001b39836a69cca6234cdbb354e5b32f56df81e46ae33fff -MD5 99c7fd08e691cf6b4bdcd6b96540d83e proftpd-1.3.0a.ebuild 6324 -RMD160 bb8c7ef49740421565f367a878f9317663c0ee4f proftpd-1.3.0a.ebuild 6324 -SHA256 657b825e022ced3d001b39836a69cca6234cdbb354e5b32f56df81e46ae33fff proftpd-1.3.0a.ebuild 6324 -EBUILD proftpd-1.3.1_rc1.ebuild 6071 RMD160 006c878d8501acd38f51efb4e5fa0f360f43c9bd SHA1 095bb3bd5566e4492f97e6d31552ac1f0c884f91 SHA256 694952706be2f757deeaed689d2484d4cbc9ec3a41f08287fa6dede8e6814ae5 -MD5 20d18d680a5e135d747de27f3ee994df proftpd-1.3.1_rc1.ebuild 6071 -RMD160 006c878d8501acd38f51efb4e5fa0f360f43c9bd proftpd-1.3.1_rc1.ebuild 6071 -SHA256 694952706be2f757deeaed689d2484d4cbc9ec3a41f08287fa6dede8e6814ae5 proftpd-1.3.1_rc1.ebuild 6071 -MISC ChangeLog 23446 RMD160 872ba2612c5852a267bab0a2fec027aebe45cb3b SHA1 fb7a2f06379a7c4ddb6fe1ce7273ba8eb6bd320a SHA256 9a480b7d8f82dc4b88040595ce32ddea71fc19dec9a96fe2a7ec63f6fe4186a0 -MD5 00e9af53cc353049064144a91cde7c3a ChangeLog 23446 -RMD160 872ba2612c5852a267bab0a2fec027aebe45cb3b ChangeLog 23446 -SHA256 9a480b7d8f82dc4b88040595ce32ddea71fc19dec9a96fe2a7ec63f6fe4186a0 ChangeLog 23446 +EBUILD proftpd-1.3.1_rc2.ebuild 6065 RMD160 3617faeea8085e4de93a5367d0dc436bf67997b8 SHA1 66edfd62f2bd7da92dac049d9c5e68b30e218c87 SHA256 8aaf22e644fa151cdd35590ff0d7a497c94b56d7a5bc73f16874c2765440f6d5 +MD5 4b43019dba72ff59a2bd3a98cd25b564 proftpd-1.3.1_rc2.ebuild 6065 +RMD160 3617faeea8085e4de93a5367d0dc436bf67997b8 proftpd-1.3.1_rc2.ebuild 6065 +SHA256 8aaf22e644fa151cdd35590ff0d7a497c94b56d7a5bc73f16874c2765440f6d5 proftpd-1.3.1_rc2.ebuild 6065 +MISC ChangeLog 24177 RMD160 4e75b2331fb3dc89f69248aa0cae0fa2e8d8aa6f SHA1 c880f958efbfe9022e8bce5ccc010592595ffd6e SHA256 eca6c8ba73eb73e1923c55f136e65cfd29143fe443468bec326f01e3edb3f653 +MD5 f10b83c38e7f23c513ee268f7752f0b9 ChangeLog 24177 +RMD160 4e75b2331fb3dc89f69248aa0cae0fa2e8d8aa6f ChangeLog 24177 +SHA256 eca6c8ba73eb73e1923c55f136e65cfd29143fe443468bec326f01e3edb3f653 ChangeLog 24177 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata.xml 397 -MD5 d8ff66c411bfd99d5551438fd5b2736a files/digest-proftpd-1.2.10-r7 518 -RMD160 ec25a22bf78ee25df0c5168defeb6fe6db6cf179 files/digest-proftpd-1.2.10-r7 518 -SHA256 ea87bf530416e83405291521ef6268680a3b6a93cb982098e22e2ba9ebdac203 files/digest-proftpd-1.2.10-r7 518 -MD5 66f98bb7535b92691c80b850f2587c33 files/digest-proftpd-1.3.0a 1241 -RMD160 fec1ce9aa44ecd4875887fcfaa39580d81999c6d files/digest-proftpd-1.3.0a 1241 -SHA256 ce23a27fd36f6b5227bdec431ab632356e4a244e8eda95dbc188bcf58da665ed files/digest-proftpd-1.3.0a 1241 -MD5 e9e52e20055997806dbe1f5d23b5b5e8 files/digest-proftpd-1.3.1_rc1 1247 -RMD160 08385084022247973b438a28c18cd368e4045b6c files/digest-proftpd-1.3.1_rc1 1247 -SHA256 a93ef45a9e9098d97dec4a88eb13de30dc59d88c2e80c734ec7a6d55ce919538 files/digest-proftpd-1.3.1_rc1 1247 +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 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 deleted file mode 100644 index 3fa349452892..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337 -RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b proftpd-1.2.10.tar.bz2 920337 -SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25 proftpd-1.2.10.tar.bz2 920337 -MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090 -RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 proftpd-mod-shaper-0.5.5.tar.gz 18090 -SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696 proftpd-mod-shaper-0.5.5.tar.gz 18090 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0a b/net-ftp/proftpd/files/digest-proftpd-1.3.0a deleted file mode 100644 index 90a2c2c8cbc8..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.3.0a +++ /dev/null @@ -1,15 +0,0 @@ -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 cc2e99f38a810982f91d5cbe1f4091f0 proftpd-1.3.0a.tar.bz2 1386956 -RMD160 406998669e798e1af253fd822d4d09dbeb75c98a proftpd-1.3.0a.tar.bz2 1386956 -SHA256 02f614586ff692a67299510064100b0537fd53b4ed0d238d7aaa5b723bf7a0aa proftpd-1.3.0a.tar.bz2 1386956 -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 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613 -RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613 -SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc1 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc1 deleted file mode 100644 index f685d24ee176..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc1 +++ /dev/null @@ -1,15 +0,0 @@ -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 08f4d526b46c84f10e9634d2d913052c proftpd-1.3.1rc1.tar.bz2 1484138 -RMD160 5d27844da7483973f273db6abf3947f99096b2b4 proftpd-1.3.1rc1.tar.bz2 1484138 -SHA256 32cf852535c2ec55c5833c2766cbd0c6aba950ab2967565606e1df334736a766 proftpd-1.3.1rc1.tar.bz2 1484138 -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.2.10-ftpshut.patch b/net-ftp/proftpd/files/proftpd-1.2.10-ftpshut.patch deleted file mode 100644 index 17a57f938eca..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.10-ftpshut.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/response.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/src/response.c,v -retrieving revision 1.4 -diff -u -r1.4 response.c ---- src/response.c 3 Jun 2003 16:25:23 -0000 1.4 -+++ src/response.c 27 Jun 2005 23:03:35 -0000 -@@ -1,6 +1,6 @@ - /* - * ProFTPD - FTP server daemon -- * Copyright (c) 2001, 2002, 2003 The ProFTPD Project team -+ * Copyright (c) 2001-2005 The ProFTPD Project team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -169,7 +169,7 @@ - buf[sizeof(buf) - 1] = '\0'; - sstrcat(buf, "\r\n", sizeof(buf)); - -- RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf)) -+ RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf) - } - - void pr_response_send(const char *resp_numeric, const char *fmt, ...) { diff --git a/net-ftp/proftpd/files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch b/net-ftp/proftpd/files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch deleted file mode 100644 index 8cfdd22a04ad..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- proftpd-1.2.10/contrib/mod_quotatab_sql.c.orig 2006-09-04 11:21:09.000000000 +0000 -+++ proftpd-1.2.10/contrib/mod_quotatab_sql.c 2006-09-04 11:22:27.000000000 +0000 -@@ -684,8 +684,7 @@ - return NULL; - } - -- tab->tab_data = pcalloc(tab->tab_pool, sizeof(char)); -- ((char *) tab->tab_data) = pstrdup(tab->tab_pool, select_query); -+ tab->tab_data = (void *) pstrdup(tab->tab_pool, select_query); - } - - /* Set all the necessary function pointers. */ diff --git a/net-ftp/proftpd/files/proftpd-1.2.10-openssl_0.9.8.patch b/net-ftp/proftpd/files/proftpd-1.2.10-openssl_0.9.8.patch deleted file mode 100644 index 7601d4b26a4d..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.10-openssl_0.9.8.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: contrib/mod_tls.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v -retrieving revision 1.77 -retrieving revision 1.78 -diff -u -r1.77 -r1.78 ---- contrib/mod_tls.c 14 Jun 2005 01:23:44 -0000 1.77 -+++ contrib/mod_tls.c 18 Jun 2005 21:05:34 -0000 1.78 -@@ -568,7 +568,12 @@ - } - } - -+#if OPENSSL_VERSION_NUMBER < 0x00908001 - PEMerr(PEM_F_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); -+#else -+ PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); -+#endif -+ - pr_memscrub(buf, buflen); - return -1; - } diff --git a/net-ftp/proftpd/files/proftpd-1.2.10-sqlshowinfo.patch b/net-ftp/proftpd/files/proftpd-1.2.10-sqlshowinfo.patch deleted file mode 100644 index 9bf501a3d2da..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.10-sqlshowinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- /var/tmp/portage/proftpd-1.2.10-r7/work/proftpd-1.2.10/contrib/mod_sql.c 2004-08-03 01:44:31.000000000 +0100 -+++ contrib/mod_sql.c 2005-07-29 16:36:08.251407235 +0100 -@@ -2036,7 +2036,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2110,7 +2110,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2201,7 +2201,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add_err( c->argv[0], outs); -+ pr_response_add_err(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2275,7 +2275,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-main_commandbuf.patch b/net-ftp/proftpd/files/proftpd-1.3.0-main_commandbuf.patch deleted file mode 100644 index c770a60fb42f..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.0-main_commandbuf.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- src/main.c 2006/09/29 16:38:16 1.292 -+++ src/main.c 2006/11/17 23:42:04 1.294 -@@ -116,5 +116,7 @@ - - static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'}; - -+#define PR_DEFAULT_CMD_BUFSZ 512 -+ - static char **Argv = NULL; - static char *LastArgv = NULL; -@@ -832,16 +834,25 @@ - pr_timer_reset(TIMER_IDLE, NULL); - - if (cmd_buf_size == -1) { -- long *buf_size = get_param_ptr(main_server->conf, -- "CommandBufferSize", FALSE); -- -- if (buf_size == NULL || *buf_size <= 0) -- cmd_buf_size = 512; -+ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); -+ if (bufsz == NULL) { -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ -+ } else if (*bufsz <= 0) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, using default buffer size (%u) instead", -+ *bufsz, PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ -+ } else if (*bufsz + 1 > sizeof(buf)) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, using default buffer size (%u) instead", -+ *bufsz, PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; - -- else if (*buf_size + 1 > sizeof(buf)) { -- pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. " -- "Resetting to 512."); -- cmd_buf_size = 512; -+ } else { -+ pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); -+ cmd_buf_size = (long) *bufsz; - } - } - diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch b/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch deleted file mode 100644 index 17bd69b17749..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- modules/mod_ctrls.c 11 Nov 2005 21:05:32 -0000 1.30 -+++ modules/mod_ctrls.c 23 May 2006 17:31:51 -0000 -@@ -3,7 +3,7 @@ - * server, as well as several utility functions for other Controls - * modules - * -- * Copyright (c) 2000-2005 TJ Saunders -+ * Copyright (c) 2000-2006 TJ Saunders - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -34,7 +34,7 @@ - #include "privs.h" - #include "mod_ctrls.h" - --#define MOD_CTRLS_VERSION "mod_ctrls/0.9.3" -+#define MOD_CTRLS_VERSION "mod_ctrls/0.9.4" - - /* Master daemon in standalone mode? (from src/main.c) */ - extern unsigned char is_master; -@@ -518,7 +518,7 @@ - } else if (res == PR_LOG_WRITABLE_DIR) { - pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION - ": unable to open ControlsLog '%s': " -- "containing directory is world writeable", ctrls_logname); -+ "containing directory is world writable", ctrls_logname); - - } else if (res == PR_LOG_SYMLINK) { - pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION -@@ -1476,7 +1476,7 @@ - - if (res == -2) - CONF_ERROR(cmd, pstrcat(cmd->tmp_pool, -- "unable to log to a world-writeable directory", NULL)); -+ "unable to log to a world-writable directory", NULL)); - } - - return HANDLED(cmd); -@@ -1506,10 +1506,12 @@ - CONF_ERROR(cmd, "must be an absolute path"); - - /* Close the socket. */ -- pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'", -- ctrls_sock_file); -- close(ctrls_sockfd); -- ctrls_sockfd = -1; -+ if (ctrls_sockfd >= 0) { -+ pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)", -+ ctrls_sock_file, ctrls_sockfd); -+ close(ctrls_sockfd); -+ ctrls_sockfd = -1; -+ } - - /* Change the path. */ - if (strcmp(cmd->argv[1], ctrls_sock_file) != 0) -@@ -1608,9 +1610,28 @@ - PRIVS_ROOT - ctrls_sockfd = ctrls_listen(ctrls_sock_file); - PRIVS_RELINQUISH -- if (ctrls_sockfd < 0) -+ if (ctrls_sockfd < 0) { - pr_log_pri(PR_LOG_NOTICE, "notice: unable to listen to local socket: %s", - strerror(errno)); -+ -+ } else { -+ /* Ensure that the listen socket used is not one of the major three -+ * (stdin, stdout, or stderr). -+ */ -+ if (ctrls_sockfd < 3) { -+ if (dup2(ctrls_sockfd, 3) < 0) { -+ pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION -+ ": error duplicating listen socket: %s", strerror(errno)); -+ (void) close(ctrls_sockfd); -+ ctrls_sockfd = -1; -+ -+ } else { -+ (void) close(ctrls_sockfd); -+ ctrls_sockfd = 3; -+ } -+ } -+ } -+ - } - - static void ctrls_restart_ev(const void *event_data, void *user_data) { -@@ -1633,10 +1654,11 @@ - cl_list = NULL; - cl_listlen = 0; - -- pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'", -- ctrls_sock_file); -+ pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)", -+ ctrls_sock_file, ctrls_sockfd); - close(ctrls_sockfd); - ctrls_sockfd = -1; -+ - ctrls_closelog(); - - /* Clear the existing pool */ diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-mod_sql_mysql.patch b/net-ftp/proftpd/files/proftpd-1.3.0-mod_sql_mysql.patch deleted file mode 100644 index be382c6835d2..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.0-mod_sql_mysql.patch +++ /dev/null @@ -1,128 +0,0 @@ -Index: contrib/mod_sql_mysql.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_mysql.c,v -retrieving revision 1.40 -diff -u -r1.40 mod_sql_mysql.c ---- contrib/mod_sql_mysql.c 21 Apr 2006 01:59:45 -0000 1.40 -+++ contrib/mod_sql_mysql.c 26 May 2006 18:37:14 -0000 -@@ -128,7 +128,7 @@ - * Internal define used for debug and logging. All backends are encouraged - * to use the same format. - */ --#define MOD_SQL_MYSQL_VERSION "mod_sql_mysql/4.05" -+#define MOD_SQL_MYSQL_VERSION "mod_sql_mysql/4.0.7" - - #define _MYSQL_PORT "3306" - -@@ -158,6 +158,7 @@ - char *pass; - char *db; - char *port; -+ char *unix_sock; - - MYSQL *mysql; - -@@ -431,8 +432,8 @@ - mysql_options(conn->mysql, MYSQL_READ_DEFAULT_GROUP, "client"); - - if (!mysql_real_connect(conn->mysql, conn->host, conn->user, conn->pass, -- conn->db, (int) strtol(conn->port, (char **) NULL, 10), NULL, -- CLIENT_INTERACTIVE)) { -+ conn->db, (int) strtol(conn->port, (char **) NULL, 10), -+ conn->unix_sock, CLIENT_INTERACTIVE)) { - - /* If it didn't work, return an error. */ - sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_open"); -@@ -567,8 +568,7 @@ - * a number or ttl is negative, the connection will be assumed to have no - * associated timer. - */ --MODRET cmd_defineconnection(cmd_rec *cmd) --{ -+MODRET cmd_defineconnection(cmd_rec *cmd) { - char *info = NULL; - char *name = NULL; - -@@ -586,12 +586,14 @@ - - _sql_check_cmd(cmd, "cmd_defineconnection"); - -- if ((cmd->argc < 4) || (cmd->argc > 5) || (!cmd->argv[0])) { -+ if (cmd->argc < 4 || -+ cmd->argc > 5 || -+ !cmd->argv[0]) { - sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection"); - return ERROR_MSG(cmd, MOD_SQL_MYSQL_VERSION, "badly formed request"); - } - -- conn = (db_conn_t *) palloc(conn_pool, sizeof(db_conn_t)); -+ conn = (db_conn_t *) pcalloc(conn_pool, sizeof(db_conn_t)); - - name = pstrdup(conn_pool, cmd->argv[0]); - conn->user = pstrdup(conn_pool, cmd->argv[1]); -@@ -615,6 +617,7 @@ - if (haveport) { - port = haveport + 1; - *haveport = '\0'; -+ - } else { - port = _MYSQL_PORT; - } -@@ -622,16 +625,28 @@ - if (havehost) { - host = havehost + 1; - *havehost = '\0'; -+ - } else { - host = "localhost"; - } - -- conn->host = pstrdup(conn_pool, host); -+ /* Hack to support ability to configure path to Unix domain socket -+ * for MySQL: if the host string starts with a '/', assume it's -+ * a path to the Unix domain socket to use. -+ */ -+ if (*host == '/') { -+ conn->unix_sock = pstrdup(conn_pool, host); -+ -+ } else { -+ conn->host = pstrdup(conn_pool, host); -+ } -+ - conn->db = pstrdup(conn_pool, db); - conn->port = pstrdup(conn_pool, port); - -- /* insert the new conn_info into the connection hash */ -- if (!(entry = _sql_add_connection(conn_pool, name, (void *) conn))) { -+ /* Insert the new conn_info into the connection hash */ -+ entry = _sql_add_connection(conn_pool, name, (void *) conn); -+ if (!entry) { - sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection"); - return ERROR_MSG(cmd, MOD_SQL_MYSQL_VERSION, - "named connection already exists"); -@@ -645,12 +660,19 @@ - entry->timer = 0; - entry->connections = 0; - -- sql_log(DEBUG_INFO, " name: '%s'", entry->name); -- sql_log(DEBUG_INFO, " user: '%s'", conn->user); -- sql_log(DEBUG_INFO, " host: '%s'", conn->host); -- sql_log(DEBUG_INFO, " db: '%s'", conn->db); -- sql_log(DEBUG_INFO, " port: '%s'", conn->port); -- sql_log(DEBUG_INFO, " ttl: '%d'", entry->ttl); -+ sql_log(DEBUG_INFO, " name: '%s'", entry->name); -+ sql_log(DEBUG_INFO, " user: '%s'", conn->user); -+ -+ if (conn->host) { -+ sql_log(DEBUG_INFO, " host: '%s'", conn->host); -+ -+ } else if (conn->unix_sock) { -+ sql_log(DEBUG_INFO, "socket: '%s'", conn->unix_sock); -+ } -+ -+ sql_log(DEBUG_INFO, " db: '%s'", conn->db); -+ sql_log(DEBUG_INFO, " port: '%s'", conn->port); -+ sql_log(DEBUG_INFO, " ttl: '%d'", entry->ttl); - - sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection"); - return HANDLED(cmd); diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-mod_tls_overflow.patch b/net-ftp/proftpd/files/proftpd-1.3.0-mod_tls_overflow.patch deleted file mode 100644 index 56dfd9b9011b..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.0-mod_tls_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/mod_tls.c 2005-11-08 18:59:49 +0100 -+++ contrib/mod_tls.c 2006-11-15 17:54:43 +0100 -@@ -2421,6 +2421,8 @@ - datalen = BIO_get_mem_data(mem, &data); - - if (data) { -+ if (datalen > sizeof(buf)-1) -+ datalen = sizeof(buf)-1; - memset(&buf, '\0', sizeof(buf)); - memcpy(buf, data, datalen); - buf[datalen] = '\0'; diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild deleted file mode 100644 index 4aefd9c822d9..000000000000 --- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.13 2006/11/23 16:45:27 vivo Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" - -IUSE="authfile hardened ipv6 ldap mysql ncurses noauthunix pam postgres selinux sendfile shaper softquota ssl tcpd xinetd" - -SHAPER_VER="0.5.5" - -DESCRIPTION="An advanced and very configurable FTP server." -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2 - shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )" -HOMEPAGE="http://www.proftpd.org/ - http://www.castaglia.org/proftpd/" - -SLOT="0" -LICENSE="GPL-2" - -DEPEND="ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( virtual/mysql ) - ncurses? ( sys-libs/ncurses ) - 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 )" - -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 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 - - # Fix ftpshut and SqlShowInfo, bug #100364 - epatch "${FILESDIR}/${P}-ftpshut.patch" - epatch "${FILESDIR}/${P}-sqlshowinfo.patch" - - # Fix gcc4 compile errors, bug #145940 - epatch "${FILESDIR}/${P}-gcc4_mod_quotatab_sql.patch" - - # Fix OpenSSL 0.9.8 compile errors, bug #146534 - epatch "${FILESDIR}/${P}-openssl_0.9.8.patch" -} - -src_compile() { - addpredict /etc/krb5.conf - local modules myconf - - modules="mod_ratio:mod_readme" - use pam && modules="${modules}:mod_auth_pam" - use shaper && modules="${modules}:mod_shaper" - use ssl && modules="${modules}:mod_tls" - use tcpd && modules="${modules}:mod_wrap" - - if use ldap ; then - modules="${modules}:mod_ldap" - append-ldflags "-lresolv" - 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 - - # 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 authfile auth-file) \ - $(use_enable ipv6) \ - $(use_enable ncurses) \ - $(use_with sendfile) \ - ${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 contrib/UPGRADE.mod_sql "${FILESDIR}/proftpd.conf" \ - COPYING CREDITS ChangeLog NEWS README* \ - doc/{license.txt,GetConf} - 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() { - einfo - einfo "You can find the config files in /etc/proftpd" - einfo - einfo "mod_delay has been causing more bad than good and has been removed." - einfo - ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." - ewarn "Remember to change that in the configuration file." - einfo -} diff --git a/net-ftp/proftpd/proftpd-1.3.0a.ebuild b/net-ftp/proftpd/proftpd-1.3.0a.ebuild deleted file mode 100644 index a59613aa5bc1..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.0a.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# 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.0a.ebuild,v 1.9 2007/01/19 20:10:20 eroyf 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 noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd" - -SHAPER_VER="0.6.2" -VROOT_VER="0.7.1" - -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 )" - -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 stripping of files - sed -e "s| @INSTALL_STRIP@||g" -i Make* - - # Fix bug #147654, patch by upstream - epatch "${FILESDIR}/${PN}-1.3.0-mod_ctrls_sighup.patch" - - # Fix bug #156503, patch by OpenPKG - epatch "${FILESDIR}/${PN}-1.3.0-mod_tls_overflow.patch" - - # Fix bug #154650, patch by upstream - epatch "${FILESDIR}/${PN}-1.3.0-main_commandbuf.patch" - - # Fix bug in SQL/MySQL module - epatch "${FILESDIR}/${PN}-1.3.0-mod_sql_mysql.patch" - - 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} --with-includes=/usr/include/openssl" - CFLAGS="${CFLAGS} -DHAVE_OPENSSL" - 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() { - einfo - einfo "You can find the config files in /etc/proftpd" - einfo - ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." - ewarn "Remember to change that in the configuration file." - einfo - 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." - einfo - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild deleted file mode 100644 index 6e1d36f5f4e6..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# 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_rc1.ebuild,v 1.8 2007/01/23 10:18:19 beandog Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -KEYWORDS="alpha amd64 hppa 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 ) - !mips? ( 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 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() { - einfo - einfo "You can find the config files in /etc/proftpd" - einfo - ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." - ewarn "Remember to change that in the configuration file." - einfo - 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." - einfo - fi -} -- 2.26.2