From 68eeed828507c6edc395772d6d9c81f1cc12dd53 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 6 May 2012 12:51:14 +0200
Subject: [PATCH] traceroute: update to 2.0.18 and fix name resolution.

fixes #10097
---
 lfs/traceroute                             |  8 +++---
 src/patches/traceroute-2.0.18-ipfire.patch | 31 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/patches/traceroute-2.0.18-ipfire.patch

diff --git a/lfs/traceroute b/lfs/traceroute
index fec18a4cea..74cffc7ea7 100644
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.12
+VER        = 2.0.18
 
 THISAPP    = traceroute-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = traceroute
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2262a9d30ae85f12b759a38ef827f8f7
+$(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i 's|hints.ai_flags = AI_IDN;|/* hints.ai_flags = AI_IDN; */|g' traceroute/traceroute.c
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ipfire.patch
 	cd $(DIR_APP) && make 
 	cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin
 	chmod u-s /usr/sbin/traceroute
diff --git a/src/patches/traceroute-2.0.18-ipfire.patch b/src/patches/traceroute-2.0.18-ipfire.patch
new file mode 100644
index 0000000000..14f09d8a85
--- /dev/null
+++ b/src/patches/traceroute-2.0.18-ipfire.patch
@@ -0,0 +1,31 @@
+diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/traceroute/traceroute.c
+--- traceroute-2.0.18.org/traceroute/traceroute.c	2011-08-18 17:19:48.000000000 +0200
++++ traceroute-2.0.18/traceroute/traceroute.c	2012-05-06 12:42:55.000000000 +0200
+@@ -31,6 +31,9 @@
+ #include "version.h"
+ #include "traceroute.h"
+ 
++#ifndef IPV6_TCLASS
++#define IPV6_TCLASS 67
++#endif
+ 
+ #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
+ #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR
+@@ -186,7 +189,7 @@
+ 
+ 	memset (&hints, 0, sizeof (hints));
+ 	hints.ai_family = af;
+-	hints.ai_flags = AI_IDN;
++	/* hints.ai_flags = AI_IDN; */
+ 
+ 	ret = getaddrinfo (name, NULL, &hints, &res);
+ 	if (ret) {
+@@ -688,7 +691,7 @@
+ 
+ 	    buf[0] = '\0';
+ 	    getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
+-							    0, 0, NI_IDN);
++							    0, 0, 0);
+ 	    printf (" %s (%s)", buf[0] ? buf : str, str);
+ 	}
+ 
-- 
2.39.5