Date: Wednesday, November 18, 2009 @ 10:47:01
Author: giovanni
Revision: 58962
Merged revisions 58956 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mysql/trunk
........
r58956 | andrea | 2009-11-18 07:09:53 -0800 (mer, 18 nov 2009) | 2 lines
upgpkg: mysql 5.1.41-1
upstream release; create group and user in .install; fix /var/run/mysql
permission
........
Added:
mysql/repos/extra-x86_64/mysql.install
(from rev 58956, mysql/trunk/mysql.install)
Modified:
mysql/repos/extra-x86_64/ (properties)
mysql/repos/extra-x86_64/PKGBUILD
mysql/repos/extra-x86_64/mysqld
---------------+
PKGBUILD | 9 +++++----
mysql.install | 17 +++++++++++++++++
mysqld | 18 ------------------
3 files changed, 22 insertions(+), 22 deletions(-)
Property changes on: mysql/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /mysql/trunk:1-58954
+ /mysql/trunk:1-58961
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-11-18 15:39:08 UTC (rev 58961)
+++ extra-x86_64/PKGBUILD 2009-11-18 15:47:01 UTC (rev 58962)
@@ -5,8 +5,8 @@
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.40
-pkgrel=2
+pkgver=5.1.41
+pkgrel=1
pkgdesc="A fast SQL database server"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,8 +17,8 @@
'mysqld'
'my.cnf'
'mysqld.conf.d')
-md5sums=('32e7373c16271606007374396e6742ad'
- '09f64b1da689f0bc60e17172f9aa0b38'
+md5sums=('b5d39e8789174753f3c782959729e68c'
+ '7e1c46ccbd91553cc11df7199fbfca32'
'26589ea08b78fc38dd174caeb93b810c'
'4a9077fc95ec6db1d5420e0cdc74d31c')
@@ -108,6 +108,7 @@
package_mysql(){
backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+ install=mysql.install
depends=('mysql-clients')
optdepends=('perl-dbi' 'perl-dbd-mysql')
Copied: mysql/repos/extra-x86_64/mysql.install (from rev 58956,
mysql/trunk/mysql.install)
===================================================================
--- extra-x86_64/mysql.install (rev 0)
+++ extra-x86_64/mysql.install 2009-11-18 15:47:01 UTC (rev 58962)
@@ -0,0 +1,17 @@
+post_install(){
+ groupadd -g 89 mysql &>/dev/null
+ useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+ usr/bin/mysql_install_db --datadir=/var/lib/mysql --user=mysql
+ chown -R mysql:mysql var/lib/mysql &> /dev/null
+ chown mysql:mysql var/run/mysqld &> /dev/null
+}
+
+post_upgrade(){
+ chown -R mysql:mysql var/lib/mysql &> /dev/null
+ chown mysql:mysql var/run/mysqld
+}
+
+post_remove(){
+ userdel mysql &>/dev/null
+ groupdel mysql &>/dev/null
+}
Modified: extra-x86_64/mysqld
===================================================================
--- extra-x86_64/mysqld 2009-11-18 15:39:08 UTC (rev 58961)
+++ extra-x86_64/mysqld 2009-11-18 15:47:01 UTC (rev 58962)
@@ -12,24 +12,6 @@
echo $(pgrep -u mysql mysqld);
}
-if [ ! `egrep '^mysql:' /etc/group` ]; then
- stat_busy "Adding mysql group"
- groupadd -g 89 mysql
- stat_done
-fi
-if [ ! `egrep '^mysql:' /etc/passwd` ]; then
- stat_busy "Adding mysql user"
- useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
- [ -d $MYSQLD_ROOT ] && chown -R mysql:mysql $MYSQLD_ROOT
- stat_done
-fi
-
-if [ ! -d $MYSQLD_ROOT ]; then
- mkdir $MYSQLD_ROOT
- /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
- chown -R mysql:mysql $MYSQLD_ROOT
-fi
-
case "$1" in
start)
stat_busy "Starting MySQL"
