include Config
-VER = 2.0.12
+VER = 2.0.18
THISAPP = traceroute-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = traceroute
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2262a9d30ae85f12b759a38ef827f8f7
+$(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef
install : $(TARGET)
$(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
--- /dev/null
+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);
+ }
+