From nobody Tue Oct 19 08:50:47 2021 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 83CA217F0BFC; Tue, 19 Oct 2021 08:50:48 +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 4HYSBb5Bxwz3q9w; Tue, 19 Oct 2021 08:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5CB4211506; Tue, 19 Oct 2021 08:50:47 +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 19J8olT7070629; Tue, 19 Oct 2021 08:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19J8olqE070628; Tue, 19 Oct 2021 08:50:47 GMT (envelope-from git) Date: Tue, 19 Oct 2021 08:50:47 GMT Message-Id: <202110190850.19J8olqE070628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 5290fb1d9274 - main - comms/aprsd: Spell SUB_LIST correctly and unbreak rc script 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5290fb1d9274aa22c0a1dba1b21b424efd01dcd0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=5290fb1d9274aa22c0a1dba1b21b424efd01dcd0 commit 5290fb1d9274aa22c0a1dba1b21b424efd01dcd0 Author: Tobias Kortkamp AuthorDate: 2021-10-15 17:16:09 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-19 08:37:53 +0000 comms/aprsd: Spell SUB_LIST correctly and unbreak rc script Reported by: portscan (unreferenced variable) --- comms/aprsd/Makefile | 4 ++-- comms/aprsd/files/aprsd.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile index bcd9254ef6bf..b12533eca532 100644 --- a/comms/aprsd/Makefile +++ b/comms/aprsd/Makefile @@ -2,7 +2,7 @@ PORTNAME= aprsd PORTVERSION= 2.2.515 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.2.5-15 DISTNAME= aprsd-2.2.5-15 @@ -23,7 +23,7 @@ GROUPS= aprsd dialer tnc APRSD_RC_USER= aprsd APRSD_RC_GROUP= aprsd -RC_SUB_LIST= LOCALBASE=${LOCALBASE} APRSD_RC_USER=${APRSD_RC_USER} \ +SUB_LIST= APRSD_RC_USER=${APRSD_RC_USER} \ APRSD_RC_GROUP=${APRSD_RC_GROUP} OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/comms/aprsd/files/aprsd.in b/comms/aprsd/files/aprsd.in index 393eefeb56af..f7cc47ab0c83 100644 --- a/comms/aprsd/files/aprsd.in +++ b/comms/aprsd/files/aprsd.in @@ -27,9 +27,9 @@ pidfile=/var/run/aprsd.pid aprsd_pre() { if [ ${aprsd_root} != "YES" ]; then - echo "Starting aprs server as user ${APRSD_RC_USER}:${APRSD_RC_GROUP}." - install -o ${APRSD_RC_USER} -g ${APRSD_RC_GROUP} /dev/null ${pidfile} - chown -R ${APRSD_RC_USER}:${APRSD_RC_GROUP} /var/log/aprsd + echo "Starting aprs server as user ${aprsd_user}:${aprsd_group}." + install -o ${aprsd_user} -g ${aprsd_group} /dev/null ${pidfile} + chown -R ${aprsd_user}:${aprsd_group} /var/log/aprsd else echo "Starting aprs server as root." install -o root -g wheel /dev/null ${pidfile}