From nobody Tue Jan 17 21:12:56 2023 X-Original-To: dev-commits-ports-all@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 4NxM6w54TDz2v5DF; Tue, 17 Jan 2023 21:12:56 +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 4NxM6w3RRRz40mN; Tue, 17 Jan 2023 21:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673989976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYRihT22zyXYflx0hqYseTeaMmbEfm2W9W55GV2KJLw=; b=nT+ieeQQNi//Ytt3+Pew5+NbqJpl8DFv/D+ooEiqUMOVtDR1F/vbCaH3dAbElScmXSUfBz 8TMrIpC9uoYhZF4Y7XAKCEfHEskE6hqjsj4NXVu33GRuHRaWC0wCn3nJ/vt8/CBHChmE/j 34QPUkuzFrh3r1Wb35s26qISHEOO0EKCAanxa9+sA0CwClM+BBwoM4hyER1arDkhptNpap /m1X4g+S6ufzSN35jRBEN3jljAN3J36cwqxfGJ2sTrbYaaUL5fk01ToHx8L5fEq6FdYU7a cIXl9O+stO6JxWostcBIQSK5uQxW+OcobvyG4b3g/6K8fFDx/GQaQE1IFWEMIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673989976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYRihT22zyXYflx0hqYseTeaMmbEfm2W9W55GV2KJLw=; b=bMULP3qX2e5uq4su+Utn83bksBuowpnxPKzE4MiAGp+g69oJ+gR4fLp5zCP+EFOZNbneLj OvAhFRy+l/5yGqZ3kzQWOCST42JwOFOtJLI5frcunDhgqYBdf/D1K3Hk0qG6kVcfXFuSwZ CwWfU3dt7V19q5t5qySqc95fmOSpY6lk3aiRsWxkIoNaP1eOimyMjOV4yLT5G77EuULX0I lQQGu2vjcGZG5YbZ1/dmp5HkcPqzWTiwKLRAcv9aEAJRDw3wV89s4kJgWun+1v74UdH4zu uhp52VUsnF2tkVEZLrHqACLKgYWZ+Wkdb1cA/gVbe/B+FwPBM0ICeoWKE8Kcpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673989976; a=rsa-sha256; cv=none; b=gB/YsSAVyoLkx9Jrzr1GG8GybOO7Ey2cyBK4GxokFn5AItAHwufN0j5JacC8/+EjMYBS0n bKVWBJUjnBMZJE0L0Y9f5pzkdDnlBowG+NII70qo3MnggF+ZuynjhN0YZo3t9+WQFsY/ub dEgRjTs33excxcOubMfOfvhX9COS1F4S+DIrpq3Aj/1WwlG8/zZbwCy5HZRjVwo9PfmDrD McTzLZM4BEXEKD9k7Kjt1VR3Ic0afbg+E42zejD7n1eLdiqJ9POkq0xjcA5QbobChifLwL 1zdeb0BTjK4M0TiYOJSqmRwjTDaBCzL4RWsNt/m2fl7UkRw7f4f/VddsVOHPyQ== 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 4NxM6w2XCNzmMT; Tue, 17 Jan 2023 21:12:56 +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 30HLCuWT092575; Tue, 17 Jan 2023 21:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30HLCuGb092574; Tue, 17 Jan 2023 21:12:56 GMT (envelope-from git) Date: Tue, 17 Jan 2023 21:12:56 GMT Message-Id: <202301172112.30HLCuGb092574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 02c038c8cc15 - main - sysutils/nut*: Use a dedicated UID and GID List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02c038c8cc15469c27b4b8ec24ae8b75d587262f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=02c038c8cc15469c27b4b8ec24ae8b75d587262f commit 02c038c8cc15469c27b4b8ec24ae8b75d587262f Author: Cy Schubert AuthorDate: 2023-01-16 22:00:46 +0000 Commit: Cy Schubert CommitDate: 2023-01-17 21:12:13 +0000 sysutils/nut*: Use a dedicated UID and GID To reduce conflicts with other packages and improve security, avoid using the uucp UID and GID. This avoids potential conflicts with the net/freebsd-uucp port. Users who wish to continue using the uucp user and group may add NUT_USER=uucp and NUT_GROUP=uucp to their make.conf. PR: 268960 Reported by: delphij MFH: 2023Q1 --- GIDs | 2 +- UIDs | 2 +- UPDATING | 8 ++++++++ sysutils/nut-devel/Makefile | 8 +++++--- sysutils/nut/Makefile | 8 +++++--- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/GIDs b/GIDs index 08e2ed3767a4..d101bd427a53 100644 --- a/GIDs +++ b/GIDs @@ -256,7 +256,7 @@ _sphinx:*:312: _fastdfs:*:313: promscale:*:314: lavinmq:*:315: -# free: 316 +nut:*:316: # free: 317 # free: 318 # free: 319 diff --git a/UIDs b/UIDs index 7a7aee1f9492..5057f56c9672 100644 --- a/UIDs +++ b/UIDs @@ -261,7 +261,7 @@ _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin _fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin promscale:*:314:314::0:0:Promscale:/nonexistent:/usr/sbin/nologin lavinmq:*:315:315::0:0:LavinMQ user:/nonexistent:/usr/sbin/nologin -# free: 316 +nut:*:316:316::0:0:Network UPS Tools user:/nonexistent:/usr/sbin/nologin # free: 317 # free: 318 # free: 319 diff --git a/UPDATING b/UPDATING index 3fcbb66292c2..87d5e3e55ef1 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230116: + AFFECTS: users of sysutils/nut and sysutils/nut-devel + AUTHOR: cy@freebsd.org + + As of PR/268960 Network UPS Tools will now run under its own UID and GID + instead of uucp. Users who wish to continue using the uucp user and + group may add NUT_USER=uucp and NUT_GROUP=uucp to their make.conf. + 20230111: AFFECTS: users of sysutils/graylog AUTHOR: dch@freebsd.org diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index 73c12f6dba39..9062aedab8f2 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -28,8 +28,10 @@ GNU_CONFIGURE= yes USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python USE_LDCONFIG= yes -NUT_USER?= uucp -NUT_GROUP?= uucp +NUT_USER?= nut +NUT_GROUP?= nut +USERS= ${NUT_USER} +GROUPS= ${NUT_GROUP} STATEDIR?= /var/db/nut PLIST_SUB+= NUT_USER=${NUT_USER} PLIST_SUB+= NUT_GROUP=${NUT_GROUP} diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 7d3aecc8b8d4..5a23d86a286c 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,6 +1,6 @@ PORTNAME= nut PORTVERSION= 2.8.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -18,8 +18,10 @@ GNU_CONFIGURE= yes USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build USE_LDCONFIG= yes -NUT_USER?= uucp -NUT_GROUP?= uucp +NUT_USER?= nut +NUT_GROUP?= nut +USERS= ${NUT_USER} +GROUPS= ${NUT_GROUP} STATEDIR?= /var/db/nut PLIST_SUB+= NUT_USER=${NUT_USER} PLIST_SUB+= NUT_GROUP=${NUT_GROUP}