diff --git a/build.inc b/build.inc deleted file mode 100644 index 0c06e4e..0000000 --- a/build.inc +++ /dev/null @@ -1,49 +0,0 @@ -EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter" -# Mariadb devs seems to fall in love with -Werror option -EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error" -%ifarch ppc64 -EXTRA_FLAGS="${EXTRA_FLAGS} -mminimal-toc" -%endif -export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS" -export CXXFLAGS="$CFLAGS -felide-constructors" -%cmake -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_LIBEVENT=system \ - -DWITH_JEMALLOC=auto \ - -DWITH_READLINE=0 \ - -DWITH_LIBEDIT=0 \ - -DINSTALL_LAYOUT=RPM \ - -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" \ - -DWITH_EXTRA_CHARSET=all \ - -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ -%if 0%{with_oqgraph} > 0 - -DWITH_OQGRAPH_STORAGE_ENGINE=1 \ -%endif -%if 0%{with_cassandra} > 0 - -DWITH_CASSANDRA_STORAGE_ENGINE=1 \ -%endif - -DWITH_XTRADB_STORAGE_ENGINE=1 \ - -DWITH_CSV_STORAGE_ENGINE=1 \ - -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ - -DWITH_EMBEDDED_SERVER=true \ - -DCOMPILATION_COMMENT="openSUSE package" \ - -DDENABLE_DOWNLOADS=false \ - -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \ - -DINSTALL_LIBDIR_RPM="%{_lib}" \ - -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ - -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \ - -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" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ - -Wno-dev "$@" .. -make %{?_smp_mflags} -nm --numeric-sort sql/mysqld > sql/mysqld.sym diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 50b80ce..190412b 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c96c09b6dff46a9d93d48ae6e5fdbf83469abbafd1191f2eef92f452b17ac4f -size 218 +oid sha256:903fae90258c7b429449752b3cb8cdcc8bfd4ae844e758cf8cb4c7b82cbc997f +size 309 diff --git a/install.inc b/install.inc index 4045a7e..015dad0 100644 --- a/install.inc +++ b/install.inc @@ -126,9 +126,7 @@ fi rm -rf '%buildroot'/etc/my.cnf.d mkdir -p '%buildroot'/etc/my.cnf.d bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf - -%if %have_info < 1 [ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info* -%endif [ -z "`ls '%buildroot'/usr/share/mysql-test/suite/innodb/t/*.zip`" ] || chmod a-x '%buildroot'/usr/share/mysql-test/suite/innodb/t/*.zip if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then echo '%%dir %%_libdir/mysql' >> mysql-client.files diff --git a/mariadb-10.0.17.tar.gz b/mariadb-10.0.17.tar.gz deleted file mode 100644 index 44c82a8..0000000 --- a/mariadb-10.0.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311 -size 55989700 diff --git a/mariadb-10.0.19.tar.gz b/mariadb-10.0.19.tar.gz new file mode 100644 index 0000000..4e5b019 --- /dev/null +++ b/mariadb-10.0.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 +size 56224123 diff --git a/mariadb.changes b/mariadb.changes index 89e08b0..7f30adf 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 23 13:16:03 UTC 2015 - tchvatal@suse.com + +- Update to 10.0.19, sync to git state of repository: + https://mariadb.com/kb/en/mariadb/mariadb-10019-release-notes/ + ------------------------------------------------------------------- Tue Apr 14 13:42:54 UTC 2015 - michal.hrusecky@opensuse.org diff --git a/mariadb.spec b/mariadb.spec index c468ba1..86c9969 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,17 @@ # -%define preferred 01 -%define have_info 0 +%define pretty_name MariaDB +%define libname mysqlclient +%define soname 18 +%define preferred 01 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb -%define use_extra_provides 1 %define extra_provides mariadb_100 -%define srv_vers 5.6.26 +%define srv_vers 5.6.24 +# Remove when 13.1 is out of support scope %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif - %if 0 > 0 %define with_jemalloc 1 %define with_oqgraph 1 @@ -35,11 +36,10 @@ %define with_oqgraph 0 %define with_cassandra 0 %endif - Name: mariadb -Version: 10.0.17 +Version: 10.0.19 Release: 0 -Summary: Server part of MariaDB +Summary: Server part of %{pretty_name} License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: https://www.mariadb.org @@ -51,7 +51,6 @@ Source5: mysql.SuSEfirewall2 Source7: README.install Source8: README.SUSE Source9: mysql-patches.tar.bz2 -Source10: build.inc Source11: install.inc Source12: series Source13: configuration-tweaks.tar.bz2 @@ -60,25 +59,13 @@ Source15: rc.mysql.sysvinit Source16: rc.mysql.systemd Source17: mysql.service BuildRequires: bison -%if 0%{with_oqgraph} > 0 || 0%{with_cassandra} > 0 -BuildRequires: boost-devel -%endif BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -%if 0%{with_jemalloc} > 0 -BuildRequires: jemalloc-devel -%endif -%if 0%{with_oqgraph} > 0 -BuildRequires: judy-devel -%endif BuildRequires: libaio-devel BuildRequires: libbz2-devel BuildRequires: libedit-devel BuildRequires: libevent-devel -%if 0%{with_cassandra} > 0 -BuildRequires: libthrift-devel -%endif BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: lzo-devel @@ -99,6 +86,10 @@ Requires: %{name}-errormessages = %{version} Requires: perl-base Requires(pre): pwdutils Recommends: logrotate +Conflicts: otherproviders(mariadb-server) +Conflicts: otherproviders(mysql) +Conflicts: otherproviders(mysql-debug) +Conflicts: otherproviders(mysql-server) Provides: mysql-Max = %{srv_vers} # Compatibility with Fedora/CentOS Provides: mysql-server = %{srv_vers} @@ -108,32 +99,31 @@ Provides: %{name}-debug-version = %{srv_vers} Obsoletes: %{name}-debug-version < %{srv_vers} Provides: %{name}-debug = %{srv_vers} Obsoletes: %{name}-debug < %{srv_vers} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: otherproviders(mysql) -Conflicts: otherproviders(mysql-server) -Conflicts: otherproviders(mariadb-server) -Conflicts: otherproviders(mysql-debug) -%{?systemd_requires} -%if 0%{have_info} > 0 -Requires(post): %{install_info_prereq} %insserv_prereq -%endif -%if "%{name}" != mysql Provides: mysql = %{srv_vers} Provides: mysql-debug = %{srv_vers} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} +%if 0%{with_oqgraph} > 0 || 0%{with_cassandra} > 0 +BuildRequires: boost-devel +%endif +%if 0%{with_jemalloc} > 0 +BuildRequires: jemalloc-devel +%endif +%if 0%{with_oqgraph} > 0 +BuildRequires: judy-devel +%endif +%if 0%{with_cassandra} > 0 +BuildRequires: libthrift-devel %endif -%if 0%{?use_extra_provides} > 0 Provides: %{extra_provides} = %{version} Obsoletes: %{extra_provides} < %{version} Provides: %{extra_provides}-debug-version = %{version} Obsoletes: %{extra_provides}-debug-version < %{version} -%endif %if 0%{?preferred} > 0 Obsoletes: mysql-Max < %{srv_vers} -%if "%{name}" != mysql Obsoletes: mysql < %{srv_vers} Obsoletes: mysql-debug < %{srv_vers} %endif -%endif %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -144,81 +134,74 @@ This package only contains the server-side programs. %if 0%{?preferred} > 0 %package -n libmysqlclient-devel -Summary: MariaDB development header files and libraries +Summary: %{pretty_name} development header files and libraries Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: libmysqlclient_r18 = %{version} -Requires: libmysqlclient18 = %{version} +Requires: libmysqlclient_r%{soname} = %{version} +Requires: libmysqlclient%{soname} = %{version} Requires: openssl-devel Requires: zlib-devel -# mysql-devel was last used in openSUSE 10.2 -Provides: mysql-devel = %{srv_vers}-%{release} -Obsoletes: mysql-devel < %{srv_vers} %description -n libmysqlclient-devel This package contains the development header files and libraries -necessary to develop client applications for MariaDB. +necessary to develop client applications for %{pretty_name}. -%package -n libmysqld18 -Summary: MariaDB embedded server development files +%package -n libmysqld%{soname} +Summary: %{pretty_name} embedded server development files Group: Development/Libraries/C and C++ Requires: %{name}-errormessages = %{version} -%description -n libmysqld18 +%description -n libmysqld%{soname} This package contains the development header files and libraries -for developing applications that embed the MariaDB. +for developing applications that embed the %{pretty_name}. %package -n libmysqld-devel -Summary: MariaDB embedded server development files +Summary: %{pretty_name} embedded server development files Group: Development/Libraries/C and C++ # the headers files are the shared Requires: libmysqlclient-devel = %{version} -Requires: libmysqld18 = %{version} +Requires: libmysqld%{soname} = %{version} Requires: tcpd-devel %description -n libmysqld-devel This package contains the development header files and libraries -for developing applications that embed the MariaDB. +for developing applications that embed the %{pretty_name}. %endif -%package -n libmysqlclient18 -Summary: Shared Libraries for MariaDB +%package -n lib%{libname}%{soname} +Summary: Shared Libraries for %{pretty_name} Group: Development/Libraries/Other -%description -n libmysqlclient18 +%description -n lib%{libname}%{soname} This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. +languages and applications need to dynamically load and use %{pretty_name}. -%package -n libmysqlclient_r18 -Summary: Shared Libraries for MariaDB +%package -n lib%{libname}_r%{soname} +Summary: Shared Libraries for %{pretty_name} Group: Development/Libraries/Other -Requires: libmysqlclient18 +Requires: lib%{libname}%{soname} -%description -n libmysqlclient_r18 +%description -n lib%{libname}_r%{soname} This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. +languages and applications need to dynamically load and use %{pretty_name}. %package client -Summary: Client for MariaDB +Summary: Client for %{pretty_name} Group: Productivity/Databases/Clients Requires: %{name}-errormessages = %{version} -Conflicts: otherproviders(mysql-client) -%if "%{name}" != mysql -Provides: mysql-client = %{srv_vers} -%endif +# Explicit requires to pull in charsets for errormessages +Requires: lib%{libname}%{soname} Requires(pre): pwdutils -%if 0%{?use_extra_provides} > 0 +Conflicts: otherproviders(mysql-client) +Provides: mysql-client = %{srv_vers} Provides: %{extra_provides}-client = %{version} Obsoletes: %{extra_provides}-client < %{version} -%endif %if 0%{?preferred} > 0 -%if "%{name}" != mysql Obsoletes: mysql-client < %{srv_vers} %endif -%endif %description client -This package contains the standard clients for MariaDB. +This package contains the standard clients for %{pretty_name}. %package errormessages Summary: MySQL Community Server development header files and libraries @@ -229,32 +212,26 @@ This package provides the translated error messages for the standalone server daemon as well as the embedded server %package bench -Summary: Benchmarks for MariaDB +Summary: Benchmarks for %{pretty_name} Group: Productivity/Databases/Tools Requires: %{name}-client Requires: perl-DBD-mysql Conflicts: otherproviders(mysql-bench) -%if "%{name}" != mysql Provides: mysql-bench = %{srv_vers} -%endif -%if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-bench = %{version} Obsoletes: %{extra_provides}-bench < %{version} -%endif %if 0%{?preferred} > 0 -%if "%{name}" != mysql Obsoletes: mysql-bench < %{srv_vers} %endif -%endif %description bench -This package contains benchmark scripts and data for MariaDB. +This package contains benchmark scripts and data for %{pretty_name}. To run these database benchmarks, start the script "run-all-tests" in -the directory %{_datadir}/sql-bench after starting MariaDB. +the directory %{_datadir}/sql-bench after starting %{pretty_name}. %package test -Summary: Testsuite for MariaDB +Summary: Testsuite for %{pretty_name} Group: Productivity/Databases/Servers Requires: %{name} = %{version} Requires: %{name}-bench = %{version} @@ -262,48 +239,36 @@ Requires: %{name}-client = %{version} Requires: %{name}-tools = %{version} Requires: perl-DBD-mysql Conflicts: otherproviders(mysql-test) -%if "%{name}" != mysql Provides: mysql-test = %{srv_vers} -%endif -%if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-test = %{version} Obsoletes: %{extra_provides}-test < %{version} -%endif %if 0%{?preferred} > 0 -%if "%{name}" != mysql Obsoletes: mysql-test < %{srv_vers} %endif -%endif %description test -This package contains the test scripts and data for MariaDB. +This package contains the test scripts and data for %{pretty_name}. To run the testsuite, run %{_datadir}/mysql-test/suse-test-run. %package tools -Summary: MariaDB tools +Summary: %{pretty_name} tools Group: Productivity/Databases/Servers Requires: perl-DBD-mysql +Conflicts: otherproviders(mysql-tools) # make sure this package is installed when updating from 10.2 and older Provides: mysql-client:%{_bindir}/perror Provides: mysql:%{_bindir}/mysqlhotcopy -Conflicts: otherproviders(mysql-tools) -%if "%{name}" != mysql Provides: mysql-tools = %{srv_vers} -%endif -%if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-tools = %{version} Obsoletes: %{extra_provides}-tools < %{version} -%endif %if 0%{?preferred} > 0 -%if "%{name}" != mysql Obsoletes: mysql-tools < %{srv_vers} %endif -%endif %description tools -A set of scripts for administering a MariaDB or developing -applications with MariaDB. +A set of scripts for administering a %{pretty_name} or developing +applications with %{pretty_name}. %prep %setup -q -n mariadb-%{version} -D -a 9 @@ -327,8 +292,8 @@ rm -f sql/sql_builtin.cc sed -i 's|@localstatedir@|%{_localstatedir}/log|' support-files/mysql-log-rotate.sh %if 0%{preferred} < 1 for i in `grep -Rl mysqlclient .`; do - sed -i 's|mysqlclient|mysqlclient|g' $i - sed -i 's|-libmysqlclient-symbols.patch|-libmysqlclient-symbols.patch|g' $i + sed -i 's|mysqlclient|%{libname}|g' $i + sed -i 's|-lib%{libname}-symbols.patch|-libmysqlclient-symbols.patch|g' $i done %endif # Broken test that needs sources @@ -339,7 +304,52 @@ for i in `grep -Rl '^#!@PERL@$' .`; do done %build -%{expand:%(cat %{_sourcedir}/build.inc)} +EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter" +# Mariadb devs seems to fall in love with -Werror option +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_ZLIB=system \ + -DWITH_LIBEVENT=system \ + -DWITH_JEMALLOC=auto \ + -DWITH_READLINE=0 \ + -DWITH_LIBEDIT=0 \ + -DINSTALL_LAYOUT=RPM \ + -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" \ + -DWITH_EXTRA_CHARSET=all \ + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ +%if 0%{with_oqgraph} > 0 + -DWITH_OQGRAPH_STORAGE_ENGINE=1 \ +%endif +%if 0%{with_cassandra} > 0 + -DWITH_CASSANDRA_STORAGE_ENGINE=1 \ +%endif + -DWITH_XTRADB_STORAGE_ENGINE=1 \ + -DWITH_CSV_STORAGE_ENGINE=1 \ + -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ + -DWITH_EMBEDDED_SERVER=true \ + -DCOMPILATION_COMMENT="openSUSE package" \ + -DDENABLE_DOWNLOADS=false \ + -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \ + -DINSTALL_LIBDIR_RPM="%{_lib}" \ + -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \ + -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" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -Wno-dev "$@" .. +make %{?_smp_mflags} +nm --numeric-sort sql/mysqld > sql/mysqld.sym %install %{expand:%(cat %{_sourcedir}/install.inc)} @@ -368,25 +378,21 @@ done [ $1 = 1 ] || %{_sbindir}/rcmysql stop || true %posttrans -%if 0%{have_info} > 0 -[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \ -%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* -%endif rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} for in in protected tmp; do rmdir %{_localstatedir}/lib/mysql/.$i 2>/dev/null || : done # During package rename, there might be config file move -if [ -f /etc/my.cnf.rpmsave ]; then - mv /etc/my.cnf{,.rpmnew} - mv /etc/my.cnf{.rpmsave,} +if [ -f %{_sysconfdir}/my.cnf.rpmsave ]; then + mv %{_sysconfdir}/my.cnf{,.rpmnew} + mv %{_sysconfdir}/my.cnf{.rpmsave,} cat >> %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF -WARNING: /etc/my.cnf.rpmsave file detected! +WARNING: %{_sysconfdir}/my.cnf.rpmsave file detected! This probably means that you are upgrading from different variant of MySQL. Your original configuration file was restored. If it is not a case, you can -find your original /etc/my.cnf as /etc/my.cnf.rpmnew +find your original %{_sysconfdir}/my.cnf as %{_sysconfdir}/my.cnf.rpmnew EOF @@ -434,13 +440,13 @@ fi # Various ldconfig post scripts # ####################################################################### -%post -n libmysqlclient18 -p /sbin/ldconfig +%post -n lib%{libname}%{soname} -p /sbin/ldconfig -%postun -n libmysqlclient18 -p /sbin/ldconfig +%postun -n lib%{libname}%{soname} -p /sbin/ldconfig -%post -n libmysqlclient_r18 -p /sbin/ldconfig +%post -n lib%{libname}_r%{soname} -p /sbin/ldconfig -%postun -n libmysqlclient_r18 -p /sbin/ldconfig +%postun -n lib%{libname}_r%{soname} -p /sbin/ldconfig %if 0%{preferred} > 0 %post -n libmysqld18 -p /sbin/ldconfig @@ -450,9 +456,6 @@ fi %postun if [ $1 = 0 ]; then - %if 0%{have_info} > 0 - %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* - %endif %insserv_cleanup rm -f "%{_localstatedir}/lib/systemd/migrated/mysql.service" if [ -x %{_bindir}/systemctl ]; then @@ -471,9 +474,6 @@ fi %config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/my.cnf.d/* %config %{_sysconfdir}/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} -%if 0%{have_info} > 0 -%doc %{_infodir}/mysql.info.* -%endif %dir %{_libexecdir}/mysql %{_libexecdir}/mysql/rcmysql %{_libexecdir}/systemd/system/mysql.service @@ -514,13 +514,13 @@ fi %{_libdir}/libmysqld.so.* %endif -%files -n libmysqlclient18 +%files -n lib%{libname}%{soname} %defattr(-, root, root) -%{_libdir}/libmysqlclient.so.* +%{_libdir}/lib%{libname}.so.* -%files -n libmysqlclient_r18 +%files -n lib%{libname}_r%{soname} %defattr(-, root, root) -%{_libdir}/libmysqlclient_r.so.* +%{_libdir}/lib%{libname}_r.so.* %files bench -f mysql-bench.files %defattr(-, root, root) diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index c099b24..3e1aa1c 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0850543056d459a235ccb6e4d36f503e7dfe58a2ce2ef6015072d495000c533 -size 14898 +oid sha256:d4b9a9a1f6f6a3f231d3a1e70e8a40226e4a9221f20453a043f3ece8996b9b37 +size 16106 diff --git a/series b/series index 10332b1..51ff215 100644 --- a/series +++ b/series @@ -10,8 +10,10 @@ mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-10.0.17-group.patch mariadb-10.0.5-deharcode-libdir.patch -mariadb-10.0.15-upgrade-datadir.patch 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