From 3554f7fe6daa72d51608843866ecf6e242947ad4 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 3 Jan 2022 11:20:40 +0100 Subject: [PATCH] ndctl: 71.1 -> 72 --- ndctl/.footprint | 32 +++++++++++++++++++++++++------- ndctl/.signature | 9 +++++---- ndctl/186.patch | 23 +++++++++++++++++++++++ ndctl/Pkgfile | 10 +++++++--- 4 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 ndctl/186.patch diff --git a/ndctl/.footprint b/ndctl/.footprint index 6513b1a1c..24607fb32 100644 --- a/ndctl/.footprint +++ b/ndctl/.footprint @@ -1,33 +1,51 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/daxctl.conf.d/ +-rw-r--r-- root/root etc/daxctl.conf.d/daxctl.example.conf drwxr-xr-x root/root etc/modprobe.d/ -rw-r--r-- root/root etc/modprobe.d/nvdimm-security.conf drwxr-xr-x root/root etc/ndctl/ +drwxr-xr-x root/root etc/ndctl.conf.d/ +-rw-r--r-- root/root etc/ndctl.conf.d/monitor.conf +-rw-r--r-- root/root etc/ndctl.conf.d/ndctl.conf drwxr-xr-x root/root etc/ndctl/keys/ -rw-r--r-- root/root etc/ndctl/keys/keys.readme --rw-r--r-- root/root etc/ndctl/monitor.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/cxl -rwxr-xr-x root/root usr/bin/daxctl -rwxr-xr-x root/root usr/bin/ndctl drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/cxl/ +-rw-r--r-- root/root usr/include/cxl/cxl_mem.h +-rw-r--r-- root/root usr/include/cxl/libcxl.h drwxr-xr-x root/root usr/include/daxctl/ -rw-r--r-- root/root usr/include/daxctl/libdaxctl.h drwxr-xr-x root/root usr/include/ndctl/ +-rw-r--r-- root/root usr/include/ndctl/cxl_mem.h +-rw-r--r-- root/root usr/include/ndctl/libcxl.h -rw-r--r-- root/root usr/include/ndctl/libdaxctl.h -rw-r--r-- root/root usr/include/ndctl/libndctl.h -rw-r--r-- root/root usr/include/ndctl/ndctl.h drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libcxl.la +-rwxr-xr-x root/root usr/lib/libcxl.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libcxl.so.1 -> libcxl.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libcxl.so -> libcxl.so.1.0.0 -rwxr-xr-x root/root usr/lib/libdaxctl.la -lrwxrwxrwx root/root usr/lib/libdaxctl.so -> libdaxctl.so.1.5.0 -lrwxrwxrwx root/root usr/lib/libdaxctl.so.1 -> libdaxctl.so.1.5.0 --rwxr-xr-x root/root usr/lib/libdaxctl.so.1.5.0 +-rwxr-xr-x root/root usr/lib/libdaxctl.so.1.6.0 +lrwxrwxrwx root/root usr/lib/libdaxctl.so.1 -> libdaxctl.so.1.6.0 +lrwxrwxrwx root/root usr/lib/libdaxctl.so -> libdaxctl.so.1.6.0 -rwxr-xr-x root/root usr/lib/libndctl.la -lrwxrwxrwx root/root usr/lib/libndctl.so -> libndctl.so.6.19.1 -lrwxrwxrwx root/root usr/lib/libndctl.so.6 -> libndctl.so.6.19.1 --rwxr-xr-x root/root usr/lib/libndctl.so.6.19.1 +-rwxr-xr-x root/root usr/lib/libndctl.so.6.20.1 +lrwxrwxrwx root/root usr/lib/libndctl.so.6 -> libndctl.so.6.20.1 +lrwxrwxrwx root/root usr/lib/libndctl.so -> libndctl.so.6.20.1 drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/libcxl.pc -rw-r--r-- root/root usr/lib/pkgconfig/libdaxctl.pc -rw-r--r-- root/root usr/lib/pkgconfig/libndctl.pc +drwxr-xr-x root/root usr/lib/udev/ +drwxr-xr-x root/root usr/lib/udev/rules.d/ +-rw-r--r-- root/root usr/lib/udev/rules.d/90-daxctl-device.rules drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/daxctl/ -rw-r--r-- root/root usr/share/daxctl/daxctl.conf diff --git a/ndctl/.signature b/ndctl/.signature index 76e302605..a5357dd56 100644 --- a/ndctl/.signature +++ b/ndctl/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38tw1xGRmrBFKa5KTfTq+gMtWmQka8L9Ic8eOKEReS0Vc6yW6mO3yZi8FCOkGysJn4eX926jaa6VEfwrbgm1cg8= -SHA256 (Pkgfile) = 00f9c58e1403704935707dc9497b7c896a5260630884f28b81bfc9acebe15ed3 -SHA256 (.footprint) = d978f8b9ba5905ee9b3e95fdfc8dbfe889788e489e9afc5a7d8d3d65a5a4cefc -SHA256 (ndctl-71.1.tar.gz) = cfd0d9d6c893a83491296c40c710f4202d6e9b5b6c74ae1aca905584a5db512b +RWSagIOpLGJF3w1OFyhWyHQu6ECmC1XZZmI65jIhUg7I9hdH6wJGPKsaSlf6NqQ78a+GIJHpGEG7Ea36HuFA56/alzcOZjp4cgA= +SHA256 (Pkgfile) = d78cab88ff0d914985fafad5ec2d3ae1d70691f48b5b129d26448568dd9e9cc9 +SHA256 (.footprint) = ab54b969f82c2ad9ff3bc5543c552ebf325cb408b4e5e3f99d92446f09ac1c61 +SHA256 (ndctl-72.tar.gz) = 8ecc0d6e9ebbcd90a405d3188784d34dfd09f9c3bee51c434df18da2e76f6db8 +SHA256 (186.patch) = 76916a2f90f813d217052641bbd1dedccfe2c625bddcbba7f7640c77e7aec57c diff --git a/ndctl/186.patch b/ndctl/186.patch new file mode 100644 index 000000000..71ab8f46e --- /dev/null +++ b/ndctl/186.patch @@ -0,0 +1,23 @@ +From 42381683097e61113f8cf4b13795a2e03e566835 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Sun, 19 Dec 2021 04:45:25 +0800 +Subject: [PATCH] Fix iniparser.h include + +In configure.ac `iniparser.h` was checked without a path too, this change makes it consistent and fixes building on Arch Linux which has the header installed in /usr/include directly. +--- + util/parse-configs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/parse-configs.c b/util/parse-configs.c +index 1b7ffa69..c834a070 100644 +--- a/util/parse-configs.c ++++ b/util/parse-configs.c +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/ndctl/Pkgfile b/ndctl/Pkgfile index 71d815c36..9f4f575c4 100644 --- a/ndctl/Pkgfile +++ b/ndctl/Pkgfile @@ -1,15 +1,19 @@ # Description: Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel # URL: https://github.com/pmem/ndctl # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: json-c keyutils +# Depends on: iniparser json-c keyutils name=ndctl -version=71.1 +version=72 release=1 -source=(https://github.com/pmem/ndctl/archive/v$version/$name-$version.tar.gz) +source=(https://github.com/pmem/ndctl/archive/v$version/$name-$version.tar.gz + 186.patch) build() { cd $name-$version + + patch -Np1 -i $SRC/186.patch + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc \