ports/157557: [PATCH] Fix port: databases/rdfdb should use USERS and GROUPS

[Chris Rees]

>Number:         157557
>Category:       ports
>Synopsis:       [PATCH] Fix port: databases/rdfdb should use USERS and GROUPS
>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:   Fri Jun 03 10:30:11 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 pkg-install has been removed.


--- databases-rdfdb.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/rdfdb/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	23 May 2011 12:09:06 -0000	1.11
+++ Makefile	2 Jun 2011 13:53:30 -0000
@@ -23,10 +23,10 @@
 MAKEFILE=	makefile
 ALL_TARGET=
 CFLAGS+=	${PTHREAD_CFLAGS}
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
 
-RDFDB_DIR?=	/var/db/rdfdb
 RDFDB_PORT?=	7001
-PLIST_SUB=	RDFDB_DIR=${RDFDB_DIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
@@ -37,13 +37,7 @@
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/rdfdb ${PREFIX}/bin
-.if !exists(${RDFDB_DIR})
-	@${MKDIR} ${RDFDB_DIR}
-.endif
-	@${SETENV} RDFDB_DIR=${RDFDB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} \
-		PRE-INSTALL
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%RDFDB_DIR%%|${RDFDB_DIR}|g; \
-		s|%%RDFDB_PORT%%|${RDFDB_PORT}|g" \
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%RDFDB_PORT%%|${RDFDB_PORT}|g" \
 		< ${FILESDIR}/rdfdb-server.sh.tmpl \
 		> ${PREFIX}/etc/rc.d/rdfdb-server.sh
 	@${CHMOD} 554 ${PREFIX}/etc/rc.d/rdfdb-server.sh
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	24 Jun 2004 08:11:09 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-if [ -z "${RDFDB_DIR}" ]; then
-	RDFDB_DIR=/var/db/rdfdb
-fi
-
-case $2 in
-PRE-INSTALL)
-	USER=rdfdb
-	GROUP=${USER}
-	UID=55
-	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 ${RDFDB_DIR}
-		then
-			echo "Changed home directory of \"${USER}\" to \"${RDFDB_DIR}\""
-		else
-			echo "Changing home directory of \"${USER}\" to \"${RDFDB_DIR}\" failed..."
-			exit 1
-		fi
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d ${RDFDB_DIR} -s /bin/sh -c "rdfDB Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	chown -R ${USER}:${GROUP} ${RDFDB_DIR}
-	;;
-esac
Index: pkg-plist
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/rdfdb/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	9 Jun 2002 00:35:39 -0000	1.1
+++ pkg-plist	2 Jun 2011 13:54:40 -0000
@@ -1,4 +1,4 @@
 bin/rdfdb
 etc/rc.d/rdfdb-server.sh
- at unexec rmdir %%RDFDB_DIR%% 2>/dev/null || true
- at exec mkdir -p %%RDFDB_DIR%%
+ at unexec rmdir /var/db/rdfdb 2>/dev/null || true
+ at exec mkdir -p /var/db/rdfdb
Index: files/rdfdb-server.sh.tmpl
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/rdfdb/files/rdfdb-server.sh.tmpl,v
retrieving revision 1.1
diff -u -r1.1 rdfdb-server.sh.tmpl
--- files/rdfdb-server.sh.tmpl	9 Jun 2002 00:35:39 -0000	1.1
+++ files/rdfdb-server.sh.tmpl	2 Jun 2011 13:53:56 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RDFDB_DIR=%%RDFDB_DIR%%
+RDFDB_DIR=/var/db/rdfdb
 RDFDB_PORT=%%RDFDB_PORT%%
 export RDFDB_DIR RDFDB_PORT
 
--- databases-rdfdb.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: