Date: Fri, 3 Jun 2011 11:27:18 +0100 From: Chris Rees <utisoft@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/157558: [PATCH] Fix port databases/postgresql83-server should use USERS= Message-ID: <BLU0-SMTP125E418C56BCD82293F9188A97F0@phx.gbl> Resent-Message-ID: <201106031030.p53AUCIu031245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157558 >Category: ports >Synopsis: [PATCH] Fix port databases/postgresql83-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: Fri Jun 03 10:30:12 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-postgresql83-server.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql83-server/Makefile,v retrieving revision 1.210 diff -u -r1.210 Makefile --- Makefile 18 Apr 2011 23:34:26 -0000 1.210 +++ Makefile 2 Jun 2011 13:33:36 -0000 @@ -61,6 +61,8 @@ USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USERS= ${PGUSER} +GROUPS= ${PGGROUP} .endif .if !defined(SLAVE_ONLY) @@ -273,12 +275,6 @@ . endif .endif -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ - ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in Index: pkg-install-server =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql83-server/pkg-install-server,v retrieving revision 1.7 diff -u -r1.7 pkg-install-server --- pkg-install-server 18 Feb 2008 12:55:02 -0000 1.7 +++ pkg-install-server 2 Jun 2011 13:31:55 -0000 @@ -20,43 +20,6 @@ } case $2 in -PRE-INSTALL) - backupwarning - PGUSER=${PGUSER:-pgsql} - PGGROUP=${PGGROUP:-pgsql} - DB_DIR=${PKG_PREFIX}/${PGUSER} - UID=70 - GID=70 - - if pw group show "${PGGROUP}" 2>/dev/null; then - echo "You already have a group \"${PGGROUP}\", so I will use it." - else - if pw groupadd ${PGGROUP} -g ${GID}; then - echo "Added group \"${PGGROUP}\"." - else - echo "Adding group \"${PGGROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${PGUSER}" 2>/dev/null; then - echo "You already have a user \"${PGUSER}\", so I will use it." - else - if pw useradd ${PGUSER} -u ${UID} -g ${PGGROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${PGUSER}\"." - else - echo "Adding user \"${PGUSER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PGUSER} ] ; then - install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} - fi - ;; - BACKUPWARNING) backupwarning ;; --- databases-postgresql83-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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BLU0-SMTP125E418C56BCD82293F9188A97F0>