- new source, new epoch

- comaptibility patch, use -s and -i options
- enable working IPv6 support in traceroute (removed from iputils, needs
    iputils update first)
- removed old compatibility links, nothing has SUID/SGID
- added some documentation files
- don't expand rpm macros in %%changelog
- license is GPL
- description of this implementation
- man page needs 0644
- link it agains relative paths, it works over NFS

.cvsignore

@@ -1 +1 @@
-traceroute-1.4a12.tar.bz2
+traceroute-1.0.3.tar.bz2

sources

@@ -1 +1 @@
-3af0b55b2f9f5c330631fb540ffda11d  traceroute-1.4a12.tar.bz2
+abd013aadcd289dc2319b35f787de6ef  traceroute-1.0.3.tar.bz2

traceroute.spec

@@ -1,31 +1,12 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
-Version: 1.4a12
-Release: 27
-License: BSD
+Version: 1.0.3
+Release: 4
+Epoch: 2
+License: GPL
 Group: Applications/Internet
-Source: ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.bz2
-Patch0: traceroute-1.4a5-fix.patch
-Patch1: traceroute-1.4a5-secfix.patch
-Patch2: traceroute-1.4a5-alpha.patch
-Patch3: traceroute-1.4a5-autoroute.patch
-Patch4: traceroute-1.4a5-autoroute2.patch
-Patch5: traceroute-1.4a5-unaligned.patch
-Patch6: traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch
-Patch7: traceroute-1.4a5-fhs.patch
-Patch8: traceroute-1.4a5-sourceroute.patch
-Patch9: traceroute-1.4a5-aliases.patch
-Patch10: traceroute-1.4a5-droproot.patch
-Patch11: traceroute-1.4a5-bigpacklen.patch
-Patch12: traceroute-1.4a5-lsrr.patch
-Patch13: traceroute-1.4a12-sockopt.patch
-Patch14: traceroute-1.4a12-sockopt2.patch
-Patch15: traceroute-1.4a12-tos-monitoring.patch
-Patch16: traceroute-1.4a12-mpls-icmp-02.patch
-Patch17: traceroute-1.4a12-pie.patch
-Patch18: traceroute-1.4a12-icmp_cksum.patch
-Patch19: traceroute-1.4a12-name.patch
-URL: ftp://ftp.ee.lbl.gov/
+Source: ftp://ftp.lst.de/pub/people/okir/traceroute/%{name}-%{version}.tar.bz2
+Patch0: traceroute-1.0.3-compat.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -36,69 +17,66 @@ route taken by the packets.  Traceroute is used as a network debugging
 tool.  If you're having network connectivity problems, traceroute will
 show you where the trouble is coming from along the route.
 
+This is a small traceroute replacement that works without requiring a
+setuid bit. This implementation relies on a number of features of the
+2.4 Linux kernel. It also has IPv6 support, and does parallel probes,
+which makes it a little faster.
+
 Install traceroute if you need a tool for diagnosing network connectivity
 problems.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix
-%patch1 -p1 -b .secfix
-#%patch2 -p1 -b .alpha
-%patch3 -p1 -b .autoroute
-%patch4 -p1 -b .autoroute2
-%patch5 -p1 -b .unaligned
-%patch6 -p1 -b .hostname
-%patch7 -p1 -b .fhs
-#%patch8 -p1 -b .sourceroute
-%patch9 -p1 -b .aliases
-%patch10 -p1 -b .droproot
-%patch11 -p1 -b .bigpacklen
-%patch12 -p1 -b .lsrr
-%patch13 -p1 -b .sockopt
-%patch14 -p1 -b .sockopt2
-%patch15 -p1 -b .tos-monitoring
-%patch16 -p1 -b .mpls-icmp-02
-%patch17 -p1 -b .pie
-%patch18 -p1 -b .icmp_cksum
-%patch19 -p1 -b .name
+%patch0 -p1 -b .compat
 
 %build
-rm -f config.sub
-cp -f %{_datadir}/libtool/config.sub .
 %ifarch s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
 %endif
 export LDFLAGS="-pie"
-%configure
+
 make CCOPT="$CFLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-
-make DESTDIR=${RPM_BUILD_ROOT} install install-man
-
-ln -sf /bin/traceroute ${RPM_BUILD_ROOT}%{_sbindir}
-
-# remove sugid apps to get proper debuginfo
-chmod 755 ${RPM_BUILD_ROOT}/bin/*
+rm -rf %{buildroot}
+install -m 755 -D %{name} %{buildroot}/bin/%{name}
+install -m 644 -D %{name}.1 %{buildroot}%{_mandir}/man8/%{name}.8
+#for IPv6 traceroute - needs change in iputils, supressed for testing
+ln -sf %{name} %{buildroot}/bin/traceroute6
+ln -sf %{_mandir}/man8/%{name}.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/%{name}6.8 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-echo %{_prefix}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-# this is set as 4555 by make install, which I don't really like
-%attr(4755,root,root)	/bin/traceroute
-%{_sbindir}/traceroute
+%doc ChangeLog COPYING.GPL README
+/bin/traceroute*
 %{_mandir}/man8/*
 
 %changelog
+* Tue Nov 08 2005 Radek Vokal <rvokal@redhat.com> 1.0.3-4
+- comaptibility patch, use -s and -i options
+
+* Thu Nov 03 2005 Robert Scheck <redhat@linuxnetz.de> 1.0.3-3
+- enable working IPv6 support in traceroute
+- removed old compatibility links, nothing has SUID/SGID
+- added some documentation files
+- don't expand rpm macros in %%changelog
+
+* Wed Nov 02 2005 Xose Vazquez Perez <xose.vazquez@gmail.com> 1.0.3-2
+- license is GPL
+- remove S_ISUID from /bin/traceroute
+- description of this implementation
+- s/$RPM_BUILD_ROOT/%%{buildroot}
+- man page needs 0644
+- link it agains relative paths, it works over NFS
+
+* Wed Nov 02 2005 Radek Vokal <rvokal@redhat.com> 1.0.3-1
+- new source 
+
 * Thu Aug 11 2005 Radek Vokal <rvokal@redhat.com> 1.4a12-27
 - fixed packet size for icmp checksum (#164466)
 - small buffer-overflow fixies
@@ -229,7 +207,7 @@ echo %{_prefix}
 - patch added to automatically determine interface to route through
 
 * Fri Jan 22 1999 Jeff Johnson <jbj@redhat.com>
-- use %configure
+- use %%configure
 - fix 64 bit problem on alpha (#919)
 
 * Wed Jan 13 1999 Bill Nottingham <notting@redhat.com>