.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,13 +1 @@
-traceroute-2.0.15.tar.gz
+SOURCES/traceroute-2.1.0.tar.gz
-/traceroute-2.0.16.tar.gz
-/traceroute-2.0.17.tar.gz
-/traceroute-2.0.18.tar.gz
-/traceroute-2.0.19.tar.gz
-/traceroute-2.0.20.tar.gz
-/traceroute-2.1.0.tar.gz
-/traceroute-2.1.1.tar.gz
-/traceroute-2.1.2.tar.gz
-/traceroute-2.1.3.tar.gz
-/traceroute-2.1.4.tar.gz
-/traceroute-2.1.5.tar.gz
-/traceroute-2.1.6.tar.gz

SOURCES/001-traceroute-CVE-2023-46316.patch

@@ -0,0 +1,68 @@
+From 9a605da8a6c72f0f52f505f38adb3133b7e726f8 Mon Sep 17 00:00:00 2001
+From: Jan Macku <jamacku@redhat.com>
+Date: Mon, 30 Oct 2023 12:55:43 +0100
+Subject: [PATCH] Fix command line parsing in wrappers
+
+Resolves: CVE-2023-46316
+---
+ wrappers/tcptraceroute    | 2 +-
+ wrappers/tracepath        | 2 +-
+ wrappers/traceproto       | 2 +-
+ wrappers/traceroute-nanog | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/wrappers/tcptraceroute b/wrappers/tcptraceroute
+index b4fc810..9063886 100755
+--- a/wrappers/tcptraceroute
++++ b/wrappers/tcptraceroute
+@@ -26,7 +26,7 @@ usage () {
+ }
+ 
+ 
+-PARSED=`getopt 'hvdnNi:l:f:Fm:p:q:w:s:t:SAE' "$@"`
++PARSED=`getopt -- 'hvdnNi:l:f:Fm:p:q:w:s:t:SAE' "$@"`
+ [ $? != 0 ] && exit 2
+ 
+ eval set -- "$PARSED"
+diff --git a/wrappers/tracepath b/wrappers/tracepath
+index 987b998..448f031 100755
+--- a/wrappers/tracepath
++++ b/wrappers/tracepath
+@@ -25,7 +25,7 @@ usage () {
+ }
+ 
+ 
+-PARSED=`getopt 'hnbl:' "$@"`
++PARSED=`getopt -- 'hnbl:' "$@"`
+ [ $? != 0 ] && exit 2
+ 
+ eval set -- "$PARSED"
+diff --git a/wrappers/traceproto b/wrappers/traceproto
+index 988fdc5..5dfd9a7 100755
+--- a/wrappers/traceproto
++++ b/wrappers/traceproto
+@@ -38,7 +38,7 @@ warning () {
+ }
+  
+ 
+-PARSED=`getopt 'cCTfAhvRp:d:D:s:S:m:M:w:W:a:P:F:k:I:H:i:o:t:' "$@"`
++PARSED=`getopt -- 'cCTfAhvRp:d:D:s:S:m:M:w:W:a:P:F:k:I:H:i:o:t:' "$@"`
+ [ $? != 0 ] && exit 2
+ 
+ eval set -- "$PARSED"
+diff --git a/wrappers/traceroute-nanog b/wrappers/traceroute-nanog
+index 29fd2a4..aac4c83 100755
+--- a/wrappers/traceroute-nanog
++++ b/wrappers/traceroute-nanog
+@@ -31,7 +31,7 @@ warning () {
+ }
+  
+ 
+-PARSED=`getopt 'adnruvAMOPQU$w:S:m:p:q:g:t:s:I:f:T:' "$@"`
++PARSED=`getopt -- 'adnruvAMOPQU$w:S:m:p:q:g:t:s:I:f:T:' "$@"`
+ [ $? != 0 ] && {
+     usage
+     exit 2
+-- 
+2.41.0
+

SPECS/traceroute.spec

@@ -1,18 +1,18 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.1.6
+Version: 2.1.0
-Release: 3%{?dist}
+Release: 8%{?dist}
-License: GPL-2.0-or-later
+Group: Applications/Internet
+License: GPLv2+
 URL:  http://traceroute.sourceforge.net
-Source0: https://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
+
+Patch001: 001-traceroute-CVE-2023-46316.patch
 
 Provides: tcptraceroute = 1.5-1
 Obsoletes: tcptraceroute < 1.5-1
 
-BuildRequires: make
-BuildRequires: gcc
-
 
 %description
 The traceroute utility displays the route used by IP packets on their
@@ -27,103 +27,45 @@ problems.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
-%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SKIPDIRS="${RPM_SPECPARTS_DIR##*/}"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 
 %install
-install -D -p -m755 traceroute/traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute
+
-ln -s traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute6
+install -d $RPM_BUILD_ROOT/bin
-install -D -p -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}/tcptraceroute
+install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
-install -D -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute.8
+pushd $RPM_BUILD_ROOT/bin
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8
+ln -s traceroute traceroute6
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8
+popd
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}
+
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
+pushd $RPM_BUILD_ROOT%{_mandir}/man8
+ln -s traceroute.8 traceroute6.8
+ln -s traceroute.8 tcptraceroute.8
+popd
 
 
 %files
-%license COPYING
+%doc COPYING README TODO CREDITS
-%doc README TODO CREDITS
+/bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3:2.1.6-3
+* Mon Nov 27 2023 Jan Macku <jamacku@redhat.com> - 3:2.1.0-8
-- Bump release for October 2024 mass rebuild:
+- add gating.yaml
-  Resolves: RHEL-64018
 
-* Tue Sep 17 2024 Jan Macku <jamacku@redhat.com> - 3:2.1.6-2
+* Mon Oct 30 2023 Jan Macku <jamacku@redhat.com> - 3:2.1.0-7
-- Spec bump
+- fix improper command line parsing (CVE-2023-46316)
-
-* Mon Sep 16 2024 Jan Macku <jamacku@redhat.com> - 3:2.1.6-1
-- Update to 2.1.6
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3:2.1.5-3
-- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 18 2023 Dmitry Butskoy <Dmitry@Butskoy.name>  - 3:2.1.5-1
-- update to 2.1.5
-
-* Thu Dec 14 2023 Dmitry Butskoy <Dmitry@Butskoy.name>  - 3:2.1.4-1
-- update to 2.1.4
-
-* Thu Sep 21 2023 Dmitry Butskoy <Dmitry@Butskoy.name>  - 3:2.1.3-1
-- update to 2.1.3
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Apr 12 2023 Lukáš Zaoral <lzaoral@redhat.com> - 3:2.1.2-2
-- migrate to SPDX license format
-
-* Mon Feb 13 2023 Dmitry Butskoy <Dmitry@Butskoy.name>  - 3:2.1.2-1
-- update to 2.1.2
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Dec 28 2022 Dmitry Butskoy <Dmitry@Butskoy.name>  - 3:2.1.1-1
-- update to 2.1.1
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 2021 Dmitry Butskoy <Dmitry@Butskoy.name> - 3:2.1.0-13
-- Install into %{_bindir} (#1915614)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 3:2.1.0-11
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

plans/tier1-internal.fmf

@@ -1,11 +0,0 @@
-summary: Internal gating tests plan
-discover:
-  - name: Internal gating tests
-    how: fmf
-    filter: 'tag: CI-Tier-1'
-    url: https://pkgs.devel.redhat.com/git/tests/traceroute
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora

sources

@@ -1 +0,0 @@
-SHA512 (traceroute-2.1.6.tar.gz) = e0400a8f4f6ce27af064ea9755f031280d662bd3bae1b504734669371a07e8bb1f89e4af2877ce68412fe61306f5e50dc7ad8d8df5483eb30075a043cbceba62