157664 – Fix port: mail/p5-Mail-SpamAssassin should use USERS

no flags

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

Fix: - Use USERS and GROUPS

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




-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--B9pyYm4F3ZiJrCQzBc5S0rFv32Id2Q0LLiGpRGWatkd1EOvi
Content-Type: text/plain; name="mail-p5-Mail-SpamAssassin.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="mail-p5-Mail-SpamAssassin.patch"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile

--- Makefile	16 Dec 2010 02:33:56 -0000	1.137
+++ Makefile	4 Jun 2011 14:25:18 -0000
@@ -35,6 +35,9 @@
 	       	CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
 		LOCALSTATEDIR="/var/db/spamassassin"
 
+USERS=		spamd
+GROUPS=		spamd
+
 # You can override it if you like
 CONTACT_ADDRESS?=	The administrator of that system
 
Index: pkg-install
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/mail/p5-Mail-SpamAssassin/pkg-install,v
retrieving revision 1.9
diff -u -r1.9 pkg-install
--- pkg-install	8 Apr 2010 13:13:00 -0000	1.9
+++ pkg-install	4 Jun 2011 14:16:38 -0000
@@ -32,28 +32,6 @@
                 echo "Please answer yes or no."
         done
 }
-    if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-    	if pw groupadd ${GROUP} -g ${GID}; then
-    		echo "Added group \"${GROUP}\"."
-    	else
-    		echo "Adding group \"${GROUP}\" failed..."
-    		exit 1
-    	fi
-    fi
-    
-    if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-    	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-    		-s "/sbin/nologin" -d "${HOME}" \
-    		-c "SpamAssassin user"; \
-    	then
-    		echo "Added user \"${USER}\"."
-    		mkdir ${HOME} && chown ${USER}:${GROUP} ${HOME}
-    	else
-    		echo "Adding user \"${USER}\" failed..."
-    		exit 1
-    	fi
-    fi
-    
     # Create pid directory
     mkdir /var/run/spamd 2> /dev/null && chown ${USER}:${GROUP} /var/run/spamd
     /usr/bin/su root -c "${PKG_PREFIX}/bin/spamassassin -x -L --lint"