From owner-svn-ports-all@freebsd.org Mon May 18 07:23:43 2020 Return-Path: Delivered-To: svn-ports-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 4C1CC138F1F; Mon, 18 May 2020 07:23:43 +0000 (UTC) (envelope-from dch@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49QVqg1KYHz4J4p; Mon, 18 May 2020 07:23:43 +0000 (UTC) (envelope-from dch@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 28B771DE9B; Mon, 18 May 2020 07:23:43 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04I7NhYc087311; Mon, 18 May 2020 07:23:43 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04I7NgHC087307; Mon, 18 May 2020 07:23:42 GMT (envelope-from dch@FreeBSD.org) Message-Id: <202005180723.04I7NgHC087307@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Mon, 18 May 2020 07:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535721 - in head/net/fiche: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/net/fiche: . files X-SVN-Commit-Revision: 535721 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2020 07:23:43 -0000 Author: dch Date: Mon May 18 07:23:42 2020 New Revision: 535721 URL: https://svnweb.freebsd.org/changeset/ports/535721 Log: net/fiche: enable passing options such as runtime user to daemon - daemon(8) mistakenly consumes the usual prepended rc.subr fiche_flags - wrap command_args for line length Approved by: zi Sponsored by: SkunkWerks, GmbH Differential Revision: https://reviews.freebsd.org/D23438 Modified: head/net/fiche/Makefile head/net/fiche/files/fiche.in head/net/fiche/pkg-descr Modified: head/net/fiche/Makefile ============================================================================== --- head/net/fiche/Makefile Mon May 18 07:19:22 2020 (r535720) +++ head/net/fiche/Makefile Mon May 18 07:23:42 2020 (r535721) @@ -3,7 +3,7 @@ PORTNAME= fiche PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= zi@FreeBSD.org Modified: head/net/fiche/files/fiche.in ============================================================================== --- head/net/fiche/files/fiche.in Mon May 18 07:19:22 2020 (r535720) +++ head/net/fiche/files/fiche.in Mon May 18 07:23:42 2020 (r535721) @@ -13,6 +13,7 @@ # fiche_enable (bool): Set to "NO" by default. # Set it to "YES" to enable fiche. # fiche_domain (str): Default "localhost" +# fiche_options (str): Additional flags Default "" # fiche_output (str): Default "/usr/local/www/fiche" # fiche_logfile (str): Default "/var/log/fiche/fiche.log" @@ -25,6 +26,7 @@ load_rc_config $name : ${fiche_enable="NO"} : ${fiche_pidfile="/var/run/${name}.pid"} +: ${fiche_options=""} : ${fiche_output="%%WWWDIR%%"} : ${fiche_domain="localhost"} : ${fiche_logfile="/var/log/${name}/${name}.log"} @@ -34,7 +36,11 @@ pidfile="${fiche_pidfile}" procname="%%PREFIX%%/sbin/fiche" command="/usr/sbin/daemon" -command_args="-fp ${pidfile} %%PREFIX%%/sbin/fiche -o ${fiche_output} -d ${fiche_domain} -l ${fiche_logfile}" +command_args="-fp ${pidfile} %%PREFIX%%/sbin/fiche \ + -o ${fiche_output} \ + -d ${fiche_domain} \ + -l ${fiche_logfile} \ + ${fiche_options}" fiche_prestart() { install -d -o 477 -g 477 -m 755 /var/log/${name} Modified: head/net/fiche/pkg-descr ============================================================================== --- head/net/fiche/pkg-descr Mon May 18 07:19:22 2020 (r535720) +++ head/net/fiche/pkg-descr Mon May 18 07:23:42 2020 (r535721) @@ -3,4 +3,4 @@ Command line pastebin for sharing terminal output. Note: fiche requires a separate web-server to serve the pastebin content. -WWW: http://termbin.com/ +WWW: https://github.com/solusipse/fiche