Tue Nov 8 10:13:56 UTC 2005

Author: rvokal

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23173

Modified Files:
	.cvsignore sources traceroute.spec 
Added Files:
	traceroute-1.0.3-compat.patch 
Removed Files:
	traceroute-1.4a12-icmp_cksum.patch 
	traceroute-1.4a12-mpls-icmp-02.patch 
	traceroute-1.4a12-name.patch traceroute-1.4a12-pie.patch 
	traceroute-1.4a12-sockopt.patch 
	traceroute-1.4a12-sockopt2.patch 
	traceroute-1.4a12-tos-monitoring.patch 
	traceroute-1.4a5-aliases.patch traceroute-1.4a5-alpha.patch 
	traceroute-1.4a5-autoroute.patch 
	traceroute-1.4a5-autoroute2.patch 
	traceroute-1.4a5-bigpacklen.patch 
	traceroute-1.4a5-droproot.patch traceroute-1.4a5-fhs.patch 
	traceroute-1.4a5-fix.patch 
	traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch 
	traceroute-1.4a5-lsrr.patch traceroute-1.4a5-secfix.patch 
	traceroute-1.4a5-sourceroute.patch 
	traceroute-1.4a5-unaligned.patch 
Log Message:

 - 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



traceroute-1.0.3-compat.patch:
 traceroute.1 |    8 ++++----
 traceroute.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE traceroute-1.0.3-compat.patch ---
--- traceroute-1.0.3/traceroute.1.compat	2003-04-10 10:51:53.000000000 +0200
+++ traceroute-1.0.3/traceroute.1	2005-11-08 10:19:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TRACEROUTE 1 "6 December 2000"
+.TH TRACEROUTE 8 "6 December 2000"
 .UC 6
 .SH NAME
 traceroute \- print the route packets take to network host
@@ -13,7 +13,7 @@ traceroute \- print the route packets ta
 .BR "" "[" "-t tos" "] [" "-w timeout" "] [" "-q nqueries" ] 
 .br
 .ti +8
-.BR "" "[" "-S source_addr" "] [" "-I interface" "]
+.BR "" "[" "-s source_addr" "] [" "-i interface" "]
 .br
 .ti +8
 .BR "" [ "-g gateway" "] " host " [" "packetlen" "]"
@@ -74,7 +74,7 @@ specified
 Not very useful, because most routers have disabled source routing
 for security reasons.
 .TP
-.BI \-I " interface
+.BI \-i " interface
 Specifies the interface through which to 
 .I traceroute
 should send packets. By default, the interface is selected
@@ -146,7 +146,7 @@ router that has been configured to not r
 .IP
 This feature hasn't been implemented yet.
 .TP
-.BI \-S " source_addr
+.BI \-s " source_addr
 Chooses an alternative source address. Note that you must select the
 address of one of the interfaces.
 By default, the address of the outgoing interface is used.
--- traceroute-1.0.3/traceroute.c.compat	2005-11-02 10:07:18.000000000 +0100
+++ traceroute-1.0.3/traceroute.c	2005-11-08 10:19:23.000000000 +0100
@@ -124,7 +124,7 @@ main(int argc, char **argv)
 	/* Set the locale - needed for international domain names */
 	setlocale (LC_ALL, "");
 
-	while ((c = getopt(argc, argv, "46DFVf:g:I:m:N:np:t:w:q:rRS:")) != -1) {
+	while ((c = getopt(argc, argv, "46DFVf:g:i:m:N:np:t:w:q:rRs:")) != -1) {
 		switch (c) {
 		case '4':
 			af = AF_INET;
@@ -151,7 +151,7 @@ main(int argc, char **argv)
 			opt_gateway_name[ngateways++] = optarg;
 			break;
 
-		case 'I':
+		case 'i':
 			src_device = optarg;
 			break;
 
@@ -191,7 +191,7 @@ main(int argc, char **argv)
 			opt_rr = 1;
 			break;
 
-		case 'S':
+		case 's':
 			src_addr_name = optarg;
 			break;
 
@@ -355,7 +355,7 @@ usage(int exval)
 {
 	fprintf(stderr,
 	"usage: traceroute [-nFV] [-f first_ttl] [-m max_hops] [-p port]\n"
-	"           [-S source_addr] [-I interface]\n"
+	"           [-s source_addr] [-i interface] [-g gateway]\n"
 	"           [-t tos] [-w timeout] [-q nqueries] host [packetlen]\n");
 	exit(1);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 13:29:36 -0000	1.4
+++ .cvsignore	8 Nov 2005 10:13:52 -0000	1.5
@@ -1 +1 @@
-traceroute-1.4a12.tar.bz2
+traceroute-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 13:29:36 -0000	1.4
+++ sources	8 Nov 2005 10:13:52 -0000	1.5
@@ -1 +1 @@
-3af0b55b2f9f5c330631fb540ffda11d  traceroute-1.4a12.tar.bz2
+abd013aadcd289dc2319b35f787de6ef  traceroute-1.0.3.tar.bz2


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- traceroute.spec	11 Aug 2005 11:52:50 -0000	1.16
+++ traceroute.spec	8 Nov 2005 10:13:52 -0000	1.17
@@ -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 @@
 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 at redhat.com> 1.0.3-4
+- comaptibility patch, use -s and -i options
+
+* Thu Nov 03 2005 Robert Scheck <redhat at 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 at 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 at redhat.com> 1.0.3-1
+- new source 
+
 * Thu Aug 11 2005 Radek Vokal <rvokal at redhat.com> 1.4a12-27
 - fixed packet size for icmp checksum (#164466)
 - small buffer-overflow fixies
@@ -229,7 +207,7 @@
 - patch added to automatically determine interface to route through
 
 * Fri Jan 22 1999 Jeff Johnson <jbj at redhat.com>
-- use %configure
+- use %%configure
 - fix 64 bit problem on alpha (#919)
 
 * Wed Jan 13 1999 Bill Nottingham <notting at redhat.com>


--- traceroute-1.4a12-icmp_cksum.patch DELETED ---


--- traceroute-1.4a12-mpls-icmp-02.patch DELETED ---


--- traceroute-1.4a12-name.patch DELETED ---


--- traceroute-1.4a12-pie.patch DELETED ---


--- traceroute-1.4a12-sockopt.patch DELETED ---


--- traceroute-1.4a12-sockopt2.patch DELETED ---


--- traceroute-1.4a12-tos-monitoring.patch DELETED ---


--- traceroute-1.4a5-aliases.patch DELETED ---


--- traceroute-1.4a5-alpha.patch DELETED ---


--- traceroute-1.4a5-autoroute.patch DELETED ---


--- traceroute-1.4a5-autoroute2.patch DELETED ---


--- traceroute-1.4a5-bigpacklen.patch DELETED ---


--- traceroute-1.4a5-droproot.patch DELETED ---


--- traceroute-1.4a5-fhs.patch DELETED ---


--- traceroute-1.4a5-fix.patch DELETED ---


--- traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch DELETED ---


--- traceroute-1.4a5-lsrr.patch DELETED ---


--- traceroute-1.4a5-secfix.patch DELETED ---


--- traceroute-1.4a5-sourceroute.patch DELETED ---


--- traceroute-1.4a5-unaligned.patch DELETED ---


