From 54145bd8e492a0bf5f52e8984f3eaa59a596e8d9 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 25 Apr 2012 09:42:32 +0300 Subject: [PATCH] - run test-suite with MALLOC_CHECK_=3 - disable buggy malloc_usable_size code (#801981) --- sqlite-3.7.11-no-malloc-usable-size.patch | 24 +++++++++++++++++++++++ sqlite.spec | 12 +++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 sqlite-3.7.11-no-malloc-usable-size.patch diff --git a/sqlite-3.7.11-no-malloc-usable-size.patch b/sqlite-3.7.11-no-malloc-usable-size.patch new file mode 100644 index 0000000..8e550ac --- /dev/null +++ b/sqlite-3.7.11-no-malloc-usable-size.patch @@ -0,0 +1,24 @@ +diff -up sqlite-src-3071100/configure.ac.malloc_usable_size sqlite-src-3071100/configure.ac +--- sqlite-src-3071100/configure.ac.malloc_usable_size 2012-04-25 09:36:02.999684178 +0300 ++++ sqlite-src-3071100/configure.ac 2012-04-25 09:36:21.415584431 +0300 +@@ -127,7 +127,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h s + ######### + # Figure out whether or not we have these functions + # +-AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s utime malloc_usable_size]) ++AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s utime]) + + ######### + # By default, we use the amalgamation (this may be changed below...) +diff -up sqlite-src-3071100/configure.malloc_usable_size sqlite-src-3071100/configure +--- sqlite-src-3071100/configure.malloc_usable_size 2012-04-25 09:36:10.255643392 +0300 ++++ sqlite-src-3071100/configure 2012-04-25 09:36:37.684496632 +0300 +@@ -12148,7 +12148,7 @@ done + + + +-for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s utime malloc_usable_size ++for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s utime + do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/sqlite.spec b/sqlite.spec index 1d1b558..b41cb9c 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -10,7 +10,7 @@ Summary: Library that implements an embeddable SQL database engine Name: sqlite Version: %{rpmver} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: Applications/Databases URL: http://www.sqlite.org/ @@ -24,6 +24,10 @@ Patch2: sqlite-3.7.7.1-stupid-openfiles-test.patch # options and whatnot. Dunno why this started failing in 3.7.10 but # doesn't seem particularly critical... Patch3: sqlite-3.7.10-pagecache-overflow-test.patch +# sqlite >= 3.7.10 is buggy if malloc_usable_size() is detected, disable it: +# https://bugzilla.redhat.com/show_bug.cgi?id=801981 +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665363 +Patch4: sqlite-3.7.11-no-malloc-usable-size.patch BuildRequires: ncurses-devel readline-devel glibc-devel %if %{with tcl} BuildRequires: /usr/bin/tclsh @@ -94,6 +98,7 @@ This package contains the tcl modules for %{name}. %patch1 -p1 -b .lemon-system-template %patch2 -p1 -b .stupid-openfiles-test %patch3 -p1 -b .pagecache-overflow-test +%patch4 -p1 -b .no-malloc-usable-size # Remove cgi-script erroneously included in sqlite-doc-3070500 rm -f %{name}-doc-%{realver}/search @@ -132,6 +137,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a} %if %{with check} %check +export MALLOC_CHECK_=3 %ifarch s390 s390x ppc ppc64 %{sparc} %{arm} make test || : %else @@ -179,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Apr 25 2012 Panu Matilainen - 3.7.11-2 +- run test-suite with MALLOC_CHECK_=3 +- disable buggy malloc_usable_size code (#801981) + * Mon Mar 26 2012 Panu Matilainen - 3.7.11-1 - update to 3.7.11 (http://www.sqlite.org/releaselog/3_7_11.html)