diff --git a/backport-CVE-2023-46316.patch b/backport-CVE-2023-46316.patch deleted file mode 100644 index 1e80e8f..0000000 --- a/backport-CVE-2023-46316.patch +++ /dev/null @@ -1,68 +0,0 @@ -Author: Dmitry Butskoy -Description: - Fix command line parsing in wrappers. - -Conflict:NA -Reference:https://udomain.dl.sourceforge.net/project/traceroute/traceroute/traceroute-2.1.3/traceroute-2.1.3.tar.gz - ---- - 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.27.0 diff --git a/traceroute-2.1.2.tar.gz b/traceroute-2.1.2.tar.gz deleted file mode 100644 index 7e93d05..0000000 Binary files a/traceroute-2.1.2.tar.gz and /dev/null differ diff --git a/traceroute-2.1.5.tar.gz b/traceroute-2.1.5.tar.gz new file mode 100644 index 0000000..250e4e3 Binary files /dev/null and b/traceroute-2.1.5.tar.gz differ diff --git a/traceroute.spec b/traceroute.spec index 03887b1..ea14901 100644 --- a/traceroute.spec +++ b/traceroute.spec @@ -1,13 +1,11 @@ Name: traceroute Epoch: 3 -Version: 2.1.2 -Release: 2 +Version: 2.1.5 +Release: 1 Summary: A new modern implementation of traceroute(8) utility for Linux systems License: GPL-2.0-or-later URL: http://traceroute.sourceforge.net/ -Source0: https://udomain.dl.sourceforge.net/project/traceroute/traceroute/traceroute-2.1.2/traceroute-2.1.2.tar.gz - -Patch0: backport-CVE-2023-46316.patch +Source0: https://sourceforge.net/projects/traceroute/files/traceroute/%{name}-%{version}/%{name}-%{version}.tar.gz Provides: tcptraceroute = 1.5-1 Obsoletes: tcptraceroute < 1.5-1 @@ -47,6 +45,12 @@ ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8 %{_mandir}/*/* %changelog +* Fri Dec 29 2023 Xingwei - 3:2.1.5-1 +- Type:requirement +- Id:NA +- SUG:NA +- DESC:Update to version 2.1.5 + * Mon Oct 30 2023 xingwei - 3:2.1.2-2 - Type:CVE - CVE:CVE-2023-46316