Bug 157664

Summary: Fix port: mail/p5-Mail-SpamAssassin should use USERS
Product: Ports & Packages Reporter: Chris Rees <utisoft>
Component: Individual Port(s)Assignee: Olli Hauer <ohauer>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
saup_patch.txt none

Description Chris Rees 2011-06-06 18:40:04 UTC 
	

	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"
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2011-06-06 18:40:14 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->perl

perl@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2011-06-06 18:40:16 UTC 
Maintainer of mail/p5-Mail-SpamAssassin,

Please note that PR ports/157664 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/157664

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2011-06-06 18:40:18 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Michael Scheidell 2011-06-06 19:51:57 UTC 
Port comitters:

Please use the following patch:  this incorporates utisoft's patch, bump 
to REVISION 4, as well as a bugfix submitted by ohauer@FreeBSD.org
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6488


-- 
Michael Scheidell, CTO
o: 561-999-5000
d: 561-948-2259
 >*| *SECNAP Network Security Corporation

    * Best Mobile Solutions Product of 2011
    * Best Intrusion Prevention Product
    * Hot Company Finalist 2011
    * Best Email Security Product
    * Certified SNORT Integrator


______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.secnap.com/products/spammertrap/
______________________________________________________________________
Comment 5 Olli Hauer freebsd_committer freebsd_triage 2011-06-07 23:06:09 UTC 
State Changed
From-To: feedback->open

I'll take it
Comment 6 Olli Hauer freebsd_committer freebsd_triage 2011-06-07 23:06:09 UTC 
Responsible Changed
From-To: perl->ohauer
Comment 7 dfilter service freebsd_committer freebsd_triage 2011-06-08 00:23:59 UTC 
ohauer      2011-06-07 23:23:51 UTC

  FreeBSD ports repository

  Modified files:
    mail/p5-Mail-SpamAssassin Makefile distinfo pkg-install 
  Added files:
    mail/p5-Mail-SpamAssassin/files patch-bug6488 
  Log:
  - use ports framework to create USER and GROUP [1]
  - add bugfix for https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6488
    noted by Yury <yuri _at_ rawbw.com>
  - bump PORTREVISION
  
  PR:             ports/157664 [1]
  Submitted by:   Chris Rees <utisoft _at_ gmail.com>
  Approved by:    maintainer ( Michael Scheidell <scheidell _at_ secnap.net> )
  
  Revision  Changes    Path
  1.138     +4 -2      ports/mail/p5-Mail-SpamAssassin/Makefile
  1.45      +0 -1      ports/mail/p5-Mail-SpamAssassin/distinfo
  1.1       +18 -0     ports/mail/p5-Mail-SpamAssassin/files/patch-bug6488 (new)
  1.10      +4 -25     ports/mail/p5-Mail-SpamAssassin/pkg-install
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 8 Olli Hauer freebsd_committer freebsd_triage 2011-06-08 00:25:10 UTC 
State Changed
From-To: open->closed

Committed with some minor changes. 
Thanks!