From fb25581d7dd3181e0e3091e0e66d5fc796d4901c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 17:31:14 -0500 Subject: [PATCH] import ndctl-67-2.el8 --- .gitignore | 2 +- .ndctl.metadata | 2 +- ...obe-link-user-keyring-before-loadkeys.patch | 6 ++++++ SPECS/ndctl.spec | 18 ++++++++++++++++-- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 SOURCES/modprobe-link-user-keyring-before-loadkeys.patch diff --git a/.gitignore b/.gitignore index 95acd8f..4e90943 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ndctl-65.tar.gz +SOURCES/ndctl-67.tar.gz diff --git a/.ndctl.metadata b/.ndctl.metadata index d4c53b7..3ca7aea 100644 --- a/.ndctl.metadata +++ b/.ndctl.metadata @@ -1 +1 @@ -65bfc783a624628e5eb60e936f46e6b543025670 SOURCES/ndctl-65.tar.gz +6bea3b5d545201ab31c3d90b90204cc90dfa88bd SOURCES/ndctl-67.tar.gz diff --git a/SOURCES/modprobe-link-user-keyring-before-loadkeys.patch b/SOURCES/modprobe-link-user-keyring-before-loadkeys.patch new file mode 100644 index 0000000..9cd6fd9 --- /dev/null +++ b/SOURCES/modprobe-link-user-keyring-before-loadkeys.patch @@ -0,0 +1,6 @@ +diff -up ndctl-67/contrib/nvdimm-security.conf.orig ndctl-67/contrib/nvdimm-security.conf +--- ndctl-67/contrib/nvdimm-security.conf.orig 2019-11-01 13:21:04.669374133 -0400 ++++ ndctl-67/contrib/nvdimm-security.conf 2019-11-01 13:21:04.669374133 -0400 +@@ -1 +1 @@ +-install libnvdimm /usr/bin/ndctl load-keys ; /sbin/modprobe --ignore-install libnvdimm $CMDLINE_OPTS ++install libnvdimm keyctl link @u @s; /usr/bin/ndctl load-keys; /sbin/modprobe --ignore-install libnvdimm $CMDLINE_OPTS diff --git a/SPECS/ndctl.spec b/SPECS/ndctl.spec index 1a90639..8850fa6 100644 --- a/SPECS/ndctl.spec +++ b/SPECS/ndctl.spec @@ -1,11 +1,12 @@ Name: ndctl -Version: 65 -Release: 1%{?dist} +Version: 67 +Release: 2%{?dist} Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPLv2 Group: System Environment/Base Url: https://github.com/pmem/ndctl Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: modprobe-link-user-keyring-before-loadkeys.patch Requires: ndctl-libs%{?_isa} = %{version}-%{release} Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -88,6 +89,7 @@ control API for these devices. %prep %setup -q ndctl-%{version} +%patch0 -p1 %build echo %{version} > version @@ -153,6 +155,18 @@ make check %changelog +* Fri Nov 1 2019 Jeff Moyer - 67-2.el8 +- Fix up botched change to nvdimm-security.conf (Jeff Moyer) +- Related: bz#1724531 + +* Mon Oct 28 2019 Jeff Moyer - 67-1.el8 +- Rebase to v67. This brings in the following features: + - support for the 'security frozen' sysfs attribute + - support for using pmem as system ram + - various cleanup and bug fixes +- Fix load-keys failure in initramfs (Jeff Moyer) +- Resolves: bz#1724531 bz#1730673 bz#1741164 bz#1741165 bz#1749888 bz#1749889 + * Mon Jun 3 2019 Jeff Moyer - 65-1.el8 - Rebase to v65. - Resolves: bz#1665407 bz#1634349