From 15e4f4fd1a4ff352628fa0afe3f6917fc3dc0e6f601503c844afd1ac9aacab6e Mon Sep 17 00:00:00 2001 From: Alexander Naumov Date: Fri, 11 Jan 2019 12:44:48 +0000 Subject: [PATCH] Accepting request 663734 from home:elvigia:branches:network:utilities - Update to version 2.1.0 * Implement -w MAX_SECS,HERE,NEAR option * Provide tcptraceroute * Improve the main loop for better interactivity. OBS-URL: https://build.opensuse.org/request/show/663734 OBS-URL: https://build.opensuse.org/package/show/network:utilities/traceroute?expand=0&rev=9 --- traceroute-2.0.21.tar.gz | 3 --- traceroute-2.1.0.tar.gz | 3 +++ traceroute-autotools.patch | 23 ++++++++++------------- traceroute.changes | 8 ++++++++ traceroute.spec | 17 ++++++++++++----- 5 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 traceroute-2.0.21.tar.gz create mode 100644 traceroute-2.1.0.tar.gz diff --git a/traceroute-2.0.21.tar.gz b/traceroute-2.0.21.tar.gz deleted file mode 100644 index 0e1baf8..0000000 --- a/traceroute-2.0.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7ac93ef30b13a587292b8d6a7e2538a65bc978a3a576eab238c392b884e96e0 -size 69159 diff --git a/traceroute-2.1.0.tar.gz b/traceroute-2.1.0.tar.gz new file mode 100644 index 0000000..b598049 --- /dev/null +++ b/traceroute-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 +size 71460 diff --git a/traceroute-autotools.patch b/traceroute-autotools.patch index 30050c5..1f5398f 100644 --- a/traceroute-autotools.patch +++ b/traceroute-autotools.patch @@ -1,5 +1,7 @@ +Index: traceroute-2.1.0/Makefile.am +=================================================================== --- /dev/null -+++ traceroute-2.0.21/Makefile.am ++++ traceroute-2.1.0/Makefile.am @@ -0,0 +1,17 @@ +AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/libsupp +AM_CFLAGS = -fvisibility=hidden -fPIE @@ -19,8 +21,10 @@ +traceroute_traceroute_LDFLAGS = -pie +traceroute_traceroute_LDADD = libsupp.a \ No newline at end of file +Index: traceroute-2.1.0/configure.ac +=================================================================== --- /dev/null -+++ traceroute-2.0.21/configure.ac ++++ traceroute-2.1.0/configure.ac @@ -0,0 +1,26 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. @@ -48,8 +52,10 @@ + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ---- traceroute-2.0.21.orig/traceroute/traceroute.c -+++ traceroute-2.0.21/traceroute/traceroute.c +Index: traceroute-2.1.0/traceroute/traceroute.c +=================================================================== +--- traceroute-2.1.0.orig/traceroute/traceroute.c ++++ traceroute-2.1.0/traceroute/traceroute.c @@ -28,7 +28,6 @@ #include "flowlabel.h" @@ -58,12 +64,3 @@ #include "traceroute.h" -@@ -72,7 +71,7 @@ - - - static char version_string[] = "Modern traceroute for Linux, " -- "version " _TEXT(VERSION) ", " __DATE__ -+ "version " _TEXT(VERSION) - "\nCopyright (c) 2008 Dmitry Butskoy, " - " License: GPL v2 or any later"; - static int debug = 0; diff --git a/traceroute.changes b/traceroute.changes index c6ee905..e9afb7b 100644 --- a/traceroute.changes +++ b/traceroute.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 8 15:02:56 UTC 2019 - Cristian Rodríguez + +- Update to version 2.1.0 +* Implement -w MAX_SECS,HERE,NEAR option +* Provide tcptraceroute +* Improve the main loop for better interactivity. + ------------------------------------------------------------------- Thu Jul 16 20:27:50 UTC 2015 - crrodriguez@opensuse.org diff --git a/traceroute.spec b/traceroute.spec index c97604f..0c999f4 100644 --- a/traceroute.spec +++ b/traceroute.spec @@ -1,7 +1,7 @@ # # spec file for package traceroute # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: traceroute -Version: 2.0.21 +Version: 2.1.0 Release: 0 Summary: A new modern implementation of traceroute(8) utility for Linux systems -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://traceroute.sourceforge.net/ Source: %{name}-%{version}.tar.gz @@ -29,6 +29,8 @@ Patch0: traceroute-autotools.patch Patch1: traceroute-secure_getenv.patch BuildRequires: automake Provides: net-tools:%{_sbindir}/%{name} +Provides: tcptraceroute +Obsoletes: tcptraceroute <= 1.5.beta7 %description Traceroute tracks the route packets taken from an IP network on their way to a given host. @@ -50,12 +52,17 @@ make %{?_smp_mflags} %make_install ln -sf %{_sbindir}/%{name} %{buildroot}%{_sbindir}/%{name}6 ln -s %{_mandir}/man8/traceroute.8 %{buildroot}%{_mandir}/man8/traceroute6.8 +install -D -m0755 wrappers/tcptraceroute %{buildroot}%{_bindir}/tcptraceroute +install -m0644 wrappers/tcptraceroute.8 %{buildroot}%{_mandir}/man8/tcptraceroute.8 %files %defattr(-,root,root) -%doc ChangeLog README COPYING +%license COPYING +%doc ChangeLog README +%{_bindir}/tcptraceroute %{_sbindir}/%{name} %{_sbindir}/%{name}6 %{_mandir}/man8/traceroute*.8* +%{_mandir}/man8/tcptraceroute.8* %changelog