Skip to content

Commit 7447806

Browse files
pevikpevik
committed
Remove rdisc
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 <[email protected]> Acked-by: Mike Gilbert <[email protected]> Acked-by: Rosen Penev <[email protected]> Acked-by: Mike Frysinger <[email protected]> Acked-by: Sevan Janiyan <[email protected]> Signed-off-by: Petr Vorel <[email protected]>
1 parent fba7b62 commit 7447806

File tree

10 files changed

+2
-1875
lines changed

10 files changed

+2
-1875
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- container: "debian:stable"
4141
env:
4242
CC: gcc
43-
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"
43+
EXTRA_BUILD_OPTS: "-DUSE_CAP=false -DUSE_IDN=false -DBUILD_ARPING=false -DBUILD_CLOCKDIFF=false -DNO_SETCAP_OR_SUID=true -DUSE_GETTEXT=false"
4444

4545
# other builds
4646
- container: "centos:latest"

‎LICENSE‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
arping: GPL v2 or later
22
clockdiff: BSD-3
33
ping: BSD-3
4-
rdisc: AS-IS, SUN MICROSYSTEMS license
54
tracepath: GPL v2 or later
65

76
Files containing license texts are available in Documentation directory.

‎build-aux/setcap-setuid.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ _log() {
1717
case "$perm_type" in
1818
caps)
1919
params="cap_net_raw+p"
20-
[ "$2" = "rdisc" ] && params="cap_net_raw,cap_net_admin+ep"
2120
_log "calling: $setcap $params $exec_path"
2221
"$setcap" $params "$exec_path"
2322
;;

‎doc/meson.build‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ if build_ping == true
1616
manpages += ['ping']
1717
endif
1818

19-
if build_rdisc == true
20-
manpages += ['rdisc']
21-
endif
22-
2319
if build_tracepath == true
2420
manpages += ['tracepath']
2521
endif

‎doc/rdisc.xml‎

Lines changed: 0 additions & 265 deletions
This file was deleted.

‎iputils.doap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ xmlns:foaf="http://xmlns.com/foaf/0.1/">
99
<shortdesc>The iputils package is set of small utilities for
1010
Linux networking.</shortdesc>
1111
<description>The iputils package includes arping, clockdiff,
12-
ping, rdisc, tracepath.</description>
12+
ping, tracepath.</description>
1313
<bug-database rdf:resource="https://github.com/iputils/iputils/issues" />
1414
<download-page rdf:resource="https://github.com/iputils/iputils/releases" />
1515
<programming-language>C</programming-language>

‎meson.build‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ conf.set('_GNU_SOURCE', 1, description : 'Enable GNU extensions on systems that
2424
build_arping = get_option('BUILD_ARPING')
2525
build_clockdiff = get_option('BUILD_CLOCKDIFF')
2626
build_ping = get_option('BUILD_PING')
27-
build_rdisc = get_option('BUILD_RDISC')
28-
build_rdisc_server = get_option('ENABLE_RDISC_SERVER')
2927
build_tracepath = get_option('BUILD_TRACEPATH')
3028

3129
build_mans = get_option('BUILD_MANS')
@@ -48,12 +46,10 @@ endif
4846
setcap_arping = false
4947
setcap_clockdiff = false
5048
setcap_ping = false
51-
setcap_rdisc = false
5249
if (not get_option('NO_SETCAP_OR_SUID'))
5350
setcap_arping = get_option('SETCAP_OR_SUID_ARPING')
5451
setcap_clockdiff = get_option('SETCAP_OR_SUID_CLOCKDIFF')
5552
setcap_ping = get_option('SETCAP_OR_SUID_PING')
56-
setcap_rdisc = get_option('SETCAP_OR_SUID_RDISC')
5753
endif
5854

5955
# Check functions.
@@ -144,12 +140,6 @@ if host_machine.endian() == 'big'
144140
conf.set('WORDS_BIGENDIAN', '1')
145141
endif
146142

147-
if build_rdisc == true
148-
if build_rdisc_server == true
149-
conf.set('RDISC_SERVER', 1, description : 'If set build rdisc server.')
150-
endif
151-
endif
152-
153143
foreach h : [
154144
'error.h',
155145
]
@@ -214,31 +204,6 @@ if build_clockdiff == true
214204
endif
215205
endif
216206

217-
if build_rdisc == true
218-
rdisc = executable('rdisc', ['rdisc.c', git_version_h],
219-
install_dir: sbindir,
220-
link_with : [libcommon],
221-
install: true)
222-
if (setcap_rdisc)
223-
meson.add_install_script('build-aux/setcap-setuid.sh',
224-
sbindir,
225-
'rdisc',
226-
perm_type,
227-
setcap_path
228-
)
229-
endif
230-
if install_systemd_units
231-
subs = configuration_data()
232-
subs.set('sbindir', sbindir)
233-
unit_file = configure_file(
234-
input: 'systemd/rdisc.service.in',
235-
output: 'rdisc.service',
236-
configuration: subs
237-
)
238-
install_data(unit_file, install_dir: systemdunitdir)
239-
endif
240-
endif
241-
242207
if build_arping == true
243208
arping = executable('arping', ['arping.c', git_version_h],
244209
dependencies : [rt_dep, cap_dep, idn_dep, intl_dep],
@@ -271,9 +236,6 @@ output += 'clockdiff: ' + build_clockdiff.to_string()
271236
output += ' (capability or suid: ' + setcap_clockdiff.to_string() + ')\n'
272237
output += 'ping: ' + build_ping.to_string()
273238
output += ' (capability or suid: ' + setcap_ping.to_string() + ')\n'
274-
output += 'rdisc: ' + build_rdisc.to_string()
275-
output += ' (server: ' + build_rdisc_server.to_string() + ', '
276-
output += 'capability or suid: ' + setcap_rdisc.to_string() + ')\n'
277239
output += 'tracepath: ' + build_tracepath.to_string() + '\n'
278240

279241
output += '\nCONFIGURATION\n'

0 commit comments

Comments
 (0)