Date: Sat, 4 Jun 2011 14:21:22 +0100 From: Chris Rees <utisoft@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/157611: Fix port: irc/ircd-ratbox should use USERS Message-ID: <BLU0-SMTP1282B97D4CA7828ADF3427AA97E0@phx.gbl> Resent-Message-ID: <201106041330.p54DUEgd057826@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157611 >Category: ports >Synopsis: Fix port: irc/ircd-ratbox 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 13: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.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/ircd-ratbox/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 28 Jan 2010 21:29:16 -0000 1.17 +++ Makefile 4 Jun 2011 12:24:35 -0000 @@ -25,6 +25,9 @@ USE_RC_SUBR= ircd-ratbox.sh USE_PERL5_BUILD= yes +USERS= ircd +GROUPS= ${USERS} + LOGDIR= /var/log/${PORTNAME} RUNDIR= /var/run/${PORTNAME} SUB_FILES= pkg-message pkg-install @@ -179,13 +182,12 @@ ${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl pre-su-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${CHOWN} ircd:ircd ${PREFIX}/etc/${PORTNAME} ${MKDIR} ${DATADIR}/help ${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules post-install: + ${CHOWN} -R ircd:ircd ${PREFIX}/etc/${PORTNAME} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/irc/ircd-ratbox/files/pkg-install.in,v retrieving revision 1.1 diff -u -r1.1 pkg-install.in --- files/pkg-install.in 27 Jan 2006 06:09:27 -0000 1.1 +++ files/pkg-install.in 2 Jun 2011 19:19:42 -0000 @@ -3,93 +3,12 @@ # 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 <<EOF -Your system does not include the "pw" utility. You should upgrade -to a newer version of FreeBSD. Without "pw" this script will not -run. -EOF - exit 1 -fi - -echo "" -if pw groupshow ircd 2> /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.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BLU0-SMTP1282B97D4CA7828ADF3427AA97E0>