From b44402ba3f59ab733630b0a10f21be4deb340d0e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 11:33:24 +0000
Subject: import memkind-1.11.0-2.el9


---

diff --git a/SOURCES/configure.ac.patch b/SOURCES/configure.ac.patch
new file mode 100644
index 0000000..50e6b4c
--- /dev/null
+++ b/SOURCES/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
diff --git a/SPECS/memkind.spec b/SPECS/memkind.spec
index 6b58520..e9f94db 100644
--- a/SPECS/memkind.spec
+++ b/SPECS/memkind.spec
@@ -3,7 +3,7 @@
 Name: memkind
 Summary: User Extensible Heap Manager
 Version: 1.11.0
-Release: 1%{?checkout}%{?dist}
+Release: 2%{?checkout}%{?dist}
 License: BSD
 URL: http://memkind.github.io/memkind
 BuildRequires: make
@@ -14,6 +14,7 @@ BuildRequires: automake libtool numactl-devel systemd gcc gcc-c++ daxctl-devel
 ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
 
 Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}/%{name}-%{version}.tar.gz
+Patch0: configure.ac.patch
 
 %description
 The memkind library is an user extensible heap manager built on top of
@@ -44,19 +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
-# 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}
@@ -92,6 +92,9 @@ rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 %{_mandir}/man3/pmemallocator.3.*
 
 %changelog
+* 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