rpm/traceroute
SHA256
1
0
Fork 0
forked from pool/traceroute
Code Pull Requests Activity

Accepting request 246993 from home:elvigia:branches:network:utilities

Browse Source 
- version 2.0.20 
* Describe all complementary long options in the man page
* Use correct service name for AS lookups
* Avoid some rare case null dereference
* Improve expiration check for simultaneous probes
- traceroute-secure_getenv.patch use secure_getenv
- traceroute-autotools.patch refresh

OBS-URL: https://build.opensuse.org/request/show/246993
OBS-URL: https://build.opensuse.org/package/show/network:utilities/traceroute?expand=0&rev=5
This commit is contained in:
OBS User mrdocs 2014-09-01 06:04:05 +00:00 committed by Git OBS Bridge
parent 0f1160657c
commit d9b80b5c55
6 changed files with 85 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
traceroute-2.0.19.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:082be58ec3e6fe9717a52160150e2f6d52fa90f8ecb82abf3b363c8150b0607e
size 69614

3
traceroute-2.0.20.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2facba9525c95428d7bff3a313fc6ecfd8c529c678ae666c73015558a0edc271
size 68907

15
traceroute-autotools.patch
View File

@ -1,11 +1,11 @@
--- /dev/null
+++ Makefile.am
+++ traceroute-2.0.20/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libsupp traceroute
\ No newline at end of file
--- /dev/null
+++ configure.ac
@@ -0,0 +1,40 @@
+++ traceroute-2.0.20/configure.ac
@@ -0,0 +1,41 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
@ -43,11 +43,12 @@
+AC_FUNC_REALLOC
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([dup2 gettimeofday memset setlocale socket strcasecmp strchr strdup strrchr strstr strtol strtoul uname])
+AC_CHECK_FUNCS([__secure_getenv secure_getenv])
+
+AC_CONFIG_FILES([Makefile libsupp/Makefile traceroute/Makefile])
+AC_OUTPUT
--- /dev/null
+++ libsupp/Makefile.am
+++ traceroute-2.0.20/libsupp/Makefile.am
@@ -0,0 +1,5 @@
+AM_CPPFLAGS = -include $(top_builddir)/config.h
+
@ -55,7 +56,7 @@
+
+libsupp_la_SOURCES = clif.c clif.h
--- /dev/null
+++ traceroute/Makefile.am
+++ traceroute-2.0.20/traceroute/Makefile.am
@@ -0,0 +1,18 @@
+
+
@ -76,8 +77,8 @@
+traceroute_LDFLAGS = -pie
+traceroute_LDADD = $(top_builddir)/libsupp/libsupp.la
\ No newline at end of file
--- traceroute/traceroute.c.orig
+++ traceroute/traceroute.c
--- traceroute-2.0.20.orig/traceroute/traceroute.c
+++ traceroute-2.0.20/traceroute/traceroute.c
@@ -28,7 +28,6 @@
#include "flowlabel.h"

57
traceroute-secure_getenv.patch Normal file
View File

@ -0,0 +1,57 @@
--- traceroute-2.0.20.orig/traceroute/traceroute.h
+++ traceroute-2.0.20/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 */
+#ifndef HAVE_SECURE_GETENV
+# ifdef HAVE___SECURE_GETENV
+# define secure_getenv __secure_getenv
+# else
+# error neither secure_getenv nor __secure_getenv is available
+# 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
@@ -39,10 +39,10 @@ const char *get_as_path (const char *que
struct addrinfo *res;
int ret;
- server = getenv ("RA_SERVER");
+ server = secure_getenv ("RA_SERVER");
if (!server) server = DEF_RADB_SERVER;
- service = getenv ("RA_SERVICE");
+ service = secure_getenv ("RA_SERVICE");
if (!service) service = DEF_RADB_SERVICE;
--- traceroute-2.0.20.orig/libsupp/clif.c
+++ traceroute-2.0.20/libsupp/clif.c
@@ -398,7 +398,7 @@ int CLIF_parse_cmdline (int argc, char *
unsigned int dirty_flags = 0;
int dirty_plus = 0;
int exclusive_cnt = 0;
- int posix = getenv ("POSIXLY_CORRECT") != NULL ||
+ int posix = secure_getenv ("POSIXLY_CORRECT") != NULL ||
(parse_flags & CLIF_POSIX);
curr.argc = argc;
--- traceroute-2.0.20.orig/libsupp/clif.h
+++ traceroute-2.0.20/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 }
+#ifndef HAVE_SECURE_GETENV
+# ifdef HAVE___SECURE_GETENV
+# define secure_getenv __secure_getenv
+# else
+# error neither secure_getenv nor __secure_getenv is available
+# endif
+#endif
+
#endif /* _CLIF_H */

11
traceroute.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Aug 31 17:02:49 UTC 2014 - crrodriguez@opensuse.org
- version 2.0.20
* Describe all complementary long options in the man page
* Use correct service name for AS lookups
* Avoid some rare case null dereference
* Improve expiration check for simultaneous probes
- traceroute-secure_getenv.patch use secure_getenv
- traceroute-autotools.patch refresh
-------------------------------------------------------------------
Thu Mar 7 17:52:47 UTC 2013 - crrodriguez@opensuse.org

10
traceroute.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package traceroute
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: traceroute
Version: 2.0.19
Version: 2.0.20
Release: 0
Summary: A new modern implementation of traceroute(8) utility for Linux systems
License: GPL-2.0+
@ -25,7 +25,8 @@ Group: Productivity/Networking/Other
Url: http://traceroute.sourceforge.net/
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: traceroute-autotools.patch
Patch0: traceroute-autotools.patch
Patch1: traceroute-secure_getenv.patch
BuildRequires: libtool
Provides: net-tools:%{_sbindir}/%{name}
@ -36,7 +37,8 @@ response from each gateway along the path to the host.
%prep
%setup -q
%patch
%patch0 -p1
%patch1 -p1
%build
export LDFLAGS="-Wl,-z,relro,-z,now"