ports/157601: [PATCH] Fix port: dns/rbldnsd should use USERS

[Chris Rees]

>Number:         157601
>Category:       ports
>Synopsis:       [PATCH] Fix port: dns/rbldnsd should use USERS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 11:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
bayofrum
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	

	This port uses pkg-install to create new users instead of using USERS= and GROUPS=

>How-To-Repeat:
	
>Fix:

	

	- Use USERS and GROUPS

	Submitted by: Chris Rees (utisoft at gmail.com)

	Please note that pkg-install has been removed.


--- dns-rbldnsd.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/dns/rbldnsd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	10 Feb 2010 02:58:33 -0000	1.15
+++ Makefile	2 Jun 2011 15:29:46 -0000
@@ -32,13 +32,11 @@
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	rbldnsd
+USERS=		rbldns
+GROUPS=		${USERS}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-pre-install:
-		@${ECHO} "==>  Creating custom user to run rbldnsd..."
-		@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 do-install:
 		@if [ ! -d ${ROOTDIR} ]; then \
 			${MKDIR} ${ROOTDIR}; \
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	22 Sep 2006 04:34:40 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-RBLDNSUSER=${RBLDNSUSER:-rbldns}
-RBLDNSGROUP=${RBLDNSGROUP:-rbldns}
-
-if ! pw groupshow "$RBLDNSGROUP" 2>/dev/null 1>&2; then
-	if pw groupadd $RBLDNSGROUP; then
-		echo "=> Added group \"$RBLDNSGROUP\"."
-	else
-                echo "=> Adding group \"$RBLDNSGROUP\" failed..."
-                exit 1
-        fi
-fi
-
-if ! pw usershow "$RBLDNSUSER" 2>/dev/null 1>&2; then
-        if pw useradd $RBLDNSUSER -g $RBLDNSGROUP -h - \
-                -s "/usr/sbin/nologin" -d "/nonexistent" \
-                -c "rbldnsd pseudo-user"; \
-        then
-                echo "=> Added user \"$RBLDNSUSER\"."
-        else
-                echo "=> Adding user \"$RBLDNSUSER\" failed..."
-                exit 1
-        fi
-fi
-exit 0
--- dns-rbldnsd.patch ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
>Unformatted: