From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 4 09:40:19 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 DEE43106568D for ; Sat, 4 Jun 2011 09:40:19 +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 B450F8FC14 for ; Sat, 4 Jun 2011 09:40:19 +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 p549eJ0Y044256 for ; Sat, 4 Jun 2011 09:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p549eJjr044251; Sat, 4 Jun 2011 09:40:19 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jun 2011 09:40:19 GMT Resent-Message-Id: <201106040940.p549eJjr044251@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 91DED1065670 for ; Sat, 4 Jun 2011 09:35:56 +0000 (UTC) (envelope-from utisoft@hotmail.com) Received: from blu0-omc1-s34.blu0.hotmail.com (blu0-omc1-s34.blu0.hotmail.com [65.55.116.45]) by mx1.freebsd.org (Postfix) with ESMTP id 519B38FC13 for ; Sat, 4 Jun 2011 09:35:56 +0000 (UTC) Received: from BLU0-SMTP130 ([65.55.116.9]) by blu0-omc1-s34.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:35:56 -0700 Received: from zeus.bayofrum.net ([90.221.7.100]) by BLU0-SMTP130.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jun 2011 02:35:54 -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 p549XqUj014399 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jun 2011 10:33:52 +0100 (BST) (envelope-from chris@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p549XpMo014398; Sat, 4 Jun 2011 10:33:52 +0100 (BST) (envelope-from chris) Message-Id: Date: Sat, 4 Jun 2011 10:33:52 +0100 From: Chris Rees Sender: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157591: [PATCH] Fix port: databases/mysql40-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: Sat, 04 Jun 2011 09:40:20 -0000 >Number: 157591 >Category: ports >Synopsis: [PATCH] Fix port: databases/mysql40-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: Sat Jun 04 09:40:19 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) Please note that pkg-install has been removed. --- databases-mysql40-server.patch begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/mysql40-server/Makefile,v retrieving revision 1.219 diff -u -r1.219 Makefile --- Makefile 8 Feb 2011 12:01:34 -0000 1.219 +++ Makefile 2 Jun 2011 12:51:24 -0000 @@ -78,6 +78,9 @@ # MySQL-Server part .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) +USERS= ${PORTNAME} +GROUPS= ${USERS} + USE_MYSQL= yes WANT_MYSQL_VER= 40 @@ -121,11 +124,6 @@ @${REINPLACE_CMD} -e 's|\&\& defined(__GNUC__)|\&\& defined(__GNUC__) \&\& 0|' \ ${WRKSRC}/include/my_global.h -post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - .else # MySQL-Client part .if defined(CLIENT_ONLY) Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- pkg-install 14 Mar 2005 10:52:45 -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 --- databases-mysql40-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: