.gitignore

@@ -1 +1 @@
-SOURCES/traceroute-2.1.0.tar.gz
+SOURCES/traceroute-2.1.5.tar.gz

.traceroute.metadata

@@ -1 +1 @@
-bc5c6c8022187511be5665b3818d919be5987dcc SOURCES/traceroute-2.1.0.tar.gz
+5f73692aa6b2ab30d09c2db6397ca64d8e569a17 SOURCES/traceroute-2.1.5.tar.gz

SOURCES/001-review-of-CWE-170-CWE-772.patch

@@ -1,57 +0,0 @@
-From 4bbfd43121e4c1f59074b1b0def9804c1890b2dc Mon Sep 17 00:00:00 2001
-From: Jan Macku <jamacku@redhat.com>
-Date: Mon, 19 Jul 2021 09:48:19 +0200
-Subject: [PATCH] review of CWE-170, CWE-772
-
-Resolves: #1938887
----
- libsupp/clif.c          | 2 ++
- traceroute/traceroute.c | 7 ++++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/libsupp/clif.c b/libsupp/clif.c
-index 4ef20e4..60ec291 100644
---- a/libsupp/clif.c
-+++ b/libsupp/clif.c
-@@ -229,10 +229,12 @@ static void err_bad_arg (const CLIF_option *optn, char c, int n) {
- 
- 	if (c) {
- 	    s = show_short (&tmp);	/*  always without arg...  */
-+	    /* coverity[buffer_size_warning] - not a bug, s ends with '\0', see line 97 */
- 	    strncpy (ss, s, sizeof (ss));
- 	    s = show_short (optn);
- 	} else {
- 	    s = show_long (&tmp);	/*  always without arg...  */
-+	    /* coverity[buffer_size_warning] - not a bug, s ends with '\0', see line 97 */
- 	    strncpy (ss, s, sizeof (ss));
- 	    s = show_long (optn);
- 	}
-diff --git a/traceroute/traceroute.c b/traceroute/traceroute.c
-index 4be9b24..0a29e36 100644
---- a/traceroute/traceroute.c
-+++ b/traceroute/traceroute.c
-@@ -217,8 +217,12 @@ static int getaddr (const char *name, sockaddr_any *addr) {
- 	}
- 	if (!ai)  ai = res;	/*  anything...  */
- 
--	if (ai->ai_addrlen > sizeof (*addr))
-+	if (ai->ai_addrlen > sizeof (*addr)) {
-+		/* Avoid of leaking res (CWE-772) */
-+		freeaddrinfo (res);
- 		return -1;	/*  paranoia   */
-+	}
-+
- 	memcpy (addr, ai->ai_addr, ai->ai_addrlen);
- 
- 	freeaddrinfo (res);
-@@ -244,6 +248,7 @@ static void make_fd_used (int fd) {
- 	    close (nfd);
- 	}
- 
-+	/* coverity[leaked_handle] - not a bug, see line 665 */
- 	return;
- }
- 
--- 
-2.31.1
-

SPECS/traceroute.spec

@@ -1,14 +1,12 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.1.0
+Version: 2.1.5
-Release: 16%{?dist}
+Release: 3%{?dist}
-License: GPLv2+
+License: GPL-2.0-or-later
 URL:  http://traceroute.sourceforge.net
 Source0: https://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
 
-Patch001: 001-review-of-CWE-170-CWE-772.patch
-
 Provides: tcptraceroute = 1.5-1
 Obsoletes: tcptraceroute < 1.5-1
 
@@ -31,11 +29,9 @@ problems.
 %prep
 %setup -q
 
-%patch001 -p1
-
 
 %build
-%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
+%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SKIPDIRS="${RPM_SPECPARTS_DIR##*/}"
 
 
 %install
@@ -55,15 +51,47 @@ ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8
 
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3:2.1.0-16
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3:2.1.5-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 10
-  Related: rhbz#1991688
+
+* 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
 
-* Mon Jul 19 2021 Jan Macku <jamacku@redhat.com> - 3:2.1.0-15
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-15
-- review of CWE-170 and CWE-772 (#1938887)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3:2.1.0-14
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.1.0-14
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- 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