Enable httpd(8) in the builds to get more testing, feedback and

improvements.  It is not "finished" but serves static files.

ok deraadt@

diff --git a/etc/Makefile b/etc/Makefile
index 872e89f..fc6c066 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.385 2014/07/22 17:05:45 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.386 2014/07/22 17:37:15 reyk Exp $
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME=     Canada/Mountain
@@ -45,14 +45,14 @@ EXAMPLES+= wsconsctl.conf
 .endif
 
 # -rw-------
-EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
-       ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf rc.local \
-       rc.securelevel rc.shutdown relayd.conf ripd.conf \
+EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf httpd.conf iked.conf \
+       ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \
+       rc.local rc.securelevel rc.shutdown relayd.conf ripd.conf \
        sasyncd.conf snmpd.conf ypldap.conf 
 
 # -r-xr-xr-x
 RCDAEMONS=     amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
-               ftpd ftpproxy hostapd hotplugd identd ifstated iked \
+               ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
                inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
                named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
                relayd ripd route6d rtadvd rtsold sasyncd sendmail \

diff --git a/etc/changelist b/etc/changelist
index ab60bd1..0c13851 100644 (file)
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#      $OpenBSD: changelist,v 1.96 2014/07/16 10:25:38 deraadt Exp $
+#      $OpenBSD: changelist,v 1.97 2014/07/22 17:37:16 reyk Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -40,6 +40,7 @@
 +/etc/hostname.*
 /etc/hosts
 /etc/hosts.lpd
++/etc/httpd.conf
 +/etc/ifstated.conf
 +/etc/iked.conf
 +/etc/inetd.conf

diff --git a/etc/rc.conf b/etc/rc.conf
index 08c0735..8f844b6 100644 (file)
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.conf,v 1.194 2014/07/21 20:39:59 naddy Exp $
+#      $OpenBSD: rc.conf,v 1.195 2014/07/22 17:37:16 reyk Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -48,6 +48,7 @@ hotplugd_flags=NO     # for normal use: ""
 watchdogd_flags=NO     # for normal use: ""
 ftpproxy_flags=NO      # for normal use: ""
 hostapd_flags=NO       # for normal use: ""
+httpd_flags=NO         # for normal use: ""
 ifstated_flags=NO      # for normal use: ""
 relayd_flags=NO                # for normal use: ""
 snmpd_flags=NO         # for normal use: ""

diff --git a/etc/rc.d/httpd b/etc/rc.d/httpd
new file mode 100644 (file)
index 0000000..406f46e
--- /dev/null
+++ b/etc/rc.d/httpd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: httpd,v 1.3 2014/07/22 17:37:16 reyk Exp $
+
+daemon="/usr/sbin/httpd"
+
+. /etc/rc.d/rc.subr
+
+pexp="httpd: parent.*"
+
+rc_cmd $1

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 06d4db7..56cbf30 100644 (file)
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,11 +1,11 @@
-#      $OpenBSD: Makefile,v 1.178 2014/07/16 20:07:03 okan Exp $
+#      $OpenBSD: Makefile,v 1.179 2014/07/22 17:37:15 reyk Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=        ac accton acpidump adduser amd apm apmd arp \
        authpf bgpctl bgpd bind chroot config cron crunchgen dev_mkdb \
        dhcpd dhcrelay dvmrpctl dvmrpd edquota eeprom fdformat \
-       ftp-proxy fw_update gpioctl hostapd hotplugd identd ifstated \
+       ftp-proxy fw_update gpioctl hostapd hotplugd httpd identd ifstated \
        ikectl inetd installboot iostat iscsictl iscsid kgmon kvm_mkdb \
        ldapd ldapctl ldomctl ldomd ldpd ldpctl lpr mailwrapper map-mbone \
        memconfig mksuncd mkuboot mopd mrinfo mrouted \