Accepting request 328168 from home:kstreitova:branches:server:database

sync with the git state OBS-URL: https://build.opensuse.org/request/show/328168 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=179
2015-08-31 12:35:22 +00:00 · 2015-08-31 12:35:22 +00:00 · d65634e908
commit d65634e908
parent 986c00b139
8 changed files with 92 additions and 44 deletions
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d06d18f5c8475f73d299dfe2492b37d721f993751e7ac487cc24d589972ec8ea
-size 313
+oid sha256:8d6d0f3e672fe0b13c0eaf57a2659dc5da2cc26ceb2a0fca4d272490c7289163
+size 317
--- a/mariadb-10.0.20.tar.gz
+++ b/mariadb-10.0.20.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b
-size 56241178
--- a/mariadb-10.0.21.tar.gz
+++ b/mariadb-10.0.21.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545
+size 56216903
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+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]
+
 -------------------------------------------------------------------
 Sat Jul 11 12:25:05 UTC 2015 - tchvatal@suse.com

--- a/mariadb.spec
+++ b/mariadb.spec
@ -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:  fdupes
 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:  ncurses-devel
 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 @@ Provides:       %{extra_provides}-debug-version = %{version}
 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 @@ Group:          Development/Libraries/C and C++
 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}-bench = %{version}
 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(Sys::Hostname)
 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,13 +355,19 @@ EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
 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"      \
+        -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock"   \
        -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
        -DINSTALL_MYSQLSHAREDIR=share/%{name}                        \
        -DWITH_COMMENT="openSUSE MySQL rpm"                          \
@ -375,6 +385,8 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
        -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 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
        -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 @@ install -d -m 700 %{buildroot}%{_localstatedir}/log/mysql/

 # 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 innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisam

 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 @@ rm -rf '%{buildroot}'%{_sysconfdir}/init.d
 # bnc#852451
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/mysql.conf <<EOF
-x /var/tmp/mysql.*
-X /var/tmp/mysql.*
+x %{_localstatedir}/tmp/mysql.*
 EOF

 # SuSEfirewall service description
@ -611,6 +626,7 @@ cd mysql-test
    --max-test-fail=0 || :

 # client does not require server and needs the user too
+
 %pre client
 getent group mysql >/dev/null || groupadd -r mysql
 getent passwd mysql >/dev/null || useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
@ -628,8 +644,8 @@ usermod -g mysql -s /bin/false mysql

 %post
 %service_add_post mysql.service mysql@.service mysql.target mysql@default.service
-# Use %tmpfiles_create when 13.2 is oldest in support scope
-/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
+# Use %%tmpfiles_create when 13.2 is oldest in support scope
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :

 # SLE11 Migration support
 for i in protected tmp; do
@ -690,6 +706,8 @@ exit 0

 %postun
 %service_del_postun mysql.service mysql@.service mysql.target mysql@default.service
+# Remove the /var/adm updatemsg that was hand-created and thus not on filelist
+rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}

 %post -n lib%{libname}%{soname} -p /sbin/ldconfig

@ -727,6 +745,8 @@ exit 0
 %{_datadir}/%{name}/*.sql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
+%{_libdir}/mysql/INFO_BIN
+%{_libdir}/mysql/INFO_SRC
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mysql
 %dir %{_libdir}/mysql/plugin
 %{_libdir}/mysql/plugin/[!d]*.so
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a402573f978d63eef12baaa5e15af4a13a913b95b18fd70f75b6600ba416c1f
-size 16529
+oid sha256:7f9e27993a63973a763a8c2ca9d1ec8246b6989547e8352c1a5be7995c64cb37
+size 14773
--- a/9
+++ b/9
@ -20,10 +20,10 @@ read_config() {

 	# Read options - important for multi setup
 	if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then
-		opts="$(/usr/bin/my_print_defaults --mysqld mysqld_multi "$INSTANCE")"
+		opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE")"
 		tmp_opts="$opts"
 	else
-		opts="$(/usr/bin/my_print_defaults --mysqld)"
+		opts="$(/usr/bin/my_print_defaults mysqld)"
 		tmp_opts="$opts"
 	fi

@ -34,7 +34,6 @@ read_config() {
 			--socket=*)    socket="$(echo "$arg"             | sed -e 's/^[^=]*=//')" ;;
 			--datadir=*)   datadir="$(echo "$arg"            | sed -e 's/^[^=]*=//')" ;;
 			--user=*)      mysql_daemon_user="$(echo "$arg"  | sed -e 's/^[^=]*=//')" ;;
-			--group=*)     mysql_daemon_group="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
 		esac
 	done
 }
@ -88,7 +87,7 @@ mysql_upgrade() {
 		# Run protected MySQL accessible only though socket in our directory
 		echo "Running protected MySQL... "
 		/usr/sbin/mysqld \
-			--user="$mysql_daemon_user" --group="$mysql_daemon_group" \
+			--user="$mysql_daemon_user" \
 			$opts \
 			--skip-networking \
 			--skip-grant-tables \
@ -145,7 +144,7 @@ mysql_wait() {
 }

 mysql_start() {
-	/usr/sbin/mysqld --user="$mysql_daemon_user" --group="$mysql_daemon_group" $opts 
+	exec /usr/sbin/mysqld --user="$mysql_daemon_user" $opts 
 }

 # We rely on output in english at some points
--- a/5
+++ b/5
@ -1,11 +1,7 @@
-mariadb-5.5.28-hotcopy.patch
 mysql-community-server-5.1.45-multi-configuration.patch
 mysql-community-server-5.1.46-logrotate.patch
-mariadb-5.1.50-strncat-overflow.patch
 mariadb-5.5.28-install_db-quiet.patch
-mysql-community-server-5.1.51-mysql_config.patch
 mariadb-10.0.15-mysqld_multi-features.patch
-mariadb-5.5.32-upgrade-exit-status.patch
 mariadb-5.2.3-cnf.patch
 mysql-community-server-5.5.6-safe-process-in-bin.patch
 mariadb-10.0.17-group.patch
@ -14,7 +10,6 @@ mysql-community-server-5.6.12-srv_buf_size.patch
 mariadb-10.0.16-header_files_const_warnings.patch
 mariadb-10.0.15-fortify-and-O.patch
 mariadb-10.0.15-logrotate-su.patch
-mariadb-5.5.41-mariadb-admincrash.patch
 mariadb-10.0.15-covscan-signexpr.patch
 mariadb-10.0.10-string-overflow.patch
 mariadb-10.0.20-tabxml-bufferoverflowstrncat.patch