ports/157602: [PATCH] Fix port: irc/tr-ircd should use USERS

[Chris Rees]

>Number:         157602
>Category:       ports
>Synopsis:       [PATCH] Fix port: irc/tr-ircd should use USERS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 11:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>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 at 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 at gmail.com)

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


--- irc-tr-ircd.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/irc/tr-ircd/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	23 Mar 2011 15:53:18 -0000	1.24
+++ Makefile	2 Jun 2011 19:54:42 -0000
@@ -21,6 +21,8 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+USERS=		${TRIRCD_USER}
+GROUPS=		${TRIRCD_GROUP}
 TRIRCD_MAXCLIENTS?=	128
 
 TRIRCD_USER?=	trircd
@@ -45,13 +47,10 @@
 
 USE_RC_SUBR=	trircd
 
-SUB_LIST+=	TRIRCD_USER="${TRIRCD_USER}" TRIRCD_GROUP="${TRIRCD_GROUP}" \
-		TRIRCD_RUNDIR="${TRIRCD_RUNDIR}" TRIRCD_LOGDIR="${TRIRCD_LOGDIR}" \
+SUB_LIST+=	TRIRCD_RUNDIR="${TRIRCD_RUNDIR}" TRIRCD_LOGDIR="${TRIRCD_LOGDIR}" \
 		TRIRCD_CONFDIR="${TRIRCD_CONFDIR}"
 
-SUB_FILES+=	pkg-install pkg-deinstall pkg-message
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES+=	pkg-deinstall pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if !defined(NO_INSTALL_MANPAGES)
@@ -68,9 +67,6 @@
 
 .include <bsd.port.pre.mk>
 
-PW?=		/usr/sbin/pw
-SUB_LIST+=	MKDIR="${MKDIR}" PW="${PW}" CHMOD="${CHMOD}" CHOWN="${CHOWN}"
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
 .endif
@@ -90,9 +86,6 @@
 post-configure:
 	@${REINPLACE_CMD} -e "s,/var/log/tr-ircd,${TRIRCD_LOGDIR}," ${WRKSRC}/include/ircpath.h
 
-pre-install:
-	@${SH} ${PKGINSTALL}
-
 post-install:
 	@${MKDIR} ${TRIRCD_CONFDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/configuration/example.conf ${TRIRCD_CONFDIR}/ircd.conf.sample
Index: files/pkg-deinstall.in
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/irc/tr-ircd/files/pkg-deinstall.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.in
--- files/pkg-deinstall.in	8 Feb 2007 22:32:06 -0000	1.1
+++ files/pkg-deinstall.in	2 Jun 2011 19:50:04 -0000
@@ -4,19 +4,8 @@
 	exit 0
 fi
 
-TRIRCD_USER="%%TRIRCD_USER%%"
-TRIRCD_GROUP="%%TRIRCD_GROUP%%"
 TRIRCD_RUNDIR="%%TRIRCD_RUNDIR%%"
 TRIRCD_LOGDIR="%%TRIRCD_LOGDIR%%"
-PW="%%PW%%"
 
-if pw usershow "${TRIRCD_USER}" 2>/dev/null 1>&2; then
-	echo "This port may have created the user: ${TRIRCD_USER}" 
-	echo "To delete this user, use '${PW} userdel \"${TRIRCD_USER}\"'"
-fi
-if pw usershow "${TRIRCD_GROUP}" 2>/dev/null 1>&2; then
-	echo "This port may have created the group: ${TRIRCD_GROUP}"
-	echo "To delete this group, use '${PW} groupdel \"${TRIRCD_GROUP}\"'"
-fi
 	echo "You may need to remove ${TRIRCD_RUNDIR} and ${TRIRCD_LOGDIR} manually."
 exit 0
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- files/pkg-install.in	8 Feb 2007 22:32:06 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-TRIRCD_USER="%%TRIRCD_USER%%"
-TRIRCD_GROUP="%%TRIRCD_GROUP%%"
-TRIRCD_RUNDIR="%%TRIRCD_RUNDIR%%"
-TRIRCD_LOGDIR="%%TRIRCD_LOGDIR%%"
-TRIRCD_CONFDIR="%%TRIRCD_CONFDIR%%"
-
-MKDIR="%%MKDIR%%"
-PW="%%PW%%"
-
-if ! ${PW} groupshow "${TRIRCD_GROUP}" 2>/dev/null 1>&2; then
-        if pw groupadd ${TRIRCD_GROUP}; then
-                echo "Added group \"${TRIRCD_GROUP}\"."
-        else
-                echo "Adding group \"${TRIRCD_GROUP}\" failed..."
-                exit 1
-        fi
-else
-	echo "You already have a group \"${TRIRCD_GROUP}\"."
-fi
-
-if ! ${PW} usershow "${TRIRCD_USER}" 2>/dev/null 1>&2; then
-        if pw useradd ${TRIRCD_USER} -g ${TRIRCD_GROUP} -h - \
-                -s "/usr/sbin/nologin" -d "%%TRIRCD_CONFDIR%%" \
-                -c "TR-IRCD pseudo-user"; \
-        then
-                echo "Added user \"${TRIRCD_USER}\"."
-        else
-                echo "Adding user \"${TRIRCD_USER}\" failed..."
-                exit 1
-        fi
-else
-	echo "You already have a user \"${TRIRCD_USER}\"."
-fi
--- irc-tr-ircd.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:
>Unformatted: