diff --git a/disable_oom_test.patch b/disable_oom_test.patch deleted file mode 100644 index 01e66e4..0000000 --- a/disable_oom_test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Jiri Slaby -References: https://github.com/jemalloc/jemalloc/issues/379 -Subject: Fix broken test - -hugemax can be 0x70000000 on i586 and it can indeed be allocated -twice. - -Reported, waiting for feedback. - ---- - test/integration/mallocx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/test/integration/mallocx.c -+++ b/test/integration/mallocx.c -@@ -82,8 +82,8 @@ TEST_BEGIN(test_oom) - - p = mallocx(hugemax, 0); - if (p != NULL) { -- assert_ptr_null(mallocx(hugemax, 0), -- "Expected OOM for mallocx(size=%#zx, 0)", hugemax); -+/* assert_ptr_null(mallocx(hugemax, 0), -+ "Expected OOM for mallocx(size=%#zx, 0)", hugemax);*/ - dallocx(p, 0); - } - } diff --git a/jemalloc-4.1.0.tar.bz2 b/jemalloc-4.1.0.tar.bz2 deleted file mode 100644 index 40df9a9..0000000 --- a/jemalloc-4.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fad06d714f72adb4265783bc169c6d98eeb032d57ba02d87d1dcb4a2d933ec8e -size 412900 diff --git a/jemalloc-4.1.1.tar.bz2 b/jemalloc-4.1.1.tar.bz2 new file mode 100644 index 0000000..2f19ad6 --- /dev/null +++ b/jemalloc-4.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f13b72b3aced936337a864fbe614a43e968f4adf64314b2a39c6ce43c9adae +size 420807 diff --git a/jemalloc.changes b/jemalloc.changes index 5eec5a5..41541db 100644 --- a/jemalloc.changes +++ b/jemalloc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed May 4 07:30:43 UTC 2016 - idonmez@suse.com + +- Update to version 4.1.1 + * Fix hashing functions to avoid unaligned memory accesses + (and resulting crashes). This is relevant at least to some + ARM-based platforms. + * Fix fork()-related lock rank ordering reversals. These reversals + were unlikely to cause deadlocks in practice except when heap + profiling was enabled and active. + * Fix various chunk leaks in OOM code paths. + * Fix malloc_stats_print() to print opt.narenas correctly. + * Fix a variety of test failures that were due to test fragility + rather than core bugs. +- Remove disable_oom_test.patch, fixed upstream. + ------------------------------------------------------------------- Wed Apr 20 12:11:43 UTC 2016 - jslaby@suse.com diff --git a/jemalloc.spec b/jemalloc.spec index a3c8b8c..b5167cb 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -16,43 +16,41 @@ # -Name: jemalloc -Version: 4.1.0 -Release: 0 %define lname libjemalloc2 +Name: jemalloc +Version: 4.1.1 +Release: 0 Summary: General-purpose scalable concurrent malloc implementation License: BSD-2-Clause Group: Development/Libraries/C and C++ Url: http://canonware.com/jemalloc/ - #Git-Clone: git://canonware.com/jemalloc -Source: http://www.canonware.com/download/jemalloc/jemalloc-%version.tar.bz2 -Patch1: disable_oom_test.patch +Source: http://www.canonware.com/download/jemalloc/jemalloc-%{version}.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: pkg-config +Requires: %{lname} = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} == 1110 BuildRequires: gcc48 %endif -Requires: %lname = %version -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description jemalloc is a general-purpose scalable concurrent malloc(3) implementation. This package provides a shell wrapper script to run programs using jemalloc. -%package -n %lname +%package -n %{lname} Summary: General-purpose scalable concurrent malloc implementation Group: System/Libraries -%description -n %lname +%description -n %{lname} General-purpose scalable concurrent malloc(3) implementation. This distribution is the stand-alone "portable" version of jemalloc. %package devel Summary: Development files for jemalloc Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel Headers for jemalloc, general-purpose scalable concurrent malloc(3) @@ -61,7 +59,7 @@ implementation. %package devel-static Summary: Static libraries for jemalloc Group: Development/Libraries/C and C++ -Requires: %name-devel = %version +Requires: %{name}-devel = %{version} %description devel-static Static libraries of jemalloc, general-purpose scalable concurrent @@ -69,18 +67,17 @@ malloc(3) implementation. %prep %setup -q -%patch -P 1 -p1 %build -export EXTRA_CFLAGS="%optflags -std=gnu99" +export EXTRA_CFLAGS="%{optflags} -std=gnu99" %if 0%{?suse_version} == 1110 -if [ -f "%_bindir/gcc-4.6" ]; then +if [ -f "%{_bindir}/gcc-4.6" ]; then export CC=gcc-4.6 fi -if [ -f "%_bindir/gcc-4.7" ]; then +if [ -f "%{_bindir}/gcc-4.7" ]; then export CC=gcc-4.7 fi -if [ -f "%_bindir/gcc-4.8" ]; then +if [ -f "%{_bindir}/gcc-4.8" ]; then export CC=gcc-4.8 fi %endif @@ -89,43 +86,43 @@ fi make %{?_smp_mflags} %install -b="%buildroot" +b=%{buildroot} make install DESTDIR="$b" -chmod -x "%buildroot/%_libdir"/*.a -if [ "%_docdir" != "%_datadir/doc" ]; then +chmod -x "%{buildroot}/%{_libdir}"/*.a +if [ "%{_docdir}" != "%{_datadir}/doc" ]; then # stupid Makefile does not allow to set it - mkdir -p "$b/%_docdir" - mv "$b/%_datadir/doc/jemalloc" "$b/%_docdir/%name" + mkdir -p "$b/%{_docdir}" + mv "$b/%{_datadir}/doc/jemalloc" "$b/%{_docdir}/%{name}" fi %check export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH" -make check +make %{?_smp_mflags} check -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) -%_bindir/jemalloc.sh -%_bindir/jemalloc-config -%_bindir/jeprof -%_mandir/man*/* -%_docdir/%name +%{_bindir}/jemalloc.sh +%{_bindir}/jemalloc-config +%{_bindir}/jeprof +%{_mandir}/man*/* +%{_docdir}/%{name} -%files -n %lname +%files -n %{lname} %defattr(-,root,root) %doc ChangeLog COPYING README -%_libdir/libjemalloc.so.2* +%{_libdir}/libjemalloc.so.2* %files devel %defattr(-,root,root) -%_includedir/jemalloc -%_libdir/libjemalloc.so -%_libdir/pkgconfig/jemalloc.pc +%{_includedir}/jemalloc +%{_libdir}/libjemalloc.so +%{_libdir}/pkgconfig/jemalloc.pc %files devel-static %defattr(-,root,root) -%_libdir/libjemalloc*.a +%{_libdir}/libjemalloc*.a %changelog