commit: d8e73a98117c0c53391f13eebc4e8b08a8473d32 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Thu Feb 6 14:34:36 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Feb 7 14:22:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e73a98
net-misc/uftp: version 4.10.1 Fix GCC 10 build failure (#707472) Closes: https://bugs.gentoo.org/707472 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-misc/uftp/Manifest | 1 + net-misc/uftp/files/uftp-4.10.1_gcc10.patch | 14 +++++++ net-misc/uftp/uftp-4.10.1.ebuild | 57 +++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest index 2aa703a51ea..64d63ab90af 100644 --- a/net-misc/uftp/Manifest +++ b/net-misc/uftp/Manifest @@ -1,4 +1,5 @@ DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15 +DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0 DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086 DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5 diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch new file mode 100644 index 00000000000..d25de61465d --- /dev/null +++ b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch @@ -0,0 +1,14 @@ +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.ebuild b/net-misc/uftp/uftp-4.10.1.ebuild new file mode 100644 index 00000000000..db422b2917e --- /dev/null +++ b/net-misc/uftp/uftp-4.10.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 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}/${PN}-4.9.4_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.1 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.1 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 +}
