svn commit: r352927 - in head: release/picobsd/tinyware/simple_httpd share/mk tools/build/options usr.sbin usr.sbin/httpd

[Kyle Evans]

Author: kevans
Date: Tue Oct  1 14:55:16 2019
New Revision: 352927
URL: https://svnweb.freebsd.org/changeset/base/352927

Log:
  Move simple_httpd out of picobsd, add HTTPD option (default OFF)
  
  picobsd/tinyware has had this compact HTTPD server for a long time, and some
  people do use it. Move it out into usr.sbin well in advance of any action
  being taken on picobsd.
  
  This has been gated behind an HTTPD option defaulted to *off*, primarily for
  two reasons:
  1.) This code likely needs a good audit, as it's been living off in picobsd
      land for a long time, and
  2.) We don't currently ship an httpd and this may not be a welcome surprise.
  
  Reviewed by:	eugen
  Differential Revision:	https://reviews.freebsd.org/D21724

Added:
  head/tools/build/options/WITHOUT_HTTPD   (contents, props changed)
  head/tools/build/options/WITH_HTTPD   (contents, props changed)
  head/usr.sbin/httpd/
     - copied from r352926, head/release/picobsd/tinyware/simple_httpd/
Deleted:
  head/release/picobsd/tinyware/simple_httpd/
Modified:
  head/share/mk/src.opts.mk
  head/usr.sbin/Makefile
  head/usr.sbin/httpd/Makefile

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Tue Oct  1 13:36:01 2019	(r352926)
+++ head/share/mk/src.opts.mk	Tue Oct  1 14:55:16 2019	(r352927)
@@ -198,6 +198,7 @@ __DEFAULT_NO_OPTIONS = \
     EXPERIMENTAL \
     GNU_GREP_COMPAT \
     HESIOD \
+    HTTPD \
     LIBSOFT \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \

Added: head/tools/build/options/WITHOUT_HTTPD
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_HTTPD	Tue Oct  1 14:55:16 2019	(r352927)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to neither build nor install httpd

Added: head/tools/build/options/WITH_HTTPD
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_HTTPD	Tue Oct  1 14:55:16 2019	(r352927)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build and install httpd

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Tue Oct  1 13:36:01 2019	(r352926)
+++ head/usr.sbin/Makefile	Tue Oct  1 14:55:16 2019	(r352927)
@@ -138,6 +138,7 @@ SUBDIR.${MK_FMTREE}+=	fmtree
 SUBDIR.${MK_FREEBSD_UPDATE}+=	freebsd-update
 SUBDIR.${MK_GSSAPI}+=	gssd
 SUBDIR.${MK_GPIO}+=	gpioctl
+SUBDIR.${MK_HTTPD}+=	httpd
 SUBDIR.${MK_INET6}+=	ip6addrctl
 SUBDIR.${MK_INET6}+=	mld6query
 SUBDIR.${MK_INET6}+=	ndp

Modified: head/usr.sbin/httpd/Makefile
==============================================================================
--- head/release/picobsd/tinyware/simple_httpd/Makefile	Tue Oct  1 13:36:01 2019	(r352926)
+++ head/usr.sbin/httpd/Makefile	Tue Oct  1 14:55:16 2019	(r352927)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
-PROG=simple_httpd
-SRCS= 	simple_httpd.c
+PROG=	httpd
+SRCS=	simple_httpd.c
 MAN=
 WARNS?=6