diff options
Diffstat (limited to 'net-ftp')
25 files changed, 127 insertions, 488 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz Binary files differindex 1757bc7e7e9b..483e03367a8f 100644 --- a/net-ftp/Manifest.gz +++ b/net-ftp/Manifest.gz diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest index f1d4117287ff..466f92fafa16 100644 --- a/net-ftp/atftp/Manifest +++ b/net-ftp/atftp/Manifest @@ -6,13 +6,16 @@ AUX atftp-0.7-password.patch 3906 BLAKE2B beb8fadcbc9b42689c5ebfbb41e234d79f742d AUX atftp-0.7-pcre.patch 661 BLAKE2B 39080ad1cd36f434c0405fd42605cba4890ff912a63c1aea079cb0ae2c078e3d81b6c0b203d4a7c0ce1f81acf62ebb278000dc4ebb590e2e488151094d58012e SHA512 773ecc9aa63a9ffb2774ca5454daf573813f988defa6e6f8e9f99cfcc88c7984632b6d1944994c2dd6426200057a552743b9c30d5c158f469a9a74b3cd0c5dff AUX atftp-0.7-spaced_filename.patch 2395 BLAKE2B 5f0ab736e05094fa42fa891990a3664fdf0033b9ec23479945a419df909e7963fb1013b1d48668d0554704c7adf647b409745dcd68f623a68d0d311d90cb7894 SHA512 f6b352105d40fd4de2b079e847c7e6230ebeef3d2c5568aa260f7c74b22962c168928b38a244e3784e6ba282b47ae09d28b572c36944360f5bf8d880d16aeb64 AUX atftp-0.7-tests.patch 582 BLAKE2B e0eb7fe0dbd78ea164e65b320b6b4d7047becfea6c25655639c411af06d2c127102d3bb0b2eb5afcd3ec33b27d5362dfe62f417e71823e798689341cb77a5142 SHA512 93863aed523c9787f37b671caa894a92e864b009dd5c028066f7e10e50cefce955f3cf9a24ecc702c3ce572bd88fa6a47d524af08ecbaa6ff116487a68393ea8 +AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57 +DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B 8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3 SHA512 40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82 DIST atftp-0.7.tar.gz 202234 BLAKE2B 65ff486b6ef2b42b2a4737f121c2c36e8ff73838f3c10592c11020acdf2afdf0883fda8b39613e1cc35b47141fd29543a7ef2c3e2ead857033ad4f7181c91d04 SHA512 81c51b613a640f7db4d26da0fb891bda345d11d3f39e0af37f393d2abf619094c1de83f92f04ac75367f546cc70e37d7d47c1535c241c941036fd4df7863a440 DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5 EBUILD atftp-0.7-r5.ebuild 1765 BLAKE2B e16085096afbc2172f6974978ff4dfe0120b16a81b66e3a86c3f5bdea5d76f28c6ae6233379294c07dbd1371d438335d11a7401a771e1a4e310ca811ddcf3b03 SHA512 064e9c15c2d8c298f33c505b12ef32f986da77404aa63663c19aac884c2176e1e4f372ffdf7d2bbf13f6b0c048685dc795a4fd3e97a2e925206f7c829c538037 EBUILD atftp-0.7-r6.ebuild 1831 BLAKE2B 076b4853e8a1066d359b8ebac48eb9551e9b9b8083833752b4ba050e67b05e971b9979b95878e7e6176e193a243768544a16c9acf48e18b88a3167f4fdd45003 SHA512 e0f2cfe21ac0d293620850cba2994d2436fc33812e6e04b42cb719458c5c2aa5ec1075f70cc388ae7ecb328666aad87d88c8a48c562e009da5a0d71ec2da800c -MISC metadata.xml 215 BLAKE2B 8f7aa1a33da6c92db40f6122e500209464b76f7520190c109e697a9aa6f9a4447581098bd3eeb775c306855401f6b419b501c69dd0b37c9d55d083d3df316487 SHA512 dfbc3b8198f877d6f858c9228f92e82926664db8f0f19cd6ba97ce06b52d93a998e78c44fd502f20bf249cd70d612f1c0bdc01c9d66ea8495c54dab399b62116 +EBUILD atftp-0.7.2.ebuild 1481 BLAKE2B 210ffb7347a2e90038a802e34f2d647a111a973b002994e2da3be00981261e0de6dc0277462842b1990903267f10adbce9a71d75e1caa6402f142c6c5072dc82 SHA512 8a6cd4ac4b2b6a47e089f04733fcb60abcb3eff98fa943e9d2bd4e48edfcfd44928f9f2f4970679e43ff808b750590041a74e3fc64100075b8e60ccb5d011259 +MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb diff --git a/net-ftp/atftp/atftp-0.7.2.ebuild b/net-ftp/atftp/atftp-0.7.2.ebuild new file mode 100644 index 000000000000..7f0d4df1b2b5 --- /dev/null +++ b/net-ftp/atftp/atftp-0.7.2.ebuild @@ -0,0 +1,68 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic systemd + +DESCRIPTION="Advanced TFTP implementation client/server" +HOMEPAGE="https://sourceforge.net/projects/atftp/" +SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="selinux tcpd readline pcre" + +DEPEND="tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0= ) + pcre? ( dev-libs/libpcre )" +RDEPEND="${DEPEND} + !net-ftp/netkit-tftp + !net-ftp/tftp-hpa + !net-ftp/uftpd + selinux? ( sec-policy/selinux-tftp )" +BDEPEND="" + +PATCHES=( + "${FILESDIR}/${P}-CFLAGS.patch" +) + +src_prepare() { + append-cppflags -D_REENTRANT -DRATE_CONTROL + # fix #561720 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tcpd libwrap) \ + $(use_enable readline libreadline) \ + $(use_enable pcre libpcre) \ + --enable-mtftp +} + +src_test() { + cd "${S}"/test || die + # Try to run the tests + ./test.sh || die +} + +src_install() { + default + + newinitd "${FILESDIR}"/atftp.init atftp + newconfd "${FILESDIR}"/atftp.confd atftp + + systemd_dounit "${FILESDIR}"/atftp.service + systemd_install_serviced "${FILESDIR}"/atftp.service.conf + + dodoc README* BUGS FAQ Changelog INSTALL TODO + dodoc "${S}"/docs/* + + docinto test + cd "${S}"/test || die + dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt +} diff --git a/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch new file mode 100644 index 000000000000..749f8e8e6d38 --- /dev/null +++ b/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch @@ -0,0 +1,32 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -69,29 +69,6 @@ + dnl Check for AIX + AC_AIX + +-CFLAGS="$CFLAGS -g -Wall -D_REENTRANT" +- +-if test x$debug = xtrue; then +- CFLAGS="$CFLAGS -O0 -DDEBUG" +-else +- if test -n "$auto_cflags"; then +- if test -n "$GCC"; then +- CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit" +- else +- case "$host_os" in +- *hpux*) CFLAGS="$CFLAGS +O3" +- ;; +- *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" +- ;; +- *) CFLAGS="$CFLAGS -O2" +- ;; +- esac +- fi +- else +- CFLAGS="$CFLAGS -O2" +- fi +-fi +- + AC_PROG_MAKE_SET + AC_PROG_INSTALL + diff --git a/net-ftp/atftp/files/atftp.init b/net-ftp/atftp/files/atftp.init index 8ab499127ba4..8ab499127ba4 100644..100755 --- a/net-ftp/atftp/files/atftp.init +++ b/net-ftp/atftp/files/atftp.init diff --git a/net-ftp/atftp/metadata.xml b/net-ftp/atftp/metadata.xml index cf1190698b2e..13613cc65e2b 100644 --- a/net-ftp/atftp/metadata.xml +++ b/net-ftp/atftp/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>klausman@gentoo.org</email> -</maintainer> + <maintainer type="person"> + <email>klausman@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>martin.dummer@gmx.net</email> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index ddea65e2b550..d868d3b4da79 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -15,7 +15,7 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1 EBUILD lftp-4.7.5.ebuild 2551 BLAKE2B 090ebc91da6dbdeae35271ddd823c68a23fe61fb980a3b575454a652c13c5237a742c264e141b0ba07f08dc18f8dbbfea54053df9f21787a1b1bbdd11c05addb SHA512 bacc149a37e2e96c1f65472689ed8454a553ab714ce301934d21451d9b8452106f66dee3d6b1466b3b236df06b1c9800578555960dcd047a31c4c5a83fd2f30f -EBUILD lftp-4.8.4-r1.ebuild 2652 BLAKE2B 59a8f1c0a5d58e9fac3e8f10e047b83d2dec7aec9b7470eff7e58d6fabaedcab220d480e5cae1fffd3979dae585112cdd2704ffd61d9cb9db47737850e68ca4c SHA512 ec03eab5113484b503d601ec1829b745ad30dc2c9d5a1fb6cc087ce3b5e59c102b23554d16da846a69e1265fd6549607449c7ebca5b467d9f6c7b83cc41108bd +EBUILD lftp-4.8.4-r1.ebuild 2646 BLAKE2B b7e25ca7d09fff43f122e2a50d4995ae9f76d31e825d240bd1374cba288156e53976ccb4a441925273dcb125b5ce637186e5d1b1c635fd2010cde51164bd3373 SHA512 da87dcaa6965626bfa88f8ce3500d3c0de31d9c9addae47531b1eedb3653a02de93468cbc68ead3aab4021902b9ac7cc7e055c240a09e2a889a00504cd41bdc5 EBUILD lftp-4.8.4.ebuild 2564 BLAKE2B c7c7f0082a43d4ae98a41a324b32e1ca283ef5424bd574eb9f29b2f667f1fe1b5ac362879a74ea91cc9e604d9e7d8b261975ad293cdccbed93bc78d0fcffb7a0 SHA512 89141dcecc69fec441b682d0ca980659784a64599a2b0c1338ddb279bb9c84e03042b7b282d474b0bb208b36d8e4618223abc55619d2dd6559b40f81b6a235a0 EBUILD lftp-9999.ebuild 2437 BLAKE2B 9acf0cd0125d59d96feeb9268f519e56dd5746704ffb9f10c8c77c1c4ca88db53b1c4c862513d71eb483765e3c724f68d51b25144402bcad721ee8c4886f420d SHA512 05ef650aa2470f8a3b00249d552892415f54b5279016db303226133a7ac03e2aaf269116d7da67bde001590a875e8fe4234f1e101cb29e23e7ed3b437b9d8f25 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild index 5faea52009eb..ff56e1feb5d7 100644 --- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild +++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" RESTRICT="test" diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest deleted file mode 100644 index 34c6b426ce1b..000000000000 --- a/net-ftp/netkit-ftpd/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX ftp.xinetd 207 BLAKE2B 8443d652c7e8b7da592018b83fd470da55aae0ff1f8113f41b9778affa12fbc2cc6d24082819728afc6a7ee6707c9f8abb256b82e04a4a58b8ea706ce584b0b1 SHA512 3a9bd4b5d8eabe11a4db9eb9181accd735ffa3979f81ea38cdf11c888f5500e71d1f528c44f662ec0b990cff73d794770b60f39209b3865c747c36523433d477 -AUX netkit-ftpd-0.17-CVE-2008-4247.patch 2909 BLAKE2B 757a2762ee9f913ce7dd43d6a00982bf59fe2c56747c28b2284cde3bbd3e1d156d7cb807f2cd73084464eb6c647991c8490fdd4e4a0724f3407b63a854868bc3 SHA512 bf4469dd7ebc7b203e45b8503ef918acb273d8b5aac82657a0c7996a8e31a3b652a2879bc5a37b4917aa7fb45d39eaa87fe8c3e06eb10b79f0e07a2e88ee0a1d -AUX netkit-ftpd-0.17-build.patch 862 BLAKE2B d01eff08329edd39af0a82e009b31b8b2973cdaf0ab00065496e148b7053ab04e8d984734c98416777a11103c9f2b7c1ec5be4c6c9b00450c57ac84731d64860 SHA512 68fc321b318acdad4685870af06096a3f165affe1edce7e8c4cde796c934d4b564c0b9faa07741eb0dcc9a3a1422a925c7bfcbe2cfdb5288308be26687867964 -AUX netkit-ftpd-0.17-cleanup-ssl.patch 279 BLAKE2B eaa7cf89c3ed7ccdde02417df26b2f6c09a933f0758416a15904fef60fd048720c593431a20e6d2e03730ad5aa242d68342f03580d1cb68ec5161332b6376779 SHA512 5c5c1c3d10a2d969701dbb2b23b56b367b28ba1e3aab33d1a14ae606d27a44870ec5f274819bccab1fa0f802712210af3b3118f5b9334092b853e8999ad391e3 -AUX netkit-ftpd-0.17-cleanup.patch 186 BLAKE2B 2ef3ec9b9424ec55ec3add36987cfc6e8c1f171c7dd5596f796d13b0d537c7ba0f2dae7c5eb3b9047d854b1ba5970e80cd08676d54dd35d9556726e54054e9f4 SHA512 c0f407f324e7c28f7cd7b26d0ce53849f8e02910a7813b9fef4648f767856f361fb0157337b76425ebd27c056702808ab408a6969af19c17550bcea22094711c -AUX netkit-ftpd-0.17-cross.patch 1353 BLAKE2B 0d159a8f4cd585163f3985c7e4eaa83f8e00a69e9fa94f2019b8e49741363c13163c743fbd3d9b9f36719e06c60187897a21f43acf8885e67d1dafe2cd39598f SHA512 19bad02d42b6abaf6b4280a9fc0cd56e90183976251584976105042aa682c1a9354886945e1e6e2364e1487425a0771d772334979510d5da6deded7199880d66 -AUX netkit-ftpd-0.17-fclose-CVE-2007-6263.patch 658 BLAKE2B 288b4b04196651524efc64a3247118bda12b6312c0e10ba99de1bd20bd6f62f3a657846ee1fae6e3c3732e35a57790d96d3a23f2dbe6a8535d92725e154d2cac SHA512 c3a0c04504dbd946ac235cb8ed68fead4647cec893cdd94cf46bfabd3b4b21e2065835b5b42782d4a3e2661408a81d9c406234dcd9f96745901c0e52bd33f216 -AUX netkit-ftpd-0.17-gcc41.patch 770 BLAKE2B ed45d154d5d590fcea9674d8a96990e1acc6eea3b505fa00f44af0ecf4a3b79f762cd9723499b14fad7bedc640d2ece053b345b8ed62e7ec333949d2d236a186 SHA512 9139fecff5b0169362f7c73a9502bc464925def180ec2f557c177bdb61eb63b9dcbeec5389199ce17abc0701dfa589851fdcad663a2d37192a1b4f8bbbbf5e35 -AUX netkit-ftpd-0.17-setguid.patch 1809 BLAKE2B 220814a5abde3a37eea51d6bcc29d7e3b249f797529775412da4732bf06ad515a98f5f939f5f9276c409900510f53fa14a866b99c6fdf5d0ed5531da231d6c32 SHA512 b9b9c2765440688b8ad66034d227c3e11f8fb3ead4c0268b78633af995e82f92def653b7cfe5528cb11f07e14b80e6ceb5e2603d5486aa4630605786fa1aa9ff -AUX netkit-ftpd-0.17-shadowfix.patch 587 BLAKE2B 2432d09909c495110f36a6dd0396b91a41e11e0ed6d1eb7b25ed369f3c3ec6fc647c21b8cb5028d0c8d0eac3acee5ef4417776d354b70edd5af59a94e1ed3306 SHA512 4e22825300c1979aad4df7f6c38e42276ca32536ae06474efa0150c423e93779f35c26a5eb0f02da503bec825cb45206893a3393b5120c5eb0d9bc146aa3c684 -DIST linux-ftpd-0.17-ssl.patch 36459 BLAKE2B 36db6fb984afa6350623ebb2af3913644e01a999e9aea17e2a064c9599fcca1d69c412d67fda8303e83049ea42b89eacb27dd4d5e794612d41a0eb7b409961d5 SHA512 f27dd2f9a50a2b3c38131c46cdb4420f81abfdbb7cd7e70d00e864da3e4562363d585a308e57b9abce7db64ede8d02e41710101e618f6c14489193776b2b1e71 -DIST linux-ftpd-0.17.tar.gz 46763 BLAKE2B b0370a6d96a666e4b58d3841c544e6f2c767c1b561fe53371b06d561332aa8418593d875a7f340df96a60e6d8e8d8bf08f38f296121de85f9c72914fa3cca3b9 SHA512 160191baa904b4c404473e2c1de23813de1b31cbb11a3c28ff64f9953aec8270b74d865a57d5aaa6d25cf404c8aeadff05348a9b32847a2a137ef4c998557d58 -EBUILD netkit-ftpd-0.17-r9.ebuild 1696 BLAKE2B 79e872679f52885325716e1c0ccdca599d585f3121bdc64f4c11e8b1f15ed18624317f9dd8c947c7efa557cb62e2b11238b9b18052ec19f35f1d98247b0885ba SHA512 8c6f5e3accfe4ef8ad571e36a7afe0b27d9d424e80886ce551129f0b163eb0024a34308c1b6462b09bb2a2e59beaf8f0caab7ba07dabcd607bbd117f7284b8dd -MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-ftp/netkit-ftpd/files/ftp.xinetd b/net-ftp/netkit-ftpd/files/ftp.xinetd deleted file mode 100644 index 1d486c3a45f6..000000000000 --- a/net-ftp/netkit-ftpd/files/ftp.xinetd +++ /dev/null @@ -1,12 +0,0 @@ -# default: off -# description: The netkit ftp daemon with optional SSL support. - -service ftp -{ - socket_type = stream - protocol = tcp - wait = no - user = root - server = /usr/bin/ftpd - disable = yes -} diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch deleted file mode 100644 index e1b50c825bfc..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch +++ /dev/null @@ -1,108 +0,0 @@ -http://bugs.gentoo.org/239047 - ---- linux-ftpd-0.17/ftpd/extern.h -+++ linux-ftpd-0.17/ftpd/extern.h -@@ -43,7 +43,7 @@ void dologout __P((int)); - void fatal __P((const char *)); - int ftpd_pclose __P((FILE *)); - FILE *ftpd_popen __P((char *, const char *)); --char *ftpd_getline __P((char *, int, FILE *)); -+int ftpd_getline __P((char *, int, FILE *)); - void ftpdlogwtmp __P((const char *, const char *, const char *)); - void lreply __P((int, const char *, ...)); - void makedir __P((char *)); ---- linux-ftpd-0.17/ftpd/ftpcmd.y -+++ linux-ftpd-0.17/ftpd/ftpcmd.y -@@ -980,7 +980,7 @@ static struct tab *lookup(struct tab *p, - /* - * getline - a hacked up version of fgets to ignore TELNET escape codes. - */ --char * ftpd_getline(char *s, int n, FILE *iop) -+int ftpd_getline(char *s, int n, FILE *iop) - { - int c; - register char *cs; -@@ -995,7 +995,7 @@ char * ftpd_getline(char *s, int n, FILE - if (debug) - syslog(LOG_DEBUG, "command: %s", s); - tmpline[0] = '\0'; -- return(s); -+ return(0); - } - if (c == 0) - tmpline[0] = '\0'; -@@ -1037,11 +1037,22 @@ char * ftpd_getline(char *s, int n, FILE - } - } - *cs++ = c; -- if (--n <= 0 || c == '\n') -+ if (--n <= 0) { -+ /* -+ * If command doesn't fit into buffer, discard the -+ * rest of the command and indicate truncation. -+ * This prevents the command to be split up into -+ * multiple commands. -+ */ -+ while (c != '\n' && (c = getc(iop)) != EOF) -+ ; -+ return (-2); -+ } -+ if (c == '\n') - break; - } - if (c == EOF && cs == s) -- return (NULL); -+ return (-1); - *cs++ = '\0'; - if (debug) { - if (!guest && strncasecmp("pass ", s, 5) == 0) { -@@ -1061,7 +1072,7 @@ char * ftpd_getline(char *s, int n, FILE - syslog(LOG_DEBUG, "command: %.*s", len, s); - } - } -- return (s); -+ return (0); - } - - void toolong(int signo) -@@ -1090,9 +1101,14 @@ static int yylex(void) - case CMD: - (void) signal(SIGALRM, toolong); - (void) alarm((unsigned) timeout); -- if (ftpd_getline(cbuf, sizeof(cbuf)-1, stdin)==NULL) { -+ n = ftpd_getline(cbuf, sizeof(cbuf)-1, stdin); -+ if (n == -1) { - reply(221, "You could at least say goodbye."); - dologout(0); -+ } else if (n == -2) { -+ reply(500, "Command too long."); -+ alarm(0); -+ continue; - } - (void) alarm(0); - if ((cp = strchr(cbuf, '\r'))) { ---- linux-ftpd-0.17/ftpd/ftpd.c -+++ linux-ftpd-0.17/ftpd/ftpd.c -@@ -2210,6 +2210,7 @@ void dologout(int status) - static void myoob(int signo) - { - char *cp; -+ int ret; - int save_errno = errno; - - (void)signo; -@@ -2218,9 +2219,13 @@ static void myoob(int signo) - if (!transflag) - return; - cp = tmpline; -- if (ftpd_getline(cp, 7, stdin) == NULL) { -+ ret = ftpd_getline(cp, 7, stdin); -+ if (ret == -1) { - reply(221, "You could at least say goodbye."); - dologout(0); -+ } else if (ret == -2) { -+ /* Ignore truncated command */ -+ return; - } - upper(cp); - if (strcmp(cp, "ABOR\r\n") == 0) { diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch deleted file mode 100644 index 6df58378c93f..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- configure -+++ configure -@@ -114,40 +114,6 @@ - echo 'no' - fi - --if [ x$DEBUG = x ]; then -- echo -n "Checking if $CC accepts -O2... " -- if ( -- $CC -O2 __conftest.c -o __conftest -- ) >/dev/null 2>&1; then -- echo 'yes' -- CFLAGS="$CFLAGS -O2" -- else -- echo 'no' -- echo -n "Checking if $CC accepts -O... " -- if ( -- $CC -O __conftest.c -o __conftest -- ) >/dev/null 2>&1; then -- echo 'yes' -- CFLAGS="$CFLAGS -O" -- else -- echo 'no' -- fi -- fi -- --else -- echo -n "Checking if $CC accepts -g... " -- if ( -- $CC -g __conftest.c -o __conftest -- ) >/dev/null 2>&1; then -- echo 'yes' -- CFLAGS="$CFLAGS -g" -- else -- echo 'no' -- fi -- --fi -- --LDFLAGS= - LIBS= - - rm -f __conftest* diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch deleted file mode 100644 index e228eaceda5f..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ftpd/ftpcmd.y -+++ ftpd/ftpcmd.y -@@ -109,6 +109,7 @@ - typedef struct ssl_st SSL; - int SSL_write(SSL *ssl,const char *buf,int num); - extern int do_ssl_start(void); -+int ssl_getc(SSL *ssl_con); - extern int ssl_secure_flag; - extern int ssl_active_flag; - extern SSL *ssl_con; diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch deleted file mode 100644 index 73289adfba05..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ftpd/logwtmp.c -+++ ftpd/logwtmp.c -@@ -43,6 +43,7 @@ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/stat.h> -+#include <time.h> - - #include <fcntl.h> - #include <utmp.h> diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch deleted file mode 100644 index cb6ad986a914..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- configure.orig 2008-05-11 12:02:50.000000000 -0700 -+++ configure 2008-05-11 12:04:14.000000000 -0700 -@@ -93,7 +93,7 @@ - echo -n 'Checking if C compiler works... ' - if ( - $CC __conftest.c -o __conftest || exit 1 -- ./__conftest || exit 1 -+ [ -e __conftest ] || exit 1 - ) >/dev/null 2>&1; then - echo 'yes' - else -@@ -169,13 +169,13 @@ - EOF - if ( - $CC $CFLAGS __conftest.c -o __conftest || exit 1 -- ./__conftest || exit 1 -+ [ -e __conftest ] || exit 1 - ) >/dev/null 2>&1; then - echo 'yes' - else - if ( - $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c -o __conftest || exit 1 -- ./__conftest || exit 1 -+ [ -e ./__conftest ] || exit 1 - ) >/dev/null 2>&1; then - echo '-D__USE_BSD_SIGNAL' - CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL" -@@ -311,7 +311,7 @@ - else - if ( - $CC $CFLAGS -D_GNU_SOURCE __conftest.c -o __conftest || exit 1 -- ./__conftest || exit 1 -+ [ -e ./__conftest ] || exit 1 - ) >/dev/null 2>&1; then - echo '-D_GNU_SOURCE' - CFLAGS="$CFLAGS -D_GNU_SOURCE" -@@ -342,7 +342,7 @@ - EOF - if ( - $CC $CFLAGS __conftest.c $LIBBSD -o __conftest || exit 1 -- ./__conftest || exit 1 -+ [ -e ./__conftest ] || exit 1 - ) >/dev/null 2>&1; then - echo 'ok' - else diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch deleted file mode 100644 index 5da61aee7343..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c ---- linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c -+++ linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c -@@ -1729,7 +1729,7 @@ - static FILE * dataconn(const char *name, off_t size, const char *mode, int stou) - { - char sizebuf[32]; -- FILE *file; -+ FILE *file = NULL; - int retry = 0, tos; - - file_size = size; -@@ -1822,7 +1822,10 @@ - ERR_error_string(ERR_get_error(),NULL)); - perror_reply(425, errbuf); - /* abort time methinks ... */ -- fclose(file); -+ if(file != NULL){ -+ fclose(file); -+ file = NULL; -+ } - return NULL; - } else { - if (ssl_debug_flag) { diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch deleted file mode 100644 index 5f516ce5d356..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- linux-ftpd-0.17/ftpd/ftpcmd.y -+++ linux-ftpd-0.17/ftpd/ftpcmd.y -@@ -125,7 +125,14 @@ - char cbuf[512]; - char *fromname; - --struct tab; -+struct tab { -+ const char *name; -+ short token; -+ short state; -+ short implemented; /* 1 if command is implemented */ -+ const char *help; -+}; -+ - static int yylex __P((void)); - static void sizecmd __P((char *)); - static void help __P((struct tab *, char *)); -@@ -891,13 +898,6 @@ - #define SITECMD 7 /* SITE command */ - #define NSTR 8 /* Number followed by a string */ - --struct tab { -- const char *name; -- short token; -- short state; -- short implemented; /* 1 if command is implemented */ -- const char *help; --}; - - struct tab cmdtab[] = { /* In order defined in RFC 765 */ - { "AUTH", AUTH, STR1, 1, "<sp> auth_type" }, diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch deleted file mode 100644 index f5d0cf75fcfd..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- linux-ftpd-0.17/ftpd/popen.c -+++ linux-ftpd-0.17/ftpd/popen.c -@@ -169,8 +169,13 @@ - * XXX: this doesn't seem right... and shouldn't - * we initgroups, or at least setgroups(0,0)? - */ -- setgid(getegid()); -- setuid(i); -+ -+/* -+ * PSz 25 Aug 06 Must check the return status of these setgid/setuid calls, -+ * see http://www.bress.net/blog/archives/34-setuid-madness.html -+ */ -+ if ( setgid(getegid()) != 0 ) _exit(1); -+ if ( setuid(i) != 0 ) _exit(1); - - #ifndef __linux__ - /* ---- linux-ftpd-0.17/ftpd/ftpd.c -+++ linux-ftpd-0.17/ftpd/ftpd.c -@@ -1159,6 +1159,13 @@ - } - strcpy(pw->pw_dir, "/"); - setenv("HOME", "/", 1); -+ } -+ /* PSz 25 Aug 06 chdir for real users done after setting UID */ -+ if (seteuid((uid_t)pw->pw_uid) < 0) { -+ reply(550, "Can't set uid."); -+ goto bad; -+ } -+ if (guest || dochroot) { /* do nothing, handled above */ - } else if (chdir(pw->pw_dir) < 0) { - if (chdir("/") < 0) { - reply(530, "User %s: can't change directory to %s.", -@@ -1167,10 +1174,7 @@ - } else - lreply(230, "No directory! Logging in with home=/"); - } -- if (seteuid((uid_t)pw->pw_uid) < 0) { -- reply(550, "Can't set uid."); -- goto bad; -- } -+ - sigfillset(&allsigs); - sigprocmask(SIG_UNBLOCK,&allsigs,NULL); - -@@ -1408,7 +1412,8 @@ - goto bad; - sleep(tries); - } -- (void) seteuid((uid_t)pw->pw_uid); -+/* PSz 25 Aug 06 Check return status */ -+ if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1); - sigfillset(&allsigs); - sigprocmask (SIG_UNBLOCK, &allsigs, NULL); - -@@ -1440,7 +1445,8 @@ - bad: - /* Return the real value of errno (close may change it) */ - t = errno; -- (void) seteuid((uid_t)pw->pw_uid); -+/* PSz 25 Aug 06 Check return status */ -+ if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1); - sigfillset (&allsigs); - sigprocmask (SIG_UNBLOCK, &allsigs, NULL); - (void) close(s); diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch deleted file mode 100644 index 79a241ff9c51..000000000000 --- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- linux-ftpd-0.17/ftpd/Makefile -+++ linux-ftpd-0.17-patched/ftpd/Makefile -@@ -19,7 +19,11 @@ - all: ftpd - - %.o: %.c -+ ifdef USE_SHADOW -+ $(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c -+ else - $(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c -+ endif - - ftpcmd.c: %.c: %.y - $(YACC) $< ---- linux-ftpd-0.17/support/Makefile -+++ linux-ftpd-0.17-patched/support/Makefile -@@ -5,7 +5,11 @@ - all: libsupport.a - - %.o: %.c -+ ifdef USE_SHADOW -+ $(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c -+ else - $(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c -+ endif - - libsupport.a: $(OBJS) - ar -cruv $@ $^ diff --git a/net-ftp/netkit-ftpd/metadata.xml b/net-ftp/netkit-ftpd/metadata.xml deleted file mode 100644 index 56c124413057..000000000000 --- a/net-ftp/netkit-ftpd/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -</pkgmetadata> diff --git a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild deleted file mode 100644 index f5466dcc5136..000000000000 --- a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ssl-cert toolchain-funcs - -MY_P="linux-ftpd-${PV}" -DESCRIPTION="The netkit FTP server with optional SSL support" -HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html" -SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-ssl.patch" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86" -IUSE="libressl ssl" - -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) ) -" -RDEPEND="${DEPEND} - virtual/inetd - !www-servers/publicfile" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - cd "${S}" || die - if use ssl; then - epatch "${DISTDIR}"/${MY_P}-ssl.patch - epatch "${FILESDIR}"/${P}-cleanup-ssl.patch - epatch "${FILESDIR}"/${P}-fclose-CVE-2007-6263.patch #199206 - fi - - epatch "${FILESDIR}"/${P}-cleanup.patch - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-shadowfix.patch - epatch "${FILESDIR}"/${P}-gcc41.patch - epatch "${FILESDIR}"/${P}-setguid.patch - epatch "${FILESDIR}"/${P}-cross.patch - epatch "${FILESDIR}"/${P}-CVE-2008-4247.patch #239047 -} - -src_configure() { - tc-export CC - ./configure --prefix=/usr || die -} - -src_compile() { - emake -} - -src_install() { - dobin ftpd/ftpd - doman ftpd/ftpd.8 - dodoc README ChangeLog - insinto /etc/xinetd.d - newins "${FILESDIR}"/ftp.xinetd ftp -} - -pkg_postinst() { - if use ssl; then - install_cert /etc/ssl/certs/ftpd - elog "In order to start the server with SSL support" - elog "You need a certificate /etc/ssl/certs/ftpd.pem." - elog "A temporary certificiate has been created." - fi -} diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 071e92a81d69..d51a61ce4817 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -20,6 +20,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239 EBUILD proftpd-1.3.5e.ebuild 7264 BLAKE2B 3e5e8dca76b1a6fcd8de4673fcb2af33454bcf2443626bbda699149251232579d24655d6bf89906feddabd502df682a2f01c19e9b0ba8d6e8f428aa3af154d4f SHA512 a0b0204493f6d10741830d9eef7c5b2349a27765ebc7c6ff3b6baa4879549c8c1d68e409b35af72b4271c2c70ef65639db9302f4d93965e4f02df9f0e908d512 EBUILD proftpd-1.3.6-r1.ebuild 8455 BLAKE2B 3152ba84ad6e73b57413a9ef9bef3f9557a9e63a3be9fdf1838ba65c8ec9be653dcba036af7c199832faa85bb6d4fcf92c48d88adf7e99214f51f51c0416afcd SHA512 6f658928141d2b08ccd93129a96a9c5bafe766a6706e7e47c6ecd2ddf64a3c373930c6db5dd9974bd2f19ea4a194da39ac939d016dab4aae0d9f8cb3a4b6a085 EBUILD proftpd-1.3.6-r2.ebuild 8533 BLAKE2B febfcd73184829ca04f0e8013ed4ad16ebbc3640a186a1432193bb991cae7f5723bfe1118ea558565ddb25e5c05e1b04d0e69392a912b2b790f6309226643c99 SHA512 ae98a188143fb35a8cfcfd85fccb6d57f28af3a5d4f978c74b08269d1e68d7e4ea738adc0793f7bb04a20791062d9e12e4ddd5db8269e9aa8299663b7eec7a00 -EBUILD proftpd-1.3.6-r3.ebuild 8580 BLAKE2B fe7a2ad9ed6e49850844b4eb39ee352175e4856ec08c17d832d05197b33e8393628ab36d09775b73bc4c24d67af9debcb62d82a8468510ba3e9c88d45f7f765b SHA512 812e9a31ccf3399cce2d412b8b67c0a3de6f4ae68c13d8839a1b218ede33386d5cdb3d83bfa0328dc97de2bd7aff3d2b3b7552586e7b60904869ba25cee6985a +EBUILD proftpd-1.3.6-r3.ebuild 8576 BLAKE2B 46aa0412fd0ccae50c80cf06cf4ecc5e397b194312f5f48e8a320f95bdca0d2d0c23958b07c99073280bf63096508207331e2ac9da8a1068cde6043412a4fcd4 SHA512 62453b086d64bb8d11afafe13f5c9136547b6ab13a1dfc63693d00ce76c4ae93d68fb0cfcb581114c56c3e8c0379d871ce450773a8b41bcd3712b13793d47939 EBUILD proftpd-1.3.6.ebuild 8337 BLAKE2B e968ce2c91b562da83a80ddf50a6acebcf16b3d8cbcfbd7dd5d6b3a511de689cd9bf67086844fe5ba502bc491731b5565c792734ebc0cfd57415f53dfeefde81 SHA512 294b99f911ff074c6ba3cb0ce3c58a59aac53255c494bed4dd8f49f450a0eb14b0e7f50cd3521c5ebb79229af35f36a919f9a267aa9b7d4f2ef7e21f3999bf93 MISC metadata.xml 3028 BLAKE2B c9b780180099942fa3a023629ed5f5faaf9a84eeca9f95cc88665d310c67b7647c7917e5d1a0ab4e1ecfa85b993af260f32f604c30267083364ef6b7683933e5 SHA512 9558151e889dc4a1f90968565247446ad47fda8f3e048d67350ad8580067fd995f8a79cef3673c462f75ebdf6fa830672c3a078d7e26b493dced84bfda8520bf diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild index 5020b56e4da2..da2fff59e8be 100644 --- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild @@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +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 libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd" diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest index 4cfbad89c15b..777b74aef3dc 100644 --- a/net-ftp/pure-ftpd/Manifest +++ b/net-ftp/pure-ftpd/Manifest @@ -4,7 +4,7 @@ AUX pure-ftpd-1.0.47-TLSv1.3.patch 1743 BLAKE2B 54d88c30f842da11c93121d2cda6d91c AUX pure-ftpd-1.0.47-disable-TLSv1.1.patch 687 BLAKE2B 3d33790c7a410bf994cb24efddc07ce79e9fb5ca2e21f32dc007a8b8ef6801f5cc7e9c1fcce58e947d3e6a52aae7b58a60314c93ae9bc5daaa1b10ceaaad8c0e SHA512 81bee81a8ed942b004ba72b97c8c7f7df05ae0344e16b9cc909a70a717a0a32de882c393ccb9565e8892dccf8ede3b71de4e9eb442918bf1991a66c4b5561980 AUX pure-ftpd-1.0.47-disable-TLSv1.3.patch 652 BLAKE2B cf6c1879eb1a2ad07117f6f8dcf7640d97b8e2ed331be327a160f1686bd2041e5b19d45194d0e2567aab77e0001671bb60200fa7c513bb85354906a65fcf044b SHA512 925087b9a454b5d3da289d04db52c947e29983041456ebf4e05d055b1526240587016db05a3e8a1b54dc7bb55a413319ef9cea084fd71cac1de888f0d22328c9 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393 -AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756b573470bd9b49dea848c74e1b04a8241df873977938011aed2c5acc9084d1e1c2d0aa7ea0de44692 SHA512 39e076b3ecc511646e6e14884852313ba6126810841ed9667a53ac061232418e8e53e2cf9191b35d7655168680d961ee2edf67bff5e16b295f8a00752032e253 +AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63 DIST pure-ftpd-1.0.48.tar.bz2 487653 BLAKE2B 6edf1ae191fba657907121a0ff6d57cfaf1df2b237fcd66f8523cf84b9fbcb737752624c031f33ca16b8d0c8345391fa876556ccfb8027cfb3c7d36045e0649d SHA512 eabcc8ba6d37e3aceb57871e80129a1db1a3ea7d2b9f57626a21f42b4978570a84006a941fe254b6af50b2432d1d391725ea512f7569fcaecfa7eb77179c2f54 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11 index cc17b5afa12d..35270ff33507 100644 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ftpd_pidfile="/var/run/pure-ftpd.pid" @@ -9,11 +9,12 @@ daemon="/usr/sbin/pure-ftpd" script_daemon="/usr/sbin/pure-uploadscript" depend() { - need net + need localmount + use netmount } start_pre() { - if [ -z "$IS_CONFIGURED" ] ; then + if [ -z "${IS_CONFIGURED}" ] ; then eerror "You need to setup /etc/conf.d/pure-ftpd first!" return 1 fi @@ -21,7 +22,7 @@ start_pre() { start() { UPSCRIPT="" - if [ -n "$UPLOADSCRIPT" ] ; then + if [ -n "${UPLOADSCRIPT}" ] ; then UPSCRIPT="--uploadscript" fi @@ -42,11 +43,11 @@ start() { --make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \ -- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g') result=$? - if [ $result -ne 0 ] ; then + if [ ${result} -ne 0 ] ; then eend 1 "Could not launch Pure-FTPd" else eend $result - if [ -n "$UPLOADSCRIPT" ] ; then + if [ -n "${UPLOADSCRIPT}" ] ; then ebegin "Starting Pure-FTPd upload script" start-stop-daemon --start --quiet --make-pidfile \ --pidfile ${script_pidfile} \ @@ -58,7 +59,7 @@ start() { } stop() { - if [ -n "$UPLOADSCRIPT" ] ; then + if [ -n "${UPLOADSCRIPT}" ] ; then ebegin "Stopping Pure-FTPd upload script" start-stop-daemon --stop --retry 20 --quiet \ --pidfile ${script_pidfile} |