Date: Fri, 3 Jun 2011 11:29:51 +0100 From: Chris Rees <utisoft@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/157559: [PATCH] Fix port: databases/postgresql82-server should use USERS Message-ID: <BLU0-SMTP189AD814243EFE82C6B8151A97F0@phx.gbl> Resent-Message-ID: <201106031040.p53Ae6CK041583@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157559
>Category: ports
>Synopsis: [PATCH] Fix port: databases/postgresql82-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:40:06 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-postgresql82-server.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql82-server/Makefile,v
retrieving revision 1.197
diff -u -r1.197 Makefile
--- Makefile 18 Apr 2011 23:34:26 -0000 1.197
+++ Makefile 2 Jun 2011 13:30:19 -0000
@@ -60,6 +60,8 @@
SUB_FILES+= dot.cshrc dot.profile
USE_PGSQL= yes
WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USERS= pgsql
+GROUPS= ${USERS}
.endif
.if !defined(SLAVE_ONLY)
@@ -241,12 +243,6 @@
. 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-install-server
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/databases/postgresql82-server/pkg-install-server,v
retrieving revision 1.2
diff -u -r1.2 pkg-install-server
--- pkg-install-server 6 Dec 2006 16:48:57 -0000 1.2
+++ pkg-install-server 2 Jun 2011 13:27:56 -0000
@@ -3,8 +3,6 @@
# $FreeBSD: ports/databases/postgresql82-server/pkg-install-server,v 1.2 2006/12/06 16:48:57 girgen Exp $
PATH=/bin:/usr/sbin
-PGUSER=pgsql
-DB_DIR=${PKG_PREFIX}/${PGUSER}
backupwarning() { echo "
@@ -22,43 +20,6 @@
}
case $2 in
-PRE-INSTALL)
- backupwarning
- USER=${PGUSER}
- GROUP=${USER}
- UID=70
- 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."
- else
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d ${DB_DIR} -c "PostgreSQL Daemon"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
-
- if ! [ -x ~${PGUSER} ] ; then
- mkdir -p ${DB_DIR}
- chown pgsql:pgsql ${DB_DIR}
- fi
- ;;
-
BACKUPWARNING)
backupwarning
;;
--- databases-postgresql82-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-SMTP189AD814243EFE82C6B8151A97F0>