[Pkg-mysql-commits] [mariadb-5.5] 01/04: Skip socket test if user undefined

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 73eea9fa81826a942314f6db364326cdd19daf5a
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Tue Feb 4 10:58:27 2014 +0200

    Skip socket test if user undefined
---
 debian/changelog                                      |  1 +
 .../80_skip_socket_test_if_user_undefined.diff        | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 377cd33..871fd88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mariadb-5.5 (5.5.35-1) unstable; urgency=low
   * Updated Russian debconf translation (Closes: #734426)
   * Updated Japanese debconf translation (Closes: #735284)
   * Updated French debconf translation (Closes: #736480)
+  * Upstream includes fix for CVE-2014-0001 (Closes: #737597)
 
  -- Otto Kekäläinen <otto at seravo.fi>  Wed, 29 Jan 2014 21:09:51 +0300
 
diff --git a/debian/patches/80_skip_socket_test_if_user_undefined.diff b/debian/patches/80_skip_socket_test_if_user_undefined.diff
new file mode 100755
index 0000000..d4ec1d5
--- /dev/null
+++ b/debian/patches/80_skip_socket_test_if_user_undefined.diff
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_skip_socket_test_if_user_undefined <otto at seravo.fi>
+##
+
+ at DPATCH@
+=== modified file 'mysql-test/suite/plugins/t/unix_socket.test'
+--- old/mysql-test/suite/plugins/t/unix_socket.test	2013-05-14 12:49:52 +0000
++++ new/mysql-test/suite/plugins/t/unix_socket.test	2014-02-03 21:25:29 +0000
+@@ -7,6 +7,10 @@
+   skip No auth_socket plugin;
+ }
+ 
++if (!$USER) {
++  skip USER variable is undefined;
++}
++
+ let $plugindir=`SELECT @@global.plugin_dir`;
+ 
+ eval install plugin unix_socket soname '$AUTH_SOCKET_SO';
diff --git a/debian/patches/series b/debian/patches/series
index 33f36dc..351c0bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@
 44_scripts__mysql_config__libs.diff
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
+80_skip_socket_test_if_user_undefined.diff
 99_rename_mariadb-server_files_in.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git