From owner-svn-ports-head@freebsd.org Fri Jun 22 08:06:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93BD1101253F; Fri, 22 Jun 2018 08:06:06 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45FB7838F8; Fri, 22 Jun 2018 08:06:06 +0000 (UTC) (envelope-from gahr@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 0CE651E023; Fri, 22 Jun 2018 08:06:06 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5M865gm091092; Fri, 22 Jun 2018 08:06:05 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5M865HB091091; Fri, 22 Jun 2018 08:06:05 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201806220806.w5M865HB091091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Fri, 22 Jun 2018 08:06:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473020 - in head/devel/fossil: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/devel/fossil: . files X-SVN-Commit-Revision: 473020 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2018 08:06:06 -0000 Author: gahr Date: Fri Jun 22 08:06:05 2018 New Revision: 473020 URL: https://svnweb.freebsd.org/changeset/ports/473020 Log: devel/fossil: add fossil_https rc.conf setting When the rc.conf fossil_https is set to a non-empty string, the --https parameter is added to the fossil serve command line to force HTTPS communication. PR: 229200 Submitted by: Oleh Hushchenkov Modified: head/devel/fossil/Makefile head/devel/fossil/files/fossil.in Modified: head/devel/fossil/Makefile ============================================================================== --- head/devel/fossil/Makefile Fri Jun 22 08:04:38 2018 (r473019) +++ head/devel/fossil/Makefile Fri Jun 22 08:06:05 2018 (r473020) @@ -2,8 +2,8 @@ PORTNAME= fossil PORTVERSION= 2.6 -PORTREVISION= 0 DISTVERSIONPREFIX= src- +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= http://fossil-scm.org/index.html/uv/ Modified: head/devel/fossil/files/fossil.in ============================================================================== --- head/devel/fossil/files/fossil.in Fri Jun 22 08:04:38 2018 (r473019) +++ head/devel/fossil/files/fossil.in Fri Jun 22 08:06:05 2018 (r473020) @@ -18,6 +18,7 @@ # 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 @@ -42,20 +43,24 @@ fossil_proto=${fossil_proto:-"http"} fossil_directory=${fossil_directory:-"/nonexistent"} case "${fossil_proto}" in -http);; -scgi) fossil_args="--scgi" ;; -*) +http) + # http is the default + ;; +scgi) + fossil_args="--scgi" + ;; +*) echo "unsupported protocol: ${fossil_proto}, only scgi and http are supported" >&2 - exit 1 ;; esac -[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" +[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" [ -z "${fossil_listenall}" ] && fossil_args="${fossil_args} --localhost" -[ -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_https}" ] && fossil_args="${fossil_args} --https" +[ -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" command_args="-f -p ${pidfile} ${procname} server -P ${fossil_port} ${fossil_args} ${fossil_directory}"