From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 4 10:20:11 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 438DA1065678 for ; Sat, 4 Jun 2011 10:20:11 +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 36A9A8FC17 for ; Sat, 4 Jun 2011 10:20: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 p54AK8D7082160 for ; Sat, 4 Jun 2011 10:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p54AK8qD082159; Sat, 4 Jun 2011 10:20:08 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jun 2011 10:20:08 GMT Resent-Message-Id: <201106041020.p54AK8qD082159@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 70C601065674 for ; Sat, 4 Jun 2011 10:13:18 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s38.blu0.hotmail.com (blu0-omc1-s38.blu0.hotmail.com [65.55.116.49]) by mx1.freebsd.org (Postfix) with ESMTP id 285D48FC0A for ; Sat, 4 Jun 2011 10:13:17 +0000 (UTC) Received: from BLU0-SMTP202 ([65.55.116.9]) by blu0-omc1-s38.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 03:13:17 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP202.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 03:13:16 -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 p54ACoMl017278 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jun 2011 11:12:51 +0100 (BST) (envelope-from chris@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p54ACor8017277; Sat, 4 Jun 2011 11:12:50 +0100 (BST) (envelope-from chris) Message-Id: Date: Sat, 4 Jun 2011 11:12:50 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157597: [PATCH] Fix port: dns/unbound 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 10:20:11 -0000 >Number: 157597 >Category: ports >Synopsis: [PATCH] Fix port: dns/unbound 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 10:20:07 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= >How-To-Repeat: >Fix: - Use USERS Submitted by: Chris Rees (utisoft@gmail.com) --- dns-unbound.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/dns/unbound/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 25 May 2011 09:30:38 -0000 1.37 +++ Makefile 2 Jun 2011 15:32:45 -0000 @@ -19,6 +19,8 @@ CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} --with-ldns-builtin USE_LDCONFIG= yes +USERS= ${PORTNAME} + USE_RC_SUBR= unbound MAN1= unbound-host.1 @@ -29,8 +31,6 @@ PORTDOCS= CREDITS Changelog FEATURES LICENSE README README.svn \ README.tests TODO control_proto_spec.txt ietf67-design-02.odp \ ietf67-design-02.pdf requirements.txt -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-install pkg-deinstall PLIST_SUB+= PYTHON=${PYTHON} @@ -84,9 +84,6 @@ @${MKDIR} ${WRKSRC}/balancer @${RM} ${WRKSRC}/util/configlexer.c -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(NOPORTDOCS) Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/dns/unbound/files/pkg-install.in,v retrieving revision 1.3 diff -u -r1.3 pkg-install.in --- files/pkg-install.in 17 Aug 2009 13:27:19 -0000 1.3 +++ files/pkg-install.in 2 Jun 2011 15:32:05 -0000 @@ -4,27 +4,10 @@ # PW=/usr/sbin/pw -UID=59 USER="unbound" PREFIX="%%PREFIX%%" case $2 in - -PRE-INSTALL) - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g daemon -h - \ - -d "/nonexistent" -s /usr/sbin/nologin -c "unbound dns resolver" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; - POST-INSTALL) chown "${USER}" $PREFIX/etc/unbound ;; --- dns-unbound.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: