summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-08-28 16:04:02 +0000
committerMike Frysinger <vapier@gentoo.org>2003-08-28 16:04:02 +0000
commite938ee097c1be3f9297d5c62d63c05de01377710 (patch)
tree145fd769b52ffd745779f6e8dec95c6369d888b4 /net-analyzer/tcptraceroute
parentlogic fix #27344 (diff)
downloadgentoo-2-e938ee097c1be3f9297d5c62d63c05de01377710.tar.gz
gentoo-2-e938ee097c1be3f9297d5c62d63c05de01377710.tar.bz2
gentoo-2-e938ee097c1be3f9297d5c62d63c05de01377710.zip
move the gcc-3.x patch out of the libnet patch and into the gentoo patch
Diffstat (limited to 'net-analyzer/tcptraceroute')
-rw-r--r--net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch16
-rw-r--r--net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch16
2 files changed, 16 insertions, 16 deletions
diff --git a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
index 6ac2b305ab47..8c91bb0a8e43 100644
--- a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
+++ b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
@@ -16,19 +16,3 @@
@@ -201 +201 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-@@ -394,4 +394,4 @@
-- fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
-- [-l <packet length>] [-q <number of queries>] [-t <tos>]
-- [-m <max ttl>] [-pP] <source port>] [-s <source address>]
-- [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-+ fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
-+" [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
-+" [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
-+" [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-@@ -1185,3 +1185,3 @@
-- safe_snprintf(filter, TEXTSIZE, "
-- (tcp and src host %s and src port %d and dst host %s)
-- or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
-+ safe_snprintf(filter, TEXTSIZE, \
-+" (tcp and src host %s and src port %d and dst host %s)\n"\
-+" or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
diff --git a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch b/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
index a665b0058225..95199c02bcd8 100644
--- a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
+++ b/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
@@ -1,5 +1,21 @@
--- tcptraceroute-1.4.orig/tcptraceroute.c
+++ tcptraceroute-1.4/tcptraceroute.c
+@@ -394,4 +394,4 @@
+- fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
+- [-l <packet length>] [-q <number of queries>] [-t <tos>]
+- [-m <max ttl>] [-pP] <source port>] [-s <source address>]
+- [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
++ fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
++" [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
++" [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
++" [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
+@@ -1185,3 +1185,3 @@
+- safe_snprintf(filter, TEXTSIZE, "
+- (tcp and src host %s and src port %d and dst host %s)
+- or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
++ safe_snprintf(filter, TEXTSIZE, \
++" (tcp and src host %s and src port %d and dst host %s)\n"\
++" or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
@@ -2003,6 +2003,6 @@
defaults();