From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 4 09:10:09 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 E39F8106566B for ; Sat, 4 Jun 2011 09:10:09 +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 B7B8C8FC15 for ; Sat, 4 Jun 2011 09:10:09 +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 p549A9hh014045 for ; Sat, 4 Jun 2011 09:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p549A9bS014044; Sat, 4 Jun 2011 09:10:09 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jun 2011 09:10:09 GMT Resent-Message-Id: <201106040910.p549A9bS014044@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 08945106566C for ; Sat, 4 Jun 2011 09:04:00 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s11.blu0.hotmail.com (blu0-omc1-s11.blu0.hotmail.com [65.55.116.22]) by mx1.freebsd.org (Postfix) with ESMTP id B44698FC08 for ; Sat, 4 Jun 2011 09:03:59 +0000 (UTC) Received: from BLU0-SMTP34 ([65.55.116.8]) by blu0-omc1-s11.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:03:58 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP34.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:03:58 -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 p5493SxM098362 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jun 2011 10:03:28 +0100 (BST) (envelope-from chris@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p5493R5U098361; Sat, 4 Jun 2011 10:03:27 +0100 (BST) (envelope-from chris) Message-Id: Date: Sat, 4 Jun 2011 10:03:27 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157580: Fix port: irc/hybserv should use USERS 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: Sat, 04 Jun 2011 09:10:10 -0000 >Number: 157580 >Category: ports >Synopsis: Fix port: irc/hybserv 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 09:10:09 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= >How-To-Repeat: >Fix: - Use USERS and GROUPS Submitted by: Chris Rees (utisoft@gmail.com) Please bear in mind that pkg-install has been removed. --- irc-hybserv.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/hybserv/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 21 Mar 2011 07:13:04 -0000 1.18 +++ Makefile 2 Jun 2011 19:03:04 -0000 @@ -16,6 +16,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes +USERS= ${PORTNAME} +GROUPS= ${USERS} + WRKSRC= ${WRKDIR}/hybserv .if defined(WITH_DAEMONTOOLS) @@ -23,9 +26,6 @@ RUN_DEPENDS+= supervise:${PORTSDIR}/sysutils/daemontools .endif -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: @${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/hybserv.sh \ > ${WRKDIR}/hybserv.sh Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- pkg-install 31 Mar 2007 12:53:57 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -#!/bin/sh - -if [ "x$2" != "xPRE-INSTALL" ]; then - exit 0; -fi - - USER=hybserv - GROUP=${USER} - UID=76 - 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 ${NONEXISTENT} - then - echo "Changed home directory of \"${USER}\" to \"${NONEXISTENT}\"" - else - echo "Changing home directory of \"${USER}\" to \"${NONEXISTENT}\" failed..." - exit 1 - fi - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d ${NONEXISTENT} -s /sbin/nologin -c "HybServ Daemon" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi --- irc-hybserv.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: