From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 6 19:10:08 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 C467B1065672 for ; Mon, 6 Jun 2011 19:10:08 +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 999558FC23 for ; Mon, 6 Jun 2011 19:10: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 p56JA8iq081659 for ; Mon, 6 Jun 2011 19:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p56JA883081658; Mon, 6 Jun 2011 19:10:08 GMT (envelope-from gnats) Resent-Date: Mon, 6 Jun 2011 19:10:08 GMT Resent-Message-Id: <201106061910.p56JA883081658@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 B105A1065674 for ; Mon, 6 Jun 2011 19:07:14 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s16.blu0.hotmail.com (blu0-omc1-s16.blu0.hotmail.com [65.55.116.27]) by mx1.freebsd.org (Postfix) with ESMTP id 681918FC12 for ; Mon, 6 Jun 2011 19:07:13 +0000 (UTC) Received: from BLU0-SMTP141 ([65.55.116.8]) by blu0-omc1-s16.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 6 Jun 2011 12:07:13 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP141.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 6 Jun 2011 12:07:12 -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 p56J1aaU056483 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Mon, 6 Jun 2011 20:01:36 +0100 (BST) (envelope-from crees@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p56J1YNe056482; Mon, 6 Jun 2011 20:01:34 +0100 (BST) (envelope-from crees) Message-Id: Date: Mon, 6 Jun 2011 20:01:34 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157669: Fix port: databases/postgresql90-server 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: Mon, 06 Jun 2011 19:10:08 -0000 >Number: 157669 >Category: ports >Synopsis: Fix port: databases/postgresql90-server 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: Mon Jun 06 19:10: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) --- databases-postgresql90-server.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql90-server/Makefile,v retrieving revision 1.219 diff -u -r1.219 Makefile --- Makefile 17 May 2011 22:26:08 -0000 1.219 +++ Makefile 2 Jun 2011 13:42:15 -0000 @@ -35,7 +35,6 @@ PG_USER?= pgsql PG_GROUP?= pgsql -PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include @@ -62,6 +61,8 @@ USE_PGSQL= yes WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} SUB_FILES+= 502.pgsql +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} .endif .if !defined(SLAVE_ONLY) @@ -314,19 +315,10 @@ . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) -PLIST_SUB+= PG_USER=$(PG_USER) PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif .endif -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in Index: pkg-plist-server =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql90-server/pkg-plist-server,v retrieving revision 1.31 diff -u -r1.31 pkg-plist-server --- pkg-plist-server 18 Apr 2011 23:34:27 -0000 1.31 +++ pkg-plist-server 4 Jun 2011 13:49:16 -0000 @@ -756,9 +756,8 @@ share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry share/postgresql/tsearch_data -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually." @dirrmtry share/postgresql @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry %%PG_USER%% +@dirrmtry pgsql Index: files/pkg-install-server.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql90-server/files/pkg-install-server.in,v retrieving revision 1.3 diff -u -r1.3 pkg-install-server.in --- files/pkg-install-server.in 2 May 2011 21:37:30 -0000 1.3 +++ files/pkg-install-server.in 2 Jun 2011 13:41:25 -0000 @@ -4,10 +4,6 @@ PATH=/bin:/usr/bin:/usr/sbin -PG_USER=%%PG_USER%% -PG_GROUP=%%PG_GROUP%% -PG_UID=%%PG_UID%% - backupwarning() { echo " =========== BACKUP YOUR DATA! ============= @@ -24,39 +20,6 @@ } case $2 in -PRE-INSTALL) - backupwarning - DB_DIR=${PKG_PREFIX}/${PG_USER} - - if pw group show "${PG_GROUP}" 2>/dev/null; then - echo "You already have a group \"${PG_GROUP}\", so I will use it." - else - if pw groupadd ${PG_GROUP} -g ${PG_UID}; then - echo "Added group \"${PG_GROUP}\"." - else - echo "Adding group \"${PG_GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${PG_USER}" 2>/dev/null; then - echo "You already have a user \"${PG_USER}\", so I will use it." - else - if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${PG_USER}\"." - else - echo "Adding user \"${PG_USER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PG_USER} ] ; then - install -m 755 -o ${PG_USER} -g ${PG_GROUP} -d ${DB_DIR} - fi - ;; - BACKUPWARNING) backupwarning ;; --- databases-postgresql90-server.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: