Refreshed patches

debian/patches/20_kfreebsd_tests.diff

-Author: Otto Kekäläinen <otto@seravo.fi>
-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=540153
-Subject: tests not getting started on kFreeBSD
- As per #670722 I found that the test socket created to test
- file name truncation was barfing even for the shortened form.
- This patch was adapted from the similar one in MySQL 5.6 package.
-Forwarded: no
-Last-Update: 2014-08-07
---- a/mysql-test/lib/My/Platform.pm
-+++ b/mysql-test/lib/My/Platform.pm
-@@ -111,6 +111,9 @@ sub check_socket_path_length {
-   # See Bug #45771
-   return 0 if ($^O eq 'aix');
- 
-+  # See Debian bug #670722 - failing on kFreeBSD even after setting short path
-+  return 0 if length $path < 40;
-+ 
-   require IO::Socket::UNIX;
- 
-   my $truncated= undef;

debian/patches/21_kfreebsd-peercred.diff

-Author: Sergei Golubchik <serg@mariadb.org>
-Descriptiong: Experimental patch from https://mariadb.atlassian.net/browse/MDEV-6577
-
-=== modified file 'plugin/auth_socket/CMakeLists.txt'
---- a/plugin/auth_socket/CMakeLists.txt	2013-03-08 18:09:15 +0000
-+++ b/plugin/auth_socket/CMakeLists.txt	2014-08-13 14:44:30 +0000
-@@ -22,18 +22,48 @@ int main() {
-   getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, 0);
- }" HAVE_PEERCRED)
-  
--IF (NOT HAVE_PEERCRED)
--  # Hi, OpenBSD!
--  CHECK_CXX_SOURCE_COMPILES(
--  "#include <sys/types.h>
--  #include <sys/socket.h>
--  int main() {
--    struct sockpeercred cred;
--    getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, 0);
--    }" HAVE_SOCKPEERCRED)
--  ADD_DEFINITIONS(-Ducred=sockpeercred)
-+IF (HAVE_PEERCRED)
-+  ADD_DEFINITIONS(-DHAVE_PEERCRED)
-+  SET(ok 1)
-+ELSE()
-+
-+# Hi, OpenBSD!
-+CHECK_CXX_SOURCE_COMPILES(
-+"#include <sys/types.h>
-+#include <sys/socket.h>
-+int main() {
-+  struct sockpeercred cred;
-+  getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, 0);
-+  }" HAVE_SOCKPEERCRED)
-+
-+IF (HAVE_SOCKPEERCRED)
-+  ADD_DEFINITIONS(-DHAVE_SOCKPEERCRED)
-+  SET(ok 1)
-+ELSE()
-+
-+# FreeBSD, is that you?
-+CHECK_CXX_SOURCE_COMPILES(
-+"#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <sys/ucred.h>
-+int main() {
-+  struct xucred cred;
-+  getsockopt(0, 0, LOCAL_PEERCRED, &cred, 0);
-+  }" HAVE_XUCRED)
-+
-+IF (HAVE_XUCRED)
-+  ADD_DEFINITIONS(-DHAVE_XUCRED)
-+  SET(ok 1)
-+ELSE()
-+
-+# What else? C'mon, show your creativity, be different!
-+
-+ENDIF()
-+ENDIF()
- ENDIF()
- 
--IF(HAVE_PEERCRED OR HAVE_SOCKPEERCRED)
-+IF(ok)
-   MYSQL_ADD_PLUGIN(auth_socket auth_socket.c MODULE_ONLY)
- ENDIF()
-+
-
-=== modified file 'plugin/auth_socket/auth_socket.c'
---- a/plugin/auth_socket/auth_socket.c	2012-02-15 17:08:08 +0000
-+++ b/plugin/auth_socket/auth_socket.c	2014-08-13 14:46:42 +0000
-@@ -27,9 +27,29 @@
- #define _GNU_SOURCE 1 /* for struct ucred */
- 
- #include <mysql/plugin_auth.h>
--#include <sys/socket.h>
--#include <pwd.h>
- #include <string.h>
-+#include <pwd.h>
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+
-+#ifdef HAVE_PEERCRED
-+#define level SOL_SOCKET
-+
-+#elif defined HAVE_SOCKPEERCRED
-+#define level SOL_SOCKET
-+#define ucred socketpeercred
-+
-+#elif defined HAVE_XUCRED
-+#include <sys/un.h>
-+#include <sys/ucred.h>
-+#define level 0
-+#define SO_PEERCRED LOCAL_PEERCRED
-+#define uid cr_uid
-+#define ucred xucred
-+
-+#else
-+#error impossible
-+#endif
- 
- /**
-   perform the unix socket based authentication
-@@ -63,7 +83,7 @@ static int socket_auth(MYSQL_PLUGIN_VIO
-     return CR_ERROR;
- 
-   /* get the UID of the client process */
--  if (getsockopt(vio_info.socket, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len))
-+  if (getsockopt(vio_info.socket, level, SO_PEERCRED, &cred, &cred_len))
-     return CR_ERROR;
- 
-   if (cred_len != sizeof(cred))
-

debian/patches/22_hppa_invalid_operands.diff

-Author: Helge Deller <deller@gmx.de>
-Description: Fix build error in HPPA, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751805
-
-diff --git a/storage/xtradb/os/os0stacktrace.c b/storage/xtradb/os/os0stacktrace.c
-index f7fb121..18b90ea 100644
---- a/storage/xtradb/os/os0stacktrace.c
-+++ b/storage/xtradb/os/os0stacktrace.c
-@@ -85,7 +85,7 @@ os_stacktrace_print(
- 	caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ;
- #elif defined(__hppa__)
- 	ucontext_t* uc = (ucontext_t*) ucontext;
--	caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ;
-+	caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL);
- #elif (defined (__ppc__)) || (defined (__powerpc__))
- 	ucontext_t* uc = (ucontext_t*) ucontext;
- 	caller_address = (void*) uc->uc_mcontext.regs->nip ;

debian/patches/50_mysql-test__db_test.diff

@@ -6,7 +6,7 @@
 ## DP: suite depends on them.
 --- old/mysql-test/mysql-test-run.pl	2009-06-16 14:24:09.000000000 +0200
 +++ new/mysql-test/mysql-test-run.pl	2009-07-04 00:03:34.000000000 +0200
-@@ -3567,6 +3567,11 @@ sub mysql_install_db {
+@@ -3578,6 +3578,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  

debian/patches/99_remove_rename_mariadb-server_files_in.diff

@@ -3,7 +3,7 @@ Description: Remove upstream debian/* handling that is obsolete
 
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
-@@ -455,12 +455,6 @@
+@@ -430,12 +430,6 @@
  CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  

debian/patches/series

-20_kfreebsd_tests.diff
-21_kfreebsd-peercred.diff
-22_hppa_invalid_operands.diff
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff
@@ -9,5 +6,4 @@
 61_replace_dash_with_bash_mbug675185.diff
 75_man_syntax_fixes.diff
 82_extend_default_test_timeout_for_tokudb.diff
-90_spelling.diff
 99_remove_rename_mariadb-server_files_in.diff