diff options
| author | Lexi Winter <lexi@hemlock.eden.le-fay.org> | 2025-04-09 16:50:21 +0100 |
|---|---|---|
| committer | Lexi Winter <lexi@hemlock.eden.le-fay.org> | 2025-04-09 17:02:34 +0100 |
| commit | 0e36a9badd5e47aa85b79aaa1178e40b98b1707e (patch) | |
| tree | c9753d75daac7dba2d863d23f39b0d04c29e2527 | |
| parent | f132e8b4c7d918ffb97f9c1f0c26b928874bfd59 (diff) | |
packages: add a new iputils package for ping and traceroutelf/dev/iputils
this moves them out of runtime, where they definitely don't belong.
since both ping and traceroute are setuid, there is a (minor) security
benefit to putting them in their own package so minimal systems don't
need to install them.
since rc.d/netwait requires ping, make rc depend on iputils for now.
| -rw-r--r-- | release/packages/Makefile.package | 3 | ||||
| -rwxr-xr-x | release/packages/generate-ucl.sh | 4 | ||||
| -rw-r--r-- | sbin/ping/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/traceroute/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/traceroute6/Makefile | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index b8b200d0966e..08e0bd94c45a 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -91,6 +91,9 @@ hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities inetd_COMMENT= Internet super-server inetd_DESC= Internet super-server +iputils_COMMENT= IP utilities +iputils_DESC= Contains non-essential IP utilities: ping, ping6, \ +traceroute and traceroute6. jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 72db4a3180b8..7be6ecf64a5d 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -43,6 +43,10 @@ main() { periodic) pkgdeps="cron" ;; + rc) + # because rc.d/netwait requires ping + pkgdeps="iputils" + ;; # -dev packages that have no corresponding non-dev package # as a dependency. diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index b4e3f115b245..f6bcc0c11974 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -1,6 +1,6 @@ .include <src.opts.mk> -PACKAGE=runtime +PACKAGE=iputils PROG= ping SRCS= main.c MAN= ping.8 diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 62d82a47d953..74578571bbcf 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,6 +1,6 @@ .include <src.opts.mk> -PACKAGE= runtime +PACKAGE= iputils PROG= traceroute MAN= traceroute.8 SRCS= as.c traceroute.c ifaddrlist.c findsaddr-udp.c diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile index d2b84296fe97..422cf000783b 100644 --- a/usr.sbin/traceroute6/Makefile +++ b/usr.sbin/traceroute6/Makefile @@ -17,7 +17,7 @@ TRACEROUTE_DISTDIR?= ${SRCTOP}/usr.sbin/traceroute .PATH: ${TRACEROUTE_DISTDIR} -PACKAGE= runtime +PACKAGE= iputils PROG= traceroute6 MAN= traceroute6.8 SRCS= as.c traceroute6.c |