diff --git a/.gitignore b/.gitignore index 8f84719..fc356c5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /mariadb-10.0.13.tar.gz /mariadb-10.0.14.tar.gz /mariadb-10.0.15.tar.gz +/mariadb-10.0.16.tar.gz diff --git a/mariadb-dh1024.patch b/mariadb-dh1024.patch index e1a2ee8..a887199 100644 --- a/mariadb-dh1024.patch +++ b/mariadb-dh1024.patch @@ -5,9 +5,9 @@ mode is on, but it doesn't seem worth the trouble.) The new parameter value was generated using "openssl dhparam -C 1024". -diff -up mariadb-10.0.15/vio/viosslfactories.c.orig mariadb-10.0.15/vio/viosslfactories.c ---- mariadb-10.0.15/vio/viosslfactories.c.orig 2014-11-27 15:02:22.757315487 +0100 -+++ mariadb-10.0.15/vio/viosslfactories.c 2014-11-27 15:00:44.847144887 +0100 +diff -up mariadb-10.0.16/vio/viosslfactories.c.orig mariadb-10.0.16/vio/viosslfactories.c +--- mariadb-10.0.16/vio/viosslfactories.c.orig 2015-01-25 16:21:38.000000000 +0100 ++++ mariadb-10.0.16/vio/viosslfactories.c 2015-02-03 10:48:26.012560285 +0100 @@ -20,27 +20,32 @@ static my_bool ssl_algorithms_added = FALSE; static my_bool ssl_error_strings_loaded= FALSE; @@ -52,7 +52,7 @@ diff -up mariadb-10.0.15/vio/viosslfactories.c.orig mariadb-10.0.15/vio/viosslfa if (! dh->p || ! dh->g) { DH_free(dh); -@@ -284,7 +289,7 @@ new_VioSSLFd(const char *key_file, const +@@ -257,7 +262,7 @@ new_VioSSLFd(const char *key_file, const } /* DH stuff */ diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch index f42c991..e55e794 100644 --- a/mariadb-scripts.patch +++ b/mariadb-scripts.patch @@ -1,7 +1,7 @@ -diff -up mariadb-10.0.15/scripts/CMakeLists.txt.systemd mariadb-10.0.15/scripts/CMakeLists.txt ---- mariadb-10.0.15/scripts/CMakeLists.txt.systemd 2014-11-27 15:06:24.670736998 +0100 -+++ mariadb-10.0.15/scripts/CMakeLists.txt 2014-11-27 15:04:26.252530666 +0100 -@@ -374,6 +374,32 @@ ELSE() +diff -up mariadb-10.0.16/scripts/CMakeLists.txt.systemd mariadb-10.0.16/scripts/CMakeLists.txt +--- mariadb-10.0.16/scripts/CMakeLists.txt.systemd 2015-01-25 16:21:37.000000000 +0100 ++++ mariadb-10.0.16/scripts/CMakeLists.txt 2015-02-03 10:53:05.261790495 +0100 +@@ -367,6 +367,32 @@ ELSE() COMPONENT ${${file}_COMPONENT} ) ENDFOREACH() diff --git a/mariadb.spec b/mariadb.spec index c8f5a6c..619419b 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -104,11 +104,11 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.0 -%global bugfixver 15 +%global bugfixver 16 Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 9%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -1139,6 +1139,10 @@ fi %endif %changelog +* Tue Feb 3 2015 Jakub Dorňák - 1:10.0.16-9 +- Rebase to version 10.0.16 + Resolves: #1187895 + * Tue Jan 27 2015 Petr Machata - 1:10.0.15-9 - Rebuild for boost 1.57.0 diff --git a/sources b/sources index 1aea2ed..18a850f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07e2ca1ad684c2dc5cb260717c4db41d mariadb-10.0.15.tar.gz +7b1a197ea5d4027833a3a2ed26fc4cae mariadb-10.0.16.tar.gz