From owner-svn-src-all@freebsd.org Tue Oct 1 14:55:18 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D7961384AD; Tue, 1 Oct 2019 14:55:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46jMkt1qb0z3xck; Tue, 1 Oct 2019 14:55:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EB6C1D01F; Tue, 1 Oct 2019 14:55:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x91EtHbB040899; Tue, 1 Oct 2019 14:55:17 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x91EtHUg040894; Tue, 1 Oct 2019 14:55:17 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201910011455.x91EtHUg040894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 1 Oct 2019 14:55:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352927 - in head: release/picobsd/tinyware/simple_httpd share/mk tools/build/options usr.sbin usr.sbin/httpd X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: release/picobsd/tinyware/simple_httpd share/mk tools/build/options usr.sbin usr.sbin/httpd X-SVN-Commit-Revision: 352927 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Oct 2019 14:55:18 -0000 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