From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 4 09:30:14 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 715EF1065670 for ; Sat, 4 Jun 2011 09:30:14 +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 463028FC24 for ; Sat, 4 Jun 2011 09:30:14 +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 p549UEBa032881 for ; Sat, 4 Jun 2011 09:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p549UEDN032878; Sat, 4 Jun 2011 09:30:14 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jun 2011 09:30:14 GMT Resent-Message-Id: <201106040930.p549UEDN032878@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 49023106566B for ; Sat, 4 Jun 2011 09:21:00 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s21.blu0.hotmail.com (blu0-omc1-s21.blu0.hotmail.com [65.55.116.32]) by mx1.freebsd.org (Postfix) with ESMTP id 004B68FC19 for ; Sat, 4 Jun 2011 09:20:59 +0000 (UTC) Received: from BLU0-SMTP109 ([65.55.116.9]) by blu0-omc1-s21.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:20:59 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP109.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:20:57 -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 p5495ig7002951 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jun 2011 10:05:44 +0100 (BST) (envelope-from chris@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p5495hT3002943; Sat, 4 Jun 2011 10:05:43 +0100 (BST) (envelope-from chris) Message-Id: Date: Sat, 4 Jun 2011 10:05:43 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157586: Fix port: irc/ircd-ratbox-devel 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:30:14 -0000 >Number: 157586 >Category: ports >Synopsis: Fix port: irc/ircd-ratbox-devel 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:30:13 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) --- irc-ircd-ratbox-devel.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/ircd-ratbox-devel/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- Makefile 28 Jan 2010 21:27:34 -0000 1.25 +++ Makefile 2 Jun 2011 19:17:50 -0000 @@ -28,6 +28,9 @@ USE_PERL5_BUILD= yes USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox +USERS= ircd +GROUPS= ${USERS} + LOGDIR?= /var/log/${PORTNAME} RUNDIR?= /var/run/${PORTNAME} DBDIR?= /var/db/${PORTNAME} @@ -188,7 +191,6 @@ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la pre-su-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${MKDIR} ${PREFIX}/etc/${PORTNAME} ${MKDIR} ${DATADIR}/help ${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/ircd-ratbox-devel/files/pkg-install.in,v retrieving revision 1.3 diff -u -r1.3 pkg-install.in --- files/pkg-install.in 28 May 2009 19:18:16 -0000 1.3 +++ files/pkg-install.in 2 Jun 2011 19:16:24 -0000 @@ -3,92 +3,11 @@ # Adapted from irc/ircd-hybrid's script # -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - #----------------------------------------------------------------------- if [ "x$2" = "xPRE-INSTALL" ]; then #----------------------------------------------------------------------- -if which -s pw ; then - : -else - cat < /dev/null ; then - echo "You already have a group \"ircd\", so I will use it." -else - if pw groupshow 72 2> /dev/null ; then - echo "You already have a gid \"72\". Please create a user \"ircd\"" - echo "with a default group of \"ircd\"." - exit 1 - fi - echo "You need a group \"ircd\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ircd -g 72 || exit - echo "Done." - else - echo "Please create it, and try again." - if ! pw usershow ircd 2> /dev/null ; then - echo "While you're at it, please create a user \"ircd\"" - echo 'too, with a default group of "ircd".' - fi - exit 1 - fi -fi - -if pw usershow ircd 2> /dev/null ; then - echo "You already have a user \"ircd\", so I will use it." -else - if pw usershow 72 2> /dev/null ; then - echo "You already have a uid \"72\". Please create a user \"irc -d\"" - echo "with a default group of \"ircd\"." - exit 1 - fi - echo "You need a user \"ircd\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd ircd -g ircd -u 72 -h - -d /nonexistent \ - -s /nonexistent -c "IRC Daemon" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi -fi +# ${DO_NADA} #----------------------------------------------------------------------- elif [ "x$2" = "xPOST-INSTALL" ]; then --- irc-ircd-ratbox-devel.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: