[Pkg-mysql-commits] r2213 - in mysql-5.6/trunk/debian: . patches
Bjoern Boschman
jesusch-guest at alioth.debian.org
Wed Feb 13 13:51:11 UTC 2013
Author: jesusch-guest
Date: 2013-02-13 13:51:11 +0000 (Wed, 13 Feb 2013)
New Revision: 2213
Added:
mysql-5.6/trunk/debian/patches/mysql-bug.63130.patch
mysql-5.6/trunk/debian/patches/mysql-bug.64685.patch
Removed:
mysql-5.6/trunk/debian/patches/hurd.patch
mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch
Modified:
mysql-5.6/trunk/debian/README.Maintainer
mysql-5.6/trunk/debian/changelog
mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch
mysql-5.6/trunk/debian/patches/series
mysql-5.6/trunk/debian/rules
mysql-5.6/trunk/debian/watch
Log:
new upstream release (5.6.10)
Modified: mysql-5.6/trunk/debian/README.Maintainer
===================================================================
--- mysql-5.6/trunk/debian/README.Maintainer 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/README.Maintainer 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,13 +1,5 @@
###########################
-## FIXME for 5.6 ##
-###########################
-
-* check mysql_upgrade
-* check remaining mysql-5.5 patches
-* indeed several other enhancements
-
-###########################
## FIXME for 5.1 ##
###########################
Modified: mysql-5.6/trunk/debian/changelog
===================================================================
--- mysql-5.6/trunk/debian/changelog 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/changelog 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,3 +1,9 @@
+mysql-5.6 (5.6.10+dfsg-1) UNRELEASED; urgency=low
+
+ * new upstream release
+
+ -- Bjoern Boschman <bjoern at boschman.de> Tue, 05 Feb 2013 14:38:29 +0100
+
mysql-5.6 (5.6.9-rc+dfsg-1) UNRELEASED; urgency=low
* new upstream
Deleted: mysql-5.6/trunk/debian/patches/hurd.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/hurd.patch 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/patches/hurd.patch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,41 +0,0 @@
-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;
-
Added: mysql-5.6/trunk/debian/patches/mysql-bug.63130.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.63130.patch (rev 0)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.63130.patch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -0,0 +1,116 @@
+From d2619556a1680088ee28e60795a4ce5be1c29fd7 Mon Sep 17 00:00:00 2001
+From: Davi Arnaut <davi at twitter.com>
+Date: Mon, 7 Nov 2011 15:50:06 -0200
+Subject: [PATCH] Bug#63130: CMake-based check for the presence of a system
+ readline library is not reliable.
+
+The MYSQL_FIND_SYSTEM_READLINE macro, which tests whether the
+Readline library is availability by trying to compile and link a
+test program, does not handle the case where the Readline library
+uses termcap functions, but does not link with the termcap or curses
+library itself.
+
+Also, the History library is not properly detected/used. The
+<readline/history.h> file should be include in any file that uses
+the History library's features. It supplies extern declarations for
+all of the library's public functions and variables, and declares
+all of the public data structures.
+
+The solution is to properly use the history library header and to
+link the available curses library.
+---
+ client/mysql.cc | 6 ++++++
+ cmake/readline.cmake | 17 +++++++++++++----
+ config.h.cmake | 1 +
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/client/mysql.cc b/client/mysql.cc
+index b6bc2f4..7c4c6ce 100644
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -89,6 +89,9 @@ extern "C" {
+ #include <conio.h>
+ #else
+ #include <readline/readline.h>
++#if HAVE_READLINE_HISTORY_H
++# include <readline/history.h>
++#endif
+ #define HAVE_READLINE
+ #define USE_POPEN
+ #endif
+@@ -1035,11 +1038,14 @@ typedef struct _hist_entry {
+ } HIST_ENTRY;
+ #endif
+
++#if !defined(HAVE_READLINE_HISTORY_H)
+ extern "C" int add_history(const char *command); /* From readline directory */
+ extern "C" int read_history(const char *command);
+ extern "C" int write_history(const char *command);
+ extern "C" HIST_ENTRY *history_get(int num);
+ extern "C" int history_length;
++#endif
++
+ static int not_in_history(const char *line);
+ static void initialize_readline (char *name);
+ static void fix_history(String *final_command);
+--- a/cmake/readline.cmake
++++ b/cmake/readline.cmake
+@@ -128,20 +128,30 @@
+ ENDMACRO()
+
+ MACRO (FIND_SYSTEM_LIBEDIT name)
+-
++
++ FIND_CURSES()
+ FIND_PATH(${name}_INCLUDE_DIR readline/readline.h )
+ FIND_LIBRARY(${name}_LIBRARY NAMES ${name})
+ MARK_AS_ADVANCED(${name}_INCLUDE_DIR ${name}_LIBRARY)
+
+ INCLUDE(CheckCXXSourceCompiles)
+- SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY})
++ SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY} ${CURSES_LIBRARY})
++
++ CHECK_INCLUDE_FILES("stdio.h;readline/readline.h;readline/history.h"
++ HAVE_READLINE_HISTORY_H)
++ IF(HAVE_READLINE_HISTORY_H)
++ LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_READLINE_HISTORY_H)
++ ENDIF()
+
+ IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR)
+ SET(SYSTEM_READLINE_FOUND 1)
+- SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY})
++ SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY} ${CURSES_LIBRARY})
+ CHECK_CXX_SOURCE_COMPILES("
+ #include <stdio.h>
+- #include <readline/readline.h>
++ #include <readline/readline.h>
++ #if HAVE_READLINE_HISTORY_H
++ #include <readline/history.h>
++ #endif
+ int main(int argc, char **argv)
+ {
+ HIST_ENTRY entry;
+@@ -170,7 +180,7 @@
+ ${name}_USE_NEW_READLINE_INTERFACE)
+
+ IF(${name}_USE_LIBEDIT_INTERFACE OR ${name}_USE_NEW_READLINE_INTERFACE)
+- SET(READLINE_LIBRARY ${${name}_LIBRARY})
++ SET(READLINE_LIBRARY ${${name}_LIBRARY} ${CURSES_LIBRARY})
+ SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR})
+ SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY})
+ SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE})
+diff --git a/config.h.cmake b/config.h.cmake
+index 8c14601..ba593fe 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -121,6 +121,7 @@
+ #cmakedefine HAVE_HIST_ENTRY 1
+ #cmakedefine USE_LIBEDIT_INTERFACE 1
+ #cmakedefine USE_NEW_READLINE_INTERFACE 1
++#cmakedefine HAVE_READLINE_HISTORY_H 1
+
+ #cmakedefine FIONREAD_IN_SYS_IOCTL 1
+ #cmakedefine GWINSZ_IN_SYS_IOCTL 1
+--
+1.7.5.4
+
Copied: mysql-5.6/trunk/debian/patches/mysql-bug.64685.patch (from rev 2209, mysql-5.6/trunk/debian/patches/hurd.patch)
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.64685.patch (rev 0)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.64685.patch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -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;
+
Modified: mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.67018.patch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,7 +1,5 @@
-Index: trunk/sql/mysqld.cc
-===================================================================
---- trunk.orig/sql/mysqld.cc 2013-01-09 11:59:43.902887077 +0100
-+++ trunk/sql/mysqld.cc 2013-01-09 12:00:31.518888125 +0100
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
@@ -6262,7 +6262,7 @@
The connection was refused by TCP wrappers.
There are no details (by client IP) available to update the host_cache.
Deleted: mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/patches/mysql-bug.68087.patch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,40 +0,0 @@
-Description: Upstream changes introduced in version 5.6.9-rc+dfsg-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- mysql-5.6 (5.6.9-rc+dfsg-1) UNRELEASED; urgency=low
- .
- * new upstream
- .
- The person named in the Author field signed this changelog entry.
-Author: Bjoern Boschman <bjoern.boschman at nfon.net>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- mysql-5.6-5.6.9-rc+dfsg.orig/cmake/readline.cmake
-+++ mysql-5.6-5.6.9-rc+dfsg/cmake/readline.cmake
-@@ -192,9 +192,9 @@ MACRO (MYSQL_CHECK_READLINE)
- IF(WITH_LIBEDIT)
- MYSQL_USE_BUNDLED_LIBEDIT()
- ELSE()
-- FIND_SYSTEM_LIBEDIT(edit)
-- IF(NOT_LIBEDIT_FOUND)
-- MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT")
-+ FIND_SYSTEM_LIBEDIT(readline)
-+ IF(NOT_LIBREADLINE_FOUND)
-+ MESSAGE(FATAL_ERROR "Cannot find system libreadline libraries.Use WITH_LIBREADLINE")
- ENDIF()
- ENDIF()
- ENDIF(NOT WIN32)
Modified: mysql-5.6/trunk/debian/patches/series
===================================================================
--- mysql-5.6/trunk/debian/patches/series 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/patches/series 2013-02-13 13:51:11 UTC (rev 2213)
@@ -13,4 +13,4 @@
#kfreebsd_fails.patch
#versioned_symbols.patch
mysql-bug.67018.patch
-mysql-bug.68087.patch
+mysql-bug.63130.patch
Modified: mysql-5.6/trunk/debian/rules
===================================================================
--- mysql-5.6/trunk/debian/rules 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/rules 2013-02-13 13:51:11 UTC (rev 2213)
@@ -170,7 +170,6 @@
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
- chmod 0755 $(TMP)/usr/share/mysql-test/lib/My/SafeProcess/safe_process.pl
chmod 0755 $(TMP)/usr/share/mysql-test/std_data/checkDBI_DBD-mysql.pl
# chmod 0644 $(TMP)/usr/share/mysql/*.ini
chmod 0644 $(TMP)/usr/share/mysql-test/[rt]/*
Modified: mysql-5.6/trunk/debian/watch
===================================================================
--- mysql-5.6/trunk/debian/watch 2013-01-22 16:10:00 UTC (rev 2212)
+++ mysql-5.6/trunk/debian/watch 2013-02-13 13:51:11 UTC (rev 2213)
@@ -1,5 +1,5 @@
# See debian/README.source for more information about the DFSG repacking here.
version=3
opts=dversionmangle=s/\+dfsg\d*$// \
- http://mirror.cogentco.com/pub/mysql/MySQL-5.6/mysql-([\d\.]+-rc).tar.gz \
+ http://mirror.cogentco.com/pub/mysql/MySQL-5.6/mysql-([\d\.]+).tar.gz \
debian sh debian/repack.sh
More information about the Pkg-mysql-commits
mailing list