From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1431332-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6726D158094 for <garchives@archives.gentoo.org>; Sun, 28 Aug 2022 08:22:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73AF5E0870; Sun, 28 Aug 2022 08:22:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C1B5E0870 for <gentoo-commits@lists.gentoo.org>; Sun, 28 Aug 2022 08:22:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 475E8341237 for <gentoo-commits@lists.gentoo.org>; Sun, 28 Aug 2022 08:22:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9119A57D for <gentoo-commits@lists.gentoo.org>; Sun, 28 Aug 2022 08:22:19 +0000 (UTC) From: "Joonas Niilola" <juippis@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org> Message-ID: <1661674929.cce47bbcd101657e6109611506af1b7f4771ef81.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/uftp/files/, net-misc/uftp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/uftp/Manifest net-misc/uftp/files/uftp-4.10.1_gcc10.patch net-misc/uftp/uftp-4.10.1-r1.ebuild net-misc/uftp/uftp-5.0-r1.ebuild X-VCS-Directories: net-misc/uftp/ net-misc/uftp/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: cce47bbcd101657e6109611506af1b7f4771ef81 X-VCS-Branch: master Date: Sun, 28 Aug 2022 08:22:19 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9caad588-4a28-4a1f-b04b-7d455657c7f7 X-Archives-Hash: d1915ba0f30fa49d5cce0bbf718dea0a commit: cce47bbcd101657e6109611506af1b7f4771ef81 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Mon Aug 8 09:35:39 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Aug 28 08:22:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce47bbc net-misc/uftp: drop 4.10.1-r1, 5.0-r1 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26781 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-misc/uftp/Manifest | 2 - net-misc/uftp/files/uftp-4.10.1_gcc10.patch | 14 ------- net-misc/uftp/uftp-4.10.1-r1.ebuild | 58 ----------------------------- net-misc/uftp/uftp-5.0-r1.ebuild | 47 ----------------------- 4 files changed, 121 deletions(-) diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest index 36471db93ad0..be3a8553de32 100644 --- a/net-misc/uftp/Manifest +++ b/net-misc/uftp/Manifest @@ -1,3 +1 @@ -DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf DIST uftp-5.0.1.tar.gz 240620 BLAKE2B f1c22d8313b8f368729dd972dae9894290aa89a0fd9305d854caf93ead9f9aec7eaf83682683722c7a30a1e11802678f3e0cc3e4054f065b51ea049fa47dce56 SHA512 755b051aadd793e8d3939241d1f8db8b4c5f5be6224284a3ef82a648a9e2189b57dd4fe91230633cf7a582c51543a1d92cf167301c633ce16e9e2417709d36f4 -DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a 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-r1.ebuild deleted file mode 100644 index 2720099e81a7..000000000000 --- a/net-misc/uftp/uftp-5.0-r1.ebuild +++ /dev/null @@ -1,47 +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}" - -PATCHES=( - "${FILESDIR}/${PN}-4.10.1_makefile.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 -}