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

diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index f693012..2385b60 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -2,18 +2,21 @@
 # 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: tcp_wrappers ncurses zlib openssl cmake libaio
+# Depends on: ncurses zlib openssl cmake libaio
 
 name=mysql
-version=5.5.37
+version=5.6.29
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \
+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/valist.patch
+  
+  # fix for openssl 1.0.2
+  sed -i 's/REGEX "^#define/REGEX "^# *define/' cmake/ssl.cmake
 
   cmake . \
         -DBUILD_CONFIG=mysql_release \
@@ -23,7 +26,7 @@ build () {
         -DINSTALL_LIBDIR=lib \
         -DINSTALL_PLUGINDIR=lib/mysql/plugin \
         -DINSTALL_MANDIR=man \
-        -DWITH_LIBWRAP=1 \
+        -DWITH_LIBWRAP=0 \
         -DWITH_SSL=system \
         -DWITH_ZLIB=system
 
@@ -34,10 +37,7 @@ build () {
   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 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
 }