diff options
Diffstat (limited to 'net-ftp/tftp-hpa')
| -rw-r--r-- | net-ftp/tftp-hpa/Manifest | 3 | ||||
| -rw-r--r-- | net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch | 42 | ||||
| -rw-r--r-- | net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild | 6 |
3 files changed, 48 insertions, 3 deletions
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest index 2e0c6183bd05..672bde382a7b 100644 --- a/net-ftp/tftp-hpa/Manifest +++ b/net-ftp/tftp-hpa/Manifest @@ -1,8 +1,9 @@ AUX in.tftpd.confd-0.44 576 BLAKE2B f5dbab65e92173c3a81ed6790d20b8091616278399471b09b3ec726c5caec1a4ad1864e5ac8b2da7aee7fbfb0a602c879d0317bd3ce6a702af1a01927b0a5da9 SHA512 2aa2f69a6cc86cd0b0ac9dd3c06bb271e3085eb5d44b74edf1b33a9723ba172b0cd0aa92dc0224de52e0572deb9f855e725ed076d8f57c86b509b2fbc03f5075 AUX in.tftpd.rc6 334 BLAKE2B 2f7c20b4704b5f3466c838fc79a59785cbb9c46a43037d044dea88caeda0be85f62084f0ff27a8aab20bb129d08dc37602d5a4934c2a6dc1b43c8e3d62c992d4 SHA512 77fd2fd385a6ee9415dfe4a15a993bde86396014cf7cfc0f97fb56c4040ef4becfe103be973b90688d0ee00bb46a36b51297ea46ecf7e32c400373c976de05df +AUX tftp-hpa-5.2-gcc-10.patch 1251 BLAKE2B 0701e5495a1d36237fa84ac97403ab2776bcf48ec9529ef486c32d40019de88d6554046e573fd3512cdb0d567f7ba8122c22906fad3e721b6564270db8d5e2cd SHA512 a6729ec1b39dd771efc82ecb9b54da9d21139906f81fca827d1cb870e4367aae3befa34ebc902d664778383019eee451af0076ee6f802f3082eb9056a7655525 AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d9692040af528bb7b0f84924d6903ea261a504b6e361c45f078cc5c2354a1438a4f18f45ebdcc4649 SHA512 e6be243fb28d014d7492b64cc9e72a29f0d2fcf7cf403f0b41998483c298bc39e83be2d0a6d0b7604d4da71fcb48ad0aabbfd0fa1620597883e66d5a6df222d8 AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394 -EBUILD tftp-hpa-5.2-r1.ebuild 1314 BLAKE2B 69222c38c7f2a5162a3895a2142b06c724ffac4f830e7ead107083843ee03391f6f4097557fb56e04e53f25e80a793369e85fe08455455b09ad0949765634eb4 SHA512 ea75db5ccddec62558244a0bd0c261d993370eed42232c8c38a2f75589bf2264f7f8e19a13afd2f96984005f5880d8c050ab7924b293fadf593c1c4d287d82af +EBUILD tftp-hpa-5.2-r1.ebuild 1361 BLAKE2B 72dd1453bdb0910feeb54fcce3384aab55f2a91ccabeba7f6f4dd874373f6addde548297c8ac8ad39ae3ff6baa4ba9c3fb9dc06f28e9f6d49d01e8e10a02727a SHA512 f971610c761758febdb7111d875b278cd12183b88965deb580afc67817688e4629f95d959d4ef75f56de352d4ee2493c775087c416959af87abaeef65cc618fc MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch new file mode 100644 index 000000000000..ff2488d5dfb4 --- /dev/null +++ b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch @@ -0,0 +1,42 @@ +From 7afd5aa65fdabaa4583f6e1a84936eb9bdd33c65 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Tue, 21 Jan 2020 23:10:46 +0000 +Subject: [PATCH] tftp-hpa: fix build failure against gcc-10 + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu tftp.o main.o ../common/libcommon.a -lreadline -liberty -o tftp +ld: main.o:(.bss+0x40): + multiple definition of `toplevel'; tftp.o:(.bss+0x100): first defined here +collect2: error: ld returned 1 exit status +make[1]: *** [Makefile:12: tftp] Error 1 +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Bug: https://bugs.gentoo.org/705834 +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + tftp/tftp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tftp/tftp.c b/tftp/tftp.c +index d15da22..d067f96 100644 +--- a/tftp/tftp.c ++++ b/tftp/tftp.c +@@ -48,7 +48,7 @@ extern int maxtimeout; + #define PKTSIZE SEGSIZE+4 + char ackbuf[PKTSIZE]; + int timeout; +-sigjmp_buf toplevel; ++extern sigjmp_buf toplevel; + sigjmp_buf timeoutbuf; + + static void nak(int, const char *); +-- +2.25.0 + diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild index d34763b41f02..78723b2d830f 100644 --- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild +++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz" LICENSE="BSD-4" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos" IUSE="ipv6 readline selinux tcpd" CDEPEND=" @@ -24,7 +24,9 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-tftp ) " + src_prepare() { + epatch "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch epatch_user sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die |