Date: Wednesday, November 18, 2009 @ 07:52:13 Author: giovanni Revision: 58955
Merged revisions 58952-58953 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mysql/trunk ........ r58952 | andrea | 2009-11-17 19:28:08 -0800 (mar, 17 nov 2009) | 2 lines upgpkg: mysql 5.1.40-2 move mysqld.sock into /var/run/mysqld ........ r58953 | andrea | 2009-11-18 04:07:26 -0800 (mer, 18 nov 2009) | 1 line mysql.sock -> mysqld.sock ........ Modified: mysql/repos/extra-x86_64/ (properties) mysql/repos/extra-x86_64/PKGBUILD mysql/repos/extra-x86_64/my.cnf Deleted: mysql/repos/extra-x86_64/mysql.install ---------------+ PKGBUILD | 11 ++++------- my.cnf | 4 ++-- mysql.install | 4 ---- 3 files changed, 6 insertions(+), 13 deletions(-) Property changes on: mysql/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /mysql/trunk:1-58940 + /mysql/trunk:1-58954 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-18 12:29:40 UTC (rev 58954) +++ extra-x86_64/PKGBUILD 2009-11-18 12:52:13 UTC (rev 58955) @@ -6,7 +6,7 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.1.40 -pkgrel=1 +pkgrel=2 pkgdesc="A fast SQL database server" arch=('i686' 'x86_64') license=('GPL') @@ -19,8 +19,8 @@ 'mysqld.conf.d') md5sums=('32e7373c16271606007374396e6742ad' '09f64b1da689f0bc60e17172f9aa0b38' - '3d19dcb0b520aece9b0c43043b24099b' - '4a9077fc95ec6db1d5420e0cdc74d31c') + '26589ea08b78fc38dd174caeb93b810c' + '4a9077fc95ec6db1d5420e0cdc74d31c') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -98,8 +98,6 @@ done cd client - -# sed -i -e 's|\$(top_builddir)/libmysql/libmysqlclient.la|/usr/lib/mysql/libmysqlclient.so|g' Makefile make link_sources make || return 1 make DESTDIR=${pkgdir} install @@ -112,7 +110,6 @@ backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld') depends=('mysql-clients') optdepends=('perl-dbi' 'perl-dbd-mysql') - install=mysql.install cd ${srcdir}/${pkgbase}-${pkgver} pushd include || return @@ -135,6 +132,6 @@ rm -f ${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest,mysqltest_embedded} rm -rf ${pkgdir}/usr/{include,lib} - # create directory for PID file + # create directory for PID and sock files install -d ${pkgdir}/var/run/mysqld } Modified: extra-x86_64/my.cnf =================================================================== --- extra-x86_64/my.cnf 2009-11-18 12:29:40 UTC (rev 58954) +++ extra-x86_64/my.cnf 2009-11-18 12:52:13 UTC (rev 58955) @@ -12,14 +12,14 @@ [client] #password = your_password port = 3306 -socket = /tmp/mysqld/mysql.sock +socket = /var/run/mysqld/mysqld.sock # Here follows entries for some specific programs # The MySQL server [mysqld] port = 3306 -socket = /tmp/mysqld/mysql.sock +socket = /var/run/mysqld/mysqld.sock datadir = /var/lib/mysql skip-locking key_buffer = 16M Deleted: extra-x86_64/mysql.install =================================================================== --- extra-x86_64/mysql.install 2009-11-18 12:29:40 UTC (rev 58954) +++ extra-x86_64/mysql.install 2009-11-18 12:52:13 UTC (rev 58955) @@ -1,4 +0,0 @@ -post_upgrade() { - echo ">> MySQL configuration file now is into /etc/mysql/ directory." - echo ">> Remember to replace it with your old configuration file." -}