Skip to content

Commit

Permalink
Remove traceroute6
Browse files Browse the repository at this point in the history
traceroute6 requires inetd to run, that is quite a rarity nowadays.
Due this it has been disabled by default since 2615a52 ("build-sys:
change build defaults"), change released in s20190324.

Remove it because there is better implementation from Dmitry Butskoy [1].
Also it can be replaced by other tools, e.g. tracepath -6 or mtr.

[1] http://traceroute.sourceforge.net/

Closes: #362

Acked-by: Noah Meyerhans <noahm@debian.org>
Acked-by: David Heidelberg <david@ixit.cz>
Acked-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
  • Loading branch information
pevik committed Aug 4, 2021
1 parent bfe93fa commit a139421
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 1,060 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -12,7 +12,6 @@ These tools are included in iputils
- rdisc
- tftpd
- tracepath
- traceroute6

If you still use [old version](http://www.skbuff.net/iputils/), please consider moving forward to new releases placed here.

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Expand Up @@ -6,7 +6,7 @@ CC="${CC:-gcc}"
BUILD_DIR="${BUILD_DIR:-builddir}"
PREFIX="${PREFIX:-$HOME/iputils-install}"

BUILD_OPTS="-Dprefix=$PREFIX -DBUILD_RARPD=true -DBUILD_TFTPD=true -DBUILD_TRACEROUTE6=true $EXTRA_BUILD_OPTS"
BUILD_OPTS="-Dprefix=$PREFIX -DBUILD_RARPD=true -DBUILD_TFTPD=true $EXTRA_BUILD_OPTS"
[ -z "$EXTRA_BUILD_OPTS" ] && BUILD_OPTS="$BUILD_OPTS -DBUILD_HTML_MANS=true"
[ -f "meson.cross" ] && BUILD_OPTS="--cross-file $PWD/meson.cross $BUILD_OPTS"

Expand Down
4 changes: 0 additions & 4 deletions doc/meson.build
Expand Up @@ -32,10 +32,6 @@ if build_tracepath == true
manpages += ['tracepath']
endif

if build_traceroute6 == true
manpages += ['traceroute6']
endif

if build_ninfod == true
manpages += ['ninfod']
endif
Expand Down
111 changes: 0 additions & 111 deletions doc/traceroute6.xml

This file was deleted.

7 changes: 2 additions & 5 deletions iputils.doap
Expand Up @@ -9,12 +9,9 @@ xmlns:foaf="http://xmlns.com/foaf/0.1/">
<shortdesc>The iputils package is set of small utilities for
Linux networking.</shortdesc>
<description>The iputils package includes arping, clockdiff,
ninfod, ping, rarpd, rdisc, tftpd, tracepath, and traceroute6.
ninfod, ping, rarpd, rdisc, tftpd, tracepath.
The rarpd is not built by default, this utility is obsoleted by
bootp and later dhcp protocols. The traceroute6 built is
disabled by default in favour of
http://traceroute.sourceforge.net/ that is maintained by Dmitry
Butskoy.</description>
bootp and later dhcp protocols.</description>
<bug-database rdf:resource="https://github.com/iputils/iputils/issues" />
<download-page rdf:resource="https://github.com/iputils/iputils/releases" />
<programming-language>C</programming-language>
Expand Down
20 changes: 0 additions & 20 deletions meson.build
Expand Up @@ -31,7 +31,6 @@ build_rdisc = get_option('BUILD_RDISC')
build_rdisc_server = get_option('ENABLE_RDISC_SERVER')
build_tftpd = get_option('BUILD_TFTPD')
build_tracepath = get_option('BUILD_TRACEPATH')
build_traceroute6 = get_option('BUILD_TRACEROUTE6')

build_mans = get_option('BUILD_MANS')
build_html_mans = get_option('BUILD_HTML_MANS')
Expand All @@ -52,13 +51,11 @@ endif
setcap_arping = false
setcap_clockdiff = false
setcap_ping = false
setcap_traceroute6 = false
setcap_rdisc = false
if (not get_option('NO_SETCAP_OR_SUID'))
setcap_arping = get_option('SETCAP_OR_SUID_ARPING')
setcap_clockdiff = get_option('SETCAP_OR_SUID_CLOCKDIFF')
setcap_ping = get_option('SETCAP_OR_SUID_PING')
setcap_traceroute6 = get_option('SETCAP_OR_SUID_TRACEROUTE6')
setcap_rdisc = get_option('SETCAP_OR_SUID_RDISC')
endif

Expand Down Expand Up @@ -251,21 +248,6 @@ if build_tracepath == true
install: true)
endif

if build_traceroute6 == true
executable('traceroute6', ['traceroute6.c', git_version_h],
dependencies : [cap_dep, intl_dep, idn_dep],
link_with : [libcommon],
install: true)
if (setcap_traceroute6)
meson.add_install_script('build-aux/setcap-setuid.sh',
bindir,
'traceroute6',
perm_type,
setcap_path
)
endif
endif

if build_clockdiff == true
executable('clockdiff', ['clockdiff.c', git_version_h],
dependencies : [cap_dep, intl_dep],
Expand Down Expand Up @@ -367,8 +349,6 @@ output += ' (server: ' + build_rdisc_server.to_string() + ', '
output += 'capability or suid: ' + setcap_rdisc.to_string() + ')\n'
output += 'tftpd: ' + build_tftpd.to_string() + '\n'
output += 'tracepath: ' + build_tracepath.to_string() + '\n'
output += 'traceroute6: ' + build_traceroute6.to_string()
output += ' (capability or suid: ' + setcap_traceroute6.to_string() + ')\n'

output += '\nCONFIGURATION\n'
output += 'Capatiblity (with libcap): ' + cap.to_string() + '\n'
Expand Down
6 changes: 0 additions & 6 deletions meson_options.txt
Expand Up @@ -30,9 +30,6 @@ option('BUILD_TFTPD', type : 'boolean', value : false,
option('BUILD_TRACEPATH', type : 'boolean', value : true,
description : 'Build tracepath')

option('BUILD_TRACEROUTE6', type : 'boolean', value : false,
description : 'Build traceroute6')

option('BUILD_NINFOD', type : 'boolean', value : true,
description : 'Build ninfod')

Expand All @@ -57,9 +54,6 @@ option('SETCAP_OR_SUID_CLOCKDIFF', type : 'boolean', value : true,
option('SETCAP_OR_SUID_PING', type : 'boolean', value : true,
description : 'Set setcap or setuid on ping with build-aux/setcap-setuid.sh')

option('SETCAP_OR_SUID_TRACEROUTE6', type : 'boolean', value : true,
description : 'Set setcap or setuid on traceroute6 with build-aux/setcap-setuid.sh')

option('SETCAP_OR_SUID_RDISC', type : 'boolean', value : false,
description : 'Set setcap or setuid on rdisc with build-aux/setcap-setuid.sh, NOTE: this is strongly discouraged, recommended way is to run it as systemd service which does not require it to be enabled')

Expand Down
1 change: 0 additions & 1 deletion po/POTFILES
Expand Up @@ -5,4 +5,3 @@ ping/ping6_common.c
ping/ping.c
ping/ping_common.c
tracepath.c
traceroute6.c

1 comment on commit a139421

@pevik
Copy link
Contributor Author

@pevik pevik commented on a139421 Sep 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

traceroute6 requires inetd to run, that is quite a rarity nowadays., no traceroute6 indeed does not require inetd, that should go to the message for removing tftpd (#369).

Please sign in to comment.