.gitignore

@@ -1 +1 @@
-SOURCES/memkind-1.10.1.tar.gz
+*.tar.gz

.memkind.metadata

@@ -1 +1 @@
-de0d9fdd1432415c005d034d8dc0ebadffbe4847 SOURCES/memkind-1.10.1.tar.gz
+9da539ad9b716419b997ccf2020c1edd510c6082 memkind-1.11.0.tar.gz

SOURCES/configure.ac.patch

@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7c332d7..fa5a487 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -159,16 +159,6 @@ fi
- ],
- [enable_secure="1"]
- )
--if test "x$enable_secure" = "x1" ; then
--  CFLAGS="$CFLAGS -fstack-protector"
--  LDFLAGS="$LDFLAGS -Wl,-z,relro,-z,now"
--
--  if test "$CFLAGS" != "${CFLAGS%-O0*}" ; then # if CFLAGS contains -O0
--      echo "WARNING: Could not apply FORTIFY_SOURCE=2 due to lack of optimization (-O0)"
--  else
--      CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" #FORTITFY_SOURCE does not work with -O0 (ex. if enable_debug=1 or enable_gcov=1)
--  fi
--fi
- 
- AC_SUBST([enable_secure])
- 

configure.ac.patch

@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 0659008..43f79d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -136,7 +136,7 @@ fi
+ [enable_secure="1"]
+ )
+ if test "x$enable_secure" = "x1" ; then
+-  CFLAGS="$CFLAGS -fstack-protector"
++  CFLAGS="$CFLAGS -fstack-protector-strong -fstack-clash-protection"
+   LDFLAGS="$LDFLAGS -Wl,-z,relro,-z,now"
+
+   if test "$CFLAGS" != "${CFLAGS%-O0*}" ; then # if CFLAGS contains -O0

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

memkind.spec

@@ -1,32 +1,19 @@
-%global gittag0 v1.10.1
+%global gittag0 v1.11.0
 
 Name: memkind
 Summary: User Extensible Heap Manager
-Version: 1.10.1
+Version: 1.11.0
-Release: 1%{?checkout}%{?dist}
+Release: 2%{?checkout}%{?dist}
 License: BSD
-Group: System Environment/Libraries
 URL: http://memkind.github.io/memkind
+BuildRequires: make
 BuildRequires: automake libtool numactl-devel systemd gcc gcc-c++ daxctl-devel
 
-# x86_64 is the only arch memkind will build and work due to
+# Upstream testing of memkind is done exclusively on x86_64; other archs
-# its current dependency on SSE4.2 CRC32 instruction which
+# are unsupported but may work.
-# is used to compute thread local storage arena mappings
+ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
-# with polynomial accumulations via GCC's intrinsic _mm_crc32_u64
-# For further info check: 
-# - /lib/gcc/<target>/<version>/include/smmintrin.h
-# - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36095 
-# - http://en.wikipedia.org/wiki/SSE4
-ExclusiveArch: x86_64
 
-# Source0 creation:
+Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}/%{name}-%{version}.tar.gz
-# (1) "git archive git archive --prefix=%%{name}-%%{version}/ --format=tar [githash] | \
-#				gzip > [srcdir]/%%{name}-%%{version}-g%%{githash}.tar.gz"; or
-# (2) wget https://github.com/%%{name}/%%{name}/archive/%%{gittag0}/%%{name}-%%{version}.tar.gz
-Source0: %{name}-%{version}.tar.gz
-
-# void nonsensical CFLAGS override done by autotools which invalidates
-# the strong stack protection setup
 Patch0: configure.ac.patch
 
 %description
@@ -46,7 +33,6 @@ Feedback on design or implementation is greatly appreciated.
 
 %package devel
 Summary: Memkind User Extensible Heap Manager development lib and tools
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -59,22 +45,18 @@ pre-alpha: bugs may exist and the interfaces may be subject to change prior to
 alpha release. Feedback on design or implementation is greatly appreciated.
 
 %prep
-%setup -q -a 0 -n %{name}-%{version}
+%setup -q -a 0
 %patch0 -p1
 
 %build
-%set_build_flags
-
-# It is required that we configure and build the jemalloc subdirectory
-# before we configure and start building the top level memkind directory.
-# To ensure the memkind build step is able to discover the output
-# of the jemalloc build we must create an 'obj' directory, and build
-# from within that directory.
 cd %{_builddir}/%{name}-%{version}
 echo %{version} > %{_builddir}/%{name}-%{version}/VERSION
-./build.sh --prefix=%{_prefix} --includedir=%{_includedir} --libdir=%{_libdir} \
+test -f configure || ./autogen.sh
-           --bindir=%{_bindir} --docdir=%{_docdir}/%{name} --mandir=%{_mandir} \
+%configure --enable-secure --enable-tls --prefix=%{_prefix} --libdir=%{_libdir} \
-           --sbindir=%{_sbindir}
+          --includedir=%{_includedir} --sbindir=%{_sbindir} --bindir=%{_bindir} \
+          --mandir=%{_mandir} --docdir=%{_docdir}/%{name} \
+          CFLAGS="$RPM_OPT_FLAGS -std=gnu99" LDFLAGS="%{build_ldflags}"
+%{__make} V=1 %{?_smp_mflags}
 
 %install
 cd %{_builddir}/%{name}-%{version}
@@ -83,9 +65,7 @@ rm -f %{buildroot}/%{_libdir}/lib%{name}.{l,}a
 rm -f %{buildroot}/%{_libdir}/libautohbw.{l,}a
 rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-
-%postun -p /sbin/ldconfig
 
 %files
 %{_libdir}/lib%{name}.so.*
@@ -112,33 +92,57 @@ rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 %{_mandir}/man3/pmemallocator.3.*
 
 %changelog
-* Mon Dec 14 2020 Rafael Aquini <aquini@redhat.com> - 1.10.1-1
+* Fri Jan 28 2022 Rafael Aquini <aquini@redhat.com> - 1.11.0-2
-- Update memkind source file to 1.10.1 upstream (1841966)
+- Fix annocheck pie test failure (2044880)
 
-* Tue Apr 14 2020 Rafael Aquini <aquini@redhat.com> - 1.10.0-10
+* Fri Oct 08 2021 Rafael Aquini <aquini@redhat.com> - 1.11.0-1
-- Fix: add Tier1 tests for CI gating (1688933)
+- Update memkind source file to 1.11.0 upstream
 
-* Sun Apr 12 2020 Rafael Aquini <aquini@redhat.com> - 1.10.0-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.1-5
-- Update to memkind source file to 1.10.0 upstream (1780394)
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- add Tier1 tests for CI gating (1688933)
+  Related: rhbz#1991688
 
-* Wed Oct 23 2019 Rafael Aquini <aquini@redhat.com> - 1.9.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.1-4
-- Update to memkind source file to 1.9.0 upstream (1660589)
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Apr  2 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-6
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-3
-- Fix: Fix: Adding CI gating basic infrastructure (1680614)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Tue Apr  2 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-5
+* Thu Oct 15 2020 Rafael Aquini <aquini@linux.com> - 1.10.1-2
-- Fix: Adding CI gating basic infrastructure (1680614)
+- Work around false positive warning with gcc-11
 
-* Tue Mar 12 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-4
+* Wed Oct 07 2020 Rafael Aquini <aquini@linux.com> - 1.10.1-1
-- Adding CI gating basic infrastructure (1680614)
+- Update memkind source file to 1.10.1 upstream
 
-* Mon Oct  8 2018 Rafael Aquini <aquini@redhat.com> - 1.7.0-3
+* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 1.10.0-3
-- Update to upstream 76495a7 to pick up assorted fixes (1631144)
+- Avoid uninitialized variable in testsuite
 
-* Tue Oct  2 2018 Rafael Aquini <aquini@redhat.com> - 1.7.0-2
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
-- Fix up annocheck distro flag failures (1630595)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Feb 01 2020 Rafael Aquini <aquini@linux.com> - 1.10.0-1
+- Update memkind source file to 1.10.0 upstream
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 1.9.0-3
+- Fix missing #include for gcc-10
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Rafael Aquini <aquini@linux.com> - 1.9.0-1
+- Update memkind source file to 1.9.0 upstream
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 20 2018 Rafael Aquini <aquini@linux.com> - 1.7.0-3
+- Rebuild to fix removal of GCC from buildroots (1604813)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Mar 23 2018 Rafael Aquini <aquini@linux.com> - 1.7.0-1
 - Update memkind source file to 1.7.0 upstream

sources

@@ -0,0 +1 @@
+SHA512 (memkind-1.11.0.tar.gz) = 0b5bde35b3565c730fa954aebfe2ccbecd1e120c920d05acdbc0a74914731a90aeef8d57101f1f47bd35fd310bc143fa517bc871b32e592b8412384ff652fc05

tests/.fmf/version

@@ -0,0 +1 @@
+1

tests/memkind-prepsource.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -x
+
+WORKDIR="${1}"
+
+rpmbuild -bp $WORKDIR/*.spec --nodeps --define "_sourcedir $WORKDIR" --define "_builddir $WORKDIR/source"
+mkdir $WORKDIR/temp
+mv $WORKDIR/source/*/* $WORKDIR/temp/
+rm -rf $WORKDIR/source/*
+mv $WORKDIR/temp/* $WORKDIR/source/

tests/memkind-test.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+RETCODE=0
+TMPTESTSFILE=/tmp/memkind-tests.log
+TMPBUILDFILE=/tmp/memkind-build.log
+
+# re-play the build
+pushd source
+./build.sh &> $TMPBUILDFILE
+RETCODE=$?
+if [ $RETCODE != 0 ]; then
+    cat $TMPBUILDFILE
+    exit $RETCODE
+fi
+
+pushd test
+
+# run all tests filtering out those that are not meant
+# to pass on a small VM
+./all_tests --gtest_filter=-BATest.test_TC_MEMKIND_hbwmalloc_Pref_CheckAvailable:DlopenTest.*:HbwVerifyFunctionTest.*:NegativeTestHuge.test_TC_MEMKIND_hbwmalloc_memalign_psize_Interleave_Policy_PAGE_SIZE_2MB:HBW*.*:BATest.test_TC_MEMKIND_free_ext_MEMKIND_GBTLB_4096_bytes &> $TMPTESTSFILE
+RETCODE=$?
+if [ $RETCODE != 0 ]; then
+    cat $TMPTESTSFILE
+fi
+exit $RETCODE
+

tests/provision.fmf

@@ -0,0 +1,5 @@
+---
+
+standard-inventory-qcow2:
+  qemu:
+    m: 4G

tests/tests.yml

@@ -0,0 +1,38 @@
+---
+- hosts: localhost
+  tags:
+  - classic
+  vars:
+    # standard-test-basic directory for tests are relative to {{ tenv_workdir }}
+    tenv_workdir: /var/str
+  pre_tasks:
+  - import_role:
+      name: standard-test-source
+    vars:
+      fetch_only: True
+  - name: Copy files including source to test environment
+    synchronize:
+      src: "{{ playbook_dir }}/.."
+      dest: "{{ tenv_workdir }}"
+      mode: push
+      ssh_args: "-o UserKnownHostsFile=/dev/null"
+  roles:
+  - role: standard-test-basic
+    required_packages:
+    - automake
+    - libtool
+    - numactl-devel
+    - systemd
+    - gcc
+    - gcc-c++
+    - make
+    - gawk
+    - python3
+    - rpm-build
+    tests:
+    - prepare-source:
+        dir: ./
+        run: ./memkind-prepsource.sh "{{tenv_workdir}}"
+    - memkind_test:
+        dir: ./
+        run: ./memkind-test.sh