git: 7ed6b6b9d1a7 - main - packages: move route(6)d to the rip package

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=7ed6b6b9d1a7085ab063c62f063938aacfb04e75

commit 7ed6b6b9d1a7085ab063c62f063938aacfb04e75
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-08-07 11:37:57 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-08-07 12:36:59 +0000

    packages: move route(6)d to the rip package
    
    These are deprecated, but in the mean time, move them to another
    package.  routed in particularly doesn't need to be in -runtime.
    
    Reviewed by:            manu
    Differential Revision:  https://reviews.freebsd.org/D51783
---
 UPDATING                         |  4 ++++
 libexec/rc/rc.d/Makefile         | 11 +++++++++--
 release/packages/ucl/rip-all.ucl |  8 ++++++++
 sbin/routed/Makefile             |  2 +-
 sbin/routed/Makefile.inc         |  2 ++
 usr.sbin/rip6query/Makefile      |  1 +
 usr.sbin/route6d/Makefile        |  1 +
 7 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/UPDATING b/UPDATING
index 1e729624f1e9..c817dbfed032 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20250807:
+	routed(8) and route6d(8) have moved to the FreeBSD-rip package.
+	If you use either of these, you should install the new package.
+
 20250806:
 	if_epair(4) now uses ether_gen_addr(9) to generate a stable MAC
 	address.
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 27d8a7526691..9cd61b96f59e 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -62,7 +62,6 @@ CONFS=	DAEMON \
 	rarpd \
 	rctl \
 	root \
-	route6d \
 	routing \
 	rpcbind \
 	rtadvd \
@@ -355,8 +354,16 @@ PPP=		ppp
 PPPPACKAGE=	ppp
 .endif
 
+.if ${MK_INET6} != "no" || ${MK_ROUTED} != "no"
+CONFGROUPS+=	RIP
+RIPPACKAGE=	rip
+
+.if ${MK_INET6} != "no"
+RIP+=		route6d
+.endif
 .if ${MK_ROUTED} != "no"
-CONFS+=		routed
+RIP+=		routed
+.endif
 .endif
 
 .if ${MK_SENDMAIL} != "no"
diff --git a/release/packages/ucl/rip-all.ucl b/release/packages/ucl/rip-all.ucl
new file mode 100644
index 000000000000..c0d774132b90
--- /dev/null
+++ b/release/packages/ucl/rip-all.ucl
@@ -0,0 +1,8 @@
+comment = "RIP routing protocol"
+desc = <<EOD
+routed(8) and route6d(8) allow the host to participate in a RIP (IPv4) or
+RIPng (IPv6) routing domain, exchanging routing information with other RIP
+routers.
+
+RIP support is deprecated and will be removed in FreeBSD 16.0.
+EOD
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 643f790049ac..b88bf17efffc 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` for FreeBSD
 
-PACKAGE=runtime
+PACKAGE=rip
 PROG=	routed
 MAN=	routed.8
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
index 01b5f23410c8..e09337e43724 100644
--- a/sbin/routed/Makefile.inc
+++ b/sbin/routed/Makefile.inc
@@ -1 +1,3 @@
+PACKAGE=	rip
+
 .include "../Makefile.inc"
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index e12637e1e1e4..7b268f6198d4 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=rip
 PROG=	rip6query
 MAN=	rip6query.8
 
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 059d329f5f09..d2a7151249f1 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=rip
 PROG=	route6d
 MAN=	route6d.8