From 2a48ab0f8089bce02103f412e8a7a3780f980830 Mon Sep 17 00:00:00 2001
From: florian <>
Date: Wed, 3 Dec 2014 20:13:49 +0000
Subject: [PATCH] Unhook rtsol(8) and rtsold(8) from the build. OK deraadt@

---
 src/etc/Makefile | 4 ++--
 src/etc/rc       | 6 ++----
 src/etc/rc.conf  | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 11e58c09..12365312 100644
--- a/src/etc/Makefile
+++ b/src/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/src/etc/rc b/src/etc/rc
index 29b21ca8..fb1acc71 100644
--- a/src/etc/rc
+++ b/src/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/src/etc/rc.conf b/src/etc/rc.conf
index 8ea12680..cc0d6162 100644
--- a/src/etc/rc.conf
+++ b/src/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: ""