From 813f3fa4abe20d9ab0f945d1ab16a27237f4844a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:02:48 +0000 Subject: import ndctl-64.1-2.el7 --- diff --git a/.gitignore b/.gitignore index 9b63ddb..ed2f4d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ndctl-62.tar.gz +SOURCES/ndctl-64.1.tar.gz diff --git a/.ndctl.metadata b/.ndctl.metadata index b4b822d..4e2dac9 100644 --- a/.ndctl.metadata +++ b/.ndctl.metadata @@ -1 +1 @@ -0f906e39f1af10fe60748b8862e761fe36abd985 SOURCES/ndctl-62.tar.gz +8841c30b4f0eba0860f8b89e57bd0ce998ee9d65 SOURCES/ndctl-64.1.tar.gz diff --git a/SOURCES/dracut-nvdimm-security.conf b/SOURCES/dracut-nvdimm-security.conf new file mode 100644 index 0000000..6ae6314 --- /dev/null +++ b/SOURCES/dracut-nvdimm-security.conf @@ -0,0 +1,3 @@ +# Make sure libnvdimm is loaded and ndctl is available in the initramfs +install_items+="/bin/ndctl" +add_drivers+="libnvdimm" diff --git a/SOURCES/ndctl-64-disable-asciidoctor.patch b/SOURCES/ndctl-64-disable-asciidoctor.patch new file mode 100644 index 0000000..1c576e5 --- /dev/null +++ b/SOURCES/ndctl-64-disable-asciidoctor.patch @@ -0,0 +1,12 @@ +diff -up ndctl-64.1/configure.ac.orig ndctl-64.1/configure.ac +--- ndctl-64.1/configure.ac.orig 2019-03-22 15:46:50.206526000 -0400 ++++ ndctl-64.1/configure.ac 2019-03-22 15:47:12.743488000 -0400 +@@ -45,7 +45,7 @@ AM_CONDITIONAL([ENABLE_DOCS], [test "x$e + AC_ARG_ENABLE([asciidoctor], + AS_HELP_STRING([--enable-asciidoctor], + [use asciidoctor for documentation build]), +- [], enable_asciidoctor=yes) ++ [], enable_asciidoctor=no) + AM_CONDITIONAL([USE_ASCIIDOCTOR], [test "x$enable_asciidoctor" = "xyes"]) + if test "x$enable_asciidoctor" = "xyes"; then + asciidoc="asciidoctor" diff --git a/SPECS/ndctl.spec b/SPECS/ndctl.spec index 8cd10ba..84a9361 100644 --- a/SPECS/ndctl.spec +++ b/SPECS/ndctl.spec @@ -1,11 +1,14 @@ Name: ndctl -Version: 62 -Release: 1%{?dist} +Version: 64.1 +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 +Source1: dracut-nvdimm-security.conf + +Patch0: ndctl-64-disable-asciidoctor.patch Requires: ndctl-libs%{?_isa} = %{version}-%{release} Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -20,7 +23,8 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(bash-completion) -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) +BuildRequires: keyutils-libs-devel %description Utility library for managing the "libnvdimm" subsystem. The "libnvdimm" @@ -87,6 +91,7 @@ control API for these devices. %prep %setup -q ndctl-%{version} +%patch0 -p1 chmod +x test/monitor.sh %build @@ -98,6 +103,7 @@ make %{?_smp_mflags} %install %make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/dracut.conf.d/nvdimm-security.conf %check # There are x86-isms in the unit tests @@ -115,22 +121,24 @@ make check %postun -n daxctl-libs -p /sbin/ldconfig %define bashcompdir %(pkg-config --variable=completionsdir bash-completion) -%define udevdir %(pkg-config --variable=udevdir udev) %files %license util/COPYING licenses/BSD-MIT licenses/CC0 %{_bindir}/ndctl %{_mandir}/man1/ndctl* %{bashcompdir}/ -%{_sysconfdir}/ndctl/monitor.conf %{_unitdir}/ndctl-monitor.service -%{_udevrulesdir}/80-ndctl.rules -%{udevdir}/ndctl-udev +%{_sysconfdir}/ndctl/keys/keys.readme +%{_sysconfdir}/modprobe.d/nvdimm-security.conf +%{_sysconfdir}/dracut.conf.d/nvdimm-security.conf + +%config(noreplace) %{_sysconfdir}/ndctl/monitor.conf %files -n daxctl %license util/COPYING licenses/BSD-MIT licenses/CC0 %{_bindir}/daxctl %{_mandir}/man1/daxctl* +%{_datadir}/daxctl/daxctl.conf %files -n ndctl-libs %doc README.md @@ -156,6 +164,16 @@ make check %changelog +* Wed Mar 27 2019 Jeff Moyer - 64.1-2 +- Fix initramfs creating by forcing installation of libnvdimm.ko +- Related: bz#1634348 + +* Fri Mar 22 2019 Jeff Moyer - 64.1-1 +- Rebase to v64.1 (Jeff Moyer) + - add security commands + - fix broken udev rule for dirty shutdown count +- Resolves: bz#1634348 bz#1635441 + * Thu Aug 23 2018 Jeff Moyer - 62-1 - Rebase to v62 (Jeff Moyer) - a new monitor command / daemon