From nobody Thu Oct 6 16:09:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MjxG33X4Yz4dvH0; Thu, 6 Oct 2022 16:09:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MjxG331dzz3SLf; Thu, 6 Oct 2022 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665072555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2e8Ub3cR724SQJz4ecFegdesshz/YEyMuD7KVmRaFM=; b=KSY0cD7+16FId8kiqbcI0h/+FK8G9nm6oHZQUdK+zIjJR4MNQZfTCNx3jsypxID1gL9aQg jQGcMrrkMviNljTWR9pCK4MBSTY20RQrOUvqMspeW1j4He+3isvq5j6S2XN4aOUeLGTVfQ +5d6gXE7/95T6BvcpzlYFp0WEHpb63/CimdTtw9xUUmdW3RORsXaAkS5e1jUlqDf5oLz1/ ZKRYmCnZwWe6mvoEVXz8T7KpfMbB0RZJiczoOm2teiK3SYvlf8uh6rULOyY5wL1e0OREOt vNFSSy3QtgDzRTKUSgzTRKGqkEAz1jKmZIzafktrH9KsmhLd5tQSjpSGuBbm2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MjxG3252SzJM1; Thu, 6 Oct 2022 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 296G9FBg006426; Thu, 6 Oct 2022 16:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296G9F7d006425; Thu, 6 Oct 2022 16:09:15 GMT (envelope-from git) Date: Thu, 6 Oct 2022 16:09:15 GMT Message-Id: <202210061609.296G9F7d006425@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 9884951c508e - main - www/darkhttpd: add rc script List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9884951c508e52eefb91fac9ea35375a267dcf3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665072555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2e8Ub3cR724SQJz4ecFegdesshz/YEyMuD7KVmRaFM=; b=VEpQpPGf33PsJmNDsVNoU+xBHlfCFH0Mnv5WcpXVME1g0+uv3gUztFdrkMUrcCkhOCzKx4 ch1kWRWiUp5eMU2EK58CZpVACU4l6T7EXPbEpcHUJGIYSL99Xst27XAhr9Zy4i1fz0gyxU 9DeMlXnLP7RWh274zFShm0OsNatoiNbnYvjMyFdDFWNyn7Be8HNkFDuO1QvmnQJQc2ARMH Ujzb54D9PGSYOMxDWqRZ4EA3U1g313e99pjxrXTSaxq1MoVkbB0LVl2cFoBSTsnYCaKQhV wYuF6UwMOSfD4bFgAztbI57ZQLTYR9Lhsvz5zJXZdQrHoxO9R5gchTlc6zpppg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665072555; a=rsa-sha256; cv=none; b=g/3W2bdMqIFuHd8pokNyx2PrfA1RPC2qRI5soQ65qGCyURYWJ4YEAh5J3wlRg5YOC8m/ob ncE5NLZsBAGPC7xqQ/ZbCxN5LXJZWszMXzJO7EnhXhGqrJCaYQQcmDJhstE0pIQUounZb6 sK/kxLJwx9tUE/oW6rJVjHZCdsJ+GI2VZVdFj0WT0zNVJdAtqtbb3F7DiGV5x5Um0lJwcR upN9tmfMnI9zgGk3j5H52zhH7VeBwxylOjGolaw5jKWlL25agybyBLI1N3pJSCIulZXazd r/bo2ltJYjqNPnoAmBuTL4Zgkinh1nJqE355ka9Ri7aPdllprwuTldccqDVSkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=9884951c508e52eefb91fac9ea35375a267dcf3e commit 9884951c508e52eefb91fac9ea35375a267dcf3e Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2022-10-06 06:07:08 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-06 16:05:41 +0000 www/darkhttpd: add rc script PR: 266239 Reported by: DtxdF@disroot.org Approved by: henrichartzer@tuta.io (maintainer, timeout > 1 month) --- GIDs | 2 +- UIDs | 2 +- www/darkhttpd/Makefile | 15 ++++++++++++++- www/darkhttpd/files/darkhttpd.in | 31 +++++++++++++++++++++++++++++++ www/darkhttpd/pkg-plist | 3 +++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/GIDs b/GIDs index 743b8d57e5e9..4c31b24ae02b 100644 --- a/GIDs +++ b/GIDs @@ -629,7 +629,7 @@ riak:*:667: # free: 685 # free: 686 # free: 687 -# free: 688 +darkhttpd:*:688: # free: 689 # free: 690 # free: 691 diff --git a/UIDs b/UIDs index 1fa5eb54fad1..37aa3204edcd 100644 --- a/UIDs +++ b/UIDs @@ -634,7 +634,7 @@ stanchion:*:669:667::0:0:Stanchion user:/usr/local/lib/stanchion:/bin/sh # free: 685 # free: 686 # free: 687 -# free: 688 +darkhttpd:*:688:688::0:0:Simple, static web server:/nonexistent:/usr/sbin/nologin # free: 689 # free: 690 # free: 691 diff --git a/www/darkhttpd/Makefile b/www/darkhttpd/Makefile index f190671eeb20..06b933fec0e4 100644 --- a/www/darkhttpd/Makefile +++ b/www/darkhttpd/Makefile @@ -1,6 +1,7 @@ PORTNAME= darkhttpd DISTVERSIONPREFIX= v DISTVERSION= 1.13 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= henrichartzer@tuta.io @@ -13,12 +14,24 @@ USES= cpe CPE_VENDOR= darkhttpd_project +USE_RC_SUBR= darkhttpd USE_GITHUB= yes GH_ACCOUNT= emikulic -PLIST_FILES= bin/darkhttpd +USERS= darkhttpd +GROUPS= darkhttpd + +SUB_LIST= USER=${USERS:[1]} \ + GROUP=${GROUPS:[1]} + +PLIST_SUB= USER=${USERS:[1]} \ + GROUP=${GROUPS:[1]} do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${LOCALBASE}/bin +post-install: + ${INSTALL} -d ${STAGEDIR}${WWWDIR} + ${INSTALL} -d ${STAGEDIR}/var/run/darkhttpd + .include diff --git a/www/darkhttpd/files/darkhttpd.in b/www/darkhttpd/files/darkhttpd.in new file mode 100644 index 000000000000..43b7e3d23fb0 --- /dev/null +++ b/www/darkhttpd/files/darkhttpd.in @@ -0,0 +1,31 @@ +#!/bin/sh + +# PROVIDE: darkhttpd +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Configuration settings for darkhttpd in /etc/rc.conf +# +# darkhttpd_enable (bool): Enable darkhttpd. (default=NO) +# darkhttpd_dir (str): WWW root directory. (default=%%WWWDIR%%) +# darkhttpd_flags (str): Flags used for darkhttpd. (default=--uid %%USER%% --gid %%GROUP%%) +# + +. /etc/rc.subr + +name="darkhttpd" +rcvar="${name}_enable" + +load_rc_config $name + +: ${darkhttpd_enable:="NO"} +: ${darkhttpd_dir:=%%WWWDIR%%} +: ${darkhttpd_flags=--uid %%USER%% --gid %%GROUP%%} + +darkhttpd_flags="${darkhttpd_dir} ${darkhttpd_flags}" + +command="%%LOCALBASE%%/bin/darkhttpd" +pidfile="/var/run/darkhttpd/darkhttpd.pid" +command_args="--daemon --pidfile ${pidfile}" + +run_rc_command "$1" diff --git a/www/darkhttpd/pkg-plist b/www/darkhttpd/pkg-plist new file mode 100644 index 000000000000..b4cfa3a1eb4b --- /dev/null +++ b/www/darkhttpd/pkg-plist @@ -0,0 +1,3 @@ +bin/darkhttpd +@dir %%WWWDIR%% +@dir(%%USER%%,%%GROUP%%,755) /var/run/darkhttpd