webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-11 01:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

traceroute: update to 2.0.18 and fix name resolution.

Browse Source 
fixes #10097
This commit is contained in:
Arne Fitzenreiter
2012-05-06 12:51:14 +02:00
parent d66d6f8827
commit 68eeed8285
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lfs/traceroute
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 2.0.12 VER = 2.0.18
THISAPP = traceroute-$(VER) THISAPP = traceroute-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = traceroute PROG = traceroute
PAK_VER = 2 PAK_VER = 3
DEPS = "" DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2262a9d30ae85f12b759a38ef827f8f7 $(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef
install : $(TARGET) install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @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
cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin
chmod u-s /usr/sbin/traceroute chmod u-s /usr/sbin/traceroute

31
src/patches/traceroute-2.0.18-ipfire.patch Normal file
View File

@@ -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);
}