Refresh d/patches

debian/patches/31_fix_replace_lookup_path.diff

-Author: Otto Kekäläinen <otto@seravo.fi>
-Bug: https://mariadb.atlassian.net/browse/MDEV-7359
-Subject: MTR tests failed to start due to replace binary not found
-Last-Update: 2014-12-28
-
---- old/mysql-test/mysql-test-run.pl
-+++ new/mysql-test/mysql-test-run.pl
-@@ -2490,14 +2490,6 @@ sub environment_setup {
-                                  "$bindir/sql$opt_vs_config/mysql_tzinfo_to_sql");
-   $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
- 
--  # ----------------------------------------------------
--  # replace
--  # ----------------------------------------------------
--  my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
--                                 "$basedir/extra/replace",
--                                 "$path_client_bindir/replace");
--  $ENV{'REPLACE'}= native_path($exe_replace);
--
-   # Create an environment variable to make it possible
-   # to detect that valgrind is being used from test cases
-   $ENV{'VALGRIND_TEST'}= $opt_valgrind;

debian/patches/38_scripts__mysqld_safe.sh__signals.diff

@@ -6,7 +6,7 @@
 
 --- a/scripts/mysqld_safe.sh	2013-01-11 16:02:41 +0000
 +++ b/scripts/mysqld_safe.sh	2013-01-11 16:03:14 +0000
-@@ -32,7 +32,6 @@ err_log=
+@@ -33,7 +33,6 @@ err_log=
  syslog_tag_mysqld=mysqld
  syslog_tag_mysqld_safe=mysqld_safe
  
@@ -14,7 +14,7 @@
  
  # MySQL-specific environment variable. First off, it's not really a umask,
  # it's the desired mode. Second, it follows umask(2), not umask(3) in that
-@@ -163,7 +162,7 @@ eval_log_error () {
+@@ -164,7 +163,7 @@ eval_log_error () {
        # sed buffers output (only GNU sed supports a -u (unbuffered) option)
        # which means that messages may not get sent to syslog until the
        # mysqld process quits.
@@ -23,7 +23,7 @@
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -802,6 +801,13 @@ then
+@@ -813,6 +812,13 @@ then
  fi
  
  #

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
-@@ -3578,6 +3578,11 @@ sub mysql_install_db {
+@@ -3570,6 +3570,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,9 +3,9 @@ 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
-@@ -430,12 +430,6 @@
- CONFIGURE_FILE(
-     ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+@@ -436,12 +436,6 @@ CONFIGURE_FILE(
+     ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
+     ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  
 -IF(DEB)
 -  CONFIGURE_FILE(

debian/patches/series

-31_fix_replace_lookup_path.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
@@ -7,5 +6,4 @@
 61_replace_dash_with_bash_mbug675185.diff
 75_man_syntax_fixes.diff
 82_extend_default_test_timeout_for_tokudb.diff
-80_new_valid_certs.diff
 99_remove_rename_mariadb-server_files_in.diff