This port uses pkg-install to create new users instead of using USERS= and GROUPS=.talled port uses that username. Fix: - Use USERS and GROUPS - Remove redundant PKGINSTALL assignment 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.--prRLYoYPnUDIlmaUcBY6QVCi2GOU5xU4JlT0VPlZmQZ6sH32 Content-Type: text/plain; name="audio-squeezeboxserver.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="audio-squeezeboxserver.patch" Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/audio/squeezeboxserver/Makefile,v retrieving revision 1.80 diff -u -r1.80 Makefile --- Makefile 22 Apr 2011 16:52:25 -0000 1.80 +++ Makefile 2 Jun 2011 09:57:22 -0000 @@ -50,8 +50,8 @@ # Work around a bug in p5-Package-Stash port RUN_DEPENDS+= p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager -PKGINSTALL= ${WRKDIR}/pkg-install - +USERS= ${SLIMUSER} +GROUPS= ${SLIMGROUP} USE_PERL5= yes .include <bsd.port.pre.mk> Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/audio/squeezeboxserver/files/pkg-install.in,v retrieving revision 1.10 diff -u -r1.10 pkg-install.in --- files/pkg-install.in 14 Oct 2009 22:33:31 -0000 1.10 +++ files/pkg-install.in 2 Jun 2011 09:55:33 -0000 @@ -2,11 +2,6 @@ # $FreeBSD: ports/audio/squeezeboxserver/files/pkg-install.in,v 1.10 2009/10/14 22:33:31 brooks Exp $ name=%%PORTNAME%% -u=%%SLIMUSER%% -g=%%SLIMGROUP%% -ugid=104 -homedir=/nonexistent -shell=/sbin/nologin comment="Slim Devices SlimServer/SqueezeCenter pseudo-user" slimdir="%%PREFIX%%/%%SLIMDIR%%" statedir=%%SLIMDBDIR%% @@ -23,29 +18,6 @@ serverlogline="${serverlogfile} ${u}:${g} 644 3 100 * J ${pidfile}" case $2 in -PRE-INSTALL) - if pw group show "${g}" >/dev/null 2>&1; then - echo "Using existing group \"${g}\"." - else - echo "Creating group \"${g}\", (gid: ${ugid})." - pw groupadd ${g} -g ${ugid} - if [ $? != 0 ]; then - echo "Failed to add group \"${g}\"." - exit 1 - fi - fi - if pw user show "${u}" >/dev/null 2>&1; then - echo "Using existing user \"${u}\"." - else - echo "Creating user \"${u}\", (uid: ${ugid})." - pw useradd ${u} -u ${ugid} -g ${ugid} -h - \ - -d ${homedir} -s ${shell} -c "${comment}" - if [ $? != 0 ]; then - echo "Failed to add user \"${u}\"." - exit 1 - fi - fi - ;; POST-INSTALL) if egrep -q "^${serverlogfile}\>" ${newsyslogfile}; then echo "Using existing ${newsyslogfile} entry."
Responsible Changed From-To: freebsd-ports-bugs->brooks Over to maintainer (via the GNATS Auto Assign Tool)
Hey, This is a pretty trivial change, mostly cosmetic. I can assure you I've Tinderbox tested it, and I'm perfectly happy to commit it and take the flak for you! If you're happy, please commit or pass the PR to me. Thanks! Chris -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
crees 2011-07-09 17:44:14 UTC FreeBSD ports repository Modified files: audio/squeezeboxserver Makefile audio/squeezeboxserver/files pkg-install.in Log: - Use USERS and GROUPS - Remove redundant PKGINSTALL assignment PR: ports/157535 Submitted by: crees (me) Approved by: rene (mentor, implicit), maintainer timeout (brooks, 35 days) Revision Changes Path 1.81 +2 -2 ports/audio/squeezeboxserver/Makefile 1.11 +1 -29 ports/audio/squeezeboxserver/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"
State Changed From-To: open->closed
Responsible Changed From-To: brooks->crees Timeout.