Accepting request 150334 from home:elvigia:branches:network:utilities
- Remove obsolete traceroute(8) implementation. Modern one is packaged as "traceroute". to fullfil userspace requirements, Require the new version explicitly. - Fix localized man page installation, the right thing (tm) to do is to use find_lang --with-man --all-name instead. OBS-URL: https://build.opensuse.org/request/show/150334 OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-tools?expand=0&rev=34
This commit is contained in:
parent
5a63872a84
commit
e3489e8bb6
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 29 18:55:00 UTC 2013 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- Remove obsolete traceroute(8) implementation.
|
||||||
|
Modern one is packaged as "traceroute". to fullfil userspace
|
||||||
|
requirements, Require the new version explicitly.
|
||||||
|
|
||||||
|
- Fix localized man page installation, the right thing (tm) to
|
||||||
|
do is to use find_lang --with-man --all-name instead.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jan 26 18:45:57 UTC 2013 - jslaby@suse.com
|
Sat Jan 26 18:45:57 UTC 2013 - jslaby@suse.com
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@ Url: http://www.tazenda.demon.co.uk/phil/net-tools/
|
|||||||
Provides: iputils:/usr/sbin/traceroute6
|
Provides: iputils:/usr/sbin/traceroute6
|
||||||
Provides: net_tool
|
Provides: net_tool
|
||||||
Obsoletes: net_tool
|
Obsoletes: net_tool
|
||||||
Provides: traceroute
|
#force new traceroute or else..
|
||||||
Obsoletes: traceroute
|
Requires: traceroute >= 2.0.0
|
||||||
Version: 1.60
|
Version: 1.60
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Important Programs for Networking
|
Summary: Important Programs for Networking
|
||||||
@ -30,7 +30,6 @@ License: GPL-2.0+
|
|||||||
Group: Productivity/Networking/Other
|
Group: Productivity/Networking/Other
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source: net-tools-%{version}.tar.bz2
|
Source: net-tools-%{version}.tar.bz2
|
||||||
Source1: ftp://ftp.lst.de/pub/people/okir/traceroute/traceroute-1.2.tar.bz2
|
|
||||||
Source2: netstat.xinetd
|
Source2: netstat.xinetd
|
||||||
Source3: nstrcmp.c
|
Source3: nstrcmp.c
|
||||||
Source4: ether-wake.c
|
Source4: ether-wake.c
|
||||||
@ -50,7 +49,6 @@ Patch13: net-tools-1.60-nameif.diff
|
|||||||
Patch14: net-tools-1.60-sockios-SIOCGMIIPHY.diff
|
Patch14: net-tools-1.60-sockios-SIOCGMIIPHY.diff
|
||||||
Patch15: net-tools-1.60-numericstuff.diff
|
Patch15: net-tools-1.60-numericstuff.diff
|
||||||
Patch16: net-tools-1.60-if_tr.diff
|
Patch16: net-tools-1.60-if_tr.diff
|
||||||
Patch17: traceroute-LDOPTS.diff
|
|
||||||
Patch18: net-tools-1.60-netstat.8.diff
|
Patch18: net-tools-1.60-netstat.8.diff
|
||||||
Patch19: net-tools-1.60-strictaliasing.diff
|
Patch19: net-tools-1.60-strictaliasing.diff
|
||||||
Patch20: net-tools-1.60-interface_stack.patch
|
Patch20: net-tools-1.60-interface_stack.patch
|
||||||
@ -61,7 +59,6 @@ Patch24: net-tools-1.60-netstat-p.patch
|
|||||||
Patch25: net-tools-1.60-sctp.patch
|
Patch25: net-tools-1.60-sctp.patch
|
||||||
Patch26: net-tools-1.60-sctp-quiet
|
Patch26: net-tools-1.60-sctp-quiet
|
||||||
Patch27: net-tools-1.60-hostname-space.patch
|
Patch27: net-tools-1.60-hostname-space.patch
|
||||||
Patch28: traceroute-strip.diff
|
|
||||||
Patch30: net-tools-1.60-ifconfig.8.diff
|
Patch30: net-tools-1.60-ifconfig.8.diff
|
||||||
Patch31: net-tools-1.60-tcp-recvq-listen.patch
|
Patch31: net-tools-1.60-tcp-recvq-listen.patch
|
||||||
Patch32: net-tools-1.60-netstat-ci.diff
|
Patch32: net-tools-1.60-netstat-ci.diff
|
||||||
@ -69,7 +66,6 @@ Patch33: net-tools-1.60-ifconfig-SIOCSIFNETMASK.diff
|
|||||||
Patch34: net-tools-1.60-interface_socket.diff
|
Patch34: net-tools-1.60-interface_socket.diff
|
||||||
Patch35: net-tools-1.60-interface_mtu.diff
|
Patch35: net-tools-1.60-interface_mtu.diff
|
||||||
Patch36: net-tools-1.60-printval-conversion.patch
|
Patch36: net-tools-1.60-printval-conversion.patch
|
||||||
Patch37: traceroute-glibc210.diff
|
|
||||||
Patch38: net-tools-1.60-obsolete.diff
|
Patch38: net-tools-1.60-obsolete.diff
|
||||||
Patch39: net-tools-1.60-fclose.diff
|
Patch39: net-tools-1.60-fclose.diff
|
||||||
Patch40: net-tools-1.60-notrim.diff
|
Patch40: net-tools-1.60-notrim.diff
|
||||||
@ -98,7 +94,7 @@ Authors:
|
|||||||
Olaf Kirch <okir@suse.de>
|
Olaf Kirch <okir@suse.de>
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a1
|
%setup -q
|
||||||
cp %{S:3} lib/
|
cp %{S:3} lib/
|
||||||
%patch
|
%patch
|
||||||
%patch1
|
%patch1
|
||||||
@ -115,11 +111,6 @@ cp %{S:3} lib/
|
|||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
cd traceroute-*
|
|
||||||
%patch17 -p2
|
|
||||||
%patch28 -p1
|
|
||||||
%patch37 -p1
|
|
||||||
cd ..
|
|
||||||
%patch18 -p1
|
%patch18 -p1
|
||||||
%patch19 -p1
|
%patch19 -p1
|
||||||
%patch20
|
%patch20
|
||||||
@ -163,10 +154,7 @@ cp %{S:5} ./man/en_US
|
|||||||
|
|
||||||
make config
|
make config
|
||||||
make COPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS" LOPTS="$RPM_OPT_FLAGS"
|
make COPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS" LOPTS="$RPM_OPT_FLAGS"
|
||||||
cd traceroute-*
|
gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -fwhole-program -o ether-wake ether-wake.c
|
||||||
make CCOPTS="$RPM_OPT_FLAGS -fpie" LDOPTS="-pie"
|
|
||||||
cd ..
|
|
||||||
gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
|
install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
|
||||||
@ -183,15 +171,9 @@ do
|
|||||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/$tool.*
|
rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/$tool.*
|
||||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/*/man*/$tool.*
|
rm -f $RPM_BUILD_ROOT/%{_mandir}/*/man*/$tool.*
|
||||||
done
|
done
|
||||||
cd traceroute-*
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/usr/sbin
|
|
||||||
make DESTDIR=$RPM_BUILD_ROOT CCOPTS="$RPM_OPT_FLAGS" install
|
|
||||||
cp traceroute.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
|
|
||||||
ln -s traceroute.1 $RPM_BUILD_ROOT/%{_mandir}/man1/traceroute6.1
|
|
||||||
cd ..
|
|
||||||
mv $RPM_BUILD_ROOT/%{_mandir}/de_DE $RPM_BUILD_ROOT/%{_mandir}/de
|
mv $RPM_BUILD_ROOT/%{_mandir}/de_DE $RPM_BUILD_ROOT/%{_mandir}/de
|
||||||
mv $RPM_BUILD_ROOT/%{_mandir}/fr_FR $RPM_BUILD_ROOT/%{_mandir}/fr
|
mv $RPM_BUILD_ROOT/%{_mandir}/fr_FR $RPM_BUILD_ROOT/%{_mandir}/fr
|
||||||
%find_lang %{name}
|
%find_lang %{name} --all-name --with-man
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -200,17 +182,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/bin/*
|
/bin/*
|
||||||
/sbin/*
|
/sbin/*
|
||||||
/usr/sbin/*
|
|
||||||
%_mandir/man*/*
|
%_mandir/man*/*
|
||||||
%config(noreplace) /etc/xinetd.d/netstat
|
%config(noreplace) /etc/xinetd.d/netstat
|
||||||
%dir %lang(de) %_mandir/de
|
|
||||||
%dir %lang(de) %_mandir/de/man*
|
|
||||||
%lang(de) %doc %_mandir/de/man*/*
|
|
||||||
%dir %lang(fr) %_mandir/fr
|
|
||||||
%dir %lang(fr) %_mandir/fr/man*
|
|
||||||
%lang(fr) %doc %_mandir/fr/man*/*
|
|
||||||
%dir %lang(pt_BR) %_mandir/pt_BR
|
|
||||||
%dir %lang(pt_BR) %_mandir/pt_BR/man*
|
|
||||||
%lang(pt_BR) %doc %_mandir/pt_BR/man*/*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:defdb660afaf680626c16ece76367b4b12ba82a6a265b727171cf89bcc83c25d
|
|
||||||
size 20791
|
|
@ -1,16 +0,0 @@
|
|||||||
--- net-tools-1.60/traceroute-0.6.3/Makefile
|
|
||||||
+++ net-tools-1.60/traceroute-0.6.3/Makefile
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
CCOPTS = -g
|
|
||||||
CFLAGS = -Wall -D_BSD_SOURCE $(CCOPTS)
|
|
||||||
LDFLAGS = $(CCOPTS)
|
|
||||||
+LDOPTS =
|
|
||||||
OBJS = traceroute.o utils.o
|
|
||||||
BINARY = traceroute
|
|
||||||
BINARY6 = traceroute6
|
|
||||||
@@ -16,4 +17,4 @@
|
|
||||||
ln -s $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY6)
|
|
||||||
|
|
||||||
traceroute: $(OBJS)
|
|
||||||
- $(CC) $(LDFLAGS) -o $@ $(OBJS)
|
|
||||||
+ $(CC) $(LDOPTS) $(LDFLAGS) -o $@ $(OBJS)
|
|
@ -1,14 +0,0 @@
|
|||||||
Index: traceroute-1.2/traceroute.c
|
|
||||||
===================================================================
|
|
||||||
--- traceroute-1.2.orig/traceroute.c
|
|
||||||
+++ traceroute-1.2/traceroute.c
|
|
||||||
@@ -13,6 +13,9 @@
|
|
||||||
#include <sys/poll.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/uio.h>
|
|
||||||
+#define _GNU_SOURCE
|
|
||||||
+#define __USE_GNU
|
|
||||||
+
|
|
||||||
#include <netinet/icmp6.h>
|
|
||||||
#include <netinet/ip_icmp.h>
|
|
||||||
#include <netinet/ip.h>
|
|
@ -1,11 +0,0 @@
|
|||||||
--- traceroute-1.0.4/Makefile
|
|
||||||
+++ traceroute-1.0.4/Makefile
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
rm -f $(BINARY) $(OBJS)
|
|
||||||
|
|
||||||
install: traceroute
|
|
||||||
- install -s -m 555 $(BINARY) $(DESTDIR)$(BINDIR)
|
|
||||||
+ install -m 555 $(BINARY) $(DESTDIR)$(BINDIR)
|
|
||||||
ln -s $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY6)
|
|
||||||
|
|
||||||
traceroute: $(OBJS)
|
|
Loading…
Reference in New Issue
Block a user