This port uses pkg-install to create new users instead of using USERS= and GROUPS=, and also tries to delete users on deinstall without prompting -- this is a problem if another installed port uses that username. Fix: - Use USERS and GROUPS Submitted by: Chris Rees (utisoft@gmail.com) Please bear in mind that pkg-install has been removed -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--glf4PX7RI4SPZeX0nF6UoWxQDNnwIrXJxwYPu3eMIfzhL4DJ Content-Type: text/plain; name="databases-mysql41-server.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="databases-mysql41-server.patch" Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/databases/mysql41-server/Makefile,v retrieving revision 1.236 diff -u -r1.236 Makefile --- Makefile 4 Dec 2010 07:30:48 -0000 1.236 +++ Makefile 2 Jun 2011 12:53:56 -0000 @@ -86,6 +86,9 @@ # MySQL-Server part .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) +USERS= ${PORTNAME} +GROUPS= ${USERS} + USE_MYSQL= yes WANT_MYSQL_VER= 41 @@ -141,11 +144,6 @@ @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc .endif -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 15 Feb 2005 22:57:02 -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
Responsible Changed From-To: freebsd-ports-bugs->ale Over to maintainer (via the GNATS Auto Assign Tool)
ale 2011-06-13 10:11:31 UTC FreeBSD ports repository Modified files: databases/mysql40-server Makefile databases/mysql41-server Makefile Removed files: databases/mysql40-server pkg-install databases/mysql41-server pkg-install Log: Switch to USERS/GROUPS. PR: ports/157562, ports/157591 Submitted by: crees Revision Changes Path 1.220 +3 -5 ports/databases/mysql40-server/Makefile 1.7 +0 -36 ports/databases/mysql40-server/pkg-install (dead) 1.237 +3 -5 ports/databases/mysql41-server/Makefile 1.7 +0 -36 ports/databases/mysql41-server/pkg-install (dead) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed.