From d89886bb5c78158ff0ae113f7dd9861288a046fa Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:51:35 +0000 Subject: [PATCH] import RHEL 10 Beta traceroute-2.1.5-3.el10 --- .gitignore | 2 +- SOURCES/001-traceroute-CVE-2023-46316.patch | 68 ------------ sources | 1 + SPECS/traceroute.spec => traceroute.spec | 110 ++++++++++++++------ 4 files changed, 81 insertions(+), 100 deletions(-) delete mode 100644 SOURCES/001-traceroute-CVE-2023-46316.patch create mode 100644 sources rename SPECS/traceroute.spec => traceroute.spec (79%) diff --git a/.gitignore b/.gitignore index 742e08a..67aece3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/traceroute-2.1.0.tar.gz +traceroute-2.1.5.tar.gz diff --git a/SOURCES/001-traceroute-CVE-2023-46316.patch b/SOURCES/001-traceroute-CVE-2023-46316.patch deleted file mode 100644 index 0c25298..0000000 --- a/SOURCES/001-traceroute-CVE-2023-46316.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9a605da8a6c72f0f52f505f38adb3133b7e726f8 Mon Sep 17 00:00:00 2001 -From: Jan Macku -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 - diff --git a/sources b/sources new file mode 100644 index 0000000..b997a3d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (traceroute-2.1.5.tar.gz) = 4557e6091cd34edd9761ffa5c75e13d63e7ae17c9d060f18306487cd5c1e7eece8a7ef3ddc6bf40f78d1014ed38ce2411c14d839251412978b2da0915180be93 diff --git a/SPECS/traceroute.spec b/traceroute.spec similarity index 79% rename from SPECS/traceroute.spec rename to traceroute.spec index a190e7c..57b0b06 100644 --- a/SPECS/traceroute.spec +++ b/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.0 -Release: 8%{?dist} -Group: Applications/Internet -License: GPLv2+ +Version: 2.1.5 +Release: 3%{?dist} +License: GPL-2.0-or-later URL: http://traceroute.sourceforge.net -Source0: http://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz - -Patch001: 001-traceroute-CVE-2023-46316.patch +Source0: https://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz 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,45 +27,93 @@ problems. %prep -%autosetup -p1 +%setup -q %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SKIPDIRS="${RPM_SPECPARTS_DIR##*/}" %install - -install -d $RPM_BUILD_ROOT/bin -install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin -pushd $RPM_BUILD_ROOT/bin -ln -s traceroute traceroute6 -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 +install -D -p -m755 traceroute/traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute +ln -s traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute6 +install -D -p -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}/tcptraceroute +install -D -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute.8 +ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8 +ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8 %files -%doc COPYING README TODO CREDITS -/bin/* +%license COPYING +%doc README TODO CREDITS %{_bindir}/* %{_mandir}/*/* %changelog -* Mon Nov 27 2023 Jan Macku - 3:2.1.0-8 -- add gating.yaml +* Mon Jun 24 2024 Troy Dawson - 3:2.1.5-3 +- Bump release for June 2024 mass rebuild -* Mon Oct 30 2023 Jan Macku - 3:2.1.0-7 -- fix improper command line parsing (CVE-2023-46316) +* Sat Jan 27 2024 Fedora Release Engineering - 3:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Dmitry Butskoy - 3:2.1.5-1 +- update to 2.1.5 + +* Thu Dec 14 2023 Dmitry Butskoy - 3:2.1.4-1 +- update to 2.1.4 + +* Thu Sep 21 2023 Dmitry Butskoy - 3:2.1.3-1 +- update to 2.1.3 + +* Sat Jul 22 2023 Fedora Release Engineering - 3:2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Apr 12 2023 Lukáš Zaoral - 3:2.1.2-2 +- migrate to SPDX license format + +* Mon Feb 13 2023 Dmitry Butskoy - 3:2.1.2-1 +- update to 2.1.2 + +* Sat Jan 21 2023 Fedora Release Engineering - 3:2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 28 2022 Dmitry Butskoy - 3:2.1.1-1 +- update to 2.1.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 3:2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3:2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3:2.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3:2.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Dmitry Butskoy - 3:2.1.0-13 +- Install into %{_bindir} (#1915614) + +* Wed Jul 29 2020 Fedora Release Engineering - 3:2.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 3:2.1.0-11 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Fri Jan 31 2020 Fedora Release Engineering - 3:2.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3:2.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3:2.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3:2.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Fri Feb 09 2018 Fedora Release Engineering - 3:2.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild