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
This commit is contained in:
Kyle Evans 2019-10-01 14:55:16 +00:00
parent 935dbbeb8b
commit 2d0a92c9ab
7 changed files with 8 additions and 2 deletions

View File

@ -198,6 +198,7 @@ __DEFAULT_NO_OPTIONS = \
EXPERIMENTAL \ EXPERIMENTAL \
GNU_GREP_COMPAT \ GNU_GREP_COMPAT \
HESIOD \ HESIOD \
HTTPD \
LIBSOFT \ LIBSOFT \
LOADER_FIREWIRE \ LOADER_FIREWIRE \
LOADER_FORCE_LE \ LOADER_FORCE_LE \

View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to neither build nor install httpd

View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to build and install httpd

View File

@ -138,6 +138,7 @@ SUBDIR.${MK_FMTREE}+= fmtree
SUBDIR.${MK_FREEBSD_UPDATE}+= freebsd-update SUBDIR.${MK_FREEBSD_UPDATE}+= freebsd-update
SUBDIR.${MK_GSSAPI}+= gssd SUBDIR.${MK_GSSAPI}+= gssd
SUBDIR.${MK_GPIO}+= gpioctl SUBDIR.${MK_GPIO}+= gpioctl
SUBDIR.${MK_HTTPD}+= httpd
SUBDIR.${MK_INET6}+= ip6addrctl SUBDIR.${MK_INET6}+= ip6addrctl
SUBDIR.${MK_INET6}+= mld6query SUBDIR.${MK_INET6}+= mld6query
SUBDIR.${MK_INET6}+= ndp SUBDIR.${MK_INET6}+= ndp

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
# #
PROG=simple_httpd PROG= httpd
SRCS= simple_httpd.c SRCS= simple_httpd.c
MAN= MAN=
WARNS?=6 WARNS?=6