Date: Sun, 31 Jan 2010 00:16:27 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ale@FreeBSD.org Subject: ports/143387: [PATCH] databases/mysql-server: switch to using USERS & GROUPS in Makefile Message-ID: <201001310016.o0V0GRb0023889@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001310030.o0V0U9va075830@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143387
>Category: ports
>Synopsis: [PATCH] databases/mysql-server: switch to using USERS & GROUPS in Makefile
>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: Sun Jan 31 00:30:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
$USERS & $GROUPS in Makefile take care of adding user accounts, there's no need to do it manually vi pkg-install
Removed file(s):
- pkg-install
Port maintainer (ale@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- mysql-server-5.1.42.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mysql51-server/Makefile,v
retrieving revision 1.258
diff -u -r1.258 Makefile
--- Makefile 11 Jan 2010 11:58:38 -0000 1.258
+++ Makefile 31 Jan 2010 00:11:21 -0000
@@ -19,6 +19,7 @@
SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
@@ -29,6 +30,9 @@
--with-comment='FreeBSD port: ${PKGNAME}' \
--enable-thread-safe-client
+USERS= mysql
+GROUPS= mysql
+
.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
@@ -160,7 +164,6 @@
post-install:
.if !defined(PACKAGE_BUILDING)
- @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
.endif
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install 6 Apr 2005 13:38:28 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
- USER=mysql
- GROUP=${USER}
- UID=88
- 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 /nonexistent -s /sbin/nologin -c "MySQL Daemon"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
- ;;
-esac
--- mysql-server-5.1.42.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001310016.o0V0GRb0023889>