Make a proper patchset.

(Portage version: 2.1.2-r12)

6 files changed, 16 insertions, 289 deletions

diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index 7b4eeb61f3f0..0cef787854bf 100644
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/traceroute
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.42 2007/01/05 21:00:15 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.43 2007/02/27 18:00:48 vapier Exp $
+
+  27 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  -files/traceroute-1.4a12-let_kernel_find_address.patch,
+  -files/traceroute-1.4a12-mpls-icmp-02.patch,
+  -files/traceroute-configure-LANG.patch, traceroute-1.4_p12-r5.ebuild:
+  Make a proper patchset.
 
   05 Jan 2007; Cedric Krier <cedk@gentoo.org> -traceroute-1.4_p12-r2.ebuild,
   -traceroute-1.4_p12-r3.ebuild, -traceroute-1.4_p12-r4.ebuild:
diff --git a/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5 b/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5
index 648a9933d43c..cff2e320cd95 100644
--- a/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5
+++ b/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5
@@ -1,6 +1,6 @@
-MD5 0b3b77a7a4b6338c4e1ee2ca338d1529 traceroute-1.4-genpatches.tar.gz 6554
-RMD160 ce28748bdbb7c3caab36049bf486c883b5976566 traceroute-1.4-genpatches.tar.gz 6554
-SHA256 861a0c785febf8b2886600f0f6d77218e686c5772852e2b0f9e44b540b3ea7e7 traceroute-1.4-genpatches.tar.gz 6554
+MD5 078b3d49ffddb622029ddf28c1897b69 traceroute-1.4_p12-patches-1.5.tar.bz2 9306
+RMD160 04a850e87924a13bd12ed8cad3e0d9a95969d211 traceroute-1.4_p12-patches-1.5.tar.bz2 9306
+SHA256 3b3d979ea31dc2cc4540bf7dda47328ab7d3909b2c0074762e446e7f6f8de73b traceroute-1.4_p12-patches-1.5.tar.bz2 9306
 MD5 964d599ef696efccdeebe7721cd4828d traceroute-1.4a12.tar.gz 74917
 RMD160 10fc951fb1453affe4b27dc197fa71e488cf0a40 traceroute-1.4a12.tar.gz 74917
 SHA256 b099eeb0e4c40f274888669ac242f6ed092b36977817bd101c051db248fec4b0 traceroute-1.4a12.tar.gz 74917
diff --git a/net-analyzer/traceroute/files/traceroute-1.4a12-let_kernel_find_address.patch b/net-analyzer/traceroute/files/traceroute-1.4a12-let_kernel_find_address.patch
deleted file mode 100644
index ddbef0cc63c2..000000000000
--- a/net-analyzer/traceroute/files/traceroute-1.4a12-let_kernel_find_address.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- traceroute.c.orig	2006-10-14 02:10:32.000000000 +0200
-+++ traceroute.c	2006-10-14 02:24:29.000000000 +0200
-@@ -788,19 +788,7 @@
- 	}
- 
- 	/* Determine our source address */
--	if (source == NULL) {
--		/*
--		 * If a device was specified, use the interface address.
--		 * Otherwise, try to determine our source address.
--		 */
--		if (device != NULL)
--			setsin(from, al->addr);
--		else if ((err = findsaddr(to, from)) != NULL) {
--			Fprintf(stderr, "%s: findsaddr: %s\n",
--			    prog, err);
--			exit(1);
--		}
--	} else {
-+	if (source != NULL) {
- 		hi = gethostinfo(source);
- 		source = hi->name;
- 		hi->name = NULL;
diff --git a/net-analyzer/traceroute/files/traceroute-1.4a12-mpls-icmp-02.patch b/net-analyzer/traceroute/files/traceroute-1.4a12-mpls-icmp-02.patch
deleted file mode 100644
index d61346a957be..000000000000
--- a/net-analyzer/traceroute/files/traceroute-1.4a12-mpls-icmp-02.patch
+++ /dev/null
@@ -1,194 +0,0 @@
---- traceroute-1.4a12/traceroute.c	Thu Dec 14 08:04:50 2000
-+++ traceroute/traceroute.c	Sun Aug 17 21:21:07 2003
-@@ -282,6 +282,55 @@
- };
- #endif
- 
-+/*
-+ * Support for ICMP extensions
-+ *
-+ * http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-mpls-icmp-02.txt
-+ */
-+#define ICMP_EXT_OFFSET    8 /* ICMP type, code, checksum, unused */ + \
-+                         128 /* original datagram */
-+#define ICMP_EXT_VERSION 2
-+/*
-+ * ICMP extensions, common header
-+ */
-+struct icmp_ext_cmn_hdr {
-+#if BYTE_ORDER == BIG_ENDIAN
-+       u_char   version:4;
-+       u_char   reserved1:4;
-+#else
-+       u_char   reserved1:4;
-+       u_char   version:4;
-+#endif
-+       u_char   reserved2;
-+       u_short  checksum;
-+};
-+
-+/*
-+ * ICMP extensions, object header
-+ */
-+struct icmp_ext_obj_hdr {
-+    u_short length;
-+    u_char  class_num;
-+#define MPLS_STACK_ENTRY_CLASS 1
-+    u_char  c_type;
-+#define MPLS_STACK_ENTRY_C_TYPE 1
-+};
-+
-+struct mpls_header {
-+#if BYTE_ORDER == BIG_ENDIAN
-+    u_int32_t label:20;
-+    u_char  exp:3;
-+    u_char  s:1;
-+    u_char  ttl:8;
-+#else
-+    u_char  ttl:8;
-+    u_char  s:1;
-+    u_char  exp:3;
-+    u_int32_t label:20;
-+#endif
-+};
-+
-+
- u_char	packet[512];		/* last inbound (icmp) packet */
- 
- struct ip *outip;		/* last output (udp) packet */
-@@ -348,6 +397,7 @@
- void	tvsub(struct timeval *, struct timeval *);
- __dead	void usage(void);
- int	wait_for_reply(int, struct sockaddr_in *, const struct timeval *);
-+void	decode_extensions(u_char *buf, int ip_len);
- #ifndef HAVE_USLEEP
- int	usleep(u_int);
- #endif
-@@ -876,6 +926,8 @@
- 			}
- 			if (cc == 0)
- 				Printf(" *");
-+			if (cc && probe == nprobes-1)
-+			    decode_extensions(packet, cc);
- 			(void)fflush(stdout);
- 		}
- 		putchar('\n');
-@@ -884,6 +936,118 @@
- 			break;
- 	}
- 	exit(0);
-+}
-+
-+void
-+decode_extensions(u_char *buf, int ip_len)
-+{
-+	struct icmp_ext_cmn_hdr *cmn_hdr;
-+	struct icmp_ext_obj_hdr *obj_hdr;
-+	struct mpls_header *mpls;
-+	int datalen, obj_len;
-+	u_int32_t mpls_h;
-+	struct ip *ip;
-+
-+	ip = (struct ip *)buf;
-+
-+	if (ip_len <= sizeof(struct ip) + ICMP_EXT_OFFSET) {
-+	    /*
-+	     * No support for ICMP extensions on this host
-+	     */
-+	    return;
-+	}
-+
-+	/*
-+	 * Move forward to the start of the ICMP extensions, if present
-+	 */
-+	buf += (ip->ip_hl << 2) + ICMP_EXT_OFFSET;
-+	cmn_hdr = (struct icmp_ext_cmn_hdr *)buf;
-+
-+	if (cmn_hdr->version != ICMP_EXT_VERSION) {
-+	    /*
-+	     * Unknown version
-+	     */
-+	    return;
-+	}
-+
-+	datalen = ip_len - ((u_char *)cmn_hdr - (u_char *)ip);
-+
-+	/*
-+	 * Check the checksum, cmn_hdr->checksum == 0 means no checksum'ing
-+	 * done by sender.
-+	 *
-+	 * If the checksum is ok, we'll get 0, as the checksum is calculated
-+	 * with	the checksum field being 0'd.
-+	 */
-+	if (ntohs(cmn_hdr->checksum) &&
-+	    in_cksum((u_short *)cmn_hdr, datalen)) {
-+
-+	    return;
-+	}
-+
-+	buf += sizeof(*cmn_hdr);
-+	datalen -= sizeof(*cmn_hdr);
-+
-+	while (datalen > 0) {
-+	    obj_hdr = (struct icmp_ext_obj_hdr *)buf;
-+	    obj_len = ntohs(obj_hdr->length);
-+
-+	    /*
-+	     * Sanity check the length field
-+	     */
-+	    if (obj_len > datalen) {
-+		return;
-+	    }
-+
-+	    datalen -= obj_len;
-+
-+	    /*
-+	     * Move past the object header
-+	     */
-+	    buf += sizeof(struct icmp_ext_obj_hdr);
-+	    obj_len -= sizeof(struct icmp_ext_obj_hdr);
-+
-+	    switch (obj_hdr->class_num) {
-+	    case MPLS_STACK_ENTRY_CLASS:
-+		switch (obj_hdr->c_type) {
-+		case MPLS_STACK_ENTRY_C_TYPE:
-+		    while (obj_len >= sizeof(u_int32_t)) {
-+			mpls_h = ntohl(*(u_int32_t *)buf);
-+
-+			buf += sizeof(u_int32_t);
-+			obj_len -= sizeof(u_int32_t);
-+
-+			mpls = (struct mpls_header *) &mpls_h;
-+			printf("\n     MPLS Label=%d CoS=%d TTL=%d S=%d",
-+			       mpls->label, mpls->exp, mpls->ttl, mpls->s);
-+		    }
-+		    if (obj_len > 0) {
-+			/*
-+			 * Something went wrong, and we're at a unknown offset
-+			 * into the packet, ditch the rest of it.
-+			 */
-+			return;
-+		    }
-+		    break;
-+		default:
-+		    /*
-+		     * Unknown object, skip past it
-+		     */
-+		    buf += ntohs(obj_hdr->length) -
-+			sizeof(struct icmp_ext_obj_hdr);
-+		    break;
-+		}
-+		break;
-+
-+	    default:
-+		/*
-+		 * Unknown object, skip past it
-+		 */
-+		buf += ntohs(obj_hdr->length) -
-+		    sizeof(struct icmp_ext_obj_hdr);
-+		break;
-+	    }
-+	}
- }
- 
- int
diff --git a/net-analyzer/traceroute/files/traceroute-configure-LANG.patch b/net-analyzer/traceroute/files/traceroute-configure-LANG.patch
deleted file mode 100644
index 3a35abf82c79..000000000000
--- a/net-analyzer/traceroute/files/traceroute-configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-adapted from sys-devel/flex
-
---- configure
-+++ configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
index 49cc70bfe089..950d59edf8aa 100644
--- a/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
+++ b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild,v 1.13 2006/11/18 12:37:33 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild,v 1.14 2007/02/27 18:00:48 vapier Exp $
 
 inherit eutils flag-o-matic
 
 MY_P="${PN}-${PV/_p/a}"
+PATCH_VER="1.5"
 DESCRIPTION="Utility to trace the route of IP packets"
 HOMEPAGE="http://ee.lbl.gov/"
 SRC_URI="ftp://ee.lbl.gov/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-1.4-genpatches.tar.gz"
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,31 +22,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	# nasty hack until bug 93363 is fixed
-	chmod 644 config.{guess,sub}
-
-	epatch ${WORKDIR}/${PN}-1.4-target-resolv.patch
-	epatch ${WORKDIR}/${PN}-1.4a12-LDFLAGS.patch
-	epatch ${WORKDIR}/${PN}-1.4a5-bigpacklen.patch
-	epatch ${WORKDIR}/${PN}-1.4a12.patch
-	epatch ${WORKDIR}/${PN}-1.4a5-droproot.patch
-	epatch ${WORKDIR}/${PN}-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch
-	epatch ${WORKDIR}/${PN}-1.4a5-secfix.patch
-	epatch ${WORKDIR}/${PN}-1.4a5-unaligned.patch
-	epatch ${WORKDIR}/${PN}-1.4-emptylabel.patch
-	epatch ${FILESDIR}/${PN}-1.4a12-mpls-icmp-02.patch
-	epatch ${FILESDIR}/${PN}-1.4a12-let_kernel_find_address.patch
-
-	# assume linux by default #26699
-	sed -i '/^t=/s:generic:linux:' configure
-
-	# bug 126065
-	epatch ${FILESDIR}/traceroute-configure-LANG.patch
-
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	use static && append-ldflags -static
-	append-ldflags $(bindnow-flags) -Wl,-z,relro
 }
 
 src_install() {