ports/157595: [PATCH] Fix port: devel/py-mercurialserver should use USERS

Chris Rees utisoft at gmail.com
Sat Jun 4 10:00:27 UTC 2011


>Number:         157595
>Category:       ports
>Synopsis:       [PATCH] Fix port: devel/py-mercurialserver 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 10:00:26 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
	- Rename CONF_FILES to avoid conflict with incoming feature

	Submitted by: Chris Rees (utisoft at gmail.com)

	Please note that pkg-install has been removed


--- devel-py-mercurialserver.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/devel/py-mercurialserver/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	14 Feb 2011 03:13:18 -0000	1.2
+++ Makefile	2 Jun 2011 15:03:31 -0000
@@ -24,13 +24,15 @@
 
 HGUSER=		hg
 HGGROUP=	hg
+USERS=		${HGUSER}
+GROUPS=		${HGGROUP}
 
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=YES
 PYDISTUTILS_PKGNAME=${SNAME}
 PYDISTUTILS_PKGVERSION=${SVERSION}
 
-CONF_FILES=	access.conf \
+HGSVCONF_FILES=	access.conf \
 		remote-hgrc.d/access.rc \
 		remote-hgrc.d/logging.rc
 
@@ -38,16 +40,11 @@
 pre-patch:
 	${SED} -I .orig -e "s#/etc/mercurial-server/#${PREFIX}/etc/${PORTNAME}/#" ${WRKSRC}/src/init/dot-mercurial-server
 
-pre-su-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} GITUSER=${HGUSER} \
-		GITGROUP=${HGGROUP} GITHOME=${HGHOME} \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}/remote-hgrc.d
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}/keys/users
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}/keys/root
-.for i in ${CONF_FILES}
+.for i in ${HGSVCONF_FILES}
 	${INSTALL_DATA} ${WRKSRC}/src/init/conf/${i} ${PREFIX}/etc/${PORTNAME}/${i}
 .endfor
 	${MV} ${PREFIX}/hg/dot-mercurial-server ${PREFIX}/hg/.mercurial-server
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	27 Nov 2010 02:07:50 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: ports/devel/py-mercurialserver/pkg-install,v 1.1 2010/11/27 02:07:50 pgollucci Exp $
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-PRE-INSTALL)
-	HGUSER=${HGUSER:-hg}
-	HGGROUP=${HGGROUP:-hg}
-	HGHOME=${HGHOME:-${PKG_PREFIX}/${HGUSER}}
-	UID=212
-	GID=212
-
-	if pw group show "${HGGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${HGGROUP}\", so I will use it."
-	else
-		if pw groupadd ${HGGROUP} -g ${GID}; then
-			echo "Added group \"${HGGROUP}\"."
-		else
-			echo "Adding group \"${HGGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${HGUSER}" 2>/dev/null; then
-		echo "You already have a user \"${HGUSER}\", so I will use it."
-	else
-		if pw useradd ${HGUSER} -u ${UID} -g ${HGGROUP} -h - -d ${HGHOME} \
-			-c "mercurial-server user"
-		then
-			echo "Added user \"${HGUSER}\"."
-		else
-			echo "Adding user \"${HGUSER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~${HGUSER} ] ; then
-		install -m 755 -o ${HGUSER} -g ${HGGROUP} -d ${HGHOME}
-	fi
-	;;
-esac
--- devel-py-mercurialserver.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:



More information about the freebsd-ports-bugs mailing list