Accepting request 317217 from network:utilities

1

OBS-URL: https://build.opensuse.org/request/show/317217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/traceroute?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2015-07-21 11:26:11 +00:00 committed by Git OBS Bridge
commit c08b8480b3
5 changed files with 48 additions and 63 deletions

View File

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

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

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

View File

@ -1,84 +1,55 @@
--- /dev/null
+++ traceroute-2.0.20/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libsupp traceroute
+++ traceroute-2.0.21/Makefile.am
@@ -0,0 +1,17 @@
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/libsupp
+AM_CFLAGS = -fvisibility=hidden -fPIE
+
+noinst_LIBRARIES = libsupp.a
+libsupp_a_SOURCES = libsupp/clif.c libsupp/clif.h
+
+sbin_PROGRAMS = traceroute/traceroute
+
+man8_MANS = traceroute/traceroute.8
+
+traceroute_traceroute_SOURCES = traceroute/as_lookups.c traceroute/extension.c traceroute/mod-icmp.c traceroute/mod-tcp.c \
+ traceroute/mod-udp.c traceroute/poll.c traceroute/time.c traceroute/traceroute.c \
+ traceroute/csum.c traceroute/flowlabel.h traceroute/mod-tcpconn.c traceroute/traceroute.h \
+ traceroute/mod-dccp.c traceroute/mod-raw.c traceroute/module.c traceroute/random.c
+
+traceroute_traceroute_LDFLAGS = -pie
+traceroute_traceroute_LDADD = libsupp.a
\ No newline at end of file
--- /dev/null
+++ traceroute-2.0.20/configure.ac
@@ -0,0 +1,41 @@
+++ traceroute-2.0.21/configure.ac
@@ -0,0 +1,26 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.60)
+AC_INIT([traceroute],
+ [2.0.19],
+ [2.0.21],
+ [traceroute-devel@lists.sourceforge.net],
+ [traceroute],
+ [http://traceroute.sourceforge.net/])
+AC_CONFIG_SRCDIR([traceroute/traceroute.h])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall silent-rules tar-pax no-dist-gzip dist-xz subdir-objects])
+
+# Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+AC_PROG_INSTALL
+AC_PROG_LN_S
+LT_INIT([disable-static pic-only])
+AM_PROG_AR
+AC_PROG_RANLIB
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_ALLOCA
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_MALLOC
+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_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- /dev/null
+++ traceroute-2.0.20/libsupp/Makefile.am
@@ -0,0 +1,5 @@
+AM_CPPFLAGS = -include $(top_builddir)/config.h
+
+noinst_LTLIBRARIES = libsupp.la
+
+libsupp_la_SOURCES = clif.c clif.h
--- /dev/null
+++ traceroute-2.0.20/traceroute/Makefile.am
@@ -0,0 +1,18 @@
+
+
+
+AM_CPPFLAGS = -include $(top_builddir)/config.h
+
+sbin_PROGRAMS = traceroute
+
+man8_MANS = traceroute.8
+
+traceroute_CFLAGS = $(AM_CFLAGS) -fpie
+traceroute_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libsupp
+traceroute_SOURCES = as_lookups.c extension.c mod-icmp.c mod-tcp.c \
+ mod-udp.c poll.c time.c traceroute.c \
+ csum.c flowlabel.h mod-tcpconn.c traceroute.h \
+ mod-dccp.c mod-raw.c module.c random.c
+
+traceroute_LDFLAGS = -pie
+traceroute_LDADD = $(top_builddir)/libsupp/libsupp.la
\ No newline at end of file
--- traceroute-2.0.20.orig/traceroute/traceroute.c
+++ traceroute-2.0.20/traceroute/traceroute.c
--- traceroute-2.0.21.orig/traceroute/traceroute.c
+++ traceroute-2.0.21/traceroute/traceroute.c
@@ -28,7 +28,6 @@
#include "flowlabel.h"

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jul 16 20:27:50 UTC 2015 - crrodriguez@opensuse.org
- traceroute-autotools.patch: switch to non-recursive automake
without libtool.
-------------------------------------------------------------------
Thu Jul 16 19:33:35 UTC 2015 - crrodriguez@opensuse.org
- Version 2.0.21
* fix -F --mtu with current kernel versions
- traceroute-autotools.patch refresh and add -fvisibility=hidden
to CFLAGS.
-------------------------------------------------------------------
Sun Aug 31 17:02:49 UTC 2014 - crrodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package traceroute
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -17,7 +17,7 @@
Name: traceroute
Version: 2.0.20
Version: 2.0.21
Release: 0
Summary: A new modern implementation of traceroute(8) utility for Linux systems
License: GPL-2.0+
@ -27,7 +27,7 @@ Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: traceroute-autotools.patch
Patch1: traceroute-secure_getenv.patch
BuildRequires: libtool
BuildRequires: automake
Provides: net-tools:%{_sbindir}/%{name}
%description