traceroute: Update to version 2.1.5

- Update from version 2.1.2 to 2.1.5
- Update of rootfile not required
- Update of traceroute patch as the source tarball has version number specified in its
   directory structure.
- Changelog
    2.1.5
	*  Fix rfc5837 parsing (Francois Rigault)
    2.1.4
	*  Parse interface information (rfc5837) for ICMP extensions
	*  Add `fastopen' tcp module option (cookie negotiation only)
	*  Complete tcp module option `mss' to discover possible mss clamping
	   along the path being traced (idea and testing from Francois Rigault).
	   The argument is optional now.
	   Changed mss is printed once in a form of `M=NUM' at the first probe
	   it was detected on. (Actually, the mss clamping performed by
	   some previous hop).
	   Note, some routers may return too short original fragment
	   in the time exceeded message, making the check impossible.
	   Besides that the responses may come in a different order.
	   All this can lead to a later place of the report
	   (using -N 1 can help for the order).
	*  Complete tcp module option `info' to print returned tcp header options too
	   (all those that can be set or altered by `-O' for tcp module).

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/traceroute b/lfs/traceroute
index 12ff5d3f7e78e30b24fdf27eeb4689e3019dbbda..961e447717e100872cd725db38ac12de41dae71a 100644 (file)
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Packet route path tracing utility
 
-VER        = 2.1.2
+VER        = 2.1.5
 
 THISAPP    = traceroute-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = traceroute
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = e0a89b3f4eef6709bc696a30579645ca096c9c424fd577a988c6d93058858b047ec01f88258bc2e558a4ffc1cc8c047c89fcd9ab85914e2c3060df8a59f07c23
+$(DL_FILE)_BLAKE2 = b2e99398b23d064f96319c9ca677589175f4bde64bce1f1d3236fc94f0ae3aa00499a2ef4a5c66c3a5815e09e16c534d049c36745119850c90c8af879ef66c6b
 
 install : $(TARGET)
 

diff --git a/src/patches/traceroute-2.1.2-ipfire.patch b/src/patches/traceroute-2.1.5-ipfire.patch
similarity index 65%
rename from src/patches/traceroute-2.1.2-ipfire.patch
rename to src/patches/traceroute-2.1.5-ipfire.patch
index 3d83d743cac7e2a07e8ee42c6bc7f9b69037216d..15a07deae20e1f8f86f00a4f7705fbe933605f18 100644 (file)
--- a/src/patches/traceroute-2.1.2-ipfire.patch
+++ b/src/patches/traceroute-2.1.5-ipfire.patch
@@ -1,6 +1,7 @@
-diff -Naur traceroute-2.1.2.orig/traceroute/traceroute.c traceroute-2.1.2/traceroute/traceroute.c
---- traceroute-2.1.2.orig/traceroute/traceroute.c      2023-02-13 18:37:06.000000000 +0100
-+++ traceroute-2.1.2/traceroute/traceroute.c   2023-08-29 17:36:52.703911135 +0200
+diff -Naur traceroute-2.1.5.orig/traceroute/traceroute.c traceroute-2.1.5/traceroute/traceroute.c
+
+--- traceroute-2.1.5.orig/traceroute/traceroute.c      2023-12-10 05:27:41.000000000 +0100
++++ traceroute-2.1.5/traceroute/traceroute.c   2024-06-07 16:25:38.063452139 +0200
 @@ -31,6 +31,9 @@
  #include "version.h"
  #include "traceroute.h"
@@ -11,7 +12,7 @@ diff -Naur traceroute-2.1.2.orig/traceroute/traceroute.c traceroute-2.1.2/tracer
  
  #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
  #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR
-@@ -201,7 +204,7 @@
+@@ -215,7 +218,7 @@
  
        memset (&hints, 0, sizeof (hints));
        hints.ai_family = af;
@@ -20,7 +21,7 @@ diff -Naur traceroute-2.1.2.orig/traceroute/traceroute.c traceroute-2.1.2/tracer
  
        ret = getaddrinfo (name, NULL, &hints, &res);
        if (ret) {
-@@ -741,7 +744,7 @@
+@@ -755,7 +758,7 @@
  
            buf[0] = '\0';
            getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),