Bug 157592 - [PATCH] Fix port: games/pvpgn should use USERS
Summary: [PATCH] Fix port: games/pvpgn should use USERS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Chris Rees
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-06-04 10:40 UTC by Chris Rees
Modified: 2011-07-03 16:20 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Rees 2011-06-04 10:40:19 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.--OtLK9y8WxnEEnoBBdZhB52g02l994zmRdJ9oQsahDDx0ZzbD
Content-Type: text/plain; name="games-pvpgn.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="games-pvpgn.patch"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/games/pvpgn/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	1 Mar 2009 08:10:58 -0000	1.13
+++ Makefile	2 Jun 2011 18:16:49 -0000
@@ -23,6 +23,9 @@
 USE_GMAKE=	yes
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
 
+USERS=		bnetd
+GROUPS=		${USERS}
+
 RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
 SED_SCRIPT+=	-e 's|%%RC_DIR%%|${RC_DIR}|g' \
Index: pkg-deinstall
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/games/pvpgn/pkg-deinstall,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall
--- pkg-deinstall	20 Jan 2005 13:46:41 -0000	1.1
+++ pkg-deinstall	2 Jun 2011 18:17:45 -0000
@@ -4,18 +4,9 @@
     exit 0
 fi
 
-USER=bnetd
 LOGDIR=/var/log/pvpgn
 PIDDIR=/var/run/pvpgn
 
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete PvPGN user permanently, use 'pw userdel ${USER}'"
-fi
-
-if pw groupshow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete PvPGN group permanently, use 'pw groupdel ${USER}'"
-fi
-
 rm -Rf ${PIDDIR}
 
 echo "If you wish to delete pvpgn data and log files, "
Index: pkg-install
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/games/pvpgn/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- pkg-install	4 Sep 2005 12:18:18 -0000	1.2
+++ pkg-install	2 Jun 2011 18:16:04 -0000
@@ -6,38 +6,11 @@
 POST-INSTALL)
 	USER=bnetd
 	GROUP=${USER}
-	UID=700
-	GID=${UID}
-	HOME_DIR=/nonexistent
 	LOGDIR=/var/log/pvpgn
 	PIDDIR=/var/run/pvpgn
 	PKGNAME=$1
 	PVPGN_CONFDIR=${PKG_PREFIX:-/usr/local}/etc/pvpgn
 
-	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."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d ${HOME_DIR} -s /sbin/nologin -c "Bnetd user"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
 	mkdir -p %%PVPGN_DIR%%/bak/charinfo
 	mkdir -p %%PVPGN_DIR%%/bak/charsave
 	mkdir -p %%PVPGN_DIR%%/bnmail
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2011-06-04 10:40:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pgollucci

pgollucci@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2011-06-04 10:40:45 UTC
Maintainer of games/pvpgn,

Please note that PR ports/157592 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/157592

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

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Chris Rees freebsd_committer freebsd_triage 2011-06-22 17:53:30 UTC
Responsible Changed
From-To: pgollucci->crees

Invalid autoassignment
Comment 5 Chris Rees freebsd_committer freebsd_triage 2011-06-22 18:01:59 UTC
Responsible Changed
From-To: crees->freebsd-ports-bugs

To pool to correct assign message
Comment 6 Chris Rees freebsd_committer freebsd_triage 2011-06-22 18:24:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->crees

Invalid autoassignment to pgollucci
Comment 7 Chris Rees freebsd_committer freebsd_triage 2011-06-26 17:43:23 UTC
State Changed
From-To: feedback->open

Maintainer has timed out.
Comment 8 Chris Rees freebsd_committer freebsd_triage 2011-07-03 16:16:14 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 9 dfilter service freebsd_committer freebsd_triage 2011-07-03 16:16:19 UTC
crees       2011-07-03 15:16:05 UTC

  FreeBSD ports repository

  Modified files:
    games/pvpgn          Makefile pkg-deinstall pkg-install 
  Log:
  - Use USERS and GROUPS
  
  PR:             ports/157592
  Submitted by:   Chris Rees <utisoft@gmail.com>
  Approved by:    rene (mentor), maintainer timeout (29 days)
  
  Revision  Changes    Path
  1.14      +3 -0      ports/games/pvpgn/Makefile
  1.2       +0 -9      ports/games/pvpgn/pkg-deinstall
  1.3       +0 -27     ports/games/pvpgn/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"