Update to PMDK version 1.12.1

Related: rhbz#2111431

Signed-off-by: Bryan Gurney <bgurney@redhat.com>

.gitignore

@@ -6,3 +6,5 @@
 /pmdk-1.10-man.tar.gz
 /pmdk-1.10.1.tar.gz
 /pmdk-1.10.1-man.tar.gz
+/pmdk-1.12.1.tar.gz
+/pmdk-1.12.1-man.tar.gz

nvml.spec

@@ -17,11 +17,11 @@
 %bcond_with pmemcheck
 
 %define min_ndctl_ver 60.1
-%define upstreamversion 1.10.1
+%define upstreamversion 1.12.1
 
 Name:		nvml
-Version:	1.10.1
-Release:	2%{?dist}
+Version:	1.12.1
+Release:	1%{?dist}
 Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
@@ -36,11 +36,12 @@ Source1:	pmdk-%{version}-man.tar.gz
 # but do_open never initializes "attr"
 # may read that object
 Patch0:         Makefile-bypass-check-doc-in-check.patch
-Patch1:         pmdk-1.10.1-use_ddebug_instead_of_debug_cflags.patch
+Patch1:         pmdk-1.12.1-use_ddebug_instead_of_debug_cflags.patch
 
 
 BuildRequires:	gcc
 BuildRequires:	make
+BuildRequires:	cmake
 BuildRequires:	glibc-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -594,6 +595,10 @@ mkdir -p %{buildroot}%{_mandir}
 
 
 %changelog
+* Tue Oct 18 2022 Bryan Gurney <bgurney@redhat.com > 1.12.1-1
+- Update to PMDK version 1.12.1
+- Related: rhbz#2111431
+
 * Mon Feb 07 2022 Bryan Gurney <bgurney@redhat.com> - 1.10.1-2
 - Use DDEBUG in Makefile.inc instead of DEBUG_CFLAGS
 - Related: rhbz#2044882

pmdk-1.12.1-use_ddebug_instead_of_debug_cflags.patch

@@ -0,0 +1,18 @@
+--- pmdk-1.12.1/src/Makefile.inc.orig	2022-10-17 11:06:39.232365095 -0400
++++ pmdk-1.12.1/src/Makefile.inc	2022-10-17 11:09:28.751365095 -0400
+@@ -73,14 +73,10 @@ endif
+ DEFAULT_CFLAGS += -Wno-deprecated-declarations
+ 
+ ifeq ($(DEBUG),1)
+-# Undefine _FORTIFY_SOURCE in case it's set in system-default or
+-# user-defined CFLAGS as it conflicts with -O0.
+-DEBUG_CFLAGS += -Wp,-U_FORTIFY_SOURCE
+-DEBUG_CFLAGS += -O0 -ggdb -DDEBUG
+ LIB_SUBDIR = /pmdk_debug
+ OBJDIR = debug
+ else
+-DEFAULT_CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
++DEFAULT_CFLAGS += -O2 -g -D_FORTIFY_SOURCE=2
+ LIB_SUBDIR =
+ OBJDIR = nondebug
+ endif

sources

@@ -1,2 +1,2 @@
-SHA512 (pmdk-1.10.1.tar.gz) = 7fecb7a96a11eebe11295b9f18e4b318c69de5c54bf219be6d072fc409421cf028a9ee78d9777e3ee007065ee65143c9ae1fb3aefa66d9a1836a93adf81899e8
-SHA512 (pmdk-1.10.1-man.tar.gz) = df3c6b82def11048a26adf86b6ec6e39d286bb9f056131298996cce0d182b640e38242700629c5d78af438c0a862fd6d02e0c94ff32feee649d8b36ac7eb5ad2
+SHA512 (pmdk-1.12.1.tar.gz) = 9b29b2038af42829b809a182ece292b6b8bfd003519c3b8f223ec3cba552da0a561477b0e7dbaf14ad7fee8120b136ded10e2d3e1bc6a4a10771051f9aeca683
+SHA512 (pmdk-1.12.1-man.tar.gz) = 2035ec0510c2e056b9e45a3a1b4bc2399e6a0c635ddb64a5380733e9988db06c6076c77ced0de2d1cbbc58b7bb447eb77c0d51324a411e9478b068559107089d

tests/run_test.sh

@@ -17,4 +17,9 @@ then
 	touch .skip-doc
 fi
 
+rm -f src/test/pmemset*/TEST*
+rm -f src/test/rpmemd_dbg/TEST*
+rm -f src/test/rpmemd_log/TEST*
+rm -f src/test/obj_zones/TEST*
+
 make check

tests/tests.yml

@@ -19,6 +19,7 @@
         - daxctl-devel
         - gcc
         - make
+        - cmake
         - glibc-devel
         - autoconf
         - automake