Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2015-09-02 00:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2015-07-14 17:46:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2015-09-02 00:36:23.000000000 +0200 @@ -1,0 +2,41 @@ +Fri Aug 28 14:49:57 UTC 2015 - kstreit...@suse.com + +- update to MySQL 5.6.26 + * changes: + * http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-26.html + * fixed CVEs: + CVE-2015-2617, CVE-2015-2648, CVE-2015-2611, CVE-2015-2582 + CVE-2015-4752, CVE-2015-4756, CVE-2015-2643, CVE-2015-4772 + CVE-2015-4761, CVE-2015-4757, CVE-2015-4737, CVE-2015-4771 + CVE-2015-4769, CVE-2015-2639, CVE-2015-2620, CVE-2015-2641 + CVE-2015-2661, CVE-2015-4767 + * fix [bnc#938412] + * remove the following patches (changes were merged upstream): + * mysql-community-server-5.6.24-regex_heap_overflow.patch + * mysql-5.6.25-logjam.patch +- disable Performance Schema by default. Since MySQL 5.6.6 upstream + enabled Performance Schema by default which results in increased + memory usage. The added option disable Performance Schema again in + order to decrease MySQL memory usage [bnc#852477]. +- fix spurious macro expansion in comment in specfile +- install INFO_BIN and INFO_SRC, noticed in MDEV-6912 +- use spec-cleaner +- tweak some cmake switches to enable more things + * WITH_ASAN=ON adress sanitization + WITH_LIBWRAP=ON tcp wrappers + ENABLED_PROFILING=OFF profiling disable + ENABLE_DEBUG_SYNC=OFF debug testing sync disable + WITH_PIC=ON by default we want pic generated binaries +- 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] +- mariadb: replace readline-devel for readline5-devel (MDEV-6912) + [bnc#902396] +- mariadb-101: set cmake options for MariaDB Galera Cluster + +------------------------------------------------------------------- Old: ---- mysql-5.6.25.tar.gz New: ---- mysql-5.6.26.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.ruNF5q/_old 2015-09-02 00:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ruNF5q/_new 2015-09-02 00:36:25.000000000 +0200 @@ -27,13 +27,14 @@ %define builtin_plugins partition,csv,heap,myisam,innobase %define extra_provides mysql-community-server_56 %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: mysql-community-server -Version: 5.6.25 +Version: 5.6.26 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 @@ -81,17 +81,6 @@ 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) @@ -103,6 +92,15 @@ BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) +# 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 @@ -180,8 +184,8 @@ Requires: glibc-devel Requires: libmysqlclient%{soname} = %{version} Requires: libmysqlclient_r%{soname} = %{version} -Requires: openssl-devel Requires: zlib-devel +Requires: pkgconfig(libssl) # mysql-devel needs to be provided as some pkgs still depend on it Provides: mysql-devel = %{version} Obsoletes: mysql-devel < %{version} @@ -368,11 +372,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" \ @@ -392,6 +402,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" \ @@ -399,7 +411,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" \ @@ -450,6 +463,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 @@ -476,7 +492,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 @@ -548,8 +564,7 @@ # 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 @@ -628,6 +643,7 @@ --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" \ @@ -645,8 +661,8 @@ %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 @@ -707,6 +723,8 @@ %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 @@ -744,6 +762,8 @@ %{_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 ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ my.ini ++++++ --- /var/tmp/diff_new_pack.ruNF5q/_old 2015-09-02 00:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ruNF5q/_new 2015-09-02 00:36:25.000000000 +0200 @@ -55,6 +55,10 @@ # sort_buffer_size = 2M # read_rnd_buffer_size = 2M +# The following option disables Performance Schema in order to decrease +# MySQL memory usage. +performance_schema=OFF + sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES [mysqld_multi] ++++++ mysql-5.6.25.tar.gz -> mysql-5.6.26.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.6.25.tar.gz /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.6.26.tar.gz differ: char 5, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch new/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch --- old/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch 2015-07-07 10:39:15.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Logjam patch for mysql bnc#934789 - -From 866b988a76e8e7e217017a7883a52a12ec5024b9 Mon Sep 17 00:00:00 2001 -From: Marek Szymczak <marek.szymc...@oracle.com> -Date: Thu, 9 Oct 2014 16:39:43 +0200 -Subject: [PATCH] Bug#18367167 DH KEY LENGTH OF 1024 BITS TO MEET MINIMUM REQ - OF FIPS 140-2 - -Perfect Forward Secrecy (PFS) requires Diffie-Hellman (DH) parameters to be set. Current implementation uses DH key of 512 bit. ---- - include/violite.h | 3 ++- - vio/viosslfactories.c | 70 ++++++++++++++++++++++++++++++++++++++++----------- - 2 files changed, 57 insertions(+), 16 deletions(-) - -Index: mysql-5.6.25/include/violite.h -=================================================================== ---- mysql-5.6.25.orig/include/violite.h -+++ mysql-5.6.25/include/violite.h -@@ -147,7 +147,8 @@ enum enum_ssl_init_error - { - SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, - SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS, -- SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR -+ SSL_INITERR_MEMFAIL, SSL_INITERR_NO_USABLE_CTX, SSL_INITERR_DHFAIL, -+ SSL_INITERR_LASTERR - }; - const char* sslGetErrString(enum enum_ssl_init_error err); - -Index: mysql-5.6.25/vio/viosslfactories.c -=================================================================== ---- mysql-5.6.25.orig/vio/viosslfactories.c -+++ mysql-5.6.25/vio/viosslfactories.c -@@ -20,27 +20,56 @@ - static my_bool ssl_algorithms_added = FALSE; - static my_bool ssl_error_strings_loaded= FALSE; - --static unsigned char dh512_p[]= -+/* -+ Diffie-Hellman key. -+ Generated using: >openssl dhparam -5 -C 2048 -+ -+ -----BEGIN DH PARAMETERS----- -+ MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ -+ 46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD -+ glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E -+ BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB -+ h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG -+ mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ== -+ -----END DH PARAMETERS----- -+ */ -+static unsigned char dh2048_p[]= - { -- 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75, -- 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F, -- 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3, -- 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12, -- 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C, -- 0x47,0x74,0xE8,0x33, -+ 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37, -+ 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C, -+ 0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2, -+ 0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59, -+ 0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7, -+ 0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41, -+ 0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D, -+ 0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19, -+ 0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64, -+ 0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD, -+ 0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C, -+ 0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0, -+ 0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1, -+ 0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA, -+ 0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E, -+ 0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E, -+ 0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE, -+ 0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C, -+ 0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF, -+ 0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3, -+ 0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66, -+ 0x00, 0x05, 0x85, 0xB7, - }; - --static unsigned char dh512_g[]={ -- 0x02, -+static unsigned char dh2048_g[]={ -+ 0x05, - }; - --static DH *get_dh512(void) -+static DH *get_dh2048(void) - { - DH *dh; - if ((dh=DH_new())) - { -- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); -- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); -+ dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); -+ dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); - if (! dh->p || ! dh->g) - { - DH_free(dh); -@@ -81,7 +110,9 @@ ssl_error_string[] = - "Private key does not match the certificate public key", - "SSL_CTX_set_default_verify_paths failed", - "Failed to set ciphers to use", -- "SSL_CTX_new failed" -+ "SSL_CTX_new failed", -+ "SSL context is not usable without certificate and private key", -+ "SSL_CTX_set_tmp_dh failed" - }; - - const char* -@@ -285,8 +316,17 @@ new_VioSSLFd(const char *key_file, const - } - - /* DH stuff */ -- dh=get_dh512(); -- SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh); -+ dh= get_dh2048(); -+ if (SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh) == 0) -+ { -+ *error= SSL_INITERR_DHFAIL; -+ DBUG_PRINT("error", ("%s", sslGetErrString(*error))); -+ report_errors(); -+ DH_free(dh); -+ SSL_CTX_free(ssl_fd->ssl_context); -+ my_free(ssl_fd); -+ DBUG_RETURN(0); -+ } - DH_free(dh); - - DBUG_PRINT("exit", ("OK 1")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.6.24-regex_heap_overflow.patch new/mysql-patches/mysql-patches/mysql-community-server-5.6.24-regex_heap_overflow.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.6.24-regex_heap_overflow.patch 2015-07-07 10:39:15.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.6.24-regex_heap_overflow.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Fix heap overflow vulnerability in regex library -BUGS: bnc#922043 - -Description of the vulnerability from -https://guidovranken.wordpress.com/2015/02/04/full-disclosure-heap-overflow-in-h-spencers-regex-library-on-32-bit-systems/ -"Fix heap overflow vulnerability in Henry Spencer’s regex library, -affecting 32 bit systems only. Variable ‘len’ is here enlarged to such -an extent that, in the process of enlarging (multiplication and addition), -causes the 32 bit register/variable to overflow." - -Maintainer: Kristyna Streitova <kstreit...@suse.com> - -Index: mysql-5.5.43/regex/regcomp.c -=================================================================== ---- mysql-5.5.43.orig/regex/regcomp.c -+++ mysql-5.5.43/regex/regcomp.c -@@ -138,7 +138,15 @@ CHARSET_INFO *charset; - (NC-1)*sizeof(cat_t)); - if (g == NULL) - return(MY_REG_ESPACE); -- p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */ -+ { -+ /* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */ -+ size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ -+ if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) { -+ free((char *) g); -+ return MY_REG_INVARG; -+ } -+ p->ssize = (long) new_ssize; -+ } - p->strip = (sop *)malloc(p->ssize * sizeof(sop)); - p->slen = 0; - if (p->strip == NULL) { ++++++ mysql-systemd-helper ++++++ --- /var/tmp/diff_new_pack.ruNF5q/_old 2015-09-02 00:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ruNF5q/_new 2015-09-02 00:36:25.000000000 +0200 @@ -34,7 +34,6 @@ --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 @@ # 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_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 ++++++ series ++++++ --- /var/tmp/diff_new_pack.ruNF5q/_old 2015-09-02 00:36:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ruNF5q/_new 2015-09-02 00:36:26.000000000 +0200 @@ -10,6 +10,4 @@ mysql-community-server-5.6.12-upgrade-datadir.patch mysql-community-server-5.6.12-srv_buf_size.patch mysql-community-server-5.6.12-logrotate-su.patch -mysql-community-server-5.6.24-regex_heap_overflow.patch mysql-community-server-5.6.24-static_library.patch -mysql-5.6.25-logjam.patch