# 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:
-AUX traceroute-1.4a12-let_kernel_find_address.patch 615 RMD160 4b59529c95ad29616961b1cc74710b39413445f8 SHA1 cb5ff5564f539eadacf195c2b2fa11a21b2ff0e9 SHA256 acb9ed7c78a1669551b40213def8108822f4b35176e5eb1b4b811e97bd76539b
-MD5 ddf3ac097ed179e2d4af223ab8dbca34 files/traceroute-1.4a12-let_kernel_find_address.patch 615
-RMD160 4b59529c95ad29616961b1cc74710b39413445f8 files/traceroute-1.4a12-let_kernel_find_address.patch 615
-SHA256 acb9ed7c78a1669551b40213def8108822f4b35176e5eb1b4b811e97bd76539b files/traceroute-1.4a12-let_kernel_find_address.patch 615
-AUX traceroute-1.4a12-mpls-icmp-02.patch 4273 RMD160 be475d41d6d1bd42dc9d06453c6843610733f3df SHA1 60d4f3dee56903e8ca63f4cad9eb37da80eba556 SHA256 b7ea05b34b255674b2eb179432b43c2c4e252fb8c5c4c525e824c6040f4a7f6a
-MD5 2504b277ffc8b8a3730629607672663d files/traceroute-1.4a12-mpls-icmp-02.patch 4273
-RMD160 be475d41d6d1bd42dc9d06453c6843610733f3df files/traceroute-1.4a12-mpls-icmp-02.patch 4273
-SHA256 b7ea05b34b255674b2eb179432b43c2c4e252fb8c5c4c525e824c6040f4a7f6a files/traceroute-1.4a12-mpls-icmp-02.patch 4273
-AUX traceroute-configure-LANG.patch 1684 RMD160 4b8b67705835e2ef224a83cf895f016d69507689 SHA1 691361d1ad401a1054b20438d72568fa6f2b037c SHA256 4968da320016fc7211a5aec839c3b49f13bab265d525e43e0cfddc98cd54cf99
-MD5 e2afdd889f5dba3d206b573eb8f45958 files/traceroute-configure-LANG.patch 1684
-RMD160 4b8b67705835e2ef224a83cf895f016d69507689 files/traceroute-configure-LANG.patch 1684
-SHA256 4968da320016fc7211a5aec839c3b49f13bab265d525e43e0cfddc98cd54cf99 files/traceroute-configure-LANG.patch 1684
-DIST traceroute-1.4-genpatches.tar.gz 6554 RMD160 ce28748bdbb7c3caab36049bf486c883b5976566 SHA1 49752689216f8bb842f952eadc9e19176fae5547 SHA256 861a0c785febf8b2886600f0f6d77218e686c5772852e2b0f9e44b540b3ea7e7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST traceroute-1.4_p12-patches-1.5.tar.bz2 9306 RMD160 04a850e87924a13bd12ed8cad3e0d9a95969d211 SHA1 8f482eaddd744c8292af2847ef7afbfeed883406 SHA256 3b3d979ea31dc2cc4540bf7dda47328ab7d3909b2c0074762e446e7f6f8de73b
DIST traceroute-1.4a12.tar.gz 74917 RMD160 10fc951fb1453affe4b27dc197fa71e488cf0a40 SHA1 4b40644db8f659ebd3511988d43050eadc8e0fbc SHA256 b099eeb0e4c40f274888669ac242f6ed092b36977817bd101c051db248fec4b0
-EBUILD traceroute-1.4_p12-r5.ebuild 1698 RMD160 3060b7a1d5fe6d1a627f7ea1945fd0c8dd2226c8 SHA1 f62e07e06af18cf05bcd25aaab2ec54b8d9e9578 SHA256 23b039f9d6d669a2e5940278b27857a0d1efe08d16653c57e792f39b018ab6b8
-MD5 caa1b3ee950b2e9bfafdd55366becb6c traceroute-1.4_p12-r5.ebuild 1698
-RMD160 3060b7a1d5fe6d1a627f7ea1945fd0c8dd2226c8 traceroute-1.4_p12-r5.ebuild 1698
-SHA256 23b039f9d6d669a2e5940278b27857a0d1efe08d16653c57e792f39b018ab6b8 traceroute-1.4_p12-r5.ebuild 1698
-MISC ChangeLog 7063 RMD160 5d51994a4701281dc0c5e9b8817f8d54241bcde1 SHA1 6c514e75783a1663fb57ce4d524499e23248e46b SHA256 07ba2b06652070542d1fb07a5457778b0855c3698e9dbc46585993c7b34c815e
-MD5 e1624dea0bf614f0d61d79ab960ed03e ChangeLog 7063
-RMD160 5d51994a4701281dc0c5e9b8817f8d54241bcde1 ChangeLog 7063
-SHA256 07ba2b06652070542d1fb07a5457778b0855c3698e9dbc46585993c7b34c815e ChangeLog 7063
+EBUILD traceroute-1.4_p12-r5.ebuild 935 RMD160 0e04ee09fa3da284b8429ebdca02b8cdd673fd33 SHA1 38784c841132cea4b7d47e8a3b2c8301f6f9020e SHA256 e829ac951b1841ac8a8263946afe784b84fe876478463cdc75312346e7b5dde8
+MD5 5a97d944b877e84bed12e9048dce3124 traceroute-1.4_p12-r5.ebuild 935
+RMD160 0e04ee09fa3da284b8429ebdca02b8cdd673fd33 traceroute-1.4_p12-r5.ebuild 935
+SHA256 e829ac951b1841ac8a8263946afe784b84fe876478463cdc75312346e7b5dde8 traceroute-1.4_p12-r5.ebuild 935
+MISC ChangeLog 7319 RMD160 91d605cabbe43f5f8a9e92eaf8a646b1e4e77732 SHA1 0b03092e9c3a59958ed34cac52e4e9f0d03879e8 SHA256 5d3694c5e9afb389cb4e03fd6266d0a334e2b3eb7c5fc52b38ed7317a32eaa38
+MD5 03923d0ac70a64a9ebb15da45c1c6c20 ChangeLog 7319
+RMD160 91d605cabbe43f5f8a9e92eaf8a646b1e4e77732 ChangeLog 7319
+SHA256 5d3694c5e9afb389cb4e03fd6266d0a334e2b3eb7c5fc52b38ed7317a32eaa38 ChangeLog 7319
MISC metadata.xml 235 RMD160 de3c26bbe3899e398acc788b01189adf8487038e SHA1 9fb34087c3a46253187189f3961acb78e92e84d4 SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e
MD5 7ed4ef8e3d3fd7d4c7e9682b2519d739 metadata.xml 235
RMD160 de3c26bbe3899e398acc788b01189adf8487038e metadata.xml 235
SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e metadata.xml 235
-MD5 8122082980a7ee66b278371da18b5c61 files/digest-traceroute-1.4_p12-r5 521
-RMD160 347245db1ccc102e599090e0592efeaaba1bf41c files/digest-traceroute-1.4_p12-r5 521
-SHA256 8013b2342e32d798ab799788e833eefdb58dab81d5fdf56c465599c7296669f4 files/digest-traceroute-1.4_p12-r5 521
+MD5 563a0671d7d0452e07bc8333e5d1bfa9 files/digest-traceroute-1.4_p12-r5 539
+RMD160 87f6f9e3c727432fc99f28652cf1b9a19564b07b files/digest-traceroute-1.4_p12-r5 539
+SHA256 21d3c1da222fa2fe50986184435b5189701906c0137f790381838d55a6340eea files/digest-traceroute-1.4_p12-r5 539
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5HIq8bi6rjpTunYRAoRnAKDOpWtr0sFxmp80uPAQ9TAreay5WgCgn55X
+iCQyxFTQ7SbOYJ/h6w3/eRM=
+=k52N
+-----END PGP SIGNATURE-----
-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
+++ /dev/null
---- 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;
+++ /dev/null
---- 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
+++ /dev/null
-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.
-# 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"
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() {
projects / gentoo.git / commitdiff