![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2015-09-13 09:42:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2015-07-19 11:45:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2015-09-13 09:42:19.000000000 +0200
@@ -1,0 +2,34 @@
+Fri Aug 28 14:38:45 UTC 2015 - kstreitova@suse.com
+
+- update to MariaDB 10.0.21
+ * changes:
+ * https://mariadb.com/kb/en/mariadb/mariadb-10021-release-notes
+ * the following patches were processed upstream and are no longer needed:
+ * mariadb-5.5.28-hotcopy.patch
+ * mariadb-5.1.50-strncat-overflow.patch
+ * mysql-community-server-5.1.51-mysql_config.patch
+ * mariadb-5.5.32-upgrade-exit-status.patch
+ * mariadb-5.5.41-mariadb-admincrash.patch
+- use syntax in mysql-systemd-helper that is accepted by both mariadb
+ and mysql [bnc#937767]
+- fix spurious macro expansion in comment in specfile
+- install INFO_BIN and INFO_SRC, noticed in MDEV-6912
+- replace readline-devel for readline5-devel (MDEV-6912) [bnc#902396]
+- use spec-cleaner
+- Tweak some cmake switches to enable more things
+ * WITH_ASAN=OFF adress sanitization
+ WITH_LIBWRAP=ON tcp wrappers
+ ENABLED_PROFILING=OFF profiling disable (for mysql)
+ ENABLE_DEBUG_SYNC=OFF debug testing sync disable (for mysql)
+ WITH_PIC=ON by default we want pic generated binaries (for mysql)
+- set cmake options for MariaDB Galera Cluster
+- remove superfluous '--group' parameter from mysql-systemd-helper
+- make -devel package installable in the presence of LibreSSL
+- cleanup after the update-message if it was displayed
+- add 'exec' to mysql-systemd-helper to shutdown mysql/mariadb cleanly
+ [bnc#943096]
+- remove redundant entry from %{_tmpfilesdir}/mysql.conf. Using both
+ 'x' and 'X' options is redundant and causes a warning message.
+ Leaving only the 'x' line fixes this problem. [bnc#942908]
+
+-------------------------------------------------------------------
Old:
----
mariadb-10.0.20.tar.gz
New:
----
mariadb-10.0.21.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.WjFZ9A/_old 2015-09-13 09:42:21.000000000 +0200
+++ /var/tmp/diff_new_pack.WjFZ9A/_new 2015-09-13 09:42:21.000000000 +0200
@@ -27,13 +27,14 @@
%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
%define extra_provides mariadb_100
%define with_mandatory_boost 0
+%define build_extras 0
# _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
# Remove when 13.1 is out of support scope
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
-%if 0 > 0
+%if 0%{build_extras} > 0
%define with_jemalloc 1
%define with_oqgraph 1
%define with_cassandra 1
@@ -43,7 +44,7 @@
%define with_cassandra 0
%endif
Name: mariadb
-Version: 10.0.20
+Version: 10.0.21
Release: 0
Summary: Server part of %{pretty_name}
License: SUSE-GPL-2.0-with-FLOSS-exception
@@ -71,7 +72,6 @@
BuildRequires: gcc-c++
BuildRequires: libaio-devel
BuildRequires: libbz2-devel
-BuildRequires: libedit-devel
BuildRequires: libevent-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
@@ -80,29 +80,27 @@
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pcre-devel
-BuildRequires: pkgconfig
-BuildRequires: procps
-BuildRequires: pwdutils
-BuildRequires: readline-devel
-BuildRequires: sqlite
-BuildRequires: tcpd-devel
-BuildRequires: zlib-devel
-BuildRequires: pkgconfig(systemd)
-# Tests requires time and ps and some perl modules
-# Keep in sync with Requires of mysql-testsuite
-BuildRequires: procps
-BuildRequires: time
+BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Env)
BuildRequires: perl(Exporter)
BuildRequires: perl(Fcntl)
BuildRequires: perl(File::Temp)
-BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Getopt::Long)
BuildRequires: perl(IPC::Open3)
BuildRequires: perl(Socket)
BuildRequires: perl(Sys::Hostname)
BuildRequires: perl(Test::More)
BuildRequires: perl(Time::HiRes)
+BuildRequires: pkgconfig
+# Tests requires time and ps and some perl modules
+# Keep in sync with Requires of mysql-testsuite
+BuildRequires: procps
+BuildRequires: pwdutils
+BuildRequires: sqlite
+BuildRequires: tcpd-devel
+BuildRequires: time
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig(systemd)
# required by rcmysql
Requires: %{name}-client
Requires: %{name}-errormessages = %{version}
@@ -129,6 +127,12 @@
Obsoletes: %{extra_provides}-debug-version < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
+# On mariadb we want readline5 and on mysql we use libedit from system
+%if "%{name}" == "mariadb"
+BuildRequires: readline5-devel
+%else
+BuildRequires: libedit-devel
+%endif
%if 0%{with_mandatory_boost} > 0
BuildRequires: boost-devel >= 1.57.0
%endif
@@ -163,7 +167,7 @@
Requires: glibc-devel
Requires: libmysqlclient%{soname} = %{version}
Requires: libmysqlclient_r%{soname} = %{version}
-Requires: openssl-devel
+Requires: pkgconfig(libssl)
Requires: zlib-devel
# mysql-devel needs to be provided as some pkgs still depend on it
Provides: mysql-devel = %{version}
@@ -265,13 +269,11 @@
Requires: %{name}-client = %{version}
Requires: %{name}-tools = %{version}
# Tests requires time and ps and some perl modules
-Requires: procps
-Requires: time
+Requires: perl(Data::Dumper)
Requires: perl(Env)
Requires: perl(Exporter)
Requires: perl(Fcntl)
Requires: perl(File::Temp)
-Requires: perl(Data::Dumper)
Requires: perl(Getopt::Long)
Requires: perl(IPC::Open3)
Requires: perl(Socket)
@@ -279,6 +281,8 @@
Requires: perl(Test::More)
Requires: perl(Time::HiRes)
Requires: perl-DBD-mysql
+Requires: procps
+Requires: time
Conflicts: otherproviders(mysql-test)
Provides: mysql-test = %{version}
Provides: %{extra_provides}-test = %{version}
@@ -351,11 +355,17 @@
export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
export CXXFLAGS="$CFLAGS -felide-constructors"
%cmake -DWITH_SSL=system \
+ -DWITH_ASAN=OFF \
+ -DWITH_LIBWRAP=ON \
+ -DENABLED_PROFILING=OFF \
+ -DENABLE_DEBUG_SYNC=OFF \
+ -DWITH_PIC=ON \
-DWITH_ZLIB=system \
-DWITH_LIBEVENT=system \
-DWITH_JEMALLOC=auto \
-DWITH_READLINE=0 \
-DWITH_LIBEDIT=0 \
+ -DWITH_EDITLINE=system \
-DINSTALL_LAYOUT=RPM \
-DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \
-DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
@@ -375,6 +385,8 @@
-DWITH_CSV_STORAGE_ENGINE=1 \
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
-DWITH_EMBEDDED_SERVER=true \
+ -DWITH_WSREP=ON \
+ -DWITH_INNODB_DISALLOW_WRITES=1 \
-DCOMPILATION_COMMENT="openSUSE package" \
-DDENABLE_DOWNLOADS=false \
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
@@ -382,7 +394,8 @@
-DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_SQLBENCHDIR=share \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DINSTALL_SQLBENCHDIR=share \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
@@ -433,6 +446,9 @@
# Symbols from build to go into libdir
install -m 644 build/sql/mysqld.sym %{buildroot}%{_libdir}/mysql/mysqld.sym
+# INFO_BIN and INFO_SRC binaries
+install -p -m 644 build/Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
+install -p -m 644 build/Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
# Remove handler socket client
rm -f %{buildroot}%{_libdir}/mysql/plugin/handlersocket.so
@@ -459,7 +475,7 @@
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files
# The dialog stuff is mariadb only
-if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
+if [ "`ls '%{buildroot}'%{_libdir}/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
echo '%%dir %%_libdir/mysql' >> mysql-client.files
echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files
echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files
@@ -531,8 +547,7 @@
# bnc#852451
mkdir -p %{buildroot}%{_tmpfilesdir}
cat > %{buildroot}%{_tmpfilesdir}/mysql.conf <