From utisoft@hotmail.com  Sat Jun  4 09:04:00 2011
Return-Path: <utisoft@hotmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08945106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jun 2011 09:04:00 +0000 (UTC)
	(envelope-from utisoft@hotmail.com)
Received: from blu0-omc1-s11.blu0.hotmail.com (blu0-omc1-s11.blu0.hotmail.com [65.55.116.22])
	by mx1.freebsd.org (Postfix) with ESMTP id B44698FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jun 2011 09:03:59 +0000 (UTC)
Received: from BLU0-SMTP34 ([65.55.116.8]) by blu0-omc1-s11.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675);
	 Sat, 4 Jun 2011 02:03:58 -0700
Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP34.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675);
	 Sat, 4 Jun 2011 02:03:58 -0700
Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1])
	by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p5493SxM098362
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Jun 2011 10:03:28 +0100 (BST)
	(envelope-from chris@zeus.bayofrum.net)
Received: (from crees@localhost)
	by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p5493R5U098361;
	Sat, 4 Jun 2011 10:03:27 +0100 (BST)
	(envelope-from chris)
Message-Id: <BLU0-SMTP344BDBCF08C5984CE8A89DA97E0@phx.gbl>
Date: Sat, 4 Jun 2011 10:03:27 +0100
From: Chris Rees <utisoft@gmail.com>
Sender: <utisoft@hotmail.com>
Reply-To: Chris Rees <utisoft@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix port: irc/hybserv should use USERS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         157580
>Category:       ports
>Synopsis:       Fix port: irc/hybserv should use USERS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 09:10:09 UTC 2011
>Closed-Date:    Mon Jun 27 17:58:05 UTC 2011
>Last-Modified:  Mon Jun 27 18:00:31 UTC 2011
>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@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@gmail.com)


	Please bear in mind that pkg-install has been removed.

--- irc-hybserv.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/irc/hybserv/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	21 Mar 2011 07:13:04 -0000	1.18
+++ Makefile	2 Jun 2011 19:03:04 -0000
@@ -16,6 +16,9 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
+
 WRKSRC=		${WRKDIR}/hybserv
 
 .if defined(WITH_DAEMONTOOLS)
@@ -23,9 +26,6 @@
 RUN_DEPENDS+=	supervise:${PORTSDIR}/sysutils/daemontools
 .endif
 
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/hybserv.sh \
 		> ${WRKDIR}/hybserv.sh
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	31 Mar 2007 12:53:57 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-if [ "x$2" != "xPRE-INSTALL" ]; then
-       exit 0;
-fi
-
-	USER=hybserv
-	GROUP=${USER}
-	UID=76
-	GID=${UID}
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-		if pw usermod ${USER} -d ${NONEXISTENT}
-		then
-			echo "Changed home directory of \"${USER}\" to \"${NONEXISTENT}\""
-		else
-			echo "Changing home directory of \"${USER}\" to \"${NONEXISTENT}\" failed..."
-			exit 1
-		fi
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d ${NONEXISTENT} -s /sbin/nologin -c "HybServ Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
--- irc-hybserv.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:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 4 09:10:20 UTC 2011 
Responsible-Changed-Why:  
pgollucci@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157580 
Responsible-Changed-From-To: pgollucci->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Wed Jun 22 16:52:25 UTC 2011 
Responsible-Changed-Why:  
Invalid autoassignment 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157580 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Mon Jun 27 17:58:04 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157580 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157580: commit references a PR
Date: Mon, 27 Jun 2011 17:58:02 +0000 (UTC)

 crees       2011-06-27 17:57:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/hybserv          Makefile 
   Removed files:
     irc/hybserv          pkg-install 
   Log:
   - Use USERS and GROUPS
   
   PR:             ports/157580
   Submitted by:   Chris Rees (utisoft@gmail.com)
   Approved by:    tabthorpe (co-mentor)
   
   Revision  Changes    Path
   1.19      +3 -3      ports/irc/hybserv/Makefile
   1.5       +0 -40     ports/irc/hybserv/pkg-install (dead)
 _______________________________________________
 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"
 
>Unformatted:
