Attachment #239516 for bug #268960

Lines 261-267 _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin Link Here

(-)b/UIDs (-1 / +1 lines)
261	_fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin	261	_fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin
262	promscale:*:314:314::0:0:Promscale:/nonexistent:/usr/sbin/nologin	262	promscale:*:314:314::0:0:Promscale:/nonexistent:/usr/sbin/nologin
263	lavinmq:*:315:315::0:0:LavinMQ user:/nonexistent:/usr/sbin/nologin	263	lavinmq:*:315:315::0:0:LavinMQ user:/nonexistent:/usr/sbin/nologin
264	# free: 316	264	nut:*:316:316::0:0:Network UPS Tools user:/nonexistent:/usr/sbin/nologin
265	# free: 317	265	# free: 317
266	# free: 318	266	# free: 318
267	# free: 319	267	# free: 319

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+8 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20230116:
		9	AFFECTS: users of sysutils/nut and sysutils/nut-devel
		10	AUTHOR: cy@freebsd.org
		11
		12	As of PR/268960 Network UPS Tools will now run under its own UID and GID
		13	instead of uucp. Users who wish to continue using the uucp user and
		14	group may add NUT_USER=uucp and NUT_GROUP=uucp to their make.conf.
		15
8	20230111:	16	20230111:
9	AFFECTS: users of sysutils/graylog	17	AFFECTS: users of sysutils/graylog
10	AUTHOR: dch@freebsd.org	18	AUTHOR: dch@freebsd.org

Lines 1-6 Link Here

(-)b/sysutils/nut-devel/Makefile (-3 / +5 lines)
1	PORTNAME= nut	1	PORTNAME= nut
2	PORTVERSION= ${NUT_COMMIT_DATE}	2	PORTVERSION= ${NUT_COMMIT_DATE}
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5	PKGNAMESUFFIX= -devel	5	PKGNAMESUFFIX= -devel
6	# MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/	6	# MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
Lines 28-35 GNU_CONFIGURE= yes Link Here
28	USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python	28	USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python
29	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
30		30
31	NUT_USER?= uucp	31	NUT_USER?= nut
32	NUT_GROUP?= uucp	32	NUT_GROUP?= nut
		33	USERS= ${NUT_USER}
		34	GROUPS= ${NUT_GROUP}
33	STATEDIR?= /var/db/nut	35	STATEDIR?= /var/db/nut
34	PLIST_SUB+= NUT_USER=${NUT_USER}	36	PLIST_SUB+= NUT_USER=${NUT_USER}
35	PLIST_SUB+= NUT_GROUP=${NUT_GROUP}	37	PLIST_SUB+= NUT_GROUP=${NUT_GROUP}

Lines 1-6 Link Here

(-)b/sysutils/nut/Makefile (-4 / +5 lines)
1	PORTNAME= nut	1	PORTNAME= nut
2	PORTVERSION= 2.8.0	2	PORTVERSION= 2.8.0
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5	MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/	5	MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
6		6
Lines 18-25 GNU_CONFIGURE= yes Link Here
18	USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build	18	USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20		20
21	NUT_USER?= uucp	21	NUT_USER?= nut
22	NUT_GROUP?= uucp	22	NUT_GROUP?= nut
		23	USERS= ${NUT_USER}
		24	GROUPS= ${NUT_GROUP}
23	STATEDIR?= /var/db/nut	25	STATEDIR?= /var/db/nut
24	PLIST_SUB+= NUT_USER=${NUT_USER}	26	PLIST_SUB+= NUT_USER=${NUT_USER}
25	PLIST_SUB+= NUT_GROUP=${NUT_GROUP}	27	PLIST_SUB+= NUT_GROUP=${NUT_GROUP}
26	-

Return to bug 268960