From nobody Mon Jan 09 10:40:41 2023 X-Original-To: dev-commits-ports-main@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 4Nr9T61jfHz2pRN9; Mon, 9 Jan 2023 10:40:42 +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 4Nr9T61GHjz3M84; Mon, 9 Jan 2023 10:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673260842; 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=MrgzxwHwB0G1Dh32vRVm6nvmaYpD4OFJMvqwKi9P7GQ=; b=PEYH+UxVngtOmLIdqSSoo+s4gomVvTCdkYaIr36SgzbL+UIy5Od9u9a1MVr/3Fnluntdlh Yl674WnOseAOUl4JhqJ2nZkAliN2Qe4Rf33XqtPeZRY+6sgmWNIYyi9v+xL2FcsgMCQzGY lJC13kKyCvum5bQq8jbeY/AQIGRi0IoFsh+YTvGpLO5cC5Y9BJUTSV+Zw5DudUY9S0bL3e WDE6eZ4R3CHqrt0eTgv74qKAEB6rzQMuWpttZzpE6n8UX7IN8rJlm1JXthaAEMBGGEQt9G QbKrhDk/0usmKHmv8KrVOSMMl0Q50LdZrLXsl/yOgaN5KE0lNkzxYtzM92yKdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673260842; 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=MrgzxwHwB0G1Dh32vRVm6nvmaYpD4OFJMvqwKi9P7GQ=; b=bizKkWfwjKYVGsh3ByTUTyshOvzD6MRJCDFx+qEPy6wwggYOQsvaOF9Nljb80+1VwSOpO1 ocrox5X/m3RhagEecg7Kymk+e8G2tpJNkZZxcjj6aM9Zq6hWPRrcvjHHn48UKfVDCJ2R03 Q+LgvML/G+dS4OkcXLPxcvEZYbedipFNexHS8efOq4sMixjXnwSkY5NqxfccYJH9PzpBJb X3uyEEpXTjeg2hZC3yVBPzvK2A6KKt/WGHQs9QqcMHbBNEtZEOpfOE4MK3zyjeGuhEA7o/ 2PIW6sDYhvcKpQA7E9hUg48VNvvrOEeNyKw9leiiYjuoBhZuR6HYxm+PkfK+hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673260842; a=rsa-sha256; cv=none; b=VGOwR7Mi4CkgUa4pCwLd4d70gQz61plvZC99zNzKwINKw3TCmRaCaihUn1rEI/t8Qcnjnw 2dJXQddKgttxjilH3jL2DyFkv1kUgeep1TdOUnQACa60iimcGpglMb6uN7sZazdWySjJS4 fjMxq71dLI+jry5sBmsNrhfnzp/aeK8+557krhitKRVLUgMap3ORvBRw2tdal2jAEbjyXe PgsocNcFvImmG2Ys7CHVm6SjC9c8OqjulJYpD4bahqBmqMlYPZMrMZoH4HCEcdMIJ5Ev85 R9RV+P4DN81wUff1u+nPd4bR6NA/VkOwUJD2b0amQguHh5pGRbMvtL1xdAZIug== 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 4Nr9T601KNzQ4R; Mon, 9 Jan 2023 10:40:42 +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 309Aef21061329; Mon, 9 Jan 2023 10:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 309AefPJ061328; Mon, 9 Jan 2023 10:40:41 GMT (envelope-from git) Date: Mon, 9 Jan 2023 10:40:41 GMT Message-Id: <202301091040.309AefPJ061328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: 16d2120cda74 - main - devel/fossil: add support for --errorlog and document RC variables List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16d2120cda74e4f87c236be43384aa5949a40e94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=16d2120cda74e4f87c236be43384aa5949a40e94 commit 16d2120cda74e4f87c236be43384aa5949a40e94 Author: Pietro Cerutti AuthorDate: 2023-01-09 10:39:07 +0000 Commit: Pietro Cerutti CommitDate: 2023-01-09 10:40:21 +0000 devel/fossil: add support for --errorlog and document RC variables Reported by: Will Senn --- devel/fossil/Makefile | 2 +- devel/fossil/files/fossil.in | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index dfc64c3603b7..088eae8d682b 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,7 +1,7 @@ PORTNAME= fossil PORTVERSION= 2.20 DISTVERSIONPREFIX= src- -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= https://fossil-scm.org/home/tarball/version-${PORTVERSION}/ diff --git a/devel/fossil/files/fossil.in b/devel/fossil/files/fossil.in index 317bf2fcdc86..aa77458e1d3b 100644 --- a/devel/fossil/files/fossil.in +++ b/devel/fossil/files/fossil.in @@ -11,15 +11,21 @@ # fossil_enable="YES" # # You can fine tune others variables too: -# fossil_port="8080" -# fossil_directory="/nonexistent" -# fossil_baseurl="" -# fossil_proto="http" -# fossil_listenall="" -# fossil_https="" # force the HTTPS CGI parameter to "on" -# fossil_files="" # comma separated globing patterns of files to serve -# fossil_notfound="" # URI to redirect to in case of 404 -# Use fossil_user to run fossil as user +# +# variable default description +# ============================================= +# fossil_port 8080 TCP port to listen to +# fossil_directory /nonexistent directory to serve +# fossil_repolist "" if non-empty, fossil will list the repositories in the fossil_directory when visiting / +# fossil_baseurl "" the server URL, for reverse proxies +# fossil_proto http spawn an http or scgi server +# fossil_listenall "" if empty, only listen on 127.0.0.1 +# fossil_https "" if non-empty, force the HTTPS CGI parameter to "on" +# fossil_files "" if non-empty, comma separated glob patterns of files to serve +# fossil_notfound "" if non-empty, URI to redirect to in case of 404 +# fossil_errorlog "" if non-empty, path to log file for errors +# fossil_user nobody user to run fossil as + . /etc/rc.subr @@ -59,6 +65,7 @@ esac [ -n "${fossil_files}" ] && fossil_args="${fossil_args} --files '${fossil_files}'" [ -n "${fossil_notfound}" ] && fossil_args="${fossil_args} --notfound \"${fossil_notfound}\"" [ -n "${fossil_repolist}" ] && fossil_args="${fossil_args} --repolist" +[ -n "${fossil_errorlog}" ] && fossil_args="${fossil_args} --errorlog \"${fossil_errorlog}\"" command_args="-S -T ${name} -p ${pidfile} ${procname} server -P ${fossil_port} ${fossil_args} ${fossil_directory}"