X-Git-Url: http://gitweb/?a=blobdiff_plain;f=mysql%2FPkgfile;h=2385b60527bc2e3891160e11408e84c17a6f88f5;hb=e6bcead0ff915fbb19750eb8cb41489cde17e581;hp=9fae8ddc31992f320bd554515c1d151f17c788bb;hpb=825e3023e51a748f9bf49a6b4528ee2c07931c36;p=ports%2Fopt-arm.git

diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 9fae8dd..2385b60 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -1,18 +1,24 @@
 # Description: SQL database server
-# URL:         http://www.mysql.com
-# Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  tcp_wrappers ncurses zlib openssl cmake libaio
+# URL: http://www.mysql.com
+# Maintainer: Juergen Daubert, jue at crux dot nu
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: ncurses zlib openssl cmake libaio
 
 name=mysql
-version=5.5.16
+version=5.6.29
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \
-        my.cnf mysqld $name-${version}_valist.patch)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
+        my.cnf mysqld valist.patch)
 
 build () {
-    cd $name-$version
-    patch -p1 -i $SRC/$name-${version}_valist.patch
-    cmake . \
+  cd $name-$version
+
+  patch -p1 -i $SRC/valist.patch
+  
+  # fix for openssl 1.0.2
+  sed -i 's/REGEX "^#define/REGEX "^# *define/' cmake/ssl.cmake
+
+  cmake . \
         -DBUILD_CONFIG=mysql_release \
         -DINSTALL_LAYOUT=RPM \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -20,21 +26,18 @@ build () {
         -DINSTALL_LIBDIR=lib \
         -DINSTALL_PLUGINDIR=lib/mysql/plugin \
         -DINSTALL_MANDIR=man \
-        -DWITH_LIBWRAP=1 \
+        -DWITH_LIBWRAP=0 \
         -DWITH_SSL=system \
         -DWITH_ZLIB=system
 
-    make
-    make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-    rm -r $PKG/usr/share/{mysql-test,info}
-    rm $PKG/usr/share/mysql/charsets/README
-    find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;
+  rm -r $PKG/usr/share/{mysql-test,info}
+  rm $PKG/usr/share/mysql/charsets/README
+  find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;
 
-    install -d  $PKG/var/{lib,log}
-    touch mysqld.log
-    install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log
-    install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql
-    install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
-    install -m 600 $SRC/my.cnf $PKG/etc
+  install -d -m 700 -o mysql -g mysql $PKG/var/{lib,log,run}/mysql
+  install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
+  install -m 600 $SRC/my.cnf $PKG/etc
 }