From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 4 12:30: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 0D3E21065673 for ; Sat, 4 Jun 2011 12:30: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 D16348FC18 for ; Sat, 4 Jun 2011 12:30:08 +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 p54CU8i3003271 for ; Sat, 4 Jun 2011 12:30:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p54CU85t003268; Sat, 4 Jun 2011 12:30:08 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jun 2011 12:30:08 GMT Resent-Message-Id: <201106041230.p54CU85t003268@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 D9954106564A for ; Sat, 4 Jun 2011 12:24:21 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s1.blu0.hotmail.com (blu0-omc1-s1.blu0.hotmail.com [65.55.116.12]) by mx1.freebsd.org (Postfix) with ESMTP id 9A8388FC18 for ; Sat, 4 Jun 2011 12:24:21 +0000 (UTC) Received: from BLU0-SMTP147 ([65.55.116.8]) by blu0-omc1-s1.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 05:24:21 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP147.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 05:24:19 -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 p54CNmYs092321 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jun 2011 13:23:48 +0100 (BST) (envelope-from chris@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p54CNmon092320; Sat, 4 Jun 2011 13:23:48 +0100 (BST) (envelope-from chris) Message-Id: Date: Sat, 4 Jun 2011 13:23:48 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157610: [PATCH] Fix port: irc/ircd-hybrid 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 12:30:09 -0000 >Number: 157610 >Category: ports >Synopsis: [PATCH] Fix port: irc/ircd-hybrid 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 12:30:08 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 I've removed pkg-install --- irc-ircd-hybrid.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/ircd-hybrid/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- Makefile 2 Sep 2009 15:01:42 -0000 1.44 +++ Makefile 4 Jun 2011 11:21:01 -0000 @@ -19,6 +19,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes +USERS= ircd +GROUPS= ${USERS} + USE_RC_SUBR= ircd-hybrid.sh SUB_FILES= pkg-message PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -78,14 +81,13 @@ --ohelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/opers \ --messagedir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/messages \ -pre-install: - ${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +pre-su-install: ${MKDIR} ${PREFIX}/etc/ircd-hybrid ${PREFIX}/share/${PORTNAME}-${PORTVERSION} ${MKDIR} ${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/ - ${MKDIR} /var/run/ircd - ${CHOWN} ircd:ircd /var/run/ircd post-install: + ${MKDIR} /var/run/ircd + ${CHOWN} ircd:ircd /var/run/ircd ${INSTALL_SCRIPT} ${WRKSRC}/etc/example.conf.quick ${PREFIX}/etc/ircd-hybrid ${INSTALL_SCRIPT} ${WRKSRC}/etc/example.efnet.conf ${PREFIX}/etc/ircd-hybrid ${INSTALL_SCRIPT} ${WRKSRC}/etc/simple.conf ${PREFIX}/etc/ircd-hybrid Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- pkg-install 20 Oct 2001 15:10:47 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,91 +0,0 @@ -#!/bin/sh - -# This script is a slightly modified copy of the pkg-install script from the -# original ircd-hybrid port, by desmo@bandwidth.org. - -if [ "x$2" != "xPRE-INSTALL" ]; then - exit 0; -fi - -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 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 --- irc-ircd-hybrid.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: