From 61c4b96090e31c42f593d03ea263ce2f5e54ce87 Mon Sep 17 00:00:00 2001
From: robert <>
Date: Tue, 26 Aug 2014 19:33:48 +0000
Subject: [PATCH] usr.sbin

---
 src/etc/Makefile          |  5 ++---
 src/etc/changelist        |  4 +---
 src/etc/mtree/4.4BSD.dist |  4 +---
 src/etc/newsyslog.conf    |  4 +---
 src/etc/rc                |  4 ++--
 src/etc/rc.conf           |  4 +---
 src/etc/rc.d/nginx        | 19 -------------------
 7 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 src/etc/rc.d/nginx

diff --git a/src/etc/Makefile b/src/etc/Makefile
index bd606f72..c2fee1ca 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.389 2014/08/22 19:19:25 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.390 2014/08/26 19:33:48 robert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -54,7 +54,7 @@ EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
 RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
 		ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
 		inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
-		nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
+		nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
 		relayd ripd route6d rtadvd rtsold sasyncd sendmail \
 		sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
 		wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \
@@ -204,7 +204,6 @@ distribution-etc-root-var: distrib-dirs
 	cd ../usr.bin/mail && exec ${MAKE} distribution
 	cd ../usr.sbin/sliplogin && exec ${MAKE} distribution
 	cd ../usr.sbin/ldapd && exec ${MAKE} distribution
-	cd ../usr.sbin/nginx && exec ${MAKE} -f Makefile.bsd-wrapper distribution
 	cd ../usr.sbin/npppd && exec ${MAKE} distribution
 	cd mail && exec ${MAKE} distribution
 	${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
diff --git a/src/etc/changelist b/src/etc/changelist
index 186f6780..6516d074 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.99 2014/08/22 19:19:25 deraadt Exp $
+#	$OpenBSD: changelist,v 1.100 2014/08/26 19:33:48 robert Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -89,8 +89,6 @@
 /etc/netstart
 /etc/networks
 /etc/newsyslog.conf
-/etc/nginx/mime.types
-/etc/nginx/nginx.conf
 /etc/npppd/npppd.conf
 +/etc/npppd/npppd-users
 /etc/ntpd.conf
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 1d8943ad..d7cf5555 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.262 2014/08/22 19:19:25 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.263 2014/08/26 19:33:48 robert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -84,8 +84,6 @@ etc
     ..
     mtree
     ..
-    nginx
-    ..
     npppd
     ..
     ppp
diff --git a/src/etc/newsyslog.conf b/src/etc/newsyslog.conf
index 78d5633a..cfa6dad3 100644
--- a/src/etc/newsyslog.conf
+++ b/src/etc/newsyslog.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: newsyslog.conf,v 1.31 2014/03/21 13:22:09 ajacoutot Exp $
+#	$OpenBSD: newsyslog.conf,v 1.32 2014/08/26 19:33:48 robert Exp $
 #
 # configuration file for newsyslog
 #
@@ -14,5 +14,3 @@
 /var/log/wtmp				644  7     *    $W6D4 B
 /var/log/xferlog			640  7     250  *     Z
 /var/log/pflog				600  3     250  *     ZB "pkill -HUP -u root -U root -t - -x pflogd"
-/var/www/logs/access.log		644  4     *    $W0   Z /var/run/nginx.pid SIGUSR1
-/var/www/logs/error.log			644  7     250  *     Z /var/run/nginx.pid SIGUSR1
diff --git a/src/etc/rc b/src/etc/rc
index 2f23913c..8955d7c7 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.440 2014/08/22 19:19:25 deraadt Exp $
+#	$OpenBSD: rc,v 1.441 2014/08/26 19:33:48 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -498,7 +498,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fi
 fi
 
-start_daemon hostapd lpd sendmail smtpd slowcgi nginx httpd ftpd
+start_daemon hostapd lpd sendmail smtpd slowcgi httpd ftpd
 start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd
 start_daemon rbootd mopd spamd spamlogd sndiod
 echo '.'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 294196de..8a3806da 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.196 2014/08/22 19:19:25 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.197 2014/08/26 19:33:48 robert Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -66,8 +66,6 @@ identd_flags=NO		# for normal use: "-e"
 cron_flags=		# for normal use: ""
 iscsid_flags=NO		# for normal use: ""
 
-# use -u to disable chroot, see nginx(8)
-nginx_flags=NO		# for normal use: ""
 slowcgi_flags=NO	# for normal use: ""
 
 # For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
diff --git a/src/etc/rc.d/nginx b/src/etc/rc.d/nginx
deleted file mode 100644
index bfb775e3..00000000
--- a/src/etc/rc.d/nginx
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: nginx,v 1.1 2012/02/19 11:34:36 robert Exp $
-
-daemon="/usr/sbin/nginx"
-
-. /etc/rc.d/rc.subr
-
-pexp="nginx:.*master.*process"
-
-rc_reload() {
-	${daemon} -s reload
-}
-
-rc_stop() {
-	${daemon} -s stop || pkill -f "^${pexp}"
-}
-
-rc_cmd $1