Adding debian version 1:2.1.5-1.debian/1%2.1.5-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 368 insertions, 0 deletions

diff --git a/debian/patches/01-skipdirs.patch b/debian/patches/01-skipdirs.patch
new file mode 100644
index 0000000..fb0b3ee
--- /dev/null
+++ b/debian/patches/01-skipdirs.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Exclude debian directory from subdirs.
+
+diff -Naurp traceroute.orig/Make.rules traceroute/Make.rules
+--- traceroute.orig/Make.rules	2008-04-18 13:22:05.000000000 +0200
++++ traceroute/Make.rules	2008-05-03 09:18:15.000000000 +0200
+@@ -72,7 +72,7 @@ DESTDIR =
+ 
+ 
+ #  layout stuff
+-SKIPDIRS = tmp%
++SKIPDIRS = tmp% debian
+ INCLUDEDIRS = include%
+ LIBDIRS = lib%
+ MODDIRS = mod%
diff --git a/debian/patches/02-path.patch b/debian/patches/02-path.patch
new file mode 100644
index 0000000..8fa0116
--- /dev/null
+++ b/debian/patches/02-path.patch
@@ -0,0 +1,46 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Adjust path.
+Reviewed-By: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2016-03-09
+
+diff -Naurp traceroute.orig/wrappers/lft traceroute/wrappers/lft
+--- traceroute.orig/wrappers/lft	2008-04-21 18:54:41.000000000 +0200
++++ traceroute/wrappers/lft	2008-05-03 09:18:47.000000000 +0200
+@@ -113,5 +113,5 @@ opts="$opts -w $sec.${timeout#$sec}"
+ 
+ opts="$method $opts"
+ 
+-exec traceroute $opts $host $length
++exec /usr/bin/traceroute.db $opts $host $length
+ 
+diff -Naurp traceroute.orig/wrappers/tcptraceroute traceroute/wrappers/tcptraceroute
+--- traceroute.orig/wrappers/tcptraceroute	2008-04-21 18:54:46.000000000 +0200
++++ traceroute/wrappers/tcptraceroute	2008-05-03 09:18:47.000000000 +0200
+@@ -74,5 +74,5 @@ echo "Running:
+ 	traceroute $opts $host $length" >&2
+ 
+ 
+-exec traceroute $opts $host $length
++exec /usr/bin/traceroute.db $opts $host $length
+ 
+diff -Naurp traceroute.orig/wrappers/traceproto traceroute/wrappers/traceproto
+--- traceroute.orig/wrappers/traceproto	2008-04-21 18:55:06.000000000 +0200
++++ traceroute/wrappers/traceproto	2008-05-03 09:18:47.000000000 +0200
+@@ -122,6 +122,6 @@ opts="$opts -z $sendwait"
+ while [ "$cont" -gt 0 ]
+ do
+     cont=$(($cont - 1))
+-    traceroute $opts $host $length
++    /usr/bin/traceroute.db $opts $host $length
+ done
+ 
+diff -Naurp traceroute.orig/wrappers/traceroute-nanog traceroute/wrappers/traceroute-nanog
+--- traceroute.orig/wrappers/traceroute-nanog	2008-04-21 18:55:17.000000000 +0200
++++ traceroute/wrappers/traceroute-nanog	2008-05-03 09:18:47.000000000 +0200
+@@ -72,5 +72,5 @@ done
+ 
+ [ -z "$spray" ] && opts="$opts -N 1"
+ 
+-exec traceroute $opts $1 $2
++exec /usr/bin/traceroute.db $opts $1 $2
+ 
diff --git a/debian/patches/03-manpage-section.patch b/debian/patches/03-manpage-section.patch
new file mode 100644
index 0000000..ae0616c
--- /dev/null
+++ b/debian/patches/03-manpage-section.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Adjust manpage section.
+
+diff -Naurp traceroute.orig/traceroute/traceroute.8 traceroute/traceroute/traceroute.8
+--- traceroute.orig/traceroute/traceroute.8	2009-11-06 08:25:57.000000000 +0100
++++ traceroute/traceroute/traceroute.8	2009-11-07 16:02:37.000000000 +0100
+@@ -1,7 +1,7 @@
+ .\" Copyright (c)  2006   Dmitry Butskoy (dmitry@butskoy.name)
+ .\" License: GPL v2 or any later version
+ .\" See COPYING for the status of this software
+-.TH TRACEROUTE 8 "11 October 2006" "Traceroute" "Traceroute For Linux"
++.TH TRACEROUTE 1 "11 October 2006" "Traceroute" "Traceroute For Linux"
+ .\" .UC 6
+ .SH NAME
+ traceroute \- print the route packets trace to network host
diff --git a/debian/patches/04-manpage-lft.patch b/debian/patches/04-manpage-lft.patch
new file mode 100644
index 0000000..60eb8db
--- /dev/null
+++ b/debian/patches/04-manpage-lft.patch
@@ -0,0 +1,38 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Mentioning lft in traceroute manpage (Closes: #554891, #555028).
+
+diff -Naurp traceroute.orig/traceroute/traceroute.8 traceroute/traceroute/traceroute.8
+--- traceroute.orig/traceroute/traceroute.8	2010-07-12 20:08:53.495867879 +0200
++++ traceroute/traceroute/traceroute.8	2010-07-12 20:18:56.510883917 +0200
+@@ -29,6 +29,12 @@ traceroute \- print the route packets tr
+ .br
+ .BR traceroute6
+ .RI " [" options ]
++.br
++.BR tcptraceroute
++.RI " [" options ]
++.br
++.BR lft
++.RI " [" options ]
+ .ad
+ .SH DESCRIPTION
+ .I traceroute
+@@ -41,6 +47,18 @@ along the path to the host.
+ is equivalent to
+ .I traceroute
+ .B \-6
++.P
++.I tcptraceroute
++is equivalent to
++.I traceroute
++.B \-T
++.P
++.I lft
++, the Layer Four Traceroute, performs a TCP traceroute, like
++.I traceroute
++.B \-T
++, but attempts to provide compatibility with the original
++such implementation, also called "lft".
+ .PP
+ The only required parameter is the name or IP address of the
+ destination
diff --git a/debian/patches/05-manpage-p.patch b/debian/patches/05-manpage-p.patch
new file mode 100644
index 0000000..49d990f
--- /dev/null
+++ b/debian/patches/05-manpage-p.patch
@@ -0,0 +1,18 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description:
+ Mentioning that -p with the tcptraceroute wrapper specifies the source port,
+ not the destination port (Closes: #448200).
+
+diff -Naurp traceroute.orig/traceroute/traceroute.8 traceroute/traceroute/traceroute.8
+--- traceroute.orig/traceroute/traceroute.8	2012-12-10 11:49:37.056140846 +0100
++++ traceroute/traceroute/traceroute.8	2012-12-10 11:49:46.172143321 +0100
+@@ -216,7 +216,8 @@ For ICMP tracing, specifies the initial
+ by each probe too).
+ .br
+ For TCP and others specifies just the (constant) destination
+-port to connect.
++port to connect. When using the tcptraceroute wrapper,
++\-p specifies the source port.
+ .TP
+ .BI \-t " tos" ", --tos=" tos
+ For IPv4, set the Type of Service (TOS) and Precedence value. Useful values
diff --git a/debian/patches/06-build.patch b/debian/patches/06-build.patch
new file mode 100644
index 0000000..fa40373
--- /dev/null
+++ b/debian/patches/06-build.patch
@@ -0,0 +1,19 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid overwriting build environment.
+
+diff -Naurp traceroute.orig/Make.rules traceroute/Make.rules
+--- traceroute.orig/Make.rules	2012-04-26 09:43:18.442365190 +0200
++++ traceroute/Make.rules	2012-05-18 12:39:37.970036900 +0200
+@@ -46,9 +46,9 @@ $(call set, INSTALL, cp)
+ $(call set, INDENT, true)
+ 
+ gcc = $(findstring gcc,$(CC))
+-$(call set, CFLAGS, $(if $(gcc), -O2 -Wall, -O))
+-$(call set, CPPFLAGS, )
+-$(call set, LDFLAGS, -s)
++#$(call set, CFLAGS, $(if $(gcc), -O2 -Wall, -O))
++#$(call set, CPPFLAGS, )
++#$(call set, LDFLAGS, -s)
+ $(call set, LIBS, )
+ 
+ 
diff --git a/debian/patches/07-reproducible-build.patch b/debian/patches/07-reproducible-build.patch
new file mode 100644
index 0000000..c00d349
--- /dev/null
+++ b/debian/patches/07-reproducible-build.patch
@@ -0,0 +1,37 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Sort lists of libraries/source/object files
+ for deterministic linking order
+
+--- a/Make.rules
++++ b/Make.rules
+@@ -136,8 +136,8 @@
+ _libs = $(strip $(foreach _lib,$(LIBDIRS),\
+ 		    $(if $(filter lib%,$(_lib)),\
+ 			$(patsubst lib%,-l%,$(_lib)),\
+-			$(wildcard $(srcdir)/$(_lib)/$(_lib).so \
+-					$(srcdir)/$(_lib)/$(_lib).a))))
++			$(sort $(wildcard $(srcdir)/$(_lib)/$(_lib).so \
++					$(srcdir)/$(_lib)/$(_lib).a)))))
+ 
+ override LIBS := $(_libs) -lm $(LIBS)
+ 
+@@ -166,7 +166,7 @@
+ endif
+ endif
+ 
+-sources = $(wildcard *.c)
++sources = $(sort $(wildcard *.c))
+ OBJS = $(sources:.c=.$(obj))
+ 
+ 
+--- a/default.rules
++++ b/default.rules
+@@ -143,7 +143,7 @@
+ ifeq ($(filter $(TARGET),$(EXEDIRS)),$(TARGET))
+ 
+ ifeq ($(filter $(TARGET),$(MODUSERS)),$(TARGET))
+-MOD_OBJS = $(wildcard $(foreach dir,$(MODDIRS),$(srcdir)/$(dir)/*.o))
++MOD_OBJS = $(sort $(wildcard $(foreach dir,$(MODDIRS),$(srcdir)/$(dir)/*.o)))
+ ifeq ($(shared),yes)
+ override LDFLAGS := -rdynamic $(LDFLAGS)
+ endif
diff --git a/debian/patches/08-manpage-update.patch b/debian/patches/08-manpage-update.patch
new file mode 100644
index 0000000..518ac43
--- /dev/null
+++ b/debian/patches/08-manpage-update.patch
@@ -0,0 +1,172 @@
+Description: fix lines with a misused two-fonts macro in manpage
+Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
+Last-Update: 2019-08-19
+
+--- traceroute.orig/traceroute/traceroute.8	2019-08-19 19:07:42.000000000 +0000
++++ traceroute/traceroute/traceroute.8.new	2019-08-19 19:26:05.000000000 +0000
+@@ -27,13 +27,13 @@ traceroute \- print the route packets tr
+ .ti +8
+ .BR host " [" "packet_len" "]"
+ .br
+-.BR traceroute6
++.B traceroute6
+ .RI " [" options ]
+ .br
+-.BR tcptraceroute
++.B tcptraceroute
+ .RI " [" options ]
+ .br
+-.BR lft
++.B lft
+ .RI " [" options ]
+ .ad
+ .SH DESCRIPTION
+@@ -122,7 +122,7 @@ and source/destination port, in order to
+ by firewalls just as a start of allowed type of a network session).
+ .SH OPTIONS
+ .TP
+-.BI \--help
++.B \-\-help
+ Print help info and exit.
+ .TP
+ .BR \-4 ", " \-6
+@@ -173,14 +173,14 @@ Specifies with what TTL to start. Defaul
+ Tells traceroute to add an IP source routing option to the outgoing
+ packet that tells the network to route the packet through the
+ specified
+-.IR gateway
++.I gateway
+ (most routers have disabled source routing for security reasons).
+ In general, several
+-.IR gateway\fR's
++.IR gateway 's
+ is allowed (comma separated). For IPv6, the form of
+-.IR num\fB,\fIaddr\fB,\fIaddr...
++.IB num , addr , addr...
+ is allowed, where
+-.IR num
++.I num
+ is a route header type (default is type 2). Note the type 0 route header
+ is now deprecated (rfc5095).
+ .TP
+@@ -204,7 +204,7 @@ considerably. The default value is 16.
+ Note that some routers and hosts can use ICMP rate throttling. In such
+ a situation specifying too large number can lead to loss of some responses.
+ .TP
+-.BI \-n
++.B \-n
+ Do not try to map IP addresses to host names when displaying them.
+ .TP
+ .BI \-p " port" ", --port=" port
+@@ -236,13 +236,13 @@ Determines how long to wait for a respon
+ .br
+ There are three (in general) float values separated by a comma
+ (or a slash).
+-.IR Max
++.I Max
+ specifies the maximum time (in seconds, default 5.0) to wait, in any case.
+ .br
+ 
+ .br
+ Traditional traceroute implementation always waited whole
+-.IR max
++.I max
+ seconds for any probe. But if we already have some replies from the
+ .B same
+ hop, or even from some
+@@ -253,15 +253,15 @@ to determine the actual reasonable amoun
+ 
+ .br
+ The optional
+-.IR here
++.I here
+ (default 3.0) specifies a factor to multiply the round trip time of an already
+ received response from the
+ .B same
+ hop. The resulting value is used as a timeout for the probe, instead of 
+ (but no more than)
+-.IR max\fR.
++.IR max .
+ The optional
+-.IR near
++.I near
+ (default 10.0) specifies a similar factor for a response from some
+ .B next
+ hop.
+@@ -275,24 +275,24 @@ hop (of the probe which will be printed
+ If nothing found, then look for some
+ .B next
+ hop. If nothing found, use
+-.IR max\fR.
++.IR max .
+ If
+-.IR here
++.I here
+ and/or
+-.IR near
++.I near
+ have zero values, the corresponding computation is skipped.
+ .br
+-.IR Here
++.I Here
+ and
+-.IR near
++.I near
+ are always set to zero if only
+-.IR max
++.I max
+ is specified (for compatibility with previous versions).
+ .TP
+ .BI \-q " nqueries" ", --queries=" nqueries
+ Sets the number of probe packets per hop. The default is 3.
+ .TP
+-.BI \-r
++.B \-r
+ Bypass the normal routing tables and send directly to a host on
+ an attached network.  If the host is not on a directly-attached
+ network, an error is returned.  This option can be used to ping a
+@@ -370,7 +370,7 @@ To print information about available opt
+ Use UDP to particular destination port for tracerouting (instead of increasing
+ the port per each probe). Default port is 53 (dns).
+ .TP
+-.BI \-UL
++.B \-UL
+ Use UDPLITE for tracerouting (default port is 53).
+ .TP
+ .B \-D, \-\-dccp
+@@ -380,7 +380,7 @@ Use DCCP Requests for probes.
+ Use raw packet of specified protocol for tracerouting. Default protocol is
+ 253 (rfc3692).
+ .TP
+-.BI \--mtu
++.B \-\-mtu
+ Discover MTU along the path being traced. Implies
+ .BR \-F\ \-N\ 1 .
+ New
+@@ -406,7 +406,7 @@ See
+ .B \-F
+ option for more info.
+ .TP
+-.BI \--back
++.B \-\-back
+ Print the number of backward hops when it seems different with the forward
+ direction. This number is guessed in assumption that remote hops send reply
+ packets with initial ttl set to either 64, or 128 or 255 (which seems
+@@ -437,7 +437,7 @@ This method may be allowed for unprivile
+ since the kernel 3.0 (IPv4, for IPv6 since 3.11), which supports new
+ .I dgram icmp
+ (or
+-.IR \fR"\fIping\fR")
++.RI """" ping """)"
+ sockets. To allow such sockets, sysadmin should provide
+ .I net/ipv4/ping_group_range
+ sysctl range to match any group of the user.
+@@ -555,7 +555,7 @@ Options:
+ .TP
+ .B service\fR=\fInum
+ Set DCCP service code to
+-.IR num
++.I num
+ (default is 1885957735).
+ .SS raw \  \  \  \ \-P proto
+ Send raw packet of protocol
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..105cec7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+01-skipdirs.patch
+02-path.patch
+03-manpage-section.patch
+04-manpage-lft.patch
+05-manpage-p.patch
+06-build.patch
+07-reproducible-build.patch
+08-manpage-update.patch