Attachment 910371 Details for Bug 1111191 – Patch for mariadb.spec to enable the workaroud and update to 10.0.12

[patch] Patch for mariadb.spec to enable the workaroud and update to 10.0.12

mariadb.patch (text/plain), 2.77 KB, created by Mikko Tiihonen on 2014-06-19 12:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikko Tiihonen

Created: 2014-06-19 12:38:04 UTC

Size: 2.77 KB

patch

obsolete

>--- mariadb.spec	2014-06-07 13:04:21.000000000 +0300
>+++ mariadb.spec.new	2014-06-19 15:36:11.182290903 +0300
>@@ -6,8 +6,8 @@
> %bcond_with tokudb
> 
> Name: mariadb
>-Version: 10.0.11
>-Release: 5%{?dist}
>+Version: 10.0.12
>+Release: 1%{?dist}
> Epoch: 1
> 
> Summary: A community developed branch of MySQL
>@@ -71,7 +71,6 @@
> Patch12: mariadb-covscan-stroverflow.patch
> Patch13: mariadb-config.patch
> Patch14: mariadb-ssltest.patch
>-Patch15: mariadb-skip-test-list.patch
> 
> BuildRequires: perl, readline-devel, openssl-devel
> BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
>@@ -272,7 +271,6 @@
> %patch12 -p1
> %patch13 -p1
> %patch14 -p1
>-%patch15 -p1
> 
> # workaround for upstream bug #56342
> rm -f mysql-test/t/ssl_8k_key-master.opt
>@@ -319,6 +317,8 @@
> CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
> # force PIC mode so that we can build libmysqld.so
> CFLAGS="$CFLAGS -fPIC"
>+# GCC 4.9 causes segfaults: https://mariadb.atlassian.net/browse/MDEV-6360
>+CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
> # gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
> # submitted as bz #529298
> %ifarch sparc sparcv9 sparc64
>@@ -490,9 +490,6 @@
> mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
> install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
> 
>-# Fix funny permissions that cmake build scripts apply to config files
>-chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/config.*.ini
>-
> # Fix scripts for multilib safety
> mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
> touch ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
>@@ -653,8 +650,6 @@
> %{_mandir}/man1/mysqlshow.1*
> %{_mandir}/man1/mysqlslap.1*
> %{_mandir}/man1/my_print_defaults.1*
>-%{_mandir}/man1/mysql_fix_privilege_tables.1*
>-%{_mandir}/man8/mysqlmanager.8*
> 
> %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
> %config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf
>@@ -758,7 +753,6 @@
> %{_mandir}/man1/mysqld_safe.1*
> %{_mandir}/man1/mysqlhotcopy.1*
> %{_mandir}/man1/mysqlimport.1*
>-%{_mandir}/man1/mysqlman.1*
> %{_mandir}/man1/mysql_setpermission.1*
> %{_mandir}/man1/mysqltest.1*
> %{_mandir}/man1/innochecksum.1*
>@@ -777,7 +771,6 @@
> %{_datadir}/%{name}/mysql_test_data_timezone.sql
> %{_datadir}/%{name}/mysql_performance_tables.sql
> %{_datadir}/%{name}/my-*.cnf
>-%{_datadir}/%{name}/config.*.ini
> 
> %{_unitdir}/mysqld.service
> %{_unitdir}/%{name}.service
>@@ -827,6 +820,10 @@
> %{_mandir}/man1/mysql_client_test.1*
> 
> %changelog
>+* Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-1
>+- Rebase to version 10.0.12
>+- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.11-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1111191: 910371