update to 1.12.1

Initialize-child_idx.patch

@@ -1,43 +0,0 @@
-From 721a48e5397bd4ab454482041e55671eae7b189f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 11 May 2020 18:01:11 -0700
-Subject: [PATCH] examples: Initialize child_idx
-
-Assign UINT_MAX and assert it
-
-Fixes warning
-rtree_map.c:358:12: error: 'child_idx' may be used uninitialized
-in this function [-Werror=maybe-uninitialized]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/examples/libpmemobj/tree_map/rtree_map.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/examples/libpmemobj/tree_map/rtree_map.c b/src/examples/libpmemobj/tree_map/rtree_map.c
-index 995e22bb94..6b3ead65c2 100644
---- a/src/examples/libpmemobj/tree_map/rtree_map.c
-+++ b/src/examples/libpmemobj/tree_map/rtree_map.c
-@@ -8,6 +8,7 @@
- #include <ex_common.h>
- #include <assert.h>
- #include <errno.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdbool.h>
- 
-@@ -320,12 +321,13 @@ has_only_one_child(TOID(struct tree_map_node) node, unsigned *child_idx)
- static void
- remove_extra_node(TOID(struct tree_map_node) *node)
- {
--	unsigned child_idx;
-+	unsigned child_idx = UINT_MAX;
- 	TOID(struct tree_map_node) tmp, tmp_child;
- 
- 	/* Our node has child with only one child. */
- 	tmp = *node;
- 	has_only_one_child(tmp, &child_idx);
-+	assert(child_idx != UINT_MAX);
- 	tmp_child = D_RO(tmp)->slots[child_idx];
- 
- 	/*

change-daxctl-include.patch

@@ -1,39 +0,0 @@
-From c1cc1b83e4b676c7d7eee0e39ccbfaa1501419fb Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Wed, 11 Jan 2023 14:49:22 +0800
-Subject: [PATCH] change daxctl include
-
----
- src/common/os_dimm_ndctl.c | 2 +-
- src/tools/daxio/daxio.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/os_dimm_ndctl.c b/src/common/os_dimm_ndctl.c
-index b528fb9..b8b9c33 100644
---- a/src/common/os_dimm_ndctl.c
-+++ b/src/common/os_dimm_ndctl.c
-@@ -42,7 +42,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <ndctl/libndctl.h>
--#include <ndctl/libdaxctl.h>
-+#include <daxctl/libdaxctl.h>
- 
- /* XXX: workaround for missing PAGE_SIZE - should be fixed in linux/ndctl.h */
- #include <sys/user.h>
-diff --git a/src/tools/daxio/daxio.c b/src/tools/daxio/daxio.c
-index 0d6f62f..0ab9029 100644
---- a/src/tools/daxio/daxio.c
-+++ b/src/tools/daxio/daxio.c
-@@ -49,7 +49,7 @@
- #include <string.h>
- 
- #include <ndctl/libndctl.h>
--#include <ndctl/libdaxctl.h>
-+#include <daxctl/libdaxctl.h>
- #include <libpmem.h>
- 
- #include "util.h"
--- 
-2.27.0
-

delete-extra-tests.patch

@@ -1,16 +1,7 @@
-diff --git a/src/test/Makefile b/src-edit/test/Makefile
+diff -ruN pmdk/src/test/Makefile pmdk-1.12.1/src/test/Makefile
-index 84bc25c..3e10c5a 100644
+--- pmdk/src/test/Makefile	2022-11-17 17:53:30.000000000 +0800
---- a/src/test/Makefile
++++ pmdk-1.12.1/src/test/Makefile	1970-01-01 08:00:00.000000000 +0800
-+++ b/src-edit/test/Makefile
+@@ -109,7 +109,6 @@
-@@ -77,7 +77,6 @@ OBJ_TESTS = \
- 	obj_bucket\
- 	obj_check\
- 	obj_constructor\
--	obj_convert\
- 	obj_ctl\
- 	obj_ctl_alloc_class\
- 	obj_ctl_alloc_class_config\
-@@ -131,7 +130,6 @@ OBJ_TESTS = \
  	obj_tx_add_range\
  	obj_tx_add_range_direct\
  	obj_tx_callbacks\
@@ -18,64 +9,36 @@ index 84bc25c..3e10c5a 100644
  	obj_tx_free\
  	obj_tx_invalid\
  	obj_tx_lock\
-@@ -140,7 +138,6 @@ OBJ_TESTS = \
+@@ -152,7 +151,6 @@
- 	obj_tx_mt\
- 	obj_tx_realloc\
- 	obj_tx_strdup\
--	obj_zones
- 
- OBJ_REMOTE_DEPS = \
- 	obj_basic_integration\
-@@ -154,20 +151,11 @@ OBJ_REMOTE_TESTS = \
- 
- OBJ_CPP_TESTS = \
- 	obj_cpp_allocator\
--	obj_cpp_make_persistent\
- 	obj_cpp_make_persistent_atomic\
- 	obj_cpp_mutex_posix\
- 	obj_cpp_p_ext\
- 	obj_cpp_pool\
- 	obj_cpp_pool_primitives\
--	obj_cpp_ptr\
--	obj_cpp_ptr_arith\
--	obj_cpp_shared_mutex_posix\
--	obj_cpp_transaction
--
--OBJ_CPP_ARRAY_TESTS = \
--	obj_cpp_make_persistent_array\
--	obj_cpp_make_persistent_array_atomic
- 
- OBJ_CPP_CONTAINER_TESTS = \
- 	obj_cpp_deque\
-@@ -207,7 +195,6 @@ OTHER_TESTS = \
  	set_funcs\
  	traces\
  	traces_custom_function\
 -	traces_pmem\
  	unicode_api\
  	unicode_match_script\
- 	util_file_create\
+ 	util_badblock\
-@@ -217,7 +204,6 @@ OTHER_TESTS = \
+@@ -166,7 +164,6 @@
  	util_map_proc\
  	util_parse_size\
- 	util_plugin\
+ 	util_pool_hdr\
 -	util_poolset\
  	util_poolset_foreach\
  	util_poolset_parse\
  	util_poolset_size\
-@@ -245,11 +231,9 @@ PMEM_TESTS = \
+@@ -244,12 +241,10 @@
- 	pmem_valgr_simple
+ endif
  
  PMEMPOOL_TESTS = \
 -	pmempool_check\
  	pmempool_create\
  	pmempool_dump\
+ 	pmempool_feature\
  	pmempool_help\
 -	pmempool_info\
  	pmempool_rm\
  	pmempool_sync\
  	pmempool_transform
-@@ -261,7 +245,6 @@ RPMEM_TESTS = \
+@@ -262,7 +257,6 @@
  	rpmem_obc\
  	rpmem_obc_int\
  	rpmem_proto\
@@ -83,27 +46,11 @@ index 84bc25c..3e10c5a 100644
  	rpmemd_db\
  	rpmemd_dbg\
  	rpmemd_log\
-@@ -300,7 +283,6 @@ VMMALLOC_DUMMY_FUNCS_DEPS = \
+@@ -291,7 +285,6 @@
- 	vmmalloc_dummy_funcs
- 
- VMMALLOC_DUMMY_FUNCS_TESTS = \
--	vmmalloc_malloc_hooks\
- 	vmmalloc_memalign\
- 	vmmalloc_valloc
- 
-@@ -308,7 +290,6 @@ VMMALLOC_TESTS = \
- 	vmmalloc_calloc\
- 	vmmalloc_check_allocations\
- 	vmmalloc_fork\
--	vmmalloc_init\
- 	vmmalloc_malloc\
- 	vmmalloc_malloc_usable_size\
- 	vmmalloc_out_of_memory\
-@@ -332,7 +313,6 @@ LIBPMEMPOOL_DEPS = \
  LIBPMEMPOOL_TESTS = \
  	libpmempool_include\
  	libpmempool_backup\
 -	libpmempool_bttdev\
+ 	libpmempool_check_version\
+ 	libpmempool_feature\
  	libpmempool_map_flog\
- 	libpmempool_rm
- 

fix-build-error.patch

@@ -1,21 +1,7 @@
-diff --git a/pmdk-1.4.2/src/examples/libpmemobj/array/array.c b/pmdk-1.4.2-edit/src/examples/libpmemobj/array/array.c
+diff -ruN pmdk/src/test/blk_rw/blk_rw.c pmdk-1.12.1/src/test/blk_rw/blk_rw.c
-index 993ada2..68c422a 100644
+--- pmdk/src/test/blk_rw/blk_rw.c	2022-11-17 17:53:30.000000000 +0800
---- a/src/examples/libpmemobj/array/array.c
++++ pmdk-1.12.1/src/test/blk_rw/blk_rw.c	2022-12-04 20:47:41.633505093 +0800
-+++ b/src/examples/libpmemobj/array/array.c
+@@ -63,7 +63,7 @@
-@@ -471,7 +471,7 @@ do_alloc(int argc, char *argv[])
- 		POBJ_FREE(&array_info);
- 	POBJ_ZNEW(pop, &array_info, struct array_info);
- 	struct array_info *info = D_RW(array_info);
--	strncpy(info->name, argv[0], MAX_BUFFLEN);
-+	strncpy(info->name, argv[0], MAX_BUFFLEN - 1);
- 	info->name[MAX_BUFFLEN - 1] = '\0';
- 	info->size = size;
- 	info->type = type;
-diff --git a/pmdk-1.4.2/src/test/blk_rw/blk_rw.c b/pmdk-1.4.2-edit/src/test/blk_rw/blk_rw.c
-index 484c442..cb0cf43 100644
---- a/src/test/blk_rw/blk_rw.c
-+++ b/src/test/blk_rw/blk_rw.c
-@@ -92,7 +92,7 @@ main(int argc, char *argv[])
  
  	const char *path = argv[2];
  
@@ -24,11 +10,10 @@ index 484c442..cb0cf43 100644
  	switch (*argv[3]) {
  		case 'c':
  			handle = pmemblk_create(path, Bsize, 0,
-diff --git a/pmdk-1.4.2/src/test/obj_realloc/obj_realloc.c b/pmdk-1.4.2-edit/src/test/obj_realloc/obj_realloc.c
+diff -ruN pmdk/src/test/obj_realloc/obj_realloc.c pmdk-1.12.1/src/test/obj_realloc/obj_realloc.c
-index 0264f12..3b12619 100644
+--- pmdk/src/test/obj_realloc/obj_realloc.c	2022-11-17 17:53:31.000000000 +0800
---- a/src/test/obj_realloc/obj_realloc.c
++++ pmdk-1.12.1/src/test/obj_realloc/obj_realloc.c	2022-12-04 20:47:41.633505093 +0800
-+++ b/src/test/obj_realloc/obj_realloc.c
+@@ -150,8 +150,8 @@
-@@ -139,8 +139,8 @@ test_realloc(PMEMobjpool *pop, size_t size_from, size_t size_to,
  
  	UT_ASSERT(usable_size_from >= size_from);
  
@@ -39,24 +24,10 @@ index 0264f12..3b12619 100644
  
  	if (zrealloc) {
  		UT_ASSERT(util_is_zeroed(D_RO(D_RO(root)->obj),
-diff --git a/pmdk-1.4.2/src/test/rpmemd_db/rpmemd_db_test.c b/pmdk-1.4.2-edit/src/test/rpmemd_db/rpmemd_db_test.c
+diff -ruN pmdk/src/test/unittest/unittest.h pmdk-1.12.1/src/test/unittest/unittest.h
-index 8e40a85..6535436 100644
+--- pmdk/src/test/unittest/unittest.h	2022-11-17 17:53:31.000000000 +0800
---- a/src/test/rpmemd_db/rpmemd_db_test.c
++++ pmdk-1.12.1/src/test/unittest/unittest.h	2022-12-04 20:47:41.633505093 +0800
-+++ b/src/test/rpmemd_db/rpmemd_db_test.c
+@@ -102,6 +102,13 @@
-@@ -585,7 +585,7 @@ test_remove(const char *root_dir, const char *pool_desc)
- 	struct rpmemd_db *db;
- 	int ret;
- 	char path[PATH_MAX];
--	snprintf(path, PATH_MAX, "%s/%s", root_dir, pool_desc);
-+	SNPRINTF(path, PATH_MAX, "%s/%s", root_dir, pool_desc);
- 
- 	fill_rand(&attr, sizeof(attr));
- 	strncpy((char *)attr.poolset_uuid, "TEST", sizeof(attr.poolset_uuid));
-diff --git a/pmdk-1.4.2/src/test/unittest/unittest.h b/pmdk-1.4.2-edit/src/test/unittest/unittest.h
-index 6acc627..75abf2e 100644
---- a/src/test/unittest/unittest.h
-+++ b/src/test/unittest/unittest.h
-@@ -131,6 +131,13 @@ int ut_get_uuid_str(char *);
  /* XXX - fix this temp hack dup'ing util_strerror when we get mock for win */
  void ut_strerror(int errnum, char *buff, size_t bufflen);
  
@@ -70,28 +41,13 @@ index 6acc627..75abf2e 100644
  /* XXX - eliminate duplicated definitions in unittest.h and util.h */
  #ifdef _WIN32
  static inline int ut_util_statW(const wchar_t *path,
-diff --git a/pmdk-1.4.2/src/test/unittest/Makefile b/pmdk-1.4.2-edit/src/test/unittest/Makefile
+diff -ruN pmdk/src/test/unittest/ut.c pmdk-1.12.1/src/test/unittest/ut.c
-index a8a17da..96ae2d4 100644
+--- pmdk/src/test/unittest/ut.c	2022-11-17 17:53:31.000000000 +0800
---- a/src/test/unittest/Makefile
++++ pmdk-1.12.1/src/test/unittest/ut.c	2022-12-04 20:47:41.633505093 +0800
-+++ b/src/test/unittest/Makefile
+@@ -1094,6 +1094,27 @@
-@@ -42,7 +42,7 @@ vpath %.h $(TOP)/src/common
- 
- TARGET = libut.a
- OBJS = ut.o ut_alloc.o ut_file.o ut_pthread.o ut_signal.o ut_backtrace.o\
--	os_posix.o os_thread_posix.o
-+	os_posix.o os_thread_posix.o
- CFLAGS = -I$(TOP)/src/include
- CFLAGS += -I$(TOP)/src/common
- CFLAGS += $(OS_INCS)
-diff --git a/pmdk-1.4.2/src/test/unittest/ut.c b/pmdk-1.4.2-edit/src/test/unittest/ut.c
-index 95fcd8f..9bb57e4 100644
---- a/src/test/unittest/ut.c
-+++ b/src/test/unittest/ut.c
-@@ -1003,3 +1003,24 @@ ut_toUTF16(const char *wstr)
- 	return str;
  }
  #endif
-+
+ 
 +int
 +ut_snprintf(const char *file, int line, const char *func,
 +		               char *str, size_t size, const char *format, ...)
@@ -112,3 +68,7 @@ index 95fcd8f..9bb57e4 100644
 +
 +	 return ret;
 +        }
++
+ /*
+  * ut_strtoi -- a strtoi call that cannot return error
+  */

fix-build-with-gcc-9.patch

@@ -1,25 +0,0 @@
-From e28d3fee51840ae6f8bca4d31c35442ff7b0ff9b Mon Sep 17 00:00:00 2001
-From: Grzegorz Brzezinski <grzegorz.brzezinski@intel.com>
-Date: Wed, 8 May 2019 13:42:08 +0200
-Subject: [PATCH] jemalloc: fix build with gcc-9.1
-
----
- src/jemalloc/src/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/jemalloc/src/util.c b/src/jemalloc/src/util.c
-index 33331af..ad8fc2a 100644
---- a/src/jemalloc/src/util.c
-+++ b/src/jemalloc/src/util.c
-@@ -344,7 +344,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
- 	}								\
- } while (0)
- #define	GET_ARG_NUMERIC(val, len) do {					\
--	switch (len) {							\
-+	switch ((int)len) {							\
- 	case '?':							\
- 		val = va_arg(ap, int);					\
- 		break;							\
--- 
-2.27.0
-

fix-gcc-check-uninitialized.patch

@@ -0,0 +1,25 @@
+diff -ruN pmdk/src/examples/libpmem2/unsafe_shutdown/unsafe_shutdown.c pmdk-1.12.1/src/examples/libpmem2/unsafe_shutdown/unsafe_shutdown.c
+--- pmdk/src/examples/libpmem2/unsafe_shutdown/unsafe_shutdown.c	2022-11-17 17:53:30.000000000 +0800
++++ pmdk-1.12.1/src/examples/libpmem2/unsafe_shutdown/unsafe_shutdown.c	2022-12-04 21:30:57.093856024 +0800
+@@ -636,8 +636,8 @@
+ 		return 1;
+ 	}
+ 
+-	struct user_data *data;
+-	size_t size;
++	struct user_data *data = NULL;
++	size_t size = 0;
+ 	enum pool_state state = pool_access_data(pool, (void **)&data, &size);
+ 
+ 	int ret = 1;
+diff -ruN pmdk/src/examples/librpmem/hello.c pmdk-1.12.1/src/examples/librpmem/hello.c
+--- pmdk/src/examples/librpmem/hello.c	2022-11-17 17:53:30.000000000 +0800
++++ pmdk-1.12.1/src/examples/librpmem/hello.c	2022-12-04 21:30:57.093856024 +0800
+@@ -41,6 +41,7 @@
+ {
+ 	hello->lang = lang;
+ 	strncpy(hello->str, hello_str[hello->lang], STR_SIZE);
++	hello->str[STR_SIZE-1] = '\0';
+ }
+ 
+ static void

nvml.spec

@@ -2,18 +2,18 @@
 
 %define min_libfabric_ver 1.4.2
 %define min_ndctl_ver 60.1
-%define upstreamversion 1.4.2
+%define upstreamversion 1.12.1
 
 Name:		nvml
 Summary:	Persistent Memory Development Kit (formerly NVML)
-Version:	1.4.2
+Version:	1.12.1
-Release:	7
+Release:	1
 License:	BSD-3-Clause
 URL:		http://pmem.io/pmdk
 
 Source0:	https://github.com/pmem/%{name}/archive/%{upstreamversion}.tar.gz#/%{name}-%{upstreamversion}.tar.gz
 
-BuildRequires:	gcc make glibc-devel autoconf automake man doxygen pkgconfig
+BuildRequires:	gcc make glibc-devel autoconf automake man doxygen pkgconfig cmake
 BuildRequires:	ndctl-devel >= %{min_ndctl_ver} daxctl-devel >= %{min_ndctl_ver}
 BuildRequires:	libfabric-devel >= %{min_libfabric_ver}
 
@@ -90,9 +90,7 @@ Provides: librpmem-debug = %{version}-%{release}
 
 Patch0000: fix-build-error.patch
 Patch0001: delete-extra-tests.patch
-Patch0002: Initialize-child_idx.patch
+Patch0002: fix-gcc-check-uninitialized.patch
-Patch0003: fix-build-with-gcc-9.patch
-Patch0004: change-daxctl-include.patch
 
 %description
 The Persistent Memory Development Kit (PMDK), formerly known as NVML, is
@@ -110,7 +108,7 @@ memory as memory-mapped files
 
 CFLAGS="%{optflags}" \
 LDFLAGS="%{?__global_ldflags}" \
-make -j1 NORPATH=1
+make %{?_smp_mflags} NORPATH=1 WEB=1
 
 %install
 make install DESTDIR=%{buildroot} \
@@ -149,67 +147,46 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
 %{_libdir}/libpmemblk.so
 %{_libdir}/pkgconfig/libpmemblk.pc
 %{_includedir}/libpmemblk.h
-%dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmemblk.so
 %{_libdir}/pmdk_debug/libpmemblk.so.*
 %{_libdir}/libpmemlog.so.*
 %{_libdir}/libpmemlog.so
 %{_libdir}/pkgconfig/libpmemlog.pc
 %{_includedir}/libpmemlog.h
-%dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmemlog.so
 %{_libdir}/pmdk_debug/libpmemlog.so.*
 %{_libdir}/libpmemobj.so.*
 %{_libdir}/libpmemobj.so
+%{_libdir}/libpmem2.so
+%{_libdir}/libpmem2.so.*
 %{_libdir}/pkgconfig/libpmemobj.pc
+%{_libdir}/pkgconfig/libpmem2.pc
 %{_includedir}/libpmemobj.h
 %{_includedir}/libpmemobj/*.h
-%dir %{_libdir}/pmdk_debug
+%{_includedir}/libpmem2.h
+%{_includedir}/libpmem2/*.h
 %{_libdir}/pmdk_debug/libpmemobj.so
 %{_libdir}/pmdk_debug/libpmemobj.so.*
-%{_libdir}/libvmem.so
+%{_libdir}/pmdk_debug/libpmem2.so
-%{_libdir}/pkgconfig/libvmem.pc
+%{_libdir}/pmdk_debug/libpmem2.so.*
-%{_includedir}/libvmem.h
-%dir %{_libdir}/pmdk_debug
-%{_libdir}/pmdk_debug/libvmem.so
-%{_libdir}/pmdk_debug/libvmem.so.*
-%{_libdir}/libvmmalloc.so.*
-%dir %{_libdir}/pmdk_debug
-%{_libdir}/pmdk_debug/libvmmalloc.so
-%{_libdir}/pmdk_debug/libvmmalloc.so.*
-%{_libdir}/pkgconfig/libpmemobj++.pc
-%{_includedir}/libpmemobj++/*.hpp
-%{_includedir}/libpmemobj++/detail/*.hpp
-%{_docdir}/libpmemobj++-devel/*
 %{_libdir}/libpmempool.so.*
 %{_libdir}/libpmempool.so
 %{_libdir}/pkgconfig/libpmempool.pc
 %{_includedir}/libpmempool.h
-%dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/libpmempool.so
 %{_libdir}/pmdk_debug/libpmempool.so.*
 %{_libdir}/librpmem.so.*
 %{_libdir}/librpmem.so
 %{_libdir}/pkgconfig/librpmem.pc
 %{_includedir}/librpmem.h
-%dir %{_libdir}/pmdk_debug
 %{_libdir}/pmdk_debug/librpmem.so
 %{_libdir}/pmdk_debug/librpmem.so.*
 %{_bindir}/rpmemd
-%{_libdir}/libpmemcto.so.*
-%{_libdir}/libpmemcto.so
-%{_libdir}/pkgconfig/libpmemcto.pc
-%{_includedir}/libpmemcto.h
-%dir %{_libdir}/pmdk_debug
-%{_libdir}/pmdk_debug/libpmemcto.so
-%{_libdir}/pmdk_debug/libpmemcto.so.*
 %{_bindir}/pmempool
 %config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool
 %{_bindir}/daxio
-%{_libdir}/libvmmalloc.so
+%{_bindir}/pmreorder
-%{_libdir}/pkgconfig/libvmmalloc.pc
+%{_datadir}/*
-%{_includedir}/libvmmalloc.h
-%{_libdir}/libvmem.so.*
 
 %files help
 %{_mandir}/man1/pmempool.1.gz
@@ -226,30 +203,85 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
 %{_mandir}/man3/direct_*.3.gz
 %{_mandir}/man3/d_r*.3.gz
 %{_mandir}/man3/tx_*.3.gz
-%{_mandir}/man3/vmem_*.3.gz
 %{_mandir}/man3/pmempool_*.3.gz
 %{_mandir}/man3/rpmem_*.3.gz
-%{_mandir}/man3/pmemcto*.3.gz
-%{_mandir}/man5/poolset.5.gz
-%{_mandir}/man5/poolset.5.gz
-%{_mandir}/man5/poolset.5.gz
-%{_mandir}/man5/poolset.5.gz
 %{_mandir}/man5/poolset.5.gz
 %{_mandir}/man7/libpmem.7.gz
 %{_mandir}/man7/libpmemblk.7.gz
 %{_mandir}/man7/libpmemlog.7.gz
 %{_mandir}/man7/libpmemobj.7.gz
-%{_mandir}/man7/libvmem.7.gz
 %{_mandir}/man7/libpmempool.7.gz
 %{_mandir}/man7/librpmem.7.gz
-%{_mandir}/man7/libpmemcto.7.gz
+%{_mandir}/man1/pmreorder.1.gz
-%{_mandir}/man7/libvmmalloc.7.gz
+%{_mandir}/man3/pmem2_async.3.gz
+%{_mandir}/man3/pmem2_badblock_clear.3.gz
+%{_mandir}/man3/pmem2_badblock_context_delete.3.gz
+%{_mandir}/man3/pmem2_badblock_context_new.3.gz
+%{_mandir}/man3/pmem2_badblock_next.3.gz
+%{_mandir}/man3/pmem2_config_delete.3.gz
+%{_mandir}/man3/pmem2_config_new.3.gz
+%{_mandir}/man3/pmem2_config_set_length.3.gz
+%{_mandir}/man3/pmem2_config_set_offset.3.gz
+%{_mandir}/man3/pmem2_config_set_protection.3.gz
+%{_mandir}/man3/pmem2_config_set_required_store_granularity.3.gz
+%{_mandir}/man3/pmem2_config_set_sharing.3.gz
+%{_mandir}/man3/pmem2_config_set_vdm.3.gz
+%{_mandir}/man3/pmem2_config_set_vm_reservation.3.gz
+%{_mandir}/man3/pmem2_deep_flush.3.gz
+%{_mandir}/man3/pmem2_errormsg.3.gz
+%{_mandir}/man3/pmem2_get_drain_fn.3.gz
+%{_mandir}/man3/pmem2_get_flush_fn.3.gz
+%{_mandir}/man3/pmem2_get_memcpy_fn.3.gz
+%{_mandir}/man3/pmem2_get_memmove_fn.3.gz
+%{_mandir}/man3/pmem2_get_memset_fn.3.gz
+%{_mandir}/man3/pmem2_get_persist_fn.3.gz
+%{_mandir}/man3/pmem2_map_delete.3.gz
+%{_mandir}/man3/pmem2_map_from_existing.3.gz
+%{_mandir}/man3/pmem2_map_get_address.3.gz
+%{_mandir}/man3/pmem2_map_get_size.3.gz
+%{_mandir}/man3/pmem2_map_get_store_granularity.3.gz
+%{_mandir}/man3/pmem2_map_new.3.gz
+%{_mandir}/man3/pmem2_memcpy_async.3.gz
+%{_mandir}/man3/pmem2_memmove_async.3.gz
+%{_mandir}/man3/pmem2_memset_async.3.gz
+%{_mandir}/man3/pmem2_perror.3.gz
+%{_mandir}/man3/pmem2_source_alignment.3.gz
+%{_mandir}/man3/pmem2_source_delete.3.gz
+%{_mandir}/man3/pmem2_source_device_id.3.gz
+%{_mandir}/man3/pmem2_source_device_usc.3.gz
+%{_mandir}/man3/pmem2_source_from_anon.3.gz
+%{_mandir}/man3/pmem2_source_from_fd.3.gz
+%{_mandir}/man3/pmem2_source_from_handle.3.gz
+%{_mandir}/man3/pmem2_source_get_fd.3.gz
+%{_mandir}/man3/pmem2_source_get_handle.3.gz
+%{_mandir}/man3/pmem2_source_numa_node.3.gz
+%{_mandir}/man3/pmem2_source_pread_mcsafe.3.gz
+%{_mandir}/man3/pmem2_source_pwrite_mcsafe.3.gz
+%{_mandir}/man3/pmem2_source_size.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_delete.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_extend.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_get_address.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_get_size.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_map_find.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_map_find_first.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_map_find_last.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_map_find_next.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_map_find_prev.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_new.3.gz
+%{_mandir}/man3/pmem2_vm_reservation_shrink.3.gz
+%{_mandir}/man5/pmem_ctl.5.gz
+%{_mandir}/man7/libpmem2.7.gz
+%{_mandir}/man7/libpmem2_unsafe_shutdown.7.gz
+
 
 %if 0%{?__debug_package} == 0
 %debug_package
 %endif
 
 %changelog
+* Mon Jan 16 2023 dan <fzhang@zhixundn.com> 1.12.1-1
+- update to 1.12.1
+
 * Wed Jan 11 2023 Ge Wang<wangge20@h-partners.com> - 1.4.2-7
 - fix build failure