Skip to content

Commit 8f0d897

Browse files
pevikpevik
committed
Remove ninfod
ninfod implements responses to IPv6 Node Information Queries (RFC4620) from clients. RFC4620 is an obsolete experimental protocol that hasn't seen any activity since 2006. It's pretty dead at this point. Fixes: #363 Suggested-by: Noah Meyerhans <[email protected]> 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 1d1e7c4 commit 8f0d897

21 files changed

+2
-3233
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 -DNINFOD_MESSAGES=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 -DENABLE_RDISC_SERVER=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,6 +1,5 @@
11
arping: GPL v2 or later
22
clockdiff: BSD-3
3-
ninfod: BSD-3
43
ping: BSD-3
54
rarp: GPL v2 or later
65
rdisc: AS-IS, SUN MICROSYSTEMS license

‎doc/meson.build‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ if build_tracepath == true
2828
manpages += ['tracepath']
2929
endif
3030

31-
if build_ninfod == true
32-
manpages += ['ninfod']
33-
endif
34-
3531
xsltproc = find_program('xsltproc', required : build_mans or build_html_mans)
3632
xsltproc_args = [
3733
'--nonet',

‎doc/ninfod.xml‎

Lines changed: 0 additions & 168 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-
ninfod, ping, rarpd, rdisc, tracepath.
12+
ping, rarpd, rdisc, tracepath.
1313
The rarpd is not built by default, this utility is obsoleted by
1414
bootp and later dhcp protocols.</description>
1515
<bug-database rdf:resource="https://github.com/iputils/iputils/issues" />

‎meson.build‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ conf.set('_GNU_SOURCE', 1, description : 'Enable GNU extensions on systems that
2323

2424
build_arping = get_option('BUILD_ARPING')
2525
build_clockdiff = get_option('BUILD_CLOCKDIFF')
26-
build_ninfod = get_option('BUILD_NINFOD')
27-
nifold_messages = get_option('NINFOD_MESSAGES')
2826
build_ping = get_option('BUILD_PING')
2927
build_rarpd = get_option('BUILD_RARPD')
3028
build_rdisc = get_option('BUILD_RDISC')
@@ -153,52 +151,6 @@ if build_rdisc == true
153151
endif
154152
endif
155153

156-
if build_ninfod == true
157-
foreach h : [
158-
'inttypes.h',
159-
'limits.h',
160-
'linux/rtnetlink.h',
161-
'memory.h',
162-
'netdb.h',
163-
'netinet/icmp6.h',
164-
'netinet/in.h',
165-
'netinet/ip6.h',
166-
'pwd.h',
167-
'stdint.h',
168-
'stdlib.h',
169-
'string.h',
170-
'strings.h',
171-
'sys/capability.h',
172-
'syslog.h',
173-
'sys/time.h',
174-
'sys/types.h',
175-
'sys/uio.h',
176-
'sys/utsname.h',
177-
'unistd.h',
178-
]
179-
if cc.has_header(h)
180-
conf.set('HAVE_' + h.to_upper().underscorify(), 1,
181-
description : 'Define if ' + h + ' can be included.')
182-
endif
183-
endforeach
184-
if cc.has_header('stdio.h') and cc.has_header('stdlib.h') and cc.has_header('stddef.h') and cc.has_header('stdarg.h')
185-
conf.set('STDC_HEADERS', 1,
186-
description : 'Define to 1 if you have the ANSI C header files.')
187-
endif
188-
threads = dependency('threads')
189-
if threads.found()
190-
conf.set('ENABLE_THREADS', 1,
191-
description : 'Defined if libpthread is found.')
192-
endif
193-
if host_machine.endian() == 'big'
194-
conf.set('WORDS_BIGENDIAN', 1,
195-
description : 'Defined if processor stores words with the most significant byte first.')
196-
endif
197-
if nifold_messages == true
198-
conf.set('ENABLE_DEBUG', 1, description : 'Enable ninfod syslog messages.')
199-
endif
200-
endif
201-
202154
foreach h : [
203155
'error.h',
204156
]
@@ -320,10 +272,6 @@ if build_rarpd == true
320272
endif
321273
endif
322274

323-
if build_ninfod == true
324-
subdir ('ninfod')
325-
endif
326-
327275
if build_mans == true or build_html_mans == true
328276
subdir ('doc')
329277
endif
@@ -339,8 +287,6 @@ output += 'arping: ' + build_arping.to_string()
339287
output += ' (capability or suid: ' + setcap_arping.to_string() + ')\n'
340288
output += 'clockdiff: ' + build_clockdiff.to_string()
341289
output += ' (capability or suid: ' + setcap_clockdiff.to_string() + ')\n'
342-
output += 'ninfod: ' + build_ninfod.to_string()
343-
output += ' (syslog: ' + nifold_messages.to_string() + ')\n'
344290
output += 'ping: ' + build_ping.to_string()
345291
output += ' (capability or suid: ' + setcap_ping.to_string() + ')\n'
346292
output += 'rarpd: ' + build_rarpd.to_string() + '\n'

‎meson_options.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ option('ENABLE_RDISC_SERVER', type : 'boolean', value : true,
2727
option('BUILD_TRACEPATH', type : 'boolean', value : true,
2828
description : 'Build tracepath')
2929

30-
option('BUILD_NINFOD', type : 'boolean', value : true,
31-
description : 'Build ninfod')
32-
33-
option('NINFOD_MESSAGES', type : 'boolean', value : true,
34-
description : 'Enable ninfod syslog messages')
35-
3630
option('BUILD_MANS', type : 'boolean', value : true,
3731
description : 'Build manuals')
3832

‎ninfod/COPYING‎

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

‎ninfod/icmp6_nodeinfo.h‎

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

0 commit comments

Comments
 (0)