diff options
-rw-r--r-- | net-ftp/proftpd/ChangeLog | 10 | ||||
-rw-r--r-- | net-ftp/proftpd/Manifest | 51 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch | 92 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild | 4 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.4b.ebuild | 228 |
5 files changed, 363 insertions, 22 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index a7e919f65539..9bd09626e415 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.290 2012/05/13 10:49:47 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.291 2012/09/19 08:27:54 voyageur Exp $ + +*proftpd-1.3.4b (19 Sep 2012) + + 19 Sep 2012; Bernard Cafarelli <voyageur@gentoo.org> + proftpd-1.3.4a-r1.ebuild, +proftpd-1.3.4b.ebuild, + +files/proftpd-1.3.4b-ubug-3795.patch: + Version bump, fixes bug #422941 (fbsd-9.0 support). Add multilib inherit + where needed 13 May 2012; <swift@gentoo.org> proftpd-1.3.3g.ebuild, proftpd-1.3.4a.ebuild, proftpd-1.3.4a-r1.ebuild: diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 4a2ec5cd89f2..ea3bec6335fa 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,19 +1,32 @@ -AUX proftpd-1.3.4a-ubug-3682.patch 4244 RMD160 5be5844579bbd26f4e87e4e169934aaf71770da4 SHA1 8d6c179ee51ed0b99c06ba4f483af7bcc1ea533f SHA256 310c18a525b3224edba7f1cfd0364a038df6394f57c0b6e1969957f0e25ded3e -AUX proftpd-1.3.4a-ubug-3728.patch 327 RMD160 d475c51d3b73af9397f08097ee0db6c2d6520f46 SHA1 074ac1333c08c812e91e252b2d93c0f33112bd91 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd -AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 -AUX proftpd.initd 1565 RMD160 efa4d3a98202666ba55e91c711fa03832ad5e320 SHA1 18ff1ec4d34d7442d06ab2201deea40548116d51 SHA256 52ee854ddd402b251b483450a26001a4d8d72706870040d0a866347440e0c395 -AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d -DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a -DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e -DIST proftpd-1.3.3g.tar.bz2 4204504 RMD160 29bdade06f63ace05811e809b0a3600ea6ed61fe SHA1 70489c2b32c87b3637fd0cf2520773c5229f4ae3 SHA256 b1104a91e5e4dfafb0aa876492c073cf24b7d00b3e8528fa4443c108d963ae15 -DIST proftpd-1.3.4a.tar.bz2 6805631 RMD160 92fcbb63be6098397ad55f05906e154a6c16db11 SHA1 18ea33d8b9f858b6e735cc81af900f0eebee8d25 SHA256 ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e -DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa -DIST proftpd-mod-case-0.7.tar.gz 13184 RMD160 9514b003b21999a97df59b2fe8b24a71d585047b SHA1 665b25a1673edc34faac87bd48fb193687c131bc SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 -DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db -DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 -DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf -EBUILD proftpd-1.3.3g.ebuild 7177 RMD160 27e88223d3ab08eb05a45daffe33fedb9c3c21b1 SHA1 80d5c33b20c740ee9836b0fa6bed7b98d40b05b3 SHA256 faf1de255cc098d2f2cc783ce8fa3b5c7d515eedc7d7bf9f254088259a00dd45 -EBUILD proftpd-1.3.4a-r1.ebuild 7298 RMD160 6007d46bb9c1c82201ef53b8f5b1f3816a44e8da SHA1 c7a5746f377dadfebe301e6b8b800ae8402c5942 SHA256 24e7bf83a079dbc4be106b9ac9dc28cacca410d7fc9c81922c2aaae9e4ddbb6b -EBUILD proftpd-1.3.4a.ebuild 6738 RMD160 120f307c22a747851008886f13e10f9b4a12e9c5 SHA1 86e1f36f0a9f0a2485be45d22ae874c657c4b677 SHA256 398c1f9ce2e9bb261af7e34fd836950a82cfa96b7a87861427ea7501585d54f2 -MISC ChangeLog 50499 RMD160 cb44d5ba86c48fa6f79a1279e17f98045804762b SHA1 2804a116193e023c02fa558346a5df9d13d76b45 SHA256 0747879d83882f93bbfe20b67371b16d81658d55ae36c59a0ec549649dae3e47 -MISC metadata.xml 2731 RMD160 92b7e5bc9e157f58383fbf8a143046e5ee59de5c SHA1 21dc2b2c1047dcd431f14f2110634d766e83353c SHA256 7f93382caca116f2a5daf9a8656096f262c926aee5fe246595e17250793a381d +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX proftpd-1.3.4a-ubug-3682.patch 4244 SHA256 310c18a525b3224edba7f1cfd0364a038df6394f57c0b6e1969957f0e25ded3e SHA512 7cd8313175704b809a001f29a9c320f51793bbb59e5fd2c732f11953aa6aa9d5b82bb48e1181b305e51ce61831a4955f40257863e184b1766d0a80cc4458585b WHIRLPOOL a094dcc2efa76af5bc4229ae5d3d68a1a8910269873a7825f3378b586c7bf07d8cc6f8f66c1247ee8b062e370ac69a43ab3e2ef4e06945202190046b3c2237b3 +AUX proftpd-1.3.4a-ubug-3728.patch 327 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd SHA512 a3b173c398a3e3dac633488e005d7aab66373c9c0b1c32738a2cf6ef30a94024602bd96bd794036c86f214198a5d4f02f7f8097a13803bc2bc6320c53c14b023 WHIRLPOOL 8c283894f69d5bb24dfa790a232a234eb6dff9ca5e61de835129df83adf57b890e54e2a2c383904ed958656c65464c6f8e23cb3b75a5ab2c53314c116f33ed00 +AUX proftpd-1.3.4b-ubug-3795.patch 2768 SHA256 cc5f5175298408fb12de7cf268d8e59a4fa3fe2bc3c798d0f60f8c204e9831d8 SHA512 ed6eb3ed8080275c6b59b8c42dab08d6fa2653b8fd1f336b571429248c1807e95f60fa6ad491c97a689fed26e2c595e00f3a99996b472bf3bd87840fe3936790 WHIRLPOOL 61d8d6ca1aa0496fa0568a89fe2ec8ed64f6221ff14abb969541a6bf2285b2ac79a67c9ce3bf98e167236f38442ed5b6b12b0810fce001b7ec1c050af2649319 +AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1 +AUX proftpd.initd 1565 SHA256 52ee854ddd402b251b483450a26001a4d8d72706870040d0a866347440e0c395 SHA512 554432fedd2fa63b2c34a08b7b9f78513fea1095f6b2829ef54317fe966f0887ba11f5f95f3a9f3e5aa34528cf2cde991488ba5fbf38f0e45834c413dbcfc061 WHIRLPOOL 5fa28cc16ac697873ef1216e5a256d55630453d5c41a4bf01127b2b3b634a87c1bd46b75a03202aecadd9f94a94d2b6471d97ddd7fd2b3b762bd9ce6f0981df3 +AUX proftpd.xinetd 295 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d SHA512 a13d29ca2289f8bd58b4eb317683d57dfb7d608c53f163844349bbf0b896790f5e9f47a27eafda3b8fc78e60f4a0d6859da7c7ced7df852166cf0b8bcad876d4 WHIRLPOOL 8fa187fe6aff903952257013d06f8953159787f03e6a1b1cd105f55bc6ed8fb70f03e02d4600c593152f9fc418b96fd7ac92555cdd6b9a8c59392e7852b8c186 +DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a +DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e +DIST proftpd-1.3.3g.tar.bz2 4204504 SHA256 b1104a91e5e4dfafb0aa876492c073cf24b7d00b3e8528fa4443c108d963ae15 +DIST proftpd-1.3.4a.tar.bz2 6805631 SHA256 ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e +DIST proftpd-1.3.4b.tar.gz 7647825 SHA256 9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb SHA512 12d955db031af66e75ba9685c244b34d2565d2f76ae89ca8e0e2f55feaeaaebee9b6cd59c0665991977f7ae7a383ff91d090c6d4584ae94f2575f919db848d2e WHIRLPOOL 56c834cc31ebce8706b9817f02ffecc174293103772cd947f534329d6ba81abb3184056708ae011361d8e12b52d7fea47d21230f94d0837ae12c977461f2f42d +DIST proftpd-mod-case-0.4.tar.gz 4849 SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa +DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 +DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db +DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 +DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf +EBUILD proftpd-1.3.3g.ebuild 7177 SHA256 faf1de255cc098d2f2cc783ce8fa3b5c7d515eedc7d7bf9f254088259a00dd45 SHA512 2b8768944f9354f6fba354fa1153d0d3ed4cbaab6e429719ab817b1c334d3ec44967f248a8301d9429e3928a94c7ecac8a355b8959d6ad0c9e7a506c90a86fcc WHIRLPOOL 0a8f85c7d8007f5504064a6c3c66d41b84df69887141398b484191ca10c84009971c7ede8fb5434ac23415ec3ad752062ef5098145a07b945c06994e0d4ac041 +EBUILD proftpd-1.3.4a-r1.ebuild 7310 SHA256 e1a2a35d992e1e84a126a4786f9a49e84ddd51ca13facfc9a31115cd3dbb1689 SHA512 51a9077c7d9d86841a6393964d0d4ea05df3abfbf16929fca4a5a4609cd5c49a6c83e9adfd0c0e6b4887d03a0b5666fc965c4a53ce2af665de6da266b1e9d2e8 WHIRLPOOL 350706a8685dd04ed0743623dac7fa2431cacf2be3e0a1e33df223ce99f78f83414558ac7b989ae7138f92b46e7d23f005b938636d82d7714dab3491515664a1 +EBUILD proftpd-1.3.4a.ebuild 6738 SHA256 398c1f9ce2e9bb261af7e34fd836950a82cfa96b7a87861427ea7501585d54f2 SHA512 bdff31c2848848c4371f93899b710aad7dfa898e2168184c9eaa1cc56c1a283ee29132f3a0458dd55d9cae06247d21fefdc07d400ceb620b7c710f59108be063 WHIRLPOOL f6db84d8c6a2a0d005b9ef873d07a10ba0a65171c6b257197ebd087abd6897131002c2c02f8500d820958ed6120c7bd7ba9826f45796395e483946777f0f59e8 +EBUILD proftpd-1.3.4b.ebuild 7216 SHA256 f0a8cbd628cec9af0ab06fe50bc568ade35b50014f739655e3bf68c9ac69bebf SHA512 4c5a1230ee552ca7a23cfbbb8760701c0a01de3b05bcb324a4c61e1763ea36a0f025c67a6347f85756869dd96897929757ebcc8e2d7ffe03266e77aa49d3de0a WHIRLPOOL ac2cdd8332338cd6b6d4dfa8ca24c6ae33cdb479527b69f7f6dca5ec6147e007e910ae578d62d85da3d02603fb68a86140c377e5ba17b2d037a1d54e560b42bc +MISC ChangeLog 50772 SHA256 ef8d92c9d62a06292e11c0a81c63bf4fa4db35e27115933f7f7c8baf6cc8b823 SHA512 8a9b3103832d6e57a28fbecfb21b1f12711056b55e0a8c06692dca44ebe87a5a6f457ccd5724df2cbe231cfada8a31ccd73d0bb0bb5e18923b47f058da624d18 WHIRLPOOL 508c565f49dd4062ddbec877a4d78e45c661968022e30e583dbce47012b5070ebc01eafd9995ad222d84a08ef8258164b5c239b69906f83c38fb5d8ff8dc020a +MISC metadata.xml 2731 SHA256 7f93382caca116f2a5daf9a8656096f262c926aee5fe246595e17250793a381d SHA512 4bffdf2cbab927f53a126e3b9d5e00657280ae37629b36d96ff290c7df61a50f29924f86e4b6f54a28fd715fab72fa33dbd25bce093d93cbecd4ece506812b29 WHIRLPOOL 170a115187d75e02f8a6a78ba7d6c2ef8251f4669e13213a2994888b8a363abf2062637bd6e1b7abbbb18e69045d3269b8cfaadbc8f615224ae474309d96875d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iF4EAREIAAYFAlBZgnIACgkQFYEBGcdFJfISwwEAkGgcCpjrD6pSn5+C50VRcwmz +x/fiNkhjcdIC5ETMBWkBAIc8U7dXojEIidgsobrk0OKsY25zSMIyzZVFjBzEF20G +=hCFY +-----END PGP SIGNATURE----- diff --git a/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch b/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch new file mode 100644 index 000000000000..b39442620438 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch @@ -0,0 +1,92 @@ +--- configure ++++ configure +@@ -33211,6 +33211,21 @@ + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext ++ ++ if test x"$openssl_cmdline" != xno; then ++ if `$openssl_cmdline version 2>/dev/null 1>&2`; then ++ openssl_cflags=`$openssl_cmdline version -f 2>/dev/null` ++ if test ! -z "$openssl_cflags"; then ++ # Look for the -pthread flag, indicating that this OpenSSL was built ++ # with threads support (see Bug#3795) ++ for openssl_cflag in $openssl_cflags; do ++ if test x"$openssl_cflag" = x"-pthread"; then ++ LIBS="$LIBS -pthread" ++ fi ++ done ++ fi ++ fi ++ fi + fi + + if test x"$pr_use_postgres" = xyes; then +@@ -33303,21 +33318,6 @@ + CPPFLAGS="$saved_cppflags" + LDFLAGS="$saved_ldflags" + LIBS="$saved_libs" +- +- if test x"$openssl_cmdline" != xno; then +- if `$openssl_cmdline version 2>/dev/null 1>&2`; then +- openssl_cflags=`$openssl_cmdline version -f 2>/dev/null` +- if test ! -z "$openssl_cflags"; then +- # Look for the -pthread flag, indicating that this OpenSSL was built +- # with threads support (see Bug#3795) +- for openssl_cflag in $openssl_cflags; do +- if test x"$openssl_cflag" = x"-pthread"; then +- LIBS="$LIBS -pthread" +- fi +- done +- fi +- fi +- fi + fi + + for module in $ac_shared_modules ; do +--- configure.in ++++ configure.in +@@ -2473,6 +2473,21 @@ + ) + ] + ) ++ ++ if test x"$openssl_cmdline" != xno; then ++ if `$openssl_cmdline version 2>/dev/null 1>&2`; then ++ openssl_cflags=`$openssl_cmdline version -f 2>/dev/null` ++ if test ! -z "$openssl_cflags"; then ++ # Look for the -pthread flag, indicating that this OpenSSL was built ++ # with threads support (see Bug#3795) ++ for openssl_cflag in $openssl_cflags; do ++ if test x"$openssl_cflag" = x"-pthread"; then ++ LIBS="$LIBS -pthread" ++ fi ++ done ++ fi ++ fi ++ fi + fi + + if test x"$pr_use_postgres" = xyes; then +@@ -2521,21 +2536,6 @@ + CPPFLAGS="$saved_cppflags" + LDFLAGS="$saved_ldflags" + LIBS="$saved_libs" +- +- if test x"$openssl_cmdline" != xno; then +- if `$openssl_cmdline version 2>/dev/null 1>&2`; then +- openssl_cflags=`$openssl_cmdline version -f 2>/dev/null` +- if test ! -z "$openssl_cflags"; then +- # Look for the -pthread flag, indicating that this OpenSSL was built +- # with threads support (see Bug#3795) +- for openssl_cflag in $openssl_cflags; do +- if test x"$openssl_cflag" = x"-pthread"; then +- LIBS="$LIBS -pthread" +- fi +- done +- fi +- fi +- fi + fi + + for module in $ac_shared_modules ; do diff --git a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild index e1a368fd7036..b4554d10007e 100644 --- a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild,v 1.2 2012/05/13 10:49:47 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild,v 1.3 2012/09/19 08:27:54 voyageur Exp $ EAPI=4 -inherit eutils +inherit eutils multilib MOD_CASE="0.7" MOD_CLAMAV="0.11rc" diff --git a/net-ftp/proftpd/proftpd-1.3.4b.ebuild b/net-ftp/proftpd/proftpd-1.3.4b.ebuild new file mode 100644 index 000000000000..9b7e5e5eb3bf --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.4b.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4b.ebuild,v 1.1 2012/09/19 08:27:54 voyageur Exp $ + +EAPI=4 +inherit eutils multilib + +MOD_CASE="0.7" +MOD_CLAMAV="0.11rc" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.3" +MOD_VROOT="0.9.2" + +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 ) + vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-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 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 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 ) + 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-base ) + 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() { + mv "${WORKDIR}"/$1/$1.c contrib + mv "${WORKDIR}"/$1/$1.html doc/contrib + rm -r "${WORKDIR}"/$1 +} + +src_prepare() { + # 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 vroot && __prepare_module mod_vroot + + # Fix Gentoo Bug #422941 / ProFTPD Bug #3795 + epatch "${FILESDIR}"/${P}-ubug-3795.patch + + # 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 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" + 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 +} + +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 +} |