Fix fortify errors for real #425184 by Robin Kauffman.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 22 insertions, 68 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index da59722cd6ef..d09bc93d94f3 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/netkit-tftp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.25 2012/07/08 17:42:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.26 2012/07/22 20:26:46 vapier Exp $
+
+  22 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  -files/netkit-tftp-0.17-overflow.patch, netkit-tftp-0.17-r8.ebuild:
+  Fix fortify errors for real #425184 by Robin Kauffman.
 
 *netkit-tftp-0.17-r8 (08 Jul 2012)
 
diff --git a/net-ftp/netkit-tftp/Manifest b/net-ftp/netkit-tftp/Manifest
index 9a84f5b04a89..19ba9a7fa076 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA1
 
 AUX memset.patch 280 SHA256 9b04964776efc6b321fe9b388dda6206101d681911b80ea20135593d47b948b8 SHA512 901697c31123000e142a7e90a16b715799c11a14eadb6c2c0e3ab064611797d44113b9e02d97e14531dcf37434de5fae1816a3a1955eafad364b9b233d973438 WHIRLPOOL 08af04aa3c7cadc56b411904c33ba3a6cac249d4b318fc41566398af096db3211d07f0bce2db0a6fd4caa91f9ec098834806ae1032a5ec8d4ee013b1a6f53432
-AUX netkit-tftp-0.17-overflow.patch 1614 SHA256 ccb56aa27b2e5cd125874b0da2b802ac8dff07850f951fb02e038121fc6370a8 SHA512 cfe18a9ec9d5f2b79faf7eaefeb536d9c7a0f84228e55711fcffc30006ba884e13c0ac63ff5105a99c6f40ec77a32a76317a552179475d9c7042504ba5e50d76 WHIRLPOOL d8d19821489f2e8d068647dd4a9c382855f853d8165bd2a7e7644232697216bfef82298fe51ef176b369e26a96ec20e8ef10093ec301cee93fb8dff2eba6d4ce
 AUX netkit-tftp-0.17-socket-reopen-on-errors.patch 2006 SHA256 e4f9a1427d86a242da5ae6cd67a527d2b937168bdc404c676483357109c8297e SHA512 583800089a187f6f59c25f22de42f5afb22440b93d08eb442c72bac9c2321730a4124de5125b594169f32c442f6fe477c21fa3eae1fc42b7d0e05eb3687572f2 WHIRLPOOL 1b5b516c027e8920fe06a834f716612b72055b826b40b4e39169c088b438821b877e2b97afb9f7d825ecd4dd472c27a797f7a9ff9be3597a54e363397995a1f2
 AUX netkit-tftp-0.17-tftp-connect-segfault.patch 785 SHA256 8ec005824a299cc106b420d012d9f5492093eaf9237c7dba692baffcb081458e SHA512 42f4c746bdfc9706fce15b76f53c82f33ced4ab687e3087ba86351e1abe22fc7ab8e52503ce89371e7db3ab4e5267d8814b22c9f61757b1a998a4d8f44b556a9 WHIRLPOOL c56ced4612dd922366d4a0d4fbe8409cab6a6cf5f25205f567339d3a5e0cd181c42b1135ffab01977a0725eefc0dbb7673429168cf6f2060918a13116e99f828
 AUX netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314 SHA256 1e216083f0cdb592f927a5a33cec5b3ae1ae6fdc803d20c738b904a1aac7a32e SHA512 42d580f4206d3b050ab20b2f2305db35dc585a9eae0decc612b1379a7f6e9a7709a29288d88d802fa8bfe7c667798a2ed74984a1cfed299003bc1a33be726565 WHIRLPOOL afc48db7cc537d9f880233a8b7ce0602415f0b5b88647e0feb856dcbc3a599a66ec6ed33c7cb02c5647fd92366fd53bcd89d3445d44743c6d0c72d683899747c
@@ -12,17 +11,23 @@ AUX tftp-dgram 246 SHA256 b79af85531e4e300da30731ed0b761d0325ad091c6ae7e9c75bf67
 AUX tftp-stream 246 SHA256 861a2d955c1d84d7268c3348ef53c33f44ce73453eda96c36b3750bba6f1f836 SHA512 8f8e1c2856f9d5cc91d56101ce5f603ba33bed7e36412fc714c1cd1fe9225b33c519c8e17e0d0b8e6c5dbea3a99c96875d0cc05fb375eacd245fef0c1287038c WHIRLPOOL 834604615275580a3804b261044f9d5b087698a102e8200f2ff2dcaa0423bff7c45cff06dbc7842a869f879328182e6b8b486de0e94961effce48fa8b9c2cfbd
 DIST netkit-tftp-0.17.tar.gz 23620 SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d SHA512 3d8d8200a31e86022818ab0ade116dda105a8f5c5e6da003c28d26b66186e0da36262b45b8ccba5753be5b7fdf306064063ba849e19226f7704f5c913b83b54c WHIRLPOOL b5252fb5c9a27e5ee177ec3127df95d387cc0efd3fdd6d6841be3a4d2d1f14fcca79b779b95ed2f774fabe172326812fe741b2e28f03347b520fa392109aea77
 EBUILD netkit-tftp-0.17-r7.ebuild 1642 SHA256 0cccc673b93bd1071c4abd9b2e5fa2ce05c6932b83af06554dbe6809b000c3db SHA512 919f9a0c9872f7e09d0244b0ceab348e3e54b3e29fb3d5c241309ca96d0abd5da96bb5efdf41d66cba5bc079d88c5abe4ef994954e6e69d17efc70578c69c507 WHIRLPOOL ef0cbe0a7b59c2717f16391ce0627d316fd8d6d4c7c60f06541d3a2b362e249794ed601ec4994f127cfdc1573acd1686786c1b4f9b809b1260e3fc17eecee776
-EBUILD netkit-tftp-0.17-r8.ebuild 1620 SHA256 287c72ce8964fa43c3d1480d10f7fb56cc6c5f55a3b674b81c04b5eb22fa61c9 SHA512 a0007ced8af541e6ba68ee36b0f1d38af8bbeafb97a3d05a53ba165f25c6ba7abfef88342c2d5fe50a331f3731a1d8988feeb3a94134a6f25c4ce238f1e7fec1 WHIRLPOOL 27a69e155e8034d344199b4470e9b99f2bd526b4402c790374c961b6fd622bd12baf42ce80eccbc4d30d9e3f1d0849561605fd3e24ee2ca8869bd35bc3e729c3
-MISC ChangeLog 5259 SHA256 b557ccc6dc7f00c7b5d806c2d8b7951f2eaeebf845d6e41d4ab8a18a57c0ffeb SHA512 3b6ebdaa3754f4f8d675cdea62eea7728abee8f378997a9e85f5de35930735b82156d619b27c074243593cb64602da02915d550f3f1a8ca91f5a45fb54e587c3 WHIRLPOOL b5aca52a220fdc0589460c7f8469bce26803a62359d4019fed5e726700c4bb551628cc28b3df579a4688b440d0802a19de5e46431ca7659de4fe3fed5add3822
+EBUILD netkit-tftp-0.17-r8.ebuild 1614 SHA256 044ab8733f714a716d6a1dbd30657abd287172ed068f77c602e7ffb5291a69eb SHA512 2472fa18e44d3216e55328fdef82d4db7add2c56c9b01762cf7919ea8b5e880ecf41e8df8fbe02fc439026579559b201f322f44a53b020c7236c2d5488fba5c9 WHIRLPOOL fe71027cacb3b7046888ef0e84bd32cd6834f2f102628bb6c4c0824bba30122ed16f965773131424f9a9c1789399bf71623370af83ab3e95a248fe33ae4c9495
+MISC ChangeLog 5434 SHA256 264263b23c9fe5561c0873bb5b1c4ab7adaa0ac4f7e2aa05bd6c72e8e0fcf513 SHA512 227fb71bd678deeab873d2a2dab47a0566db9b65b4095e30037ab3635399ab842839cc23858d7b3c219af12f70faa91ded5ba0914957233ec264ef06b5b6e6b6 WHIRLPOOL ae13db12370540a06c83d2f504a9a6b389f969333d81f93e7d50d41fb5d1d8a3a791aff65485f6e72f243f19fa1056971b4bb21c82891effbda3572d453bf545
 MISC metadata.xml 778 SHA256 4a9d0610fe6b2b7dc547da3e086552cfbaf21b837f2987813e984e5cbbee6314 SHA512 a6d56fb41390687349f322479de32c5617f6b79ba8e3349354454d9c744ae04f64aca837b024e81f1cc7c2fddee3676cfe957de48cc7fe98d9e183c58b3ce4a5 WHIRLPOOL 802c19bafcd5fc697b5480c3e00e4738a87b9817692a5b1f2023594df7b988d9513deed12769983d22a6009936fb6b8c851d486b2e51f9f27d446687a43b0e04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP+cZ+AAoJEBzRPIrUMBNCKiUH+gJyFxfS/WDpseIn5osAhcWw
-HbXQZlt8DTX7hpZOomlSZMLrhg2kQQUl5Yi8b3LBzcNrwPHWqHrtUxbV0kMrhL5f
-X/trpoiw6EG6vx+eODPlORFaNcQIpyOp0M3YMlpgg6owTvBkPjC4Tv9o+68JfTjX
-x2BmrQYdR7A4dNMahdWt4MGVufVX1NSFOGANg517IGHk6bvDqyOgYNTHoB/Lpd85
-Ycm3czbFiWds4zCl5pJulrdX6eWldwq9pMFhBiqz2IcqoeUBT0wb5+XCj7YL0mXO
-QPwnhmp1QTnTtlkTfWJz/0REgQlFmvlKXQF3XQU0X4mTjVlI2XPIYhd2MXh4csk=
-=m2gC
+iQIcBAEBAgAGBQJQDGI/AAoJELEHsLL7fEFWoVkP/RjBZZENtPxHPP/mM8jbG80K
+TlDFd2wVC7Wkx824M1JpCD+7V3OeQzR4RPbd/2kjU2cogtrhFlr2WAQVSdQhvPCw
+dZ1wdb3QHgVyQ9Jk4jBn24PpontSrcjPjQuxeDJaqjevBl0UohZC5YdoSe1TuntT
+24cF9kDDxBKIuPLeq4Wu7I3eeOKkuEeOKMP35LYzmQxeAXc3Nh83B2i+EfdQw9ZR
+Uk4H5Z9JyyJOaa9VJULxVtC2d06P30eON7CMnvOj64DAmCtQe7hT/WMgZcjReKSr
+KhA7L7vi9Yq9z1BpqwCqAuXHH4WkTAiH6cBIO+fGwVJzdM715SVzKfXxwjsQ2PTb
+XPq71SP4GpsskCKKwOZo6a9nTRlailAErJI9gUqmgVTD74vWsVcJyxVqLdnz8/k5
+wEcNjnLH+GYBFSjV08mo0TPVHbtl5m98DDRQMm/lFDgNmhVrgV9j1qWSUuUtiUbr
+gNqYQi/BGEfijBAtR8FkNJfusuroajybqZ+4Aeraiy9Nfk6K4RQIpQm9qvfAVOyv
+4+jbiVGF9E0sTduyAoEO08q2cgIR8ZbipMadRXVixMtTcMgEMwMsvqHW7MG6Ne80
+jvtoM4YkYBW6OEWzesPFXlaM03YyapdBO007bkX0PQrtbpTFN/Njg1UveWdsKTJB
+Iy6/IcAQSuIuvtIWSjxA
+=w68L
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/netkit-tftp/files/netkit-tftp-0.17-overflow.patch b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-overflow.patch
deleted file mode 100644
index 64925a244ed9..000000000000
--- a/net-ftp/netkit-tftp/files/netkit-tftp-0.17-overflow.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: netkit-tftp-0.17/tftp/tftp.c
-===================================================================
---- netkit-tftp-0.17.orig/tftp/tftp.c
-+++ netkit-tftp-0.17/tftp/tftp.c
-@@ -56,6 +56,7 @@ char tftp_rcsid[] =
- #include <setjmp.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stddef.h>
- 
- #include "tftpsubs.h"
- 
-@@ -78,7 +79,7 @@ static sigjmp_buf timeoutbuf;
- 
- 
- static int makerequest(int request, char *name, 
--		       struct tftphdr *tp, char *mode);
-+		       char *hdr, char *mode);
- static void nak(int errnor);
- static void tpacket(const char *s, struct tftphdr *tp, int n);
- static void startclock(void);
-@@ -126,7 +127,7 @@ sendfile(int fd, char *name, char *mode)
- 	mysignal(SIGALRM, timer);
- 	do {
- 		if (firsttrip) {
--			size = makerequest(WRQ, name, dp, mode) - 4;
-+		  size = makerequest(WRQ, name, (char*)dp, mode) - 4;
- 		}
- 		else {
- 		/*      size = read(fd, dp->th_data, SEGSIZE);   */
-@@ -238,7 +239,7 @@ recvfile(int fd, char *name, char *mode)
- 	mysignal(SIGALRM, timer);
- 	do {
- 		if (firsttrip) {
--			size = makerequest(RRQ, name, ap, mode);
-+			size = makerequest(RRQ, name, ackbuf, mode);
- 			firsttrip = 0;
- 		} else {
- 			ap->th_opcode = htons((u_short)ACK);
-@@ -320,12 +321,13 @@ abort:
- }
- 
- int
--makerequest(int request, char *name, struct tftphdr *tp, char *mode)
-+makerequest(int request, char *name, char *hdr, char *mode)
- {
- 	register char *cp;
-+	struct tftphdr *tp = (struct tftphdr*)hdr;
- 
- 	tp->th_opcode = htons((u_short)request);
--	cp = tp->th_stuff;
-+	cp = hdr + offsetof(struct tftphdr, th_stuff);
- 	strcpy(cp, name);
- 	cp += strlen(name);
- 	*cp++ = '\0';
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild
index df3f2330f63b..de3690a04097 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild,v 1.1 2012/07/08 17:42:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r8.ebuild,v 1.2 2012/07/22 20:26:46 vapier Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-tftp-fix-put-zero-size.diff
 	epatch "${FILESDIR}"/${P}-tftpd-put-fixes.patch
 	epatch "${FILESDIR}"/${P}-socket-reopen-on-errors.patch
-	epatch "${FILESDIR}"/${P}-overflow.patch
+	rm include/arpa/tftp.h || die #425184
 }
 
 src_configure() {