gentoo resync : 01.10.2021

7 files changed, 74 insertions, 5 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 75aedcfeec97..567ad9c0fbd8 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 04035c8804dd..20edf0a074cb 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -7,5 +7,5 @@ AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d
 DIST atftp-0.7.4.tar.gz 249699 BLAKE2B 8aa30df1cc92982b0e718cd9bcc68cf397e29f6abb795cf9fdfd0b9942d9a7dd16beafb24d69d7339f9ab4cbda16404eadf40096a8dfdb684fbc7ec1c7f81c9f SHA512 f9ff9b72b7d1d659d4ca00d990c28b9da8dea0228e66610ee2d17a3959fcd142998a7539f8ea68effdfe830d2f5e68c154a2911afb9cad52acd24a6a642d76a4
 DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
 EBUILD atftp-0.7.4.ebuild 1447 BLAKE2B 6508f1a2d3be859cb6cfb6e44ac306811342a6522f3b305bd3714b23b8d6ba9ab601495a1742ce24e7e8fda907347e4c60e897b2ee083fb484563aeec79b0889 SHA512 5d69276f37f510e10884a67a3ee8010bfff68076e5d10550a0b689fee35672804c18cc3feae8e7397cfed4a000e474707976dd50d6924e3f7909245090c0bce0
-EBUILD atftp-0.7.5.ebuild 1445 BLAKE2B 9c985d8fb684b64dd26cf15750d6fe8f0410b9e22cbae03cfb8d198f487975f63b6948e81cd50b72a14773149e04254c9e6b0c522ed7fe7097ec5fccf8ef4610 SHA512 50440bfa6d3ecc7a14bc994d9bd5399f0baa66496ffe65a849814499effa5aa75f51adbc15d889d1b95c3ba8bff0150be0aebc1a96a8825522b990f633307f50
+EBUILD atftp-0.7.5.ebuild 1441 BLAKE2B f2e7e0f0fc1a08712419be9625176e75531171c3f34520a715c77da305753099fae133f4acdb471329642cc13a41e66f384790ab5131f83b80d3363203e51a31 SHA512 a1f6effeb8af89272af9a26e7d512f66218eca61c5d62f648b890babdbdea7a49e3b3dd60aba5e5f2a7b8a7c3d1bfcc0ad08706c8d1c4477eea693b7f54b92a9
 MISC metadata.xml 449 BLAKE2B 11050f78a3331914e98ba7a89fd29c9ebc5d36f5f34c1143850af8e1d5c5f3a4eb0d01c8b0d79d5c9a03e0877cfb0f0604f38bf94c9e85301ce2dde548c6d09a SHA512 d4f4b423d74484fa8f72796904014647939f2bf5f4ebe52a28cd1f029ea7160b3c07c8dfdbaf4eda06d8b5bce94b22297ab4874b150058b29624c55009b7e132
diff --git a/net-ftp/atftp/atftp-0.7.5.ebuild b/net-ftp/atftp/atftp-0.7.5.ebuild
index 001bba2e8253..afc07d53b0e2 100644
--- a/net-ftp/atftp/atftp-0.7.5.ebuild
+++ b/net-ftp/atftp/atftp-0.7.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 457b922a14cf..f0d7333803ea 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -5,4 +5,4 @@ AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
 EBUILD frox-0.7.18-r8.ebuild 1899 BLAKE2B 69b44a1a481786424b4da09b3c31c450eaf24a7ab4a00c064d5a676606187494d5e5fffa27de48326ca25ad23401f35864df879ec4824715d9030dc8ea5d0551 SHA512 150792890883cefe7c5ee7c0e4a5bb3ab214b35b08cd728151697261da68c225250cbe27345cae160da47b6a42570998ea94398070f5ed71f4ac1f7eb3eb203e
-MISC metadata.xml 624 BLAKE2B e7d79c1ffe531cf36ede7af0d1721411ebe08a8ca07492e1858c433c4cd838a6671ff1f3c0279aaba58c430206956a7cb921e493cece133cf53b0c8745f910c2 SHA512 38db6e56654b3a9a880fb7dca456dc92cb6b549b9285ec3be8b7b7a83c990ee2926e4444c379513d01a1cff33e4698dca637a861779fdbc939723252ef6f1e25
+MISC metadata.xml 623 BLAKE2B ebe352b066faf827000496491e2570a28b62f5ae484f780c912fe18a8447b277fae392c19eaa97e7014bf01bd1500d8c4cc37968536c550c645953e821f0818b SHA512 27db1dfd65ecef394d8b5b9d289b0063b37b28a365380c34ba60188385e93ae8eb7387dfdc07df2a36666d08bcf8499a05d7c47b1f7208d6c3be478255b590bb
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 8688ff9e96d8..9ec5aa89bc85 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person" proxied="yes">
-        <email>kabel@blackhole.sk</email>
-        <name>Marek Behun</name>
+        <email>kabel@kernel.org</email>
+        <name>Marek Behún</name>
     </maintainer>
     <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index fa4f795e2fa1..0ba9e8502822 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,8 @@
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
+DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
+DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718
 EBUILD ftp-0.17.23.0.2.1.ebuild 1495 BLAKE2B aceff27473bba089c3cb5d92b3c98563bd40ce959e1be4f60b5558b212d4abea68faf37520e6a5f1b7c329e62d6c62b15d8fb94dfd50300c433822a64cd9b07a SHA512 dbb1dc09a22f6825c6d4bd354124084e2f6194b56aac60f7d3637d48a2280efd73fe8d2e1e932229d6cdb4a13ed5889086341419c5dbd188683952127a5dd98a
+EBUILD ftp-0.17.34.0.2.5.1.ebuild 1506 BLAKE2B fe9b96cce8798671fbe06a3f1738cb6d72f9546a6c7c3edebba85153b2c5e72ec437b75c20891334527d9af99c70c9c9805e1bd533aa8bb48bebc958f8c2f19f SHA512 20014497945799716fd3c5ce1caacddb4cbc399e32cb456d5a7359038ace7f527ad4e05416f005d5b8e65e418fb6ba59c24343f8d3d85dfcecd133ce90e3d9e3
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
new file mode 100644
index 000000000000..5c394dd064b5
--- /dev/null
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+PATCH_VER="3"
+MY_PN="netkit-ftp"
+MY_PV="$(ver_cut 1-2)"
+MY_P="netkit-${PN}-${MY_PV}"
+DEB_PN="${MY_PN}-ssl"
+DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
+DESCRIPTION="Standard Linux FTP client"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
+	mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 readline ssl"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2:=
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/grep"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local p
+	for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do
+		eapply "${WORKDIR}/debian/patches/${p}"
+	done
+
+	eapply "${WORKDIR}"/patch
+
+	sed -i \
+		-e 's:echo -n:printf %s :' \
+		configure || die
+
+	default
+}
+
+src_configure() {
+	append-lfs-flags #101038
+	tc-export CC
+	# not an autoconf script
+	./configure \
+		--prefix=/usr \
+		$(use_enable ipv6) \
+		$(use_enable readline) \
+		$(use_enable ssl) \
+		|| die
+}
+
+src_install() {
+	dobin ftp/ftp
+	doman ftp/ftp.1 ftp/netrc.5
+	dodoc ChangeLog README BUGS
+}