Unhook rtsol(8) and rtsold(8) from the build.

OK deraadt@

5 files changed, 9 insertions, 13 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 11e58c09fbf..12365312943 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.399 2014/11/17 18:19:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.400 2014/12/03 20:13:49 florian Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -55,7 +55,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
 	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 rarpd rbootd relayd \
-	ripd route6d rtadvd rtsold sasyncd sensorsd slowcgi smtpd sndiod \
+	ripd route6d rtadvd sasyncd sensorsd slowcgi smtpd sndiod \
 	snmpd spamd spamlogd sshd statd syslogd tftpd tftpproxy unbound \
 	watchdogd wsmoused xdm ypbind ypldap yppasswdd ypserv
 
diff --git a/etc/rc b/etc/rc
index 29b21ca82f8..fb1acc71b80 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.445 2014/11/30 18:06:45 dcoppa Exp $
+#	$OpenBSD: rc,v 1.446 2014/12/03 20:13:49 florian Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -491,9 +491,7 @@ start_daemon relayd dhcpd dhcrelay mrouted dvmrpd
 
 if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fw=`sysctl -n net.inet6.ip6.forwarding`
-	if [ X"${fw}" = X"0" ]; then
-		start_daemon rtsold
-	else
+	if [ X"${fw}" = X"1" ]; then
 		start_daemon route6d rtadvd
 	fi
 fi
diff --git a/etc/rc.conf b/etc/rc.conf
index 8ea12680237..cc0d6162279 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.199 2014/09/15 22:28:58 matthieu Exp $
+#	$OpenBSD: rc.conf,v 1.200 2014/12/03 20:13:49 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -38,8 +38,6 @@ rtadvd_flags=NO		# for normal use: list of interfaces
 			# be sure to set net.inet6.ip6.forwarding=1
 route6d_flags=NO	# for normal use: ""
 			# be sure to set net.inet6.ip6.forwarding=1
-rtsold_flags=NO		# for normal use: interface
-			# be sure to set net.inet6.ip6.forwarding=0
 lpd_flags=NO		# for normal use: "" (or "-l" for debugging)
 sensorsd_flags=NO	# for normal use: ""
 hotplugd_flags=NO	# for normal use: ""
diff --git a/sbin/Makefile b/sbin/Makefile
index e9ee724ae3a..1f2d0be28bc 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.102 2014/10/09 03:42:23 tedu Exp $
+#	$OpenBSD: Makefile,v 1.103 2014/12/03 20:13:49 florian Exp $
 
 SUBDIR=	atactl badsect bioctl clri dhclient \
 	disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs  \
@@ -8,7 +8,7 @@ SUBDIR=	atactl badsect bioctl clri dhclient \
 	mount_nfs mount_ntfs mount_tmpfs mount_udf \
 	mount_vnd mountd ncheck_ffs newfs newfs_ext2fs newfs_msdos \
 	nfsd nologin pdisk pfctl pflogd ping ping6 quotacheck \
-	reboot restore route rtsol savecore scan_ffs \
+	reboot restore route savecore scan_ffs \
 	scsi shutdown swapctl sysctl ttyflags tunefs \
 	umount wsconsctl
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 8b6560f6d12..c2a5e19a93d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.183 2014/10/01 09:50:29 mpi Exp $
+#	$OpenBSD: Makefile,v 1.184 2014/12/03 20:13:49 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ SUBDIR=	ac accton acpidump adduser amd apm apmd arp \
 	pcidump pkg_add portmap pppd procmap pstat pwd_mkdb \
 	quot quotaon rarpd rbootd rcctl rdate relayctl relayd repquota rip6query \
 	ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \
-	rtsold sa sasyncd sensorsd slowcgi smtpd \
+	sa sasyncd sensorsd slowcgi smtpd \
 	snmpctl snmpd spamdb syslogc syslogd sysmerge tcpdrop tcpdump \
 	tftp-proxy tftpd tokenadm tokeninit traceroute trpt \
 	unbound usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused \