From 5bccd369817267e8ee88645caf1b6f22884da1866d5c3fef20bbf9e4b3e518f7 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 21 Dec 2023 14:01:13 +0000
Subject: [PATCH] Accepting request 1134099 from
 home:AndreasStieger:branches:network:utilities

traceroute 2.1.5

OBS-URL: https://build.opensuse.org/request/show/1134099
OBS-URL: https://build.opensuse.org/package/show/network:utilities/traceroute?expand=0&rev=20
---
 traceroute-2.1.3.tar.gz        |  3 ---
 traceroute-2.1.5.tar.gz        |  3 +++
 traceroute-secure_getenv.patch | 28 ++++++++++++++++++----------
 traceroute.changes             | 12 ++++++++++++
 traceroute.spec                |  6 +++---
 5 files changed, 36 insertions(+), 16 deletions(-)
 delete mode 100644 traceroute-2.1.3.tar.gz
 create mode 100644 traceroute-2.1.5.tar.gz

diff --git a/traceroute-2.1.3.tar.gz b/traceroute-2.1.3.tar.gz
deleted file mode 100644
index 67d4a72..0000000
--- a/traceroute-2.1.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05ebc7aba28a9100f9bbae54ceecbf75c82ccf46bdfce8b5d64806459a7e0412
-size 73171
diff --git a/traceroute-2.1.5.tar.gz b/traceroute-2.1.5.tar.gz
new file mode 100644
index 0000000..de0cf48
--- /dev/null
+++ b/traceroute-2.1.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e
+size 75453
diff --git a/traceroute-secure_getenv.patch b/traceroute-secure_getenv.patch
index 32b9d2f..7f53ffa 100644
--- a/traceroute-secure_getenv.patch
+++ b/traceroute-secure_getenv.patch
@@ -1,5 +1,7 @@
---- traceroute-2.0.20.orig/traceroute/traceroute.h
-+++ traceroute-2.0.20/traceroute/traceroute.h
+Index: traceroute-2.1.5/traceroute/traceroute.h
+===================================================================
+--- traceroute-2.1.5.orig/traceroute/traceroute.h
++++ traceroute-2.1.5/traceroute/traceroute.h
 @@ -57,6 +57,13 @@ typedef struct tr_module_struct tr_modul
  #define DEF_DCCP_PORT	DEF_START_PORT	/*  is it a good choice?...  */
  #define DEF_RAW_PROT	253	/*  for experimentation and testing, rfc3692  */
@@ -12,10 +14,12 @@
 +#  endif
 +#endif
  
- void error (const char *str) __attribute__((noreturn));
- void error_or_perm (const char *str) __attribute__((noreturn));
---- traceroute-2.0.20.orig/traceroute/as_lookups.c
-+++ traceroute-2.0.20/traceroute/as_lookups.c
+ void error (const char *str) __attribute__ ((noreturn));
+ void error_or_perm (const char *str) __attribute__ ((noreturn));
+Index: traceroute-2.1.5/traceroute/as_lookups.c
+===================================================================
+--- traceroute-2.1.5.orig/traceroute/as_lookups.c
++++ traceroute-2.1.5/traceroute/as_lookups.c
 @@ -39,10 +39,10 @@ const char *get_as_path (const char *que
  	    struct addrinfo *res;
  	    int ret;
@@ -29,8 +33,10 @@
  	    if (!service)  service = DEF_RADB_SERVICE;
  
  
---- traceroute-2.0.20.orig/libsupp/clif.c
-+++ traceroute-2.0.20/libsupp/clif.c
+Index: traceroute-2.1.5/libsupp/clif.c
+===================================================================
+--- traceroute-2.1.5.orig/libsupp/clif.c
++++ traceroute-2.1.5/libsupp/clif.c
 @@ -398,7 +398,7 @@ int CLIF_parse_cmdline (int argc, char *
  	unsigned int dirty_flags = 0;
  	int dirty_plus = 0;
@@ -40,8 +46,10 @@
  					    (parse_flags & CLIF_POSIX);
  
  	curr.argc = argc;
---- traceroute-2.0.20.orig/libsupp/clif.h
-+++ traceroute-2.0.20/libsupp/clif.h
+Index: traceroute-2.1.5/libsupp/clif.h
+===================================================================
+--- traceroute-2.1.5.orig/libsupp/clif.h
++++ traceroute-2.1.5/libsupp/clif.h
 @@ -118,4 +118,12 @@ extern int CLIF_arg_func (CLIF_argument
  	{ "V", "version", 0, "Print version info and exit",	\
  		CLIF_version_handler, STR, 0, CLIF_EXTRA | CLIF_EXIT }
diff --git a/traceroute.changes b/traceroute.changes
index 982806f..7b03b9e 100644
--- a/traceroute.changes
+++ b/traceroute.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Dec 19 18:58:12 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.1.5:
+  * 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. 
+  * 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).
+
 -------------------------------------------------------------------
 Fri Nov 10 13:53:09 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/traceroute.spec b/traceroute.spec
index f0e60b5..8dff9b8 100644
--- a/traceroute.spec
+++ b/traceroute.spec
@@ -17,7 +17,7 @@
 
 
 Name:           traceroute
-Version:        2.1.3
+Version:        2.1.5
 Release:        0
 Summary:        Packet route path tracing utility
 License:        GPL-2.0-or-later
@@ -27,9 +27,9 @@ Source:         https://sourceforge.net/projects/traceroute/files/traceroute/tra
 Patch0:         traceroute-autotools.patch
 Patch1:         traceroute-secure_getenv.patch
 BuildRequires:  automake
-Provides:       net-tools:%{_sbindir}/%{name}
-Provides:       tcptraceroute
+Provides:       tcptraceroute = %{version}
 Obsoletes:      tcptraceroute <= 1.5.beta7
+Provides:       net-tools:%{_sbindir}/%{name}
 
 %description
 Traceroute tracks the route packets taken from an IP network on their way to a given host.