Accepting request 148857 from server:database

- making MariaDB default
- updated to MariaDB 5.5.28a
  * Release notes:
    http://kb.askmonty.org/v/mariadb-5528a-release-notes
  * Changelog:
    http://kb.askmonty.org/v/mariadb-5528a-changelog
  * fixes CVE-2012-5611 (bnc#792444)
  * fixes CVE-2012-4414 (bnc#779476)

OBS-URL: https://build.opensuse.org/request/show/148857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=23

baselibs.conf

@@ -1,2 +1,2 @@
-libmariadbclient18
+libmysqlclient18
-libmariadbclient_r18
+libmysqlclient_r18

configuration-tweaks.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce0f1567f04b02c50fc1b8e67000e6b1791b986393c210b3645f138e0dc4cac7
+oid sha256:f2509e8e7a2f38de99a0bcfd4d3fe8f6355187cd9ca7823f8d1aebfe996076f4
-size 215
+size 218

mariadb-5.5.28.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22cff1db4fd215b5949978a0b73bc32a5ff86bc6cc64159e166610947e899ba0
-size 21255655

mariadb-5.5.28a.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9580383302161e61491a8f187323bd53e2e6891ff5e9e389c4e126ee2e844a45
+size 21287499

mariadb.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jan 17 09:14:41 CET 2013 - mhrusecky@suse.cz
+
+- making MariaDB default
+
+-------------------------------------------------------------------
+Fri Jan  4 12:52:20 CET 2013 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.5.28a
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-5528a-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-5528a-changelog
+  * fixes CVE-2012-5611 (bnc#792444)
+  * fixes CVE-2012-4414 (bnc#779476)
+
 -------------------------------------------------------------------
 Wed Oct 31 22:31:34 CET 2012 - mhrusecky@suse.cz
 

mariadb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mariadb
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 # Few definitions which will alter build
-%define prefered   0
+%define prefered   1
 %define use_cmake  1
 %define cluster    0
 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
@@ -35,7 +35,7 @@ Name:           mariadb
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
-Version:        5.5.28
+Version:        5.5.28a
 Release:        1
 %define srv_vers 5.5.28
 Url:            http://www.mariab.org
@@ -146,21 +146,21 @@ This package contains the development header files and libraries
 for developing applications that embed the MariaDB.
 %endif
 
-%package -n libmariadbclient18
+%package -n libmysqlclient18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient18
+%description -n libmysqlclient18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
-%package -n libmariadbclient_r18
+%package -n libmysqlclient_r18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient_r18
+%description -n libmysqlclient_r18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
@@ -360,9 +360,11 @@ rm -f sql/sql_builtin.cc
 sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
 %if 0%{prefered} < 1
 for i in `grep -Rl mysqlclient .`; do
-	sed -i 's|mysqlclient|mariadbclient|g' $i
+	sed -i 's|mysqlclient|mysqlclient|g' $i
 done
 %endif
+# Broken test that needs sources
+rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
 
 %build
 %{expand:%(cat %_sourcedir/build.inc)}
@@ -421,13 +423,13 @@ fi
 # Various ldconfig post scripts                                       #
 #######################################################################
 
-%post -n libmariadbclient18 -p /sbin/ldconfig
+%post -n libmysqlclient18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient18 -p /sbin/ldconfig
+%postun -n libmysqlclient18 -p /sbin/ldconfig
 
-%post -n libmariadbclient_r18 -p /sbin/ldconfig
+%post -n libmysqlclient_r18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient_r18 -p /sbin/ldconfig
+%postun -n libmysqlclient_r18 -p /sbin/ldconfig
 
 %if 0%{cluster} > 1
 
@@ -504,9 +506,9 @@ fi
 %_libdir/libmysqld.so.*
 %endif
 
-%files -n libmariadbclient18
+%files -n libmysqlclient18
 %defattr(-, root, root)
-%{_libdir}/libmariadbclient.so.*
+%{_libdir}/libmysqlclient.so.*
 
 %if 0%{cluster} > 1
 
@@ -515,9 +517,9 @@ fi
 %{_libdir}/libndbclient.so.*
 %endif
 
-%files -n libmariadbclient_r18
+%files -n libmysqlclient_r18
 %defattr(-, root, root)
-%{_libdir}/libmariadbclient_r.so.*
+%{_libdir}/libmysqlclient_r.so.*
 
 %files bench -f mysql-bench.files
 %defattr(-, root, root)