From be618f76a915458f1884111c135df5382b82cff5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 26 2018 09:16:05 +0000
Subject: import rh-mysql56-mysql-5.6.39-1.el7.1


---

diff --git a/.gitignore b/.gitignore
index 973b7ab..772c4ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mysql-5.6.38.tar.gz
+SOURCES/mysql-5.6.39.tar.gz
diff --git a/.rh-mysql56-mysql.metadata b/.rh-mysql56-mysql.metadata
index 387ff5b..9922d6b 100644
--- a/.rh-mysql56-mysql.metadata
+++ b/.rh-mysql56-mysql.metadata
@@ -1 +1 @@
-bbd89dc891799b84ca0228e996bda1ec5365b38a SOURCES/mysql-5.6.38.tar.gz
+8f69162cfcfb031e0e60f85e46182548a4e34b41 SOURCES/mysql-5.6.39.tar.gz
diff --git a/SOURCES/mysql-check-socket.sh b/SOURCES/mysql-check-socket.sh
index b15cd32..0e24c96 100644
--- a/SOURCES/mysql-check-socket.sh
+++ b/SOURCES/mysql-check-socket.sh
@@ -25,10 +25,10 @@ if test -e "$socketfile" ; then
     fi
 
     # some process uses the socket file
-    if fuser "$socketfile" &>/dev/null ; then
-        socketpid=$(fuser "$socketfile" 2>/dev/null)
+    response=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
+    if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" || echo "$response" | grep -q "Lost connection to MySQL server" ; then
         echo "Is another MySQL daemon already running with the same unix socket?" >&2
-        echo "Please, stop the process $socketpid or remove $socketfile manually to start the service." >&2
+        echo "Please, stop the process using the socket $socketfile or remove the file manually to start the service." >&2
         exit 1
     fi
 
diff --git a/SOURCES/mysql.init.in b/SOURCES/mysql.init.in
index de7b9c0..bcb502c 100644
--- a/SOURCES/mysql.init.in
+++ b/SOURCES/mysql.init.in
@@ -60,7 +60,7 @@ start(){
 	    MYSQLDRUNNING=1
 	fi
     fi
-    RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
+    RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
     if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec
index b71dbef..bcadb55 100644
--- a/SPECS/mysql.spec
+++ b/SPECS/mysql.spec
@@ -110,8 +110,8 @@
 %endif
 
 Name:             %{?scl_prefix}mysql
-Version:          5.6.38
-Release:          1%{?with_debug:.debug}%{?dist}
+Version:          5.6.39
+Release:          1%{?with_debug:.debug}%{?dist}.1
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -1049,6 +1049,20 @@ fi
 %endif
 
 %changelog
+* Tue Feb 20 2018 Honza Horak <hhorak@redhat.com> - 5.6.39-1.1
+- Use mysqladmin instead of fuser for checking whether socket is used
+  Related: #1461445
+
+* Wed Jan 24 2018 Michal Schorm <mschorm@redhat.com> - 5.6.39-1
+- Update to MySQL 5.7.21, for various fixes described at
+  https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-39.html
+- Fix for various CVEs listed on
+  http://www.oracle.com/technetwork/security-advisory/cpujan2018-3236628.html
+- CVE fixes: #1533831
+            CVE-2018-2696 CVE-2018-2703 CVE-2018-2562 CVE-2018-2573 CVE-2018-2583
+            CVE-2018-2590 CVE-2018-2591 CVE-2018-2612 CVE-2018-2622 CVE-2018-2640
+            CVE-2018-2645 CVE-2018-2647 CVE-2018-2665 CVE-2018-2668
+
 * Sun Oct 22 2017 Honza Horak <hhorak@redhat.com> - 5.6.38-1
 - Update to 5.6.38
   Also fixes CVE-2017-10155 CVE-2017-10227 CVE-2017-10268 CVE-2017-10276