Date: Thursday, November 19, 2009 @ 06:06:31 Author: giovanni Revision: 59017
Merged revisions 58999 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mysql/trunk ........ r58999 | andrea | 2009-11-18 18:03:21 -0800 (mer, 18 nov 2009) | 1 line set socket path as option in configure; remove useless make; create the user and the group if don't exist ........ Modified: mysql/repos/extra-x86_64/ (properties) mysql/repos/extra-x86_64/PKGBUILD mysql/repos/extra-x86_64/mysql.install ---------------+ PKGBUILD | 49 +++++++++++++++---------------------------------- mysql.install | 8 +++++--- 2 files changed, 20 insertions(+), 37 deletions(-) Property changes on: mysql/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /mysql/trunk:1-58961 + /mysql/trunk:1-59015 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-19 11:06:04 UTC (rev 59016) +++ extra-x86_64/PKGBUILD 2009-11-19 11:06:31 UTC (rev 59017) @@ -6,7 +6,7 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.1.41 -pkgrel=1 +pkgrel=2 pkgdesc="A fast SQL database server" arch=('i686' 'x86_64') license=('GPL') @@ -33,12 +33,14 @@ --without-readline \ --with-ssl \ --with-libwrap \ - --with-charset=latin1 \ - --with-collation=latin1_general_ci \ + --with-charset=utf8 \ + --with-collation=utf8_general_ci \ --with-extra-charsets=complex \ --with-embedded-server \ + --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ --enable-local-infile \ - --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,ndbcluster + --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster + make || return 1 } package_libmysqlclient(){ @@ -46,24 +48,18 @@ depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers') cd ${srcdir}/${pkgbase}-${pkgver} - for dir in include strings mysys dbug storage regex extra vio sql; do - pushd ${dir} || return 1 - make || return 1 - popd - done for dir in libmysql libmysql_r libmysqld; do pushd ${dir} || return 1 - make link_sources - make || return 1 - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install popd done + cd include make DESTDIR=${pkgdir} install - # Copy missing includes install -m644 *.h ${pkgdir}/usr/include/mysql + # mysql_config cd ../scripts make mysql_config install -d ${pkgdir}/usr/bin @@ -83,27 +79,17 @@ depends=("libmysqlclient>=${pkgver}") cd ${srcdir}/${pkgbase}-${pkgver} - pushd include || return - make || return 1 - popd - pushd libmysql make link_sources get_password.lo || return - popd + popd - for dir in strings regex mysys dbug extra; do - pushd ${dir} || return 1 - make || return 1 - popd - done - cd client - make link_sources - make || return 1 make DESTDIR=${pkgdir} install - # Removing libmysql stuff + # Removing libmysqlclient stuff rm -rf $pkgdir/usr/lib/ + # These will be provided by mysql + rm -f ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest} } package_mysql(){ @@ -113,15 +99,10 @@ optdepends=('perl-dbi' 'perl-dbd-mysql') cd ${srcdir}/${pkgbase}-${pkgver} - pushd include || return - make || return 1 - popd - pushd libmysql make link_sources get_password.lo || return popd - make || return 1 make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include} @@ -129,8 +110,8 @@ install -D -m755 ../mysqld ${pkgdir}/etc/rc.d/mysqld install -D -m644 ../mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld - # Cleanup files provided by the other packages - rm -f ${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest,mysqltest_embedded} + # Cleanup files provided by the others packages + rm -f ${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest_embedded} rm -rf ${pkgdir}/usr/{include,lib} # create directory for PID and sock files Modified: extra-x86_64/mysql.install =================================================================== --- extra-x86_64/mysql.install 2009-11-19 11:06:04 UTC (rev 59016) +++ extra-x86_64/mysql.install 2009-11-19 11:06:31 UTC (rev 59017) @@ -7,11 +7,13 @@ } post_upgrade(){ + getent group mysql &>/dev/null || groupadd -g 89 mysql &>/dev/null + getent passwd mysql &>/dev/null || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null chown -R mysql:mysql var/lib/mysql &> /dev/null - chown mysql:mysql var/run/mysqld + chown mysql:mysql var/run/mysqld &> /dev/null } post_remove(){ - userdel mysql &>/dev/null - groupdel mysql &>/dev/null + getent passwd mysql &>/dev/null || userdel mysql &>/dev/null + getent group mysql &>/dev/null || groupdel mysql &>/dev/null }