[Pkg-mysql-commits] r2214 - in mysql-5.6/trunk/debian: . patches

[Bjoern Boschman]

Author: jesusch-guest
Date: 2013-02-18 15:17:12 +0000 (Mon, 18 Feb 2013)
New Revision: 2214

Added:
   mysql-5.6/trunk/debian/patches/hurd.patch
Modified:
   mysql-5.6/trunk/debian/changelog
   mysql-5.6/trunk/debian/mysql-server-5.6.postinst
Log:
mysql_install_db must not be run as a bash script


Modified: mysql-5.6/trunk/debian/changelog
===================================================================
--- mysql-5.6/trunk/debian/changelog	2013-02-13 13:51:11 UTC (rev 2213)
+++ mysql-5.6/trunk/debian/changelog	2013-02-18 15:17:12 UTC (rev 2214)
@@ -1,6 +1,7 @@
 mysql-5.6 (5.6.10+dfsg-1) UNRELEASED; urgency=low
 
   * new upstream release 
+  * mysql_install_db is now a perl script. Do not run it with bash
 
  -- Bjoern Boschman <bjoern at boschman.de>  Tue, 05 Feb 2013 14:38:29 +0100
 

Modified: mysql-5.6/trunk/debian/mysql-server-5.6.postinst
===================================================================
--- mysql-5.6/trunk/debian/mysql-server-5.6.postinst	2013-02-13 13:51:11 UTC (rev 2213)
+++ mysql-5.6/trunk/debian/mysql-server-5.6.postinst	2013-02-18 15:17:12 UTC (rev 2214)
@@ -140,10 +140,9 @@
     touch $mysql_statedir/debian-5.6.flag
 
     # initiate databases. Output is not allowed by debconf :-(
-    # Debian: beware of the bashisms... 
     # Debian: can safely run on upgrades with existing databases 
     set +e
-    bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
+    /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
     if [ "$?" != "0" ]; then
       echo "ATTENTION: An error has occured. More info is in the syslog!"
     fi

Added: mysql-5.6/trunk/debian/patches/hurd.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/hurd.patch	                        (rev 0)
+++ mysql-5.6/trunk/debian/patches/hurd.patch	2013-02-18 15:17:12 UTC (rev 2214)
@@ -0,0 +1,41 @@
+Author: Pino Toscano <pino at debian.org>
+Subject: cmake options for GNU/Hurd
+Bug: http://bugs.mysql.com/bug.php?id=64685
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002
+Last-Update: 2012-03-18
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+--- /dev/null
++++ b/cmake/os/GNU.cmake
+@@ -0,0 +1,20 @@
++# This file includes GNU/Hurd specific options and quirks, related to system checks
++
++INCLUDE(CheckSymbolExists)
++
++SET(_GNU_SOURCE 1)
++
++# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
++FOREACH(LANG C CXX)
++  STRING(REPLACE "-rdynamic" ""
++  CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
++  "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
++  )
++ENDFOREACH()
++
++# Ensure we have clean build for shared libraries
++# without unresolved symbols
++SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
++
++# 64 bit file offset support flag
++SET(_FILE_OFFSET_BITS 64)
+--- a/mysql-test/lib/My/Platform.pm
++++ b/mysql-test/lib/My/Platform.pm
+@@ -110,6 +110,9 @@
+   # This may not be true, but we can't test for it on AIX due to Perl bug
+   # See Bug #45771
+   return 0 if ($^O eq 'aix');
++  # Similarly the path length is hidden.
++  # See Debian bug #651002
++  return 0 if ($^O eq 'gnu');
+ 
+   require IO::Socket::UNIX;
+