X-Git-Url: http://gitweb/?a=blobdiff_plain;f=mysql%2FPkgfile;h=b57d5e4fb1a2f1eb957ec57784d8e2c4b52368a4;hb=5d8b0a4e85ead1b0500cdbb6a43811abc5d65c4b;hp=34592fc6f997fdbc24063c9d835076c541171f67;hpb=e41262f8d70662c7af271fe7d5afaa7523a5c79d;p=ports%2Fopt-arm.git

diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 34592fc..b57d5e4 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -2,10 +2,10 @@
 # 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.6.23
+version=5.6.39
 release=1
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
         my.cnf mysqld valist.patch)
@@ -15,9 +15,6 @@ build () {
 
   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 \
@@ -26,7 +23,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
 
@@ -37,10 +34,8 @@ 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 700 -o mysql -g mysql $PKG/var/lib/mysql-files
   install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
   install -m 600 $SRC/my.cnf $PKG/etc
 }