This port uses pkg-install to create new users instead of using USERS= and GROUPS= Fix: - Use USERS and GROUPS Submitted by: Chris Rees (utisoft@gmail.com) Please bear in mind that pkg-install has been removed. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--EhAp4NQf9is3gjZcof28zZx1ar19oWMtMNXTPAYZ87rJSwjA Content-Type: text/plain; name="irc-hybserv.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="irc-hybserv.patch" 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
Responsible Changed From-To: freebsd-ports-bugs->pgollucci pgollucci@ wants his PRs (via the GNATS Auto Assign Tool)
Responsible Changed From-To: pgollucci->crees Invalid autoassignment
crees 2011-06-27 17:57:54 UTC FreeBSD ports repository Modified files: irc/hybserv Makefile Removed files: irc/hybserv pkg-install Log: - Use USERS and GROUPS PR: ports/157580 Submitted by: Chris Rees (utisoft@gmail.com) Approved by: tabthorpe (co-mentor) Revision Changes Path 1.19 +3 -3 ports/irc/hybserv/Makefile 1.5 +0 -40 ports/irc/hybserv/pkg-install (dead) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!