From 0916d9612bbbb90e5650c89685b9eb15615df0ef Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 11 Jun 2015 10:23:43 +0200
Subject: [PATCH] mysql: update to 5.6.25.
---
srcpkgs/mysql/files/mysqld-post | 7 -------
srcpkgs/mysql/files/mysqld.service | 14 --------------
srcpkgs/mysql/files/mysqld.tmpfilesd | 1 -
srcpkgs/mysql/template | 12 +++---------
4 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mysql/files/mysqld-post
delete mode 100644 srcpkgs/mysql/files/mysqld.service
delete mode 100644 srcpkgs/mysql/files/mysqld.tmpfilesd
diff --git a/srcpkgs/mysql/files/mysqld-post b/srcpkgs/mysql/files/mysqld-post
deleted file mode 100644
index 50ea5da49a..0000000000
--- a/srcpkgs/mysql/files/mysqld-post
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-while true; do
- response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
- echo "$response" | grep -q "mysqld is alive" && break
- sleep 1
-done
diff --git a/srcpkgs/mysql/files/mysqld.service b/srcpkgs/mysql/files/mysqld.service
deleted file mode 100644
index 3468ce54c0..0000000000
--- a/srcpkgs/mysql/files/mysqld.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=MySQL Server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-ExecStart=/usr/bin/mysqld --user=mysql --pid-file=/run/mysqld/mysqld.pid
-ExecStartPost=/usr/bin/mysqld-post
-Restart=always
-PrivateTmp=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/mysql/files/mysqld.tmpfilesd b/srcpkgs/mysql/files/mysqld.tmpfilesd
deleted file mode 100644
index 6883dc7988..0000000000
--- a/srcpkgs/mysql/files/mysqld.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index 96c4372b11..3482506ae4 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -1,7 +1,7 @@
# Template file for 'mysql'
pkgname=mysql
-version=5.6.24
-revision=2
+version=5.6.25
+revision=1
build_style=cmake
configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -29,7 +29,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://www.mysql.com/products/community/"
license="GPL-2"
distfiles="https://downloads.skysql.com/archives/mysql-${version%.*}/mysql-${version}.tar.gz"
-checksum=37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb
+checksum=15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
CFLAGS="-D__STDC_ISO_10646__"
@@ -67,12 +67,6 @@ post_install() {
# Configuration file.
vinstall ${FILESDIR}/my.cnf 640 etc/mysql
- # systemd service.
- if [ "$build_option_systemd" ]; then
- vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
- vinstall ${FILESDIR}/mysqld-post 755 usr/bin
- vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf
- fi
# runit service
vsv mysqld
}