From utisoft@hotmail.com  Fri Jun  3 10:17:51 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 C80B5106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Jun 2011 10:17:51 +0000 (UTC)
	(envelope-from utisoft@hotmail.com)
Received: from blu0-omc1-s14.blu0.hotmail.com (blu0-omc1-s14.blu0.hotmail.com [65.55.116.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 88C2B8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Jun 2011 10:17:51 +0000 (UTC)
Received: from BLU0-SMTP20 ([65.55.116.8]) by blu0-omc1-s14.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675);
	 Fri, 3 Jun 2011 03:17:50 -0700
Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP20.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675);
	 Fri, 3 Jun 2011 03:17:49 -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 p53AGt3V010714
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 3 Jun 2011 11:16:56 +0100 (BST)
	(envelope-from crees@zeus.bayofrum.net)
Received: (from crees@localhost)
	by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p53AGsKx010671;
	Fri, 3 Jun 2011 11:16:54 +0100 (BST)
	(envelope-from crees)
Message-Id: <BLU0-SMTP203D7F3F77F98E34025C81A97F0@phx.gbl>
Date: Fri, 3 Jun 2011 11:16:54 +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: [PATCH] fix port: databases/firebird25-server should use USERS and GROUPS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         157555
>Category:       ports
>Synopsis:       [PATCH] fix port: databases/firebird25-server should use USERS and GROUPS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 03 10:20:06 UTC 2011
>Closed-Date:    Sun Jul 10 17:38:33 UTC 2011
>Last-Modified:  Sun Jul 10 17:40:08 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)


--- databases-firebird25-server.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/firebird25-server/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	20 Dec 2010 09:38:49 -0000	1.2
+++ Makefile	2 Jun 2011 12:16:01 -0000
@@ -121,8 +121,9 @@
 .endif
 
 .if !defined(CLIENT_ONLY)
-pre-su-install:
-	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+
+USERS=	${PORTNAME}
+GROUPS=	${USERS}
 
 post-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
Index: files/pkg-install.in
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/firebird25-server/files/pkg-install.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.in
--- files/pkg-install.in	20 Dec 2010 08:48:54 -0000	1.1
+++ files/pkg-install.in	2 Jun 2011 12:16:14 -0000
@@ -5,51 +5,6 @@
 PATH=/bin:/usr/bin:/usr/sbin
 
 case $2 in
-PRE-INSTALL)
-
-if [ `id -u` -ne 0 ]; then
-	echo; echo "You must be root to run this step!"; echo; echo
-  exit 1
-fi
-
-nofbuid=0
-fbUID=`id -u firebird 2>/dev/null`
-if [ $? -ne 0 ]; then
-	fbUID=90
-	while [ ! -z `id -un $fbUID 2>/dev/null` ]
-	do
-		fbUID=$(($fbUID+1))
-	done
-	nofbuid=1
-fi
-
-fbGID=`pw groupshow firebird 2>/dev/null`
-if [ $? -ne 0 ]; then
-	fbGID=90
-	while [ ! -z `id -gn $fbGID 2>/dev/null` ]
-	do
-		fbGID=$(($fbGID+1))
-	done
-	echo "firebird:*:$fbGID:" >> /etc/group
-else
-	fbGID=`echo $fbGID | awk -F: '{print $3}'`
-fi
-
-echo "firebird user using uid $fbUID"
-echo "firebird user using gid $fbGID"
-
-if which -s pw; then
-	if [ $nofbuid -ne 0 ]; then
-		pw useradd firebird -u $fbUID -g $fbGID -h - -s /usr/sbin/nologin \
-		-d /nonexistent -c "Firebird Database Administrator"
-	fi
-else
-	echo -n "unable to create user firebird - please create it manually,"
-	echo " before reinstalling this package."
-	exit 1
-fi
-;;
-
 POST-INSTALL)
 cd /var/db/firebird
 
--- databases-firebird25-server.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->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jun 3 10:20:16 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157555 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Jul 10 17:38:30 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157555 
Responsible-Changed-From-To: acm->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Jul 10 17:38:48 UTC 2011 
Responsible-Changed-Why:  
Maintainer timeout 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157555: commit references a PR
Date: Sun, 10 Jul 2011 17:37:25 +0000 (UTC)

 crees       2011-07-10 17:37:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/firebird25-server Makefile 
     databases/firebird25-server/files pkg-install.in 
   Log:
   Use USERS and GROUPS
   
   PR:             ports/157555
   Submitted by:   crees (me)
   Approved by:    rene (mentor, implicit), maintainer timeout (acm, 35 days)
   
   Revision  Changes    Path
   1.3       +3 -2      ports/databases/firebird25-server/Makefile
   1.2       +1 -46     ports/databases/firebird25-server/files/pkg-install.in
 _______________________________________________
 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:
