From c7794b818325a5b2c14dd84ff040e602a5c3a774b131ad7a28c28843d6eafc14 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 2 Oct 2018 09:41:43 +0000 Subject: [PATCH] Accepting request 639406 from home:SchoolGuy:branches:Base:System - Removed make target "install-perlmod" and filecheck from packaging process. - Update to 2.21 - Bug Fixes * The noexec stack markers are set directly * We no longer lie to glibc about shrinking the heap by less than HPAGE_SIZE - Test Suite * No existent tests are no longer marked Killed By Signal * Disable malloc per-thread cache for heap shrinking tests - Remove patch "ignore-perl-modules.diff" OBS-URL: https://build.opensuse.org/request/show/639406 OBS-URL: https://build.opensuse.org/package/show/Base:System/libhugetlbfs?expand=0&rev=53 --- _service | 4 ++-- disable-rw-on-non-ldscripts.diff | 10 ++++++---- libhugetlbfs-2.20.tar.xz | 3 --- libhugetlbfs-2.21.tar.xz | 3 +++ libhugetlbfs.changes | 17 +++++++++++++++++ libhugetlbfs.s390.patch | 10 +++++----- libhugetlbfs.spec | 11 ++++------- libhugetlbfs_fix_tests.patch | 8 +++++--- libhugetlbfs_ia64_fix_missing_test.patch | 8 ++++---- 9 files changed, 46 insertions(+), 28 deletions(-) delete mode 100644 libhugetlbfs-2.20.tar.xz create mode 100644 libhugetlbfs-2.21.tar.xz diff --git a/_service b/_service index 7ff3119..502fbeb 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ git://github.com/libhugetlbfs/libhugetlbfs.git git libhugetlbfs - 2.20 - 2.20 + 2.21 + 2.21 *.tar diff --git a/disable-rw-on-non-ldscripts.diff b/disable-rw-on-non-ldscripts.diff index 88c97c1..45987eb 100644 --- a/disable-rw-on-non-ldscripts.diff +++ b/disable-rw-on-non-ldscripts.diff @@ -1,6 +1,8 @@ ---- tests/Makefile +Index: tests/Makefile +=================================================================== +--- tests/Makefile.orig +++ tests/Makefile -@@ -46,7 +46,7 @@ +@@ -48,7 +48,7 @@ ifeq ($(CUSTOM_LDSCRIPTS),yes) TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_TESTS:%=xB.%) \ $(HUGELINK_TESTS:%=xBDT.%) $(HUGELINK_RW_TESTS) else @@ -9,9 +11,9 @@ endif else -@@ -55,7 +55,7 @@ +@@ -57,7 +57,7 @@ ifeq ($(CUSTOM_LDSCRIPTS),yes) TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_TESTS:%=xB.%) \ - $(HUGELINK_TESTS:%=xBDT.%) + $(HUGELINK_TESTS:%=xBDT.%) $(HUGELINK_RW_TESTS) else -TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) $(HUGELINK_RW_TESTS) +TESTS += $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) diff --git a/libhugetlbfs-2.20.tar.xz b/libhugetlbfs-2.20.tar.xz deleted file mode 100644 index f924848..0000000 --- a/libhugetlbfs-2.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f01aeb7986baa59a11fc8767952458c786d11b4aeec167ec5257eca38bbf00ad -size 145408 diff --git a/libhugetlbfs-2.21.tar.xz b/libhugetlbfs-2.21.tar.xz new file mode 100644 index 0000000..ba35eba --- /dev/null +++ b/libhugetlbfs-2.21.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aa61ed78c8debdcff17918d171f1cba9b738f8c1b1125539b68fea1b4e0a05a +size 134376 diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes index c766ea9..c550262 100644 --- a/libhugetlbfs.changes +++ b/libhugetlbfs.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Oct 1 13:52:36 UTC 2018 - egotthold@suse.com + +- Removed make target "install-perlmod" and filecheck from packaging process. + +------------------------------------------------------------------- +Fri Sep 28 11:30:08 UTC 2018 - egotthold@suse.com + +- Update to 2.21 +- Bug Fixes + * The noexec stack markers are set directly + * We no longer lie to glibc about shrinking the heap by less than HPAGE_SIZE +- Test Suite + * No existent tests are no longer marked Killed By Signal + * Disable malloc per-thread cache for heap shrinking tests +- Remove patch "ignore-perl-modules.diff" + ------------------------------------------------------------------- Mon Sep 11 07:47:31 UTC 2017 - jengelh@inai.de diff --git a/libhugetlbfs.s390.patch b/libhugetlbfs.s390.patch index 918d455..89334bc 100644 --- a/libhugetlbfs.s390.patch +++ b/libhugetlbfs.s390.patch @@ -2,11 +2,11 @@ Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -Index: libhugetlbfs-2.17/Makefile +Index: libhugetlbfs-2.21/Makefile =================================================================== ---- libhugetlbfs-2.17.orig/Makefile -+++ libhugetlbfs-2.17/Makefile -@@ -82,12 +82,12 @@ else +--- libhugetlbfs-2.21.orig/Makefile ++++ libhugetlbfs-2.21/Makefile +@@ -87,12 +87,12 @@ else ifeq ($(ARCH),ia64) CC64 = $(CC) TMPLIB64 = lib64 @@ -21,7 +21,7 @@ Index: libhugetlbfs-2.17/Makefile else ifeq ($(ARCH),s390x) CC64 = $(CC) -m64 -@@ -98,10 +98,15 @@ TMPLIB64 = lib64 +@@ -111,10 +111,15 @@ ELF32 = elf_s390 TMPLIB32 = lib CUSTOM_LDSCRIPTS = no else diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec index e465da2..d8f7d4e 100644 --- a/libhugetlbfs.spec +++ b/libhugetlbfs.spec @@ -1,7 +1,7 @@ # # spec file for package libhugetlbfs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %define my_make_flags V=1 CFLAGS="%{optflags} -fPIC" BUILDTYPE=NATIVEONLY PREFIX=%{_prefix} LIBDIR32=%{_libdir} DESTDIR=%{buildroot} Name: libhugetlbfs -Version: 2.20 +Version: 2.21 Release: 0 Summary: Helper library for the Huge Translation Lookaside Buffer Filesystem -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Url: https://github.com/libhugetlbfs/libhugetlbfs Source0: %{name}-%{version}.tar.xz @@ -30,7 +30,6 @@ Patch2: libhugetlbfs.s390.patch Patch4: libhugetlbfs.tests-malloc.patch Patch7: libhugetlbfs_ia64_fix_missing_test.patch Patch8: libhugetlbfs_fix_tests.patch -Patch13: ignore-perl-modules.diff Patch14: disable-rw-on-non-ldscripts.diff Patch15: zero_filesize_segment.patch BuildRequires: doxygen @@ -67,7 +66,6 @@ The testsuite for libhugetlbfs. Binaries can be found in %patch4 -p1 %patch7 -p1 %patch8 -p1 -%patch13 %patch14 %patch15 -p1 @@ -77,7 +75,7 @@ make %{my_make_flags} %install make %{my_make_flags} PMDIR="%{perl_vendorlib}/TLBC" \ - install install-perlmod install-tests + install install-tests mkdir -p %{buildroot}%{_prefix}/include cp -avL hugetlbfs.h %{buildroot}%{_prefix}/include chmod 644 %{buildroot}%{_libdir}/*.a @@ -93,7 +91,6 @@ fi %{_mandir}/man[178]/*%{?ext_man} %{_libdir}/libhugetlbfs_privutils.so %{_libdir}/libhugetlbfs.so -%{perl_vendorlib}/TLBC/ %files devel %defattr(-, root, root) diff --git a/libhugetlbfs_fix_tests.patch b/libhugetlbfs_fix_tests.patch index 0b40505..0f936b8 100644 --- a/libhugetlbfs_fix_tests.patch +++ b/libhugetlbfs_fix_tests.patch @@ -2,9 +2,11 @@ References: bnc#706891 Signed-off-by: Thomas Renninger ---- libhugetlbfs-2.12/tests/run_tests.py.org 2011-07-20 00:00:46.000000000 -0400 -+++ libhugetlbfs-2.12/tests/run_tests.py 2011-07-20 00:01:55.000000000 -0400 -@@ -234,7 +234,7 @@ def get_pagesizes(): +Index: libhugetlbfs-2.21/tests/run_tests.py +=================================================================== +--- libhugetlbfs-2.21.orig/tests/run_tests.py ++++ libhugetlbfs-2.21/tests/run_tests.py +@@ -236,7 +236,7 @@ def get_pagesizes(): """ sizes = set() out = "" diff --git a/libhugetlbfs_ia64_fix_missing_test.patch b/libhugetlbfs_ia64_fix_missing_test.patch index 5f45cf8..4c7661d 100644 --- a/libhugetlbfs_ia64_fix_missing_test.patch +++ b/libhugetlbfs_ia64_fix_missing_test.patch @@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libhugetlbfs-2.15/tests/Makefile +Index: libhugetlbfs-2.21/tests/Makefile =================================================================== ---- libhugetlbfs-2.15.orig/tests/Makefile -+++ libhugetlbfs-2.15/tests/Makefile -@@ -292,7 +292,7 @@ obj64/install: +--- libhugetlbfs-2.21.orig/tests/Makefile ++++ libhugetlbfs-2.21/tests/Makefile +@@ -295,7 +295,7 @@ obj64/install: $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64