From 91ce7b4ca6a39113a9737b7f0aa94a76b99c100a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 08 2016 15:42:46 +0000 Subject: import rh-mariadb101-mariadb-10.1.19-6.el7 --- diff --git a/.gitignore b/.gitignore index fb5a090..75c6286 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.1.16.tar.gz +SOURCES/mariadb-10.1.19.tar.gz diff --git a/.rh-mariadb101-mariadb.metadata b/.rh-mariadb101-mariadb.metadata index c74fa75..34fb6dc 100644 --- a/.rh-mariadb101-mariadb.metadata +++ b/.rh-mariadb101-mariadb.metadata @@ -1 +1 @@ -725739d36e24bfa1156f92b0c5a57fcc379f4e91 SOURCES/mariadb-10.1.16.tar.gz +6ad858653647effe16fceb096d0897694d3c7bcb SOURCES/mariadb-10.1.19.tar.gz diff --git a/SOURCES/mariadb-install-db-sharedir.patch b/SOURCES/mariadb-install-db-sharedir.patch index c7b0cf7..f32c3df 100644 --- a/SOURCES/mariadb-install-db-sharedir.patch +++ b/SOURCES/mariadb-install-db-sharedir.patch @@ -1,38 +1,23 @@ Use configured value instead of hardcoded path -diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in ---- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir 2014-09-04 12:50:24.061979080 +0200 -+++ mariadb-10.0.13/scripts/mysql_install_db.pl.in 2014-09-04 12:51:22.929045559 +0200 -@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} ) +diff -up mariadb-10.1.19/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.1.19/scripts/mysql_install_db.pl.in +--- mariadb-10.1.19/scripts/mysql_install_db.pl.in.pbasedir 2016-11-19 13:08:53.882777759 +0100 ++++ mariadb-10.1.19/scripts/mysql_install_db.pl.in 2016-11-19 13:08:53.880777758 +0100 +@@ -306,7 +306,7 @@ if ( $opt->{srcdir} ) + $bindir = "$opt->{basedir}/client"; + $extra_bindir = "$opt->{basedir}/extra"; + $mysqld = "$opt->{basedir}/sql/mysqld"; +- $mysqld_opt = "--language=$opt->{srcdir}/sql/share/english"; ++ $mysqld_opt = "--language=$opt->{srcdir}/sql/@INSTALL_MYSQLSHAREDIR@/english"; + $srcpkgdatadir = "$opt->{srcdir}/scripts"; + $buildpkgdatadir = "$opt->{builddir}/scripts"; + $scriptdir = "$opt->{srcdir}/scripts"; +@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} ) find_in_basedir($opt,"file","mysqld-nt", "bin"); # ,"sql" - $pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", + $srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", - "share","share/mysql"); # ,"scripts" + "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts" + $buildpkgdir = $srcpkgdatadir; $scriptdir = "$opt->{basedir}/scripts"; } - else -diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh ---- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir 2014-09-04 12:51:59.005086301 +0200 -+++ mariadb-10.0.13/scripts/mysql_install_db.sh 2014-09-04 12:54:02.794222597 +0200 -@@ -282,16 +282,16 @@ then - cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin - exit 1 - fi -- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` -+ langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english` - if test -z "$langdir" - then -- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english -+ cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english - exit 1 - fi -- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` -+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@` - if test -z "$pkgdatadir" - then -- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql -+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@ - exit 1 - fi - scriptdir="$basedir/scripts" diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 9ae2ae2..acbad64 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -99,6 +99,7 @@ # MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use # the bundled library, since the package cannot be build with older version +%global pcre_version 8.39 %if 0%{?fedora} >= 21 %bcond_without pcre %else @@ -153,7 +154,7 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.1 -%global bugfixver 16 +%global bugfixver 19 %if 0%{?scl:1} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} @@ -161,7 +162,7 @@ Name: %{?scl_prefix}mariadb Version: %{compatver}.%{bugfixver} -Release: 1%{?with_debug:.debug}%{?dist} +Release: 6%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -229,7 +230,6 @@ Patch90: %{pkgnamepatch}-scl-env-check.patch BuildRequires: cmake BuildRequires: libaio-devel BuildRequires: libedit-devel -BuildRequires: openssl-devel BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: systemtap-sdt-devel @@ -238,7 +238,7 @@ BuildRequires: zlib-devel BuildRequires: pam-devel # use either new enough version of pcre or provide bundles(pcre) %{?with_pcre:BuildRequires: pcre-devel >= 8.35} -%{!?with_pcre:Provides: bundled(pcre) = 8.38} +%{!?with_pcre:Provides: bundled(pcre) = %{pcre_version}} # Tests requires time and ps and some perl modules BuildRequires: procps BuildRequires: time @@ -254,8 +254,12 @@ BuildRequires: perl(Socket) BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Symbol) + # for running some openssl tests rhbz#1189180 BuildRequires: openssl +BuildRequires: openssl-devel + %if %{with galera} BuildRequires: selinux-policy-devel %endif @@ -564,7 +568,7 @@ MariaDB is a community developed branch of MySQL. %if %{with test} %package test -Summary: The test suite distributed with MariaD +Summary: The test suite distributed with MariaDB Group: Applications/Databases Requires: %{name}%{?_isa} = %{sameevr} Requires: %{name}-common%{?_isa} = %{sameevr} @@ -655,6 +659,20 @@ sed -i 's/kerberos_port_t/kerberos_master_port_t/' selinux/%{name}-server-galera cat selinux/%{name}-server-galera.te %endif +# Check if PCRE version is actual +%{!?with_pcre: +pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` +pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` + +if [ %{pcre_version} != "$pcre_maj.$pcre_min" ] +then + echo "\n PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n" + exit 1 +fi +} + + + %build # fail quickly and obviously if user tries to build as root @@ -934,9 +952,15 @@ rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql # remove solaris files rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/ +# remove *.jar file from mysql-test +rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar + # rename the wsrep README so it corresponds with the other README names mv Docs/README-wsrep Docs/README.wsrep +# remove *.jar file from mysql-test +rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar + %if %{without clibrary} unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so @@ -1218,8 +1242,8 @@ fi %doc Docs/README.wsrep LICENSE.clustercheck %{_bindir}/clustercheck %{_bindir}/galera_new_cluster -%{_bindir}/galera_recovery %if %{with init_systemd} +%{_bindir}/galera_recovery %{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf %endif %config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf @@ -1416,6 +1440,14 @@ fi %endif %changelog +* Wed Nov 23 2016 Michal Schorm - 1:10.1.19-6 +- Rebase to version 10.1.19 +- JdbcMariaDB.jar test removed +- PCRE version check added + Related: #1393306, #1396934 + Also fix: CVE-2016-3492 CVE-2016-5616 CVE-2016-5624 CVE-2016-5626 + CVE-2016-5629 CVE-2016-6662 CVE-2016-6663 CVE-2016-8283 + * Tue Jul 26 2016 Jakub Dorňák - 1:10.1.16-1 - Rebase to version 10.1.16 Resolves: #1359870