4 changed files with 69 additions and 73 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/memkind-1.10.1.tar.gz
+SOURCES/memkind-1.11.0.tar.gz
--- a/.memkind.metadata
+++ b/.memkind.metadata
@ -1 +1 @@
-de0d9fdd1432415c005d034d8dc0ebadffbe4847 SOURCES/memkind-1.10.1.tar.gz
+9da539ad9b716419b997ccf2020c1edd510c6082 SOURCES/memkind-1.11.0.tar.gz
--- a/SOURCES/configure.ac.patch
+++ b/SOURCES/configure.ac.patch
@ -1,21 +1,13 @@
 diff --git a/configure.ac b/configure.ac
-index 7c332d7..fa5a487 100644
+index 0659008..43f79d8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -159,16 +159,6 @@ fi
- ],
+@@ -136,7 +136,7 @@ fi
 [enable_secure="1"]
 )
-if test "x$enable_secure" = "x1" ; then
+ 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])
- 
+  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
--- a/SPECS/memkind.spec
+++ b/SPECS/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
-Release: 1%{?checkout}%{?dist}
+Version: 1.11.0
+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
-# its current dependency on SSE4.2 CRC32 instruction which
-# is used to compute thread local storage arena mappings
-# 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:
-# (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
+# Upstream testing of memkind is done exclusively on x86_64; other archs
+# are unsupported but may work.
+ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
+
+Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}/%{name}-%{version}.tar.gz
 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} \
-           --bindir=%{_bindir} --docdir=%{_docdir}/%{name} --mandir=%{_mandir} \
-           --sbindir=%{_sbindir}
+test -f configure || ./autogen.sh
+%configure --enable-secure --enable-tls --prefix=%{_prefix} --libdir=%{_libdir} \
+          --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
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets

 %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
- Update memkind source file to 1.10.1 upstream (1841966)
+* Fri Jan 28 2022 Rafael Aquini <aquini@redhat.com> - 1.11.0-2
+- Fix annocheck pie test failure (2044880)
+
+* Fri Oct 08 2021 Rafael Aquini <aquini@redhat.com> - 1.11.0-1
+- Update memkind source file to 1.11.0 upstream
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.1-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 15 2020 Rafael Aquini <aquini@linux.com> - 1.10.1-2
+- Work around false positive warning with gcc-11
+
+* Wed Oct 07 2020 Rafael Aquini <aquini@linux.com> - 1.10.1-1
+- Update memkind source file to 1.10.1 upstream
+
+* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 1.10.0-3
+- Avoid uninitialized variable in testsuite
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

-* Tue Apr 14 2020 Rafael Aquini <aquini@redhat.com> - 1.10.0-10
- Fix: add Tier1 tests for CI gating (1688933)
+* Sat Feb 01 2020 Rafael Aquini <aquini@linux.com> - 1.10.0-1
+- Update memkind source file to 1.10.0 upstream

-* Sun Apr 12 2020 Rafael Aquini <aquini@redhat.com> - 1.10.0-1
- Update to memkind source file to 1.10.0 upstream (1780394)
- add Tier1 tests for CI gating (1688933)
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-* Wed Oct 23 2019 Rafael Aquini <aquini@redhat.com> - 1.9.0-1
- Update to memkind source file to 1.9.0 upstream (1660589)
+* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 1.9.0-3
+- Fix missing #include for gcc-10

-* Tue Apr  2 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-6
- Fix: Fix: Adding CI gating basic infrastructure (1680614)
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

-* Tue Apr  2 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-5
- Fix: Adding CI gating basic infrastructure (1680614)
+* Wed Jul 10 2019 Rafael Aquini <aquini@linux.com> - 1.9.0-1
+- Update memkind source file to 1.9.0 upstream

-* Tue Mar 12 2019 Rafael Aquini <aquini@redhat.com> - 1.7.0-4
- Adding CI gating basic infrastructure (1680614)
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

-* Mon Oct  8 2018 Rafael Aquini <aquini@redhat.com> - 1.7.0-3
- Update to upstream 76495a7 to pick up assorted fixes (1631144)
+* Fri Jul 20 2018 Rafael Aquini <aquini@linux.com> - 1.7.0-3
+- Rebuild to fix removal of GCC from buildroots (1604813)

-* Tue Oct  2 2018 Rafael Aquini <aquini@redhat.com> - 1.7.0-2
- Fix up annocheck distro flag failures (1630595)
+* 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