From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 31 00:30:10 2010 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 F18181065679 for ; Sun, 31 Jan 2010 00:30:09 +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 CD1B78FC19 for ; Sun, 31 Jan 2010 00:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0V0U9xF075835 for ; Sun, 31 Jan 2010 00:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0V0U9va075830; Sun, 31 Jan 2010 00:30:09 GMT (envelope-from gnats) Resent-Date: Sun, 31 Jan 2010 00:30:09 GMT Resent-Message-Id: <201001310030.o0V0U9va075830@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, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18DEE106566B; Sun, 31 Jan 2010 00:20:25 +0000 (UTC) (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4CF658FC15; Sun, 31 Jan 2010 00:20:24 +0000 (UTC) Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1]) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0V0GRJR023890; Sun, 31 Jan 2010 00:16:27 GMT (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: (from root@localhost) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0V0GRb0023889; Sun, 31 Jan 2010 00:16:27 GMT (envelope-from sevan) Message-Id: <201001310016.o0V0GRb0023889@newbie.thingamajig-systems.co.uk> Date: Sun, 31 Jan 2010 00:16:27 GMT From: Sevan Janiyan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ale@FreeBSD.org Subject: ports/143387: [PATCH] databases/mysql-server: switch to using USERS & GROUPS in Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jan 2010 00:30:10 -0000 >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: