From owner-svn-ports-all@freebsd.org Mon Jun 22 13:10:52 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 DF25E34B13C; Mon, 22 Jun 2020 13:10:52 +0000 (UTC) (envelope-from meta@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 49r8t45Q82z4mBg; Mon, 22 Jun 2020 13:10:52 +0000 (UTC) (envelope-from meta@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 B516EE9C9; Mon, 22 Jun 2020 13:10:52 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05MDAqCh025741; Mon, 22 Jun 2020 13:10:52 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05MDApGP025736; Mon, 22 Jun 2020 13:10:51 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202006221310.05MDApGP025736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 22 Jun 2020 13:10:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539808 - in head/net/librespeed-go: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/net/librespeed-go: . files X-SVN-Commit-Revision: 539808 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, 22 Jun 2020 13:10:52 -0000 Author: meta Date: Mon Jun 22 13:10:51 2020 New Revision: 539808 URL: https://svnweb.freebsd.org/changeset/ports/539808 Log: net/librespeed-go: Update to 1.0.1 etc While here, refrain from running with root privileges as it is not necessary and adjust directory permissions. PR: 247353 Submitted by: Dries Michiels (maintainer) Reviewed by: meta (myself) Deleted: head/net/librespeed-go/files/patch-settings.toml Modified: head/net/librespeed-go/Makefile head/net/librespeed-go/distinfo head/net/librespeed-go/files/librespeed-go.in head/net/librespeed-go/files/pkg-message.in head/net/librespeed-go/pkg-plist Modified: head/net/librespeed-go/Makefile ============================================================================== --- head/net/librespeed-go/Makefile Mon Jun 22 13:00:24 2020 (r539807) +++ head/net/librespeed-go/Makefile Mon Jun 22 13:10:51 2020 (r539808) @@ -2,7 +2,7 @@ PORTNAME= librespeed-go DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0 +DISTVERSION= 1.0.1 CATEGORIES= net www MAINTAINER= driesm.michiels@gmail.com @@ -43,21 +43,31 @@ GH_TUPLE= etcd-io:bbolt:v1.3.3:etcd_io_bbolt/vendor/go spf13:viper:v1.6.2:spf13_viper/vendor/github.com/spf13/viper \ subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv -GO_TARGET= ./:${PREFIX}/libexec/librespeed-go/librespeed-go +USERS= librespeed +GROUPS= librespeed SUB_FILES= pkg-message +PLIST_SUB= LIBRESPEED_USER=${USERS} LIBRESPEED_GROUP=${GROUPS} +SUB_LIST= LIBRESPEED_USER=${USERS} LIBRESPEED_GROUP=${GROUPS} PORTNAME=${PORTNAME} OPTIONS_DEFINE= EXAMPLES post-patch: ${REINPLACE_CMD} -e 's|"."|"${ETCDIR}"|g' ${WRKSRC}/config/config.go + ${REINPLACE_CMD} -e 's|"./assets"|"${WWWDIR}"|g' ${WRKSRC}/config/config.go +pre-install: + ${REINPLACE_CMD} -e 's|"./assets"|"${WWWDIR}"|g' ${WRKSRC}/settings.toml + ${REINPLACE_CMD} -e 's|"speedtest.db"|"/var/db/${PORTNAME}/speedtest.db"|g' ${WRKSRC}/settings.toml + post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/assets - ${CP} -a ${WRKSRC}/assets/*.js ${STAGEDIR}${PREFIX}/libexec/librespeed-go/assets - ${CP} -a ${WRKSRC}/assets/*.ttf ${STAGEDIR}${PREFIX}/libexec/librespeed-go/assets + ${MKDIR} ${STAGEDIR}${WWWDIR} + ${CP} -a ${WRKSRC}/assets/*.js ${STAGEDIR}${WWWDIR} + ${CP} -a ${WRKSRC}/assets/*.ttf ${STAGEDIR}${WWWDIR} ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/settings.toml ${STAGEDIR}${ETCDIR}/settings.toml.sample + ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} + ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/net/librespeed-go/distinfo ============================================================================== --- head/net/librespeed-go/distinfo Mon Jun 22 13:00:24 2020 (r539807) +++ head/net/librespeed-go/distinfo Mon Jun 22 13:10:51 2020 (r539808) @@ -1,6 +1,6 @@ -TIMESTAMP = 1591867495 -SHA256 (librespeed-speedtest-go-v1.0.0_GH0.tar.gz) = 8d9c572bc06d0994f01757496016b180e61ab422ecc9c03a13f1bdab9bbd766a -SIZE (librespeed-speedtest-go-v1.0.0_GH0.tar.gz) = 2232423 +TIMESTAMP = 1592422992 +SHA256 (librespeed-speedtest-go-v1.0.1_GH0.tar.gz) = 1f8bfc80326af71e27f65716c35cc09c642f7424849f013dbe566826d3dfd31e +SIZE (librespeed-speedtest-go-v1.0.1_GH0.tar.gz) = 2233115 SHA256 (etcd-io-bbolt-v1.3.3_GH0.tar.gz) = 089ae9a1651531dcac069370212abfe16e83af1c6f331d59e0154fa64fe9b120 SIZE (etcd-io-bbolt-v1.3.3_GH0.tar.gz) = 94626 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd Modified: head/net/librespeed-go/files/librespeed-go.in ============================================================================== --- head/net/librespeed-go/files/librespeed-go.in Mon Jun 22 13:00:24 2020 (r539807) +++ head/net/librespeed-go/files/librespeed-go.in Mon Jun 22 13:10:51 2020 (r539808) @@ -2,7 +2,7 @@ # $FreeBSD$ # -# PROVIDE: librespeed-go +# PROVIDE: %%PORTNAME%% # REQUIRE: SERVERS # KEYWORD: shutdown # @@ -10,13 +10,15 @@ # to enable this service: # # librespeed_go_enable: Set to NO by default. -# Set it to YES to enable librenms +# Set it to YES to enable librespeed-go # librespeed_go_pid: Path of the pid file. -# Default /var/run/librenms/librenms.pid +# Default /var/run/%%PORTNAME%%/%%PORTNAME%%.pid +# librespeed_go_user: The user account used to run the daemon. +# Default: %%LIBRESPEED_USER%% +# librespeed_go_group: The group used to run the daemon. +# Default: %%LIBRESPEED_GROUP%% # librespeed_go_daemonflags: Flags passed to daemon(8) # Default -f which prevents any logging -# librespeed_go_chdir: Dir to run the daemon in -# Default /usr/local/libexec/librespeed-go . /etc/rc.subr @@ -27,12 +29,13 @@ command="/usr/sbin/daemon" load_rc_config $name : ${librespeed_go_enable:="NO"} -: ${librespeed_go_pid:="/var/run/librespeed-go.pid"} +: ${librespeed_go_pid:="/var/run/%%PORTNAME%%/%%PORTNAME%%.pid"} +: ${librespeed_go_user:="%%LIBRESPEED_USER%%"} +: ${librespeed_go_group:="%%LIBRESPEED_GROUP%%"} : ${librespeed_go_daemonflags:="-f"} -: ${librespeed_go_chdir:="%%PREFIX%%/libexec/librespeed-go"} pidfile="$librespeed_go_pid" -procname="%%PREFIX%%/libexec/librespeed-go/librespeed-go" +procname="%%PREFIX%%/bin/%%PORTNAME%%" command_args="$librespeed_go_daemonflags -p $pidfile $procname" run_rc_command "$1" Modified: head/net/librespeed-go/files/pkg-message.in ============================================================================== --- head/net/librespeed-go/files/pkg-message.in Mon Jun 22 13:00:24 2020 (r539807) +++ head/net/librespeed-go/files/pkg-message.in Mon Jun 22 13:10:51 2020 (r539808) @@ -1,23 +1,36 @@ [ { type: install message: <