From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] traceroute: Update to version 2.1.2
Date: Wed, 30 Aug 2023 16:17:35 +0200
Message-ID: <20230830141742.2723629-4-adolf.belka@ipfire.org>
In-Reply-To: <20230830141742.2723629-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0287733825653954173=="
List-Id: <development.lists.ipfire.org>

--===============0287733825653954173==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Update from version 2.1.0 to 2.1.2
- Update of rootfile not required.
- Updated ipfire traceroute patch.
- Changelog
    2.1.2
	*  Fix unprivileged ICMP tracerouting with Linux kernel >=3D 6.1
	   (Eric Dumazet, SF bug #14)
    2.1.1
	*  Interpret ipv4-mapped ipv6 addresses (::ffff:A.B.C.D) as true ipv4.
	   There are no ipv4-mapped addresses in the real network which we
	   operate on, so use just ipv4 in such cases, but allow users
	   to specify it this way for convenience.
	*  Return back more robast poll(2) loop handling.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/traceroute                                         |  8 ++++----
 ....1.0-ipfire.patch =3D> traceroute-2.1.2-ipfire.patch} | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename src/patches/{traceroute-2.1.0-ipfire.patch =3D> traceroute-2.1.2-ipfi=
re.patch} (65%)

diff --git a/lfs/traceroute b/lfs/traceroute
index fb1a1fc70..12ff5d3f7 100644
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2023  IPFire Team  <info(a)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
=20
 SUMMARY    =3D Packet route path tracing utility
=20
-VER        =3D 2.1.0
+VER        =3D 2.1.2
=20
 THISAPP    =3D traceroute-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D traceroute
-PAK_VER    =3D 4
+PAK_VER    =3D 5
=20
 DEPS       =3D
=20
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c8=
9bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6
+$(DL_FILE)_BLAKE2 =3D e0a89b3f4eef6709bc696a30579645ca096c9c424fd577a988c6d9=
3058858b047ec01f88258bc2e558a4ffc1cc8c047c89fcd9ab85914e2c3060df8a59f07c23
=20
 install : $(TARGET)
=20
diff --git a/src/patches/traceroute-2.1.0-ipfire.patch b/src/patches/tracerou=
te-2.1.2-ipfire.patch
similarity index 65%
rename from src/patches/traceroute-2.1.0-ipfire.patch
rename to src/patches/traceroute-2.1.2-ipfire.patch
index 14f09d8a8..3d83d743c 100644
--- a/src/patches/traceroute-2.1.0-ipfire.patch
+++ b/src/patches/traceroute-2.1.2-ipfire.patch
@@ -1,6 +1,6 @@
-diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/t=
raceroute/traceroute.c
---- traceroute-2.0.18.org/traceroute/traceroute.c	2011-08-18 17:19:48.000000=
000 +0200
-+++ traceroute-2.0.18/traceroute/traceroute.c	2012-05-06 12:42:55.000000000 =
+0200
+diff -Naur traceroute-2.1.2.orig/traceroute/traceroute.c traceroute-2.1.2/tr=
aceroute/traceroute.c
+--- traceroute-2.1.2.orig/traceroute/traceroute.c	2023-02-13 18:37:06.000000=
000 +0100
++++ traceroute-2.1.2/traceroute/traceroute.c	2023-08-29 17:36:52.703911135 +=
0200
 @@ -31,6 +31,9 @@
  #include "version.h"
  #include "traceroute.h"
@@ -11,7 +11,7 @@ diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c tr=
aceroute-2.0.18/trace
 =20
  #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
  #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR
-@@ -186,7 +189,7 @@
+@@ -201,7 +204,7 @@
 =20
  	memset (&hints, 0, sizeof (hints));
  	hints.ai_family =3D af;
@@ -20,7 +20,7 @@ diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c tr=
aceroute-2.0.18/trace
 =20
  	ret =3D getaddrinfo (name, NULL, &hints, &res);
  	if (ret) {
-@@ -688,7 +691,7 @@
+@@ -741,7 +744,7 @@
 =20
  	    buf[0] =3D '\0';
  	    getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
--=20
2.42.0


--===============0287733825653954173==--