Skip to content

Commit

Permalink
Remove rdisc
Browse files Browse the repository at this point in the history
rdisc implements both client and server side of the ICMP Internet Router
Discovery Protocol (IRDP) defined in RFC 1256.

It haven't been actively used by many decades. Nowadays replaced by DHCP.

Fixes: #363

Acked-by: Jan Synacek <jan.synacek@scrive.com>
Acked-by: Mike Gilbert <floppym@gentoo.org>
Acked-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Sevan Janiyan <venture37@geeklan.co.uk>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
  • Loading branch information
pevik committed Dec 23, 2021
1 parent fba7b62 commit 7447806
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 1,875 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -40,7 +40,7 @@ jobs:
- container: "debian:stable"
env:
CC: gcc
EXTRA_BUILD_OPTS: "-DUSE_CAP=false -DUSE_IDN=false -DBUILD_ARPING=false -DBUILD_CLOCKDIFF=false -DENABLE_RDISC_SERVER=false -DNO_SETCAP_OR_SUID=true -DUSE_GETTEXT=false"
EXTRA_BUILD_OPTS: "-DUSE_CAP=false -DUSE_IDN=false -DBUILD_ARPING=false -DBUILD_CLOCKDIFF=false -DNO_SETCAP_OR_SUID=true -DUSE_GETTEXT=false"

# other builds
- container: "centos:latest"
Expand Down
1 change: 0 additions & 1 deletion LICENSE
@@ -1,7 +1,6 @@
arping: GPL v2 or later
clockdiff: BSD-3
ping: BSD-3
rdisc: AS-IS, SUN MICROSYSTEMS license
tracepath: GPL v2 or later

Files containing license texts are available in Documentation directory.
1 change: 0 additions & 1 deletion build-aux/setcap-setuid.sh
Expand Up @@ -17,7 +17,6 @@ _log() {
case "$perm_type" in
caps)
params="cap_net_raw+p"
[ "$2" = "rdisc" ] && params="cap_net_raw,cap_net_admin+ep"
_log "calling: $setcap $params $exec_path"
"$setcap" $params "$exec_path"
;;
Expand Down
4 changes: 0 additions & 4 deletions doc/meson.build
Expand Up @@ -16,10 +16,6 @@ if build_ping == true
manpages += ['ping']
endif

if build_rdisc == true
manpages += ['rdisc']
endif

if build_tracepath == true
manpages += ['tracepath']
endif
Expand Down
265 changes: 0 additions & 265 deletions doc/rdisc.xml

This file was deleted.

2 changes: 1 addition & 1 deletion iputils.doap
Expand Up @@ -9,7 +9,7 @@ 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,
ping, rdisc, tracepath.</description>
ping, tracepath.</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
38 changes: 0 additions & 38 deletions meson.build
Expand Up @@ -24,8 +24,6 @@ conf.set('_GNU_SOURCE', 1, description : 'Enable GNU extensions on systems that
build_arping = get_option('BUILD_ARPING')
build_clockdiff = get_option('BUILD_CLOCKDIFF')
build_ping = get_option('BUILD_PING')
build_rdisc = get_option('BUILD_RDISC')
build_rdisc_server = get_option('ENABLE_RDISC_SERVER')
build_tracepath = get_option('BUILD_TRACEPATH')

build_mans = get_option('BUILD_MANS')
Expand All @@ -48,12 +46,10 @@ endif
setcap_arping = false
setcap_clockdiff = false
setcap_ping = 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_rdisc = get_option('SETCAP_OR_SUID_RDISC')
endif

# Check functions.
Expand Down Expand Up @@ -144,12 +140,6 @@ if host_machine.endian() == 'big'
conf.set('WORDS_BIGENDIAN', '1')
endif

if build_rdisc == true
if build_rdisc_server == true
conf.set('RDISC_SERVER', 1, description : 'If set build rdisc server.')
endif
endif

foreach h : [
'error.h',
]
Expand Down Expand Up @@ -214,31 +204,6 @@ if build_clockdiff == true
endif
endif

if build_rdisc == true
rdisc = executable('rdisc', ['rdisc.c', git_version_h],
install_dir: sbindir,
link_with : [libcommon],
install: true)
if (setcap_rdisc)
meson.add_install_script('build-aux/setcap-setuid.sh',
sbindir,
'rdisc',
perm_type,
setcap_path
)
endif
if install_systemd_units
subs = configuration_data()
subs.set('sbindir', sbindir)
unit_file = configure_file(
input: 'systemd/rdisc.service.in',
output: 'rdisc.service',
configuration: subs
)
install_data(unit_file, install_dir: systemdunitdir)
endif
endif

if build_arping == true
arping = executable('arping', ['arping.c', git_version_h],
dependencies : [rt_dep, cap_dep, idn_dep, intl_dep],
Expand Down Expand Up @@ -271,9 +236,6 @@ output += 'clockdiff: ' + build_clockdiff.to_string()
output += ' (capability or suid: ' + setcap_clockdiff.to_string() + ')\n'
output += 'ping: ' + build_ping.to_string()
output += ' (capability or suid: ' + setcap_ping.to_string() + ')\n'
output += 'rdisc: ' + build_rdisc.to_string()
output += ' (server: ' + build_rdisc_server.to_string() + ', '
output += 'capability or suid: ' + setcap_rdisc.to_string() + ')\n'
output += 'tracepath: ' + build_tracepath.to_string() + '\n'

output += '\nCONFIGURATION\n'
Expand Down

0 comments on commit 7447806

Please sign in to comment.