Update changelog and refresh patches after 10.0.28 import

debian/changelog

-mariadb-10.0 (10.0.27-3) UNRELEASED; urgency=low
+mariadb-10.0 (10.0.28-1) unstable; urgency=low
 
-  * Open a new changelog entry
+  [ Vicențiu Ciorbaru ]
+  * Fix tokudb jemalloc linking
 
- -- Otto Kekäläinen <otto@debian.org>  Mon, 03 Oct 2016 11:07:34 +0300
+  [ Otto Kekäläinen ]
+  * New upstream release 10.0.28. Includes fixes for the following
+    security vulnerabilities:
+    - CVE-2016-8283
+    - CVE-2016-7440
+    - CVE-2016-6663
+    - CVE-2016-5629
+    - CVE-2016-5626
+    - CVE-2016-5624
+    - CVE-2016-5616
+    - CVE-2016-5584
+    - CVE-2016-3492
+  * Drop 4 patches that have been applied upstream.
+
+ -- Otto Kekäläinen <otto@debian.org>  Fri, 28 Oct 2016 22:51:14 +0300
 
 mariadb-10.0 (10.0.27-2) unstable; urgency=low
 

debian/patches/fix-spelling-errors.patch

@@ -49,7 +49,7 @@ Last-Update: 2014-10-02
  DROP TABLE bookstore;
 --- a/extra/yassl/src/ssl.cpp
 +++ b/extra/yassl/src/ssl.cpp
-@@ -979,7 +979,7 @@ void OpenSSL_add_all_algorithms()  // co
+@@ -1007,7 +1007,7 @@ void OpenSSL_add_all_algorithms()  // co
  {}
  
  
@@ -84,7 +84,7 @@ Last-Update: 2014-10-02
  44	ru_UA	Russian - Ukraine	8	11	,	.	russian
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -7076,7 +7076,7 @@ struct my_option my_long_options[]=
+@@ -7077,7 +7077,7 @@ struct my_option my_long_options[]=
     &opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"skip-bdb", OPT_DEPRECATED_OPTION,
@@ -93,7 +93,7 @@ Last-Update: 2014-10-02
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
  #ifndef DISABLE_GRANT_OPTIONS
    {"skip-grant-tables", 0,
-@@ -8411,7 +8411,7 @@ mysqld_get_one_option(int optid,
+@@ -8412,7 +8412,7 @@ mysqld_get_one_option(int optid,
      break;
    case OPT_DEPRECATED_OPTION:
      sql_print_warning("'%s' is deprecated. It does nothing and exists only "

debian/patches/hppa-enoempty.patch

-Description: Debian bug#837369 - test failures on hppa
- ENOTEMPTY is 247 on hppa, not 39 like on Linux, according to this report:
- .
- So add another replacement for this to rpl.rpl_drop_db and
- binlog.binlog_databasae tests (there were already a couple similar
- replacements for other platforms).
-Author: Kristian Nielsen <knielsen at knielsen-hq.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/mysql-test/extra/binlog_tests/database.test
-+++ b/mysql-test/extra/binlog_tests/database.test
-@@ -52,7 +52,7 @@ eval SELECT 'hello' INTO OUTFILE 'fake_f
- 
- # Use '/' instead of '\' in the error message. On windows platform, dir is
- # formed with '\'.
----replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ /93/39/ /17/39/ /File exists/Directory not empty/
-+--replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ /93/39/ /17/39/ /247/39/ /File exists/Directory not empty/
- --error 1010
- DROP DATABASE testing_1;
- let $wait_binlog_event= DROP TABLE IF EXIST;
---- a/mysql-test/suite/rpl/t/rpl_drop_db.test
-+++ b/mysql-test/suite/rpl/t/rpl_drop_db.test
-@@ -13,7 +13,7 @@ insert into mysqltest1.t1 values (1);
- select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
- create table mysqltest1.t2 (n int);
- create table mysqltest1.t3 (n int);
----replace_result \\ / 66 39 93 39 17 39 "File exists" "Directory not empty"
-+--replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
- --error 1010
- drop database mysqltest1;
- use mysqltest1;
-@@ -30,7 +30,7 @@ while ($1)
- }
- --enable_query_log
- 
----replace_result \\ / 66 39 93 39 17 39 "File exists" "Directory not empty"
-+--replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
- --error 1010
- drop database mysqltest1;
- use mysqltest1;

debian/patches/mips-connect-unaligned.patch

@@ -12,10 +12,8 @@ Description: Handle unaligned buffers in connect's TYPBLK class
 Author: James Cowgill <jcowgill@debian.org>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: mariadb-10.0-10.0.27/storage/connect/valblk.h
-===================================================================
---- mariadb-10.0-10.0.27.orig/storage/connect/valblk.h
-+++ mariadb-10.0-10.0.27/storage/connect/valblk.h
+--- a/storage/connect/valblk.h
++++ b/storage/connect/valblk.h
 @@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
    int     Prec;             // Precision of float values
    }; // end of class VALBLK
@@ -102,10 +100,8 @@ Index: mariadb-10.0-10.0.27/storage/connect/valblk.h
    }; // end of class TYPBLK
  
  /***********************************************************************/
-Index: mariadb-10.0-10.0.27/storage/connect/valblk.cpp
-===================================================================
---- mariadb-10.0-10.0.27.orig/storage/connect/valblk.cpp
-+++ mariadb-10.0-10.0.27/storage/connect/valblk.cpp
+--- a/storage/connect/valblk.cpp
++++ b/storage/connect/valblk.cpp
 @@ -265,14 +265,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
  template <class TYPE>
  char *TYPBLK<TYPE>::GetCharString(char *p, int n)

debian/patches/mips-errno-enotempty.patch

-Description: Permit 93 as a valid value of the ENOTEMPTY error in the testsuite
- On mips, ENOTEMPTY == 93 so permit that value in two test cases by replacing it
- with 39.
-Author: James Cowgill <jcowgill@debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/mysql-test/extra/binlog_tests/database.test
-+++ b/mysql-test/extra/binlog_tests/database.test
-@@ -52,7 +52,7 @@ eval SELECT 'hello' INTO OUTFILE 'fake_f
- 
- # Use '/' instead of '\' in the error message. On windows platform, dir is
- # formed with '\'.
----replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ /17/39/ /File exists/Directory not empty/
-+--replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ /93/39/ /17/39/ /File exists/Directory not empty/
- --error 1010
- DROP DATABASE testing_1;
- let $wait_binlog_event= DROP TABLE IF EXIST;
---- a/mysql-test/suite/rpl/t/rpl_drop_db.test
-+++ b/mysql-test/suite/rpl/t/rpl_drop_db.test
-@@ -13,7 +13,7 @@ insert into mysqltest1.t1 values (1);
- select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
- create table mysqltest1.t2 (n int);
- create table mysqltest1.t3 (n int);
----replace_result \\ / 66 39 17 39 "File exists" "Directory not empty"
-+--replace_result \\ / 66 39 93 39 17 39 "File exists" "Directory not empty"
- --error 1010
- drop database mysqltest1;
- use mysqltest1;
-@@ -30,7 +30,7 @@ while ($1)
- }
- --enable_query_log
- 
----replace_result \\ / 66 39 17 39 "File exists" "Directory not empty"
-+--replace_result \\ / 66 39 93 39 17 39 "File exists" "Directory not empty"
- --error 1010
- drop database mysqltest1;
- use mysqltest1;

debian/patches/mips-machine.patch

@@ -12,8 +12,8 @@ Author: James Cowgill <jcowgill@debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/cmake/package_name.cmake
 +++ b/cmake/package_name.cmake
-@@ -30,6 +30,10 @@ IF(NOT VERSION)
-       SET(64BIT 1)
+@@ -34,6 +34,10 @@ IF(NOT VERSION)
+       SET(DEFAULT_MACHINE "mips")
      ENDIF()
  
 +    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")

debian/patches/mips-unstable-tests.patch

@@ -4,7 +4,7 @@ Author: James Cowgill <jcowgill@debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/mysql-test/unstable-tests
 +++ b/mysql-test/unstable-tests
-@@ -98,9 +98,8 @@ connect.jdbc-postgresql : New test, adde
+@@ -87,9 +87,8 @@ extra/binlog_tests.database : Modified o
  #----------------------------------------------------------------
  
  federated.federatedx             : MDEV-10617 - Wrong checksum, timeouts
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #----------------------------------------------------------------
  
-@@ -130,8 +129,7 @@ mroonga/storage.index_multiple_column_un
+@@ -118,8 +117,7 @@ mroonga/storage.index_multiple_column_un
  
  #----------------------------------------------------------------
  
@@ -26,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  multi_source.simple      : MDEV-4633 - Wrong slave status output
  multi_source.status_vars : MDEV-4632 - failed while waiting for Slave_received_heartbeats
  
-@@ -170,27 +168,21 @@ roles.set_role-9614
+@@ -148,27 +146,21 @@ plugins.thread_pool_server_audit : MDEV-
  #----------------------------------------------------------------
  
  rpl.last_insert_id                    : MDEV-10625 - warnings in error log
@@ -37,17 +37,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  rpl.rpl_checksum_cache                : MDEV-10626 - Testcase timeout
  rpl.rpl_circular_for_4_hosts          : MDEV-10627 - Testcase timeout
 -rpl.rpl_ddl                           : MDEV-10417 - Fails on Mips
+ rpl.rpl_drop_db                       : Modified on 2016-10-21 (Upstream MIPS test fixes)
  rpl.rpl_gtid_crash                    : MDEV-9501 - Warning: failed registering on master
  rpl.rpl_gtid_master_promote           : MDEV-10628 - Timeout in sync_with_master
  rpl.rpl_gtid_stop_start               : MDEV-10629 - Crash on shutdown
  rpl.rpl_gtid_until                    : MDEV-10625 - warnings in error log
- rpl.rpl_ignore_table                  : Modified on 2016-06-22
 -rpl.rpl_innodb_bug30888               : MDEV-10417 - Fails on Mips
  rpl.rpl_insert                        : MDEV-9329 - Fails on Ubuntu/s390x
  rpl.rpl_insert_delayed                : MDEV-9329 - Fails on Ubuntu/s390x
 -rpl.rpl_invoked_features              : MDEV-10417 - Fails on Mips
 -rpl.rpl_mdev6020                      : MDEV-10630, MDEV-10417 - Timeouts, fails on Mips
-+rpl.rpl_mdev6020                      : MDEV-10630 - Timeouts
++rpl.rpl_mdev6020                      : MDEV-10630, MDEV-10417 - Timeouts
  rpl.rpl_mdev6386                      : MDEV-10631 - Wrong result on slave
  rpl.rpl_parallel                      : MDEV-10632, MDEV-10653 - Failures to sync, timeouts
  rpl.rpl_parallel_temptable            : MDEV-10356 - Crash in close_thread_tables

debian/patches/mips64-taocrypt-integer.patch

-Description: Correctly fix mips64 multiplication in taocrypt
- In Debian bugs #719196 and #798126, a patch was submitted to fix a FTBFS on
- mips64el of mysql-5.5 and mysql-5.6 respectively. This patch was accepted
- upstream and made its way into mariadb (MDEV-6528). Unfortunately the patch
- was incorrect and causes segfaults when executing the SSL parts of the
- testsuite.
- .
- The previous patch replaced the "h" asm constraint with the "d" constraint
- since the "h" is not supported in newer GCC versions. The "d" constraint was
- wrong as it tells GCC that the result can be found in _any_ general purpose
- register that it chooses. This resulted in GCC reading garbage into the high
- result bits.
- .
- This new patch replaces the assembly code with a generic 128-bit
- multiplication which works correctly on mips64.
-Author: James Cowgill <jcowgill@debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/extra/yassl/taocrypt/src/integer.cpp
-+++ b/extra/yassl/taocrypt/src/integer.cpp
-@@ -193,8 +193,9 @@ DWord() {}
-                 "a" (a), "rm" (b) : "cc");
- 
-         #elif defined(__mips64)
--            __asm__("dmultu %2,%3" : "=d" (r.halfs_.high), "=l" (r.halfs_.low)
--                : "r" (a), "r" (b));
-+            unsigned __int128 t = (unsigned __int128) a * b;
-+            r.halfs_.high = t >> 64;
-+            r.halfs_.low = (word) t;
- 
-         #elif defined(_M_IX86)
-             // for testing

debian/patches/scripts__mysqld_safe.sh__signals.patch

@@ -23,7 +23,7 @@
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -819,6 +818,13 @@ then
+@@ -823,6 +822,13 @@ then
  fi
  
  #

debian/patches/series

@@ -16,11 +16,7 @@ mdev-8375-built-in-auth-socket.patch
 mdev-8375-passwordless-accounts-for-testsuite.patch
 mdev-9528-mysql_embedded.patch
 man_page_tokuftdump.patch
-mips-errno-enotempty.patch
-mips64-taocrypt-integer.patch
 mips-groonga-atomic.patch
 mips-connect-unaligned.patch
 mips-machine.patch
 mips-unstable-tests.patch
-hppa-enoempty.patch
-tokudb_jemalloc_link.patch

debian/patches/tokudb_jemalloc_link.patch

-Description: Do not link lib-jemalloc privately with TokuDB
- Linking privately with lib-jemalloc causes problems when loading/unloading
- tokudb, as lib-jemalloc sets some internal variables in thread local storage.
- If tokudb gets unloaded, we lose the destructors to these variables and
- subsequently crash.
- .
- Remove this once upstream has released an official fix.
-Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
-diff --git a/storage/tokudb/PerconaFT/portability/CMakeLists.txt b/storage/tokudb/PerconaFT/portability/CMakeLists.txt
-index 9f84d9b..4793db6 100644
---- a/storage/tokudb/PerconaFT/portability/CMakeLists.txt
-+++ b/storage/tokudb/PerconaFT/portability/CMakeLists.txt
-@@ -14,12 +14,11 @@ set(tokuportability_srcs
-   )
- 
- add_library(${LIBTOKUPORTABILITY} SHARED ${tokuportability_srcs})
--target_link_libraries(${LIBTOKUPORTABILITY} LINK_PRIVATE ${LIBJEMALLOC})
- target_link_libraries(${LIBTOKUPORTABILITY} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
- 
- add_library(tokuportability_static_conv STATIC ${tokuportability_srcs})
- set_target_properties(tokuportability_static_conv PROPERTIES POSITION_INDEPENDENT_CODE ON)
--set(tokuportability_source_libs tokuportability_static_conv ${LIBJEMALLOC} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
-+set(tokuportability_source_libs tokuportability_static_conv ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
- toku_merge_static_libs(${LIBTOKUPORTABILITY}_static ${LIBTOKUPORTABILITY}_static "${tokuportability_source_libs}")
- 
- maybe_add_gcov_to_libraries(${LIBTOKUPORTABILITY} tokuportability_static_conv)