[arch-commits] Commit in mysql/repos (3 files)
Douglas Soares de Andrade
douglas at archlinux.org
Fri Jan 30 00:08:43 UTC 2009
Date: Thursday, January 29, 2009 @ 19:08:43
Author: douglas
Revision: 25814
Merged revisions 25813 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk
........
r25813 | douglas | 2009-01-29 22:07:07 -0200 (Qui, 29 Jan 2009) | 1 line
upgpkg: mysql 5.0.75-4
........
Modified:
mysql/repos/extra-i686/ (properties)
mysql/repos/extra-i686/PKGBUILD
mysql/repos/extra-i686/mysqld
----------+
PKGBUILD | 6 +++---
mysqld | 13 ++++---------
2 files changed, 7 insertions(+), 12 deletions(-)
Property changes on: mysql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /mysql/trunk:1-25306
+ /mysql/trunk:1-25813
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-01-30 00:07:07 UTC (rev 25813)
+++ extra-i686/PKGBUILD 2009-01-30 00:08:43 UTC (rev 25814)
@@ -3,12 +3,12 @@
# Contributor: judd <jvinet at zeroflux.org>
pkgname=mysql
pkgver=5.0.75
-pkgrel=3
+pkgrel=4
pkgdesc="A fast SQL database server"
arch=(i686 x86_64)
backup=(etc/my.cnf etc/conf.d/mysqld)
depends=("mysql-clients>=${pkgver}" 'tcp_wrappers')
-makedepends=('libtool')
+makedepends=('libtool' 'patch')
url=('http://www.mysql.com/')
options=('!libtool')
optdepends=('perl-dbi' 'perl-dbd-mysql')
@@ -50,6 +50,6 @@
}
md5sums=('a234f0a60a7f8c290d9875cba3a2c5a2'
'e892aac36cbeb57f0e003ec0936afb3b'
- '25a4de5954fbdb758cb03cb6a3e0fde3'
+ '546af0d36a325f4d7b687bb4d681734b'
'0ee035590ffc61d32de994f461fd2bd2'
'4a9077fc95ec6db1d5420e0cdc74d31c')
Modified: extra-i686/mysqld
===================================================================
--- extra-i686/mysqld 2009-01-30 00:07:07 UTC (rev 25813)
+++ extra-i686/mysqld 2009-01-30 00:08:43 UTC (rev 25814)
@@ -9,12 +9,7 @@
. /etc/rc.d/functions
getPID() {
- if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
- echo `cat $MYSQLD_ROOT/$HOSTNAME.pid`
- else
- PID=`pidof -o %PPID /usr/sbin/mysqld`
- echo $PID
- fi
+ echo `pidof -o %PPID /usr/sbin/mysqld`
}
if [ ! `egrep '^mysql:' /etc/group` ]; then
@@ -25,14 +20,14 @@
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
+ [ -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
+ chown -R mysql:mysql $MYSQLD_ROOT
fi
case "$1" in
@@ -49,7 +44,7 @@
stat_fail
exit 1
else
- cp $MYSQLD_ROOT/$HOSTNAME.pid /var/run/mysqld.pid 2> /dev/null
+ echo $(getPID) >/var/run/mysqld.pid
add_daemon mysqld
stat_done
fi
More information about the arch-commits
mailing list