From patchwork Tue Jun 18 10:48:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7888 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 4W3NmJ6fMzz3wy2 for ; Tue, 18 Jun 2024 10:49:20 +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 4W3Nm610h7z4X7; Tue, 18 Jun 2024 10:49:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4W3Nm60VKMz33G5; Tue, 18 Jun 2024 10:49:10 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4W3Nm15vMKz30BS for ; Tue, 18 Jun 2024 10:49:05 +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 4W3Nm14Hpcz128; Tue, 18 Jun 2024 10:49:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1718707745; 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=TC/Tbdsbu9dTX+EHXNfXg3Txfd3+TCZQsqDvrO7ST3s=; b=1d311M296+TE9w5JmYCip8locn2S9EZlaNKmTMmv3KSqnzPvAcOdJI8Aq84b3+DjruWk5f LVOySLX5DAAHvPAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1718707745; 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=TC/Tbdsbu9dTX+EHXNfXg3Txfd3+TCZQsqDvrO7ST3s=; b=rW9N3FhBoZycEyoVRWsg8fsaqnfALZDss0HfSSmpqK5rANqAemhooKQC0CIUwEyY2ijG9m Ke6tFpPkLddxTIeHpDUXrw5r6pkdtbQF9tNTk7gFJsFLkTHrWZEh6Rcalmx0/aB6uDq+PS sixwfTbSTWlRERpfDTvDAzcU1PcTjTA0eD4FtL23JrZf1uqc6Ehffk7639I755V7vEr44Y K5DURGvTqqrOl9ornFySSUpYoKy0NxtjrjA8zM6orRl9+OWeecBkem8ZtJpOsN2aGbVSh4 p1p6cJGIJWTta6NrS3byBBZSRFZT8NVoZIXuDRNN9tTKYV0Q5Uw95hnDNqYAVA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] traceroute: Update to version 2.1.5 Date: Tue, 18 Jun 2024 12:48:56 +0200 Message-ID: <20240618104858.3386879-4-adolf.belka@ipfire.org> In-Reply-To: <20240618104858.3386879-1-adolf.belka@ipfire.org> References: <20240618104858.3386879-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 335EJGPSKVBDJSGUYHMW555LXDWO7KU4 X-Message-ID-Hash: 335EJGPSKVBDJSGUYHMW555LXDWO7KU4 X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - 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 --- lfs/traceroute | 8 ++++---- ...1.2-ipfire.patch => traceroute-2.1.5-ipfire.patch} | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) rename src/patches/{traceroute-2.1.2-ipfire.patch => traceroute-2.1.5-ipfire.patch} (65%) diff --git a/lfs/traceroute b/lfs/traceroute index 12ff5d3f7..961e44771 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 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.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 3d83d743c..15a07deae 100644 --- 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),