Added a patch to fix wrong outgoing IP address in traceroute when using an interface...

Package-Manager: portage-2.1.2_pre3-r6

diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index ebee6560c38ecb768abc059a4c69c8a52baf77c1..8fb983a7d386c318c37670865e8e6d13c5ea3d1f 100644 (file)
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/traceroute
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.39 2006/11/09 02:45:11 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.40 2006/11/18 12:37:33 eldad Exp $
+
+  18 Nov 2006; Eldad Zack <eldad@gentoo.org>
+  +files/traceroute-1.4a12-let_kernel_find_address.patch,
+  traceroute-1.4_p12-r5.ebuild:
+  Added a patch to fix wrong outgoing IP address in traceroute when using an
+  interface secondary addresses. Closes bug #131723.
 
   09 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   traceroute-1.4_p12-r5.ebuild:

diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 4025f914918db5f90e82411022a8ba3073baae0d..4dc46853e6d71fe2a03cd3489016c566f57767f4 100644 (file)
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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
@@ -20,14 +27,14 @@ EBUILD traceroute-1.4_p12-r4.ebuild 1647 RMD160 d71f83c597fb8ca63f0ca160f1c988bd
 MD5 1b18cae6648d31d9056741eb59d863d8 traceroute-1.4_p12-r4.ebuild 1647
 RMD160 d71f83c597fb8ca63f0ca160f1c988bd117e0968 traceroute-1.4_p12-r4.ebuild 1647
 SHA256 1caf672a67d00f25b8fc06702bfcb4710030c859019b957352ebb8590239407f traceroute-1.4_p12-r4.ebuild 1647
-EBUILD traceroute-1.4_p12-r5.ebuild 1635 RMD160 e20eba9e554134d9a766fa4653052302b813c2a0 SHA1 7fa53fed5ef3e45612f02a6a87c20fc0114c1b05 SHA256 acb26a3044e34a200a7315cf163535f0a432ad07f5f11a036356616a06ec9ac2
-MD5 b084b60f0b0e7cd203dff59a48092036 traceroute-1.4_p12-r5.ebuild 1635
-RMD160 e20eba9e554134d9a766fa4653052302b813c2a0 traceroute-1.4_p12-r5.ebuild 1635
-SHA256 acb26a3044e34a200a7315cf163535f0a432ad07f5f11a036356616a06ec9ac2 traceroute-1.4_p12-r5.ebuild 1635
-MISC ChangeLog 6481 RMD160 06873c79698d7073b7f0bce84194d227f0636927 SHA1 c9adf7d70622a0e8b58689498f32a5b264e1884b SHA256 c9eccc5b1e8b13cff4bd3ec5f5ca1ef041124e507ece634f632bc9ec49844953
-MD5 747090602912a5ed6150d7e426a48188 ChangeLog 6481
-RMD160 06873c79698d7073b7f0bce84194d227f0636927 ChangeLog 6481
-SHA256 c9eccc5b1e8b13cff4bd3ec5f5ca1ef041124e507ece634f632bc9ec49844953 ChangeLog 6481
+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 6747 RMD160 1af9b34693ae0859bff6bb68e49f93a0a051208a SHA1 10e64b7eacbfe6eab83eaad4a4bb22995c7fd9d9 SHA256 30ea1a41fec5387cd7c7e831c526400e2db9924d4135033f6ee3058f2c39beef
+MD5 d1943562bcf0a336cfb8eb33915ad5e4 ChangeLog 6747
+RMD160 1af9b34693ae0859bff6bb68e49f93a0a051208a ChangeLog 6747
+SHA256 30ea1a41fec5387cd7c7e831c526400e2db9924d4135033f6ee3058f2c39beef ChangeLog 6747
 MISC metadata.xml 235 RMD160 de3c26bbe3899e398acc788b01189adf8487038e SHA1 9fb34087c3a46253187189f3961acb78e92e84d4 SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e
 MD5 7ed4ef8e3d3fd7d4c7e9682b2519d739 metadata.xml 235
 RMD160 de3c26bbe3899e398acc788b01189adf8487038e metadata.xml 235
@@ -44,3 +51,10 @@ SHA256 8013b2342e32d798ab799788e833eefdb58dab81d5fdf56c465599c7296669f4 files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFXv6XT+MN7JbqCpMRAgqYAJ43r7F+2syhdgLz/RDvSRvO5GfjXACeM4gY
+hDpTJngy1qVE3egn8PUPdgQ=
+=DWTC
+-----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..ddbef0c
--- /dev/null
+++ b/net-analyzer/traceroute/files/traceroute-1.4a12-let_kernel_find_address.patch
@@ -0,0 +1,23 @@
+--- 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/traceroute-1.4_p12-r5.ebuild b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
index 1949001e19f7b13b7be463160af45bcdf9b8be47..49cc70bfe0892e8508ac33e2fe8795612e782ed4 100644 (file)
--- a/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
+++ b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12 2006/11/09 02:45:11 iluxa Exp $
+# $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 $
 
 inherit eutils flag-o-matic
 
@@ -36,6 +36,7 @@ src_unpack() {
        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