From d4185b3522a70b12193c88f4bcbe465ca0fa96b5 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Fri, 24 Jan 2020 06:17:38 +0000
Subject: [PATCH] retire rebound etc bits to the attic

---
 src/etc/Makefile      | 4 ++--
 src/etc/group         | 1 -
 src/etc/mail/aliases  | 3 +--
 src/etc/master.passwd | 1 -
 src/etc/rc            | 4 ++--
 src/etc/rc.conf       | 3 +--
 src/etc/rc.d/rebound  | 9 ---------
 7 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 src/etc/rc.d/rebound

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 9f3eee5d..75c06377 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.476 2019/12/21 21:40:00 espie Exp $
+#	$OpenBSD: Makefile,v 1.477 2020/01/24 06:17:37 tedu Exp $
 
 .include <bsd.own.mk>
 
@@ -61,7 +61,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
 	eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \
 	iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
 	lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
-	pflogd portmap rad radiusd rarpd rbootd rebound relayd ripd route6d \
+	pflogd portmap rad radiusd rarpd rbootd relayd ripd route6d \
 	sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
 	spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
 	unwind vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
diff --git a/src/etc/group b/src/etc/group
index 70d05bbe..cd9ca943 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -25,7 +25,6 @@ _unwind:*:48:
 _switchd:*:49:
 _traceroute:*:50:
 _ping:*:51:
-_rebound:*:52:
 _unbound:*:53:
 _dpb:*:54:
 _pbuild:*:55:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 09fb6cf5..bc2283c0 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.67 2019/01/26 10:58:05 florian Exp $
+#	$OpenBSD: aliases,v 1.68 2020/01/24 06:17:37 tedu Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -52,7 +52,6 @@ _rad: /dev/null
 _radiusd: /dev/null
 _rbootd: /dev/null
 _relayd: /dev/null
-_rebound: /dev/null
 _ripd: /dev/null
 _rstatd: /dev/null
 _rusersd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 9e4e3275..c445ccb5 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -14,7 +14,6 @@ _unwind:*:48:48::0:0:Unwind Daemon:/var/empty:/sbin/nologin
 _switchd:*:49:49::0:0:Switch Daemon:/var/empty:/sbin/nologin
 _traceroute:*:50:50::0:0:traceroute privdrop user:/var/empty:/sbin/nologin
 _ping:*:51:51::0:0:ping privdrop user:/var/empty:/sbin/nologin
-_rebound:*:52:52::0:0:Rebound DNS Daemon:/var/empty:/sbin/nologin
 _unbound:*:53:53:unbound:0:0:Unbound Daemon:/var/unbound:/sbin/nologin
 _dpb:*:54:54::0:0:dpb privsep:/var/empty:/sbin/nologin
 _pbuild:*:55:55:pbuild:0:0:dpb build user:/nonexistent:/sbin/nologin
diff --git a/src/etc/rc b/src/etc/rc
index 73303379..44d67f34 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.542 2019/11/11 04:55:37 deraadt Exp $
+#	$OpenBSD: rc,v 1.543 2020/01/24 06:17:37 tedu Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -476,7 +476,7 @@ dmesg >/var/run/dmesg.boot
 make_keys
 
 echo -n 'starting early daemons:'
-start_daemon syslogd ldattach pflogd nsd rebound unbound ntpd
+start_daemon syslogd ldattach pflogd nsd unbound ntpd
 start_daemon iscsid isakmpd iked sasyncd ldapd npppd
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index a513b757..65097401 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.219 2019/01/26 10:59:07 florian Exp $
+#	$OpenBSD: rc.conf,v 1.220 2020/01/24 06:17:37 tedu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -51,7 +51,6 @@ radiusd_flags=NO
 rarpd_flags=NO
 rbootd_flags=NO
 relayd_flags=NO
-rebound_flags=NO
 ripd_flags=NO
 route6d_flags=NO	# be sure to set net.inet6.ip6.forwarding=1
 sasyncd_flags=NO
diff --git a/src/etc/rc.d/rebound b/src/etc/rc.d/rebound
deleted file mode 100644
index 9ec5ee0b..00000000
--- a/src/etc/rc.d/rebound
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/ksh
-#
-# $OpenBSD: rebound,v 1.2 2018/01/11 19:52:12 rpe Exp $
-
-daemon="/usr/sbin/rebound"
-
-. /etc/rc.d/rc.subr
-
-rc_cmd $1