gentoo auto-resync : 28:08:2022 - 14:56:07

4 files changed, 3 insertions, 78 deletions

diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 08ec81b28db5..a00ba9c1c9ff 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,12 +1,9 @@
 AUX logrotate 166 BLAKE2B a3da56439bae88709b8cea7d1631d6848ea9e63870a9e9ad2853889d3b9b16d11d09bbfa99a41e24b2ecb5e1134875190b99aa7056192fd16d7696560bbfb83f SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f
-AUX uftp-4.10.1_gcc10.patch 624 BLAKE2B db832be23f45ed2aac0ecab15ce9c2cdbdefa9502e8bd3f9a90ae0bdf5b5371ac48cacb793a95c871148963ebd637156e9384223fe2c3eda6579350cefd128ab SHA512 82f0ec11196ee4f2aa2c32fd6a66e7effd03f7d3b3ac609640c850c33d85090c952ebea530076a4f18575c3c8a02ce34bc6b4975d3970c8333f3159a53143980
 AUX uftp-4.10.1_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
 AUX uftpd.conf 169 BLAKE2B 13e8d47f9a2b79f7e6c81d3a4aed80bbffa2c3195981b67eafce3801faf50b5ea2570de36634dd3e36b526f721e14259ba7b79a95f35c8e98d85fe6b95b9525f SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9
 AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf19753d836250c7d4519598049d41b9cf81832c18cc7a1726664bf647cceb92b2457a811df54ea8a SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8
 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
-DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
-DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a
-EBUILD uftp-4.10.1-r1.ebuild 1446 BLAKE2B e574ec5c675b1b08051c85ef5568e6550838e80ef830aa97cab872efe78e6c16dd835edc252f3a20ab31289d5d52dbbbc8c409822396bcd935bd7eb781bdb501 SHA512 b72ec63847ed647a06009b667e3c6d607e1d3bc4a18f85047514c18638dacecb85c81c5cf1cd99b79f34e387c96e2f999e8df50cecd81a285f36595cc75783a7
-EBUILD uftp-5.0-r1.ebuild 1196 BLAKE2B 668229d77d530a901afb74bf6a5f59c44b99a7a9c9aa0962aa1fffcc8608b933fe6dffd4fc6a5c6472281326a37ec80d0beba21367da54c83b4d0be946078644 SHA512 599ea7ec5cedcad09f3c29b8d02661c2593311deb67f70e202080b948dcb3df82ff1d5017d462871052cc3c90bea8327b5e01a113aad36b679aef7e73953f33d
+DIST uftp-5.0.1.tar.gz 240620 BLAKE2B f1c22d8313b8f368729dd972dae9894290aa89a0fd9305d854caf93ead9f9aec7eaf83682683722c7a30a1e11802678f3e0cc3e4054f065b51ea049fa47dce56 SHA512 755b051aadd793e8d3939241d1f8db8b4c5f5be6224284a3ef82a648a9e2189b57dd4fe91230633cf7a582c51543a1d92cf167301c633ce16e9e2417709d36f4
+EBUILD uftp-5.0.1.ebuild 1196 BLAKE2B ec919152ce1856c5e3db6ef11972787b1d292c76bd5835682b32e262af914835cbd46ae89ffbca65ca085b7aa780e2f0c31bb8c578f8a3258c3639f5beb6bfbe SHA512 3e78ada365661238cc4caf13aeaaed2c1ee35e2ad87379c33a4cd5778b61fdebacc0fa67ea3a95f2baacef671c9581a5fdf4de091eefcf5c42f26c999022d826
 MISC metadata.xml 545 BLAKE2B 080f61b70407d01b5fec24a1495aa533aa812f51a41d3d155d353b46ef809df8b816bb9604c33c25851f5c69a6715ef5a402a029a5c83214b29b673052c029de SHA512 5b7ff28dc9ef94cd0ef7f189a7f0c072556f001f2ebcd1645b9565a2385c2aa6f7be482fc6411da7292fcea7fde502dceebba92691895569edc64df81f19fad4
diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
deleted file mode 100644
index d25de61465dc..000000000000
--- a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar uftp-4.10.1.orig/proxy.h uftp-4.10.1/proxy.h
---- uftp-4.10.1.orig/proxy.h	2020-02-06 17:30:34.904020513 +0300
-+++ uftp-4.10.1/proxy.h	2020-02-06 17:30:49.214021144 +0300
-@@ -167,8 +167,8 @@
- extern int proxy_type, debug, rcvbuf, dscp, keyfile_count, keyinfo_count;
- extern int hb_interval, priority;
- extern unsigned int ttl;
--char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
--int port, out_port;
-+extern char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
-+extern int port, out_port;
- extern union sockaddr_u down_addr;
- extern int have_down_fingerprint;
- extern uint8_t down_fingerprint[HMAC_LEN];
diff --git a/net-misc/uftp/uftp-4.10.1-r1.ebuild b/net-misc/uftp/uftp-4.10.1-r1.ebuild
deleted file mode 100644
index cd876c63f416..000000000000
--- a/net-misc/uftp/uftp-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="https://download.sourceforge.net/${PN}-multicast/source-tar/${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist(-)] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_gcc10.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-
-	emake CC="$(tc-getCC)" ${opt} uftp uftp_keymgt
-	use server && emake CC="$(tc-getCC)" ${opt} uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman {uftp,uftp_keymgt}.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman {uftpd,uftpproxyd}.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
diff --git a/net-misc/uftp/uftp-5.0-r1.ebuild b/net-misc/uftp/uftp-5.0.1.ebuild
index 2720099e81a7..b7452e236d95 100644
--- a/net-misc/uftp/uftp-5.0-r1.ebuild
+++ b/net-misc/uftp/uftp-5.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs