From patchwork Wed Aug 30 14:17:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7135 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RbRGG62gBz3wtH for ; Wed, 30 Aug 2023 14:17:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RbRG81gPMz49k; Wed, 30 Aug 2023 14:17:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RbRG71cx5z30Hb; Wed, 30 Aug 2023 14:17:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RbRG62SnRz2y9s for ; Wed, 30 Aug 2023 14:17:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RbRG60MTJz1gY; Wed, 30 Aug 2023 14:17:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1693405070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oGSvZ4Ryttx5rhblaiS13McEVYS8h1p7tLJPZK5bzSE=; b=v5yhHOzDWxSyf1PB63XGfaIphVQyiqHI6gJ4ma6+5Cg2An1kRciisp1jgin7I0/e25t8As ateZhUosiA6kLpDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1693405070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oGSvZ4Ryttx5rhblaiS13McEVYS8h1p7tLJPZK5bzSE=; b=UXzRUwjrrte0LQGhyUytUBowLMTZxN/o085lDZHVfLSjBrtYVeSiwc7f7fe8BShCWmMnOH yVga/qW1hW2L6a+rISJWoJ8Zp8FSoj48lW/WuX1oqQJhmlBxeAbMCuXvv31UvhNJjbiVuG qZhLSy5gEiuwgwTkm97+35EAlVvZBJGtYeTnM60C7jKLSiJeaC3IqnYqPgzntVS+yYKvQq XbFBWLSba3jGi2bfr5EKZY9R4msCH//jI6tMJR2mnbRozEey1zOOZE+wN2DjbtFKvUL4Nd /0E/FmElxZ2VUYh3MQvzvPHNj322eLh5RiTW2gr1qysKNkG6bQ/ciu/sy4jJcQ== From: Adolf Belka 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> References: <20230830141742.2723629-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 >= 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 --- lfs/traceroute | 8 ++++---- ....1.0-ipfire.patch => traceroute-2.1.2-ipfire.patch} | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename src/patches/{traceroute-2.1.0-ipfire.patch => traceroute-2.1.2-ipfire.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 # +# Copyright (C) 2007-2023 IPFire Team # # # # 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.0 +VER = 2.1.2 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 = 4 +PAK_VER = 5 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 +$(DL_FILE)_BLAKE2 = e0a89b3f4eef6709bc696a30579645ca096c9c424fd577a988c6d93058858b047ec01f88258bc2e558a4ffc1cc8c047c89fcd9ab85914e2c3060df8a59f07c23 install : $(TARGET) diff --git a/src/patches/traceroute-2.1.0-ipfire.patch b/src/patches/traceroute-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/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 +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 @@ -31,6 +31,9 @@ #include "version.h" #include "traceroute.h" @@ -11,7 +11,7 @@ diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/trace #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR -@@ -186,7 +189,7 @@ +@@ -201,7 +204,7 @@ memset (&hints, 0, sizeof (hints)); hints.ai_family = af; @@ -20,7 +20,7 @@ diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/trace ret = getaddrinfo (name, NULL, &hints, &res); if (ret) { -@@ -688,7 +691,7 @@ +@@ -741,7 +744,7 @@ buf[0] = '\0'; getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),