From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 2 18:00:19 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE4E1106566C for ; Thu, 2 Jun 2011 18:00:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AF7E08FC14 for ; Thu, 2 Jun 2011 18:00:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p52I0JLE093161 for ; Thu, 2 Jun 2011 18:00:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p52I0Jvq093160; Thu, 2 Jun 2011 18:00:19 GMT (envelope-from gnats) Resent-Date: Thu, 2 Jun 2011 18:00:19 GMT Resent-Message-Id: <201106021800.p52I0Jvq093160@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6315D106566C for ; Thu, 2 Jun 2011 17:50:47 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s2.blu0.hotmail.com (blu0-omc1-s2.blu0.hotmail.com [65.55.116.13]) by mx1.freebsd.org (Postfix) with ESMTP id 1EFC78FC1B for ; Thu, 2 Jun 2011 17:50:46 +0000 (UTC) Received: from BLU0-SMTP168 ([65.55.116.9]) by blu0-omc1-s2.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 2 Jun 2011 10:50:46 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP168.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 2 Jun 2011 10:50:44 -0700 Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1]) by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p52Ho6UC060161 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Thu, 2 Jun 2011 18:50:06 +0100 (BST) (envelope-from crees@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p52Ho6J5060155; Thu, 2 Jun 2011 18:50:06 +0100 (BST) (envelope-from crees) Message-Id: Date: Thu, 2 Jun 2011 18:50:06 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157535: [PATCH] Fix port: audio/squeezeboxserver should use USERS= and GROUPS= X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2011 18:00:20 -0000 >Number: 157535 >Category: ports >Synopsis: [PATCH] Fix port: audio/squeezeboxserver 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: Thu Jun 02 18:00:19 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@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=.talled port uses that username. >How-To-Repeat: >Fix: - Use USERS and GROUPS - Remove redundant PKGINSTALL assignment Submitted by: Chris Rees (utisoft@gmail.com) --- audio-squeezeboxserver.patch begins here --- 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 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." --- audio-squeezeboxserver.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: