[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6666803d83db59c429976e75d931dea0af19a81c

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6666803d83db59c429976e75d931dea0af19a81c

[git]

[-- Attachment #1: Type: text/plain, Size: 3929 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  6666803d83db59c429976e75d931dea0af19a81c (commit)
       via  9070a6c331e58200548ee4bd134c2ef8f558a867 (commit)
      from  a526de38bc9d4aacc3275ad7e0405006df5b7dbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6666803d83db59c429976e75d931dea0af19a81c
Merge: 9070a6c a526de3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 6 12:54:13 2012 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 9070a6c331e58200548ee4bd134c2ef8f558a867
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 6 12:51:14 2012 +0200

    traceroute: update to 2.0.18 and fix name resolution.
    
    fixes #10097

-----------------------------------------------------------------------

Summary of changes:
 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

Difference in files:
diff --git a/lfs/traceroute b/lfs/traceroute
index fec18a4..74cffc7 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 0000000..14f09d8
--- /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);
+ 	}
+ 


hooks/post-receive
--
IPFire 2.x development tree