Date: Mon, 29 Mar 2021 21:01:49 +0100 From: Chris Rees <crees@bayofrum.net> To: Baptiste Daroussin <bapt@FreeBSD.org>, Sofian Brabez <sbz@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r569135 - in head/security/crowdsec: . files Message-ID: <89F23292-0BAB-4D5D-BDBA-FDC8C2B0A9C0@bayofrum.net> In-Reply-To: <B08954DA-9EFD-4C84-B912-F7B13AFC918F@bayofrum.net> References: <202103241545.12OFjJvO092197@repo.freebsd.org> <20210324155631.zvtmepz7ropprvwm@aniel.nours.eu> <B08954DA-9EFD-4C84-B912-F7B13AFC918F@bayofrum.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Sofian, I've made the suggested changes to your rc script, please review: https://reviews=2EFreeBSD=2Eorg/D29489 Cheers, Chris On 24 March 2021 16:12:04 GMT, Chris Rees <crees@bayofrum=2Enet> wrote: >Hi Sofian, > >Sorry, feel as though I'm piling on here! > >On 24 March 2021 15:56:31 GMT, Baptiste Daroussin <bapt@FreeBSD=2Eorg> >wrote: >>On Wed, Mar 24, 2021 at 03:45:19PM +0000, Sofian Brabez wrote: >>> Author: sbz >>> Date: Wed Mar 24 15:45:18 2021 >>> New Revision: 569135 >>> URL: https://svnweb=2Efreebsd=2Eorg/changeset/ports/569135 >>>=20 >>> Log: >>> - Update to 1=2E0=2E9 >>> - Add rc=2Ed script >>>=20 >>> Added: >>> head/security/crowdsec/files/ >>> head/security/crowdsec/files/crowdsec=2Ein (contents, props >>changed) >>> Modified: >>> head/security/crowdsec/Makefile >>> head/security/crowdsec/distinfo (contents, props changed) >>>=20 >>> Modified: head/security/crowdsec/Makefile >>> >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >>> --- head/security/crowdsec/Makefile Wed Mar 24 15:25:44 >>2021 (r569134) >>> +++ head/security/crowdsec/Makefile Wed Mar 24 15:45:18 >>2021 (r569135) >>> @@ -1,7 +1,7 @@ >>> # $FreeBSD$ >>> =20 >>> PORTNAME=3D crowdsec >>> -PORTVERSION=3D 1=2E0=2E7 >>> +PORTVERSION=3D 1=2E0=2E9 >>> DISTVERSIONPREFIX=3D v >>> CATEGORIES=3D security >>> =20 >>> @@ -20,6 +20,8 @@ GO_BUILDFLAGS=3D -ldflags "-s -w \ >>> =20 >>> GO_TARGET=3D =2E/cmd/crowdsec \ >>> =2E/cmd/crowdsec-cli >>> + >>> +USE_RC_SUBR=3D crowdsec >>> =20 >>> PLIST_FILES=3D bin/crowdsec \ >>> bin/crowdsec-cli >>>=20 >>> Modified: head/security/crowdsec/distinfo >>> >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >>> --- head/security/crowdsec/distinfo Wed Mar 24 15:25:44 >>2021 (r569134) >>> +++ head/security/crowdsec/distinfo Wed Mar 24 15:45:18 >>2021 (r569135) >>> @@ -1,5 +1,5 @@ >>> -TIMESTAMP =3D 1615033328 >>> -SHA256 (go/security_crowdsec/crowdsec-v1=2E0=2E7/v1=2E0=2E7=2Emod) = =3D >>810ca243ce2951dd7ab23d955efc8f50410c94feb8babc47a783146a4c06c798 >>> -SIZE (go/security_crowdsec/crowdsec-v1=2E0=2E7/v1=2E0=2E7=2Emod) =3D = 3310 >>> -SHA256 (go/security_crowdsec/crowdsec-v1=2E0=2E7/v1=2E0=2E7=2Ezip) = =3D >>1d7f5956826096405b24684db3c924476ffb7fa02f5859af5a6a2c00d8b1d753 >>> -SIZE (go/security_crowdsec/crowdsec-v1=2E0=2E7/v1=2E0=2E7=2Ezip) =3D = 29305256 >>> +TIMESTAMP =3D 1616585825 >>> +SHA256 (go/security_crowdsec/crowdsec-v1=2E0=2E9/v1=2E0=2E9=2Emod) = =3D >>b95c6a35287b10ff019c2c3391bad1d0759415cf53cb7c0bfe7b154e479f6531 >>> +SIZE (go/security_crowdsec/crowdsec-v1=2E0=2E9/v1=2E0=2E9=2Emod) =3D = 3322 >>> +SHA256 (go/security_crowdsec/crowdsec-v1=2E0=2E9/v1=2E0=2E9=2Ezip) = =3D >>0b61f7e5ed162796d14636243ffcc8c8e336a3a3ee7891115141447c7626e8f7 >>> +SIZE (go/security_crowdsec/crowdsec-v1=2E0=2E9/v1=2E0=2E9=2Ezip) =3D = 29314582 >>>=20 >>> Added: head/security/crowdsec/files/crowdsec=2Ein >>> >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >>> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >>> +++ head/security/crowdsec/files/crowdsec=2Ein Wed Mar 24 15:45:18 >>2021 (r569135) >>> @@ -0,0 +1,49 @@ >>> +#!/bin/sh >>> + >>> +# $FreeBSD$ >>> +# >>> +# PROVIDE: crowdsec >>> +# REQUIRE: LOGIN DAEMON NETWORKING >>> +# KEYWORD: shutdown >>> +# >>> +# Add the following lines to /etc/rc=2Econf=2Elocal or /etc/rc=2Econf >>> +# to enable this service: >>> +# >>> +# crowdsec_enable (bool): Set it to YES to enable crowdsec agent=2E >>> +# Default is "NO"=2E >>> +# crowdsec_config (str): Set the agent config path=2E >>> +# Default is "%%PREFIX%%/etc/crowdsec/config=2Eyaml"=2E >>> +# crowdsec_flags (str): Set the extra flags to run agent=2E >>> +# Default is "" >>> + >>> +=2E /etc/rc=2Esubr >>> + >>> +name=3Dcrowdsec >>> +desc=3D"Crowdsec Agent" >>> +rcvar=3Dcrowdsec_enable >>> + >>> +load_rc_config $name >>> + >>> +: ${crowdsec_enable:=3D"NO"} >>> +: ${crowdsec_config:=3D"%%PREFIX%%/etc/crowdsec/config=2Eyaml"} >>> +: ${crowdsec_flags:=3D""} > >Unnecessary > >>> + >>> +pidfile=3D/var/run/${name}=2Epid >>> +command=3D"%%PREFIX%%/bin/${name}" >>procname=3D"%%PREFIX%%/bin/${NAME} >>command=3D"/usr/sbin/daemon" >>commandargs=3D"-f -T ${name} -p ${pidfile} -- ${procname} -c >>${crowdsec_config} ${crowdsec_flags}" >> >>And you don't need the _start() function > >Please also run it through rclint, and rc style is to not put braces >around variable names unless in the middle of a word=2E > >Chris --=20 Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E From owner-svn-ports-head@freebsd.org Mon Mar 29 20:07:20 2021 Return-Path: <owner-svn-ports-head@freebsd.org> Delivered-To: svn-ports-head@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 84BE95A9772; Mon, 29 Mar 2021 20:07:20 +0000 (UTC) (envelope-from cs@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 4F8NsN3Kh4z4bnc; Mon, 29 Mar 2021 20:07:20 +0000 (UTC) (envelope-from cs@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 6538E197AA; Mon, 29 Mar 2021 20:07:20 +0000 (UTC) (envelope-from cs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12TK7K5a049821; Mon, 29 Mar 2021 20:07:20 GMT (envelope-from cs@FreeBSD.org) Received: (from cs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12TK7K2J049820; Mon, 29 Mar 2021 20:07:20 GMT (envelope-from cs@FreeBSD.org) Message-Id: <202103292007.12TK7K2J049820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cs set sender to cs@FreeBSD.org using -f From: Carlo Strub <cs@FreeBSD.org> Date: Mon, 29 Mar 2021 20:07:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569502 - head/www/hiawatha X-SVN-Group: ports-head X-SVN-Commit-Author: cs X-SVN-Commit-Paths: head/www/hiawatha X-SVN-Commit-Revision: 569502 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.34 Precedence: list List-Id: SVN commit messages for the ports tree for head <svn-ports-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/> List-Post: <mailto:svn-ports-head@freebsd.org> List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 29 Mar 2021 20:07:20 -0000 Author: cs Date: Mon Mar 29 20:07:19 2021 New Revision: 569502 URL: https://svnweb.freebsd.org/changeset/ports/569502 Log: Update to 10.12 Modified: head/www/hiawatha/Makefile head/www/hiawatha/distinfo Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Mon Mar 29 19:53:59 2021 (r569501) +++ head/www/hiawatha/Makefile Mon Mar 29 20:07:19 2021 (r569502) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hiawatha -PORTVERSION= 10.11 +PORTVERSION= 10.12 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ Modified: head/www/hiawatha/distinfo ============================================================================== --- head/www/hiawatha/distinfo Mon Mar 29 19:53:59 2021 (r569501) +++ head/www/hiawatha/distinfo Mon Mar 29 20:07:19 2021 (r569502) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594278603 -SHA256 (hiawatha-10.11.tar.gz) = 79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727 -SIZE (hiawatha-10.11.tar.gz) = 1393303 +TIMESTAMP = 1617048335 +SHA256 (hiawatha-10.12.tar.gz) = 61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d +SIZE (hiawatha-10.12.tar.gz) = 1454134
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?89F23292-0BAB-4D5D-BDBA-FDC8C2B0A9C0>