From 9171985e9543c57738daf0cad65e9c3f05fbb5a9 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 21 Feb 2019 14:18:58 +0100 Subject: [PATCH] New version - 2.21 - Fix checking swap status on lvm/md (vtrefny) - tests: Stop skipping some tests on Debian testing (vtrefny) - tests: Remove some old/irrelevant skips (vtrefny) - Use 512bit keys in LUKS by default (vratislav.podzimek) - Add 'autoconf-archive' to build requires (vtrefny) - vagrant: remove F27 and add F29 (vtrefny) - vagrant: install 'autoconf-archive' on Ubuntu (vtrefny) - Enable cryptsetup debug messages when compiled using --enable-debug (vtrefny) - lvm-dbus: Do not pass extra arguments enclosed in a tuple (vtrefny) - crypto: Do not try to use keyring on systems without keyring support (vtrefny) - Fix LUKS2 resize password test (vtrefny) - Use cryptsetup to check LUKS2 label (vtrefny) - Skip LUKS2+integrity test on systems without dm-integrity module (vtrefny) - Add custom error message for wrong passphrase for open (vtrefny) - Use major/minor macros from sys/sysmacros.h instead of linux/kdev_t.h (vtrefny) - crypto_test.py: Use blkid instead of lsblk to check luks label (vtrefny) - Skip VDO grow physical test (vtrefny) - Add libblkid-devel as a build dependency for the swap plugin (vtrefny) - Add error codes and Python exceptions for swapon fails (vtrefny) - Use libblkid to check swap status before swapon (vtrefny) - Add a new subpackage with the tool(s) (v.podzimek) - Document what the 'tools' directory contains (v.podzimek) - Make building tools optional (v.podzimek) - Add a tool for getting cached LVM statistics (v.podzimek) - Discard messages from libdevmapper in the LVM plugins (v.podzimek) --- .gitignore | 1 + libblockdev.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a2304f8..7deba0d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /libblockdev-2.18.tar.gz /libblockdev-2.19.tar.gz /libblockdev-2.20.tar.gz +/libblockdev-2.21.tar.gz diff --git a/libblockdev.spec b/libblockdev.spec index 697eee4..c385256 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -19,6 +19,7 @@ %define with_gi 1 %define with_escrow 1 %define with_dmraid 1 +%define with_tools 1 # python2 is not available on RHEL > 7 and not needed on Fedora > 29 %if 0%{?rhel} > 7 || 0%{?fedora} > 29 || %{with_python2} == 0 @@ -113,20 +114,22 @@ %if %{with_vdo} != 1 %define vdo_copts --without-vdo %endif +%if %{with_tools} != 1 +%define tools_copts --without-tools +%endif %if %{with_gi} != 1 %define gi_copts --disable-introspection %endif -%define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?gi_copts} +%define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?tools_copts} %{?gi_copts} Name: libblockdev -Version: 2.20 -Release: 3%{?dist} +Version: 2.21 +Release: 1%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ URL: https://github.com/storaged-project/libblockdev Source0: https://github.com/storaged-project/libblockdev/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz -Patch0: 0001-swap-error-codes.patch BuildRequires: glib2-devel %if %{with_gi} @@ -142,6 +145,7 @@ BuildRequires: python3-devel BuildRequires: gtk-doc %endif BuildRequires: glib2-doc +BuildRequires: autoconf-archive # Needed for the escrow tests in tests/crypto_test.py, but not used to build # BuildRequires: volume_key @@ -520,6 +524,7 @@ with the libblockdev-part plugin/library. %if %{with_swap} %package swap +BuildRequires: libblkid-devel Summary: The swap plugin for the libblockdev library Requires: %{name}-utils%{?_isa} >= 0.11 Requires: util-linux @@ -573,6 +578,20 @@ This package contains header files and pkg-config files needed for development with the libblockdev-vdo plugin/library. %endif +%if %{with_tools} +%package tools +Summary: Various nice tools based on libblockdev +Requires: %{name} +Requires: %{name}-lvm +BuildRequires: libbytesize-devel +%if %{with_lvm_dbus} == 1 +Recommends: %{name}-lvm-dbus +%endif + +%description tools +Various nice storage-related tools based on libblockdev. + +%endif %ifarch s390 s390x %package s390 @@ -660,7 +679,6 @@ A meta-package that pulls all the libblockdev plugins as dependencies. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build autoreconf -ivf @@ -946,6 +964,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{_includedir}/blockdev/vdo.h %endif +%if %{with_tools} +%files tools +%{_bindir}/lvm-cache-stats +%endif %ifarch s390 s390x %files s390 @@ -960,6 +982,33 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files plugins-all %changelog +* Thu Feb 21 2019 Vojtech Trefny - 2.21-1 +- Fix checking swap status on lvm/md (vtrefny) +- tests: Stop skipping some tests on Debian testing (vtrefny) +- tests: Remove some old/irrelevant skips (vtrefny) +- Use 512bit keys in LUKS by default (vratislav.podzimek) +- Add 'autoconf-archive' to build requires (vtrefny) +- vagrant: remove F27 and add F29 (vtrefny) +- vagrant: install 'autoconf-archive' on Ubuntu (vtrefny) +- Enable cryptsetup debug messages when compiled using --enable-debug (vtrefny) +- lvm-dbus: Do not pass extra arguments enclosed in a tuple (vtrefny) +- crypto: Do not try to use keyring on systems without keyring support (vtrefny) +- Fix LUKS2 resize password test (vtrefny) +- Use cryptsetup to check LUKS2 label (vtrefny) +- Skip LUKS2+integrity test on systems without dm-integrity module (vtrefny) +- Add custom error message for wrong passphrase for open (vtrefny) +- Use major/minor macros from sys/sysmacros.h instead of linux/kdev_t.h (vtrefny) +- crypto_test.py: Use blkid instead of lsblk to check luks label (vtrefny) +- Skip VDO grow physical test (vtrefny) +- Add libblkid-devel as a build dependency for the swap plugin (vtrefny) +- Add error codes and Python exceptions for swapon fails (vtrefny) +- Use libblkid to check swap status before swapon (vtrefny) +- Add a new subpackage with the tool(s) (v.podzimek) +- Document what the 'tools' directory contains (v.podzimek) +- Make building tools optional (v.podzimek) +- Add a tool for getting cached LVM statistics (v.podzimek) +- Discard messages from libdevmapper in the LVM plugins (v.podzimek) + * Fri Feb 01 2019 Fedora Release Engineering - 2.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index ff79565..aa0c552 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libblockdev-2.20.tar.gz) = 7363e05c6854757649ed865f216c71ddc8afd7f1a102a73c0bb4809c4713973462446543d97b696f55f11ea15696e261802567cc545833d16535835c5250ac8b +SHA512 (libblockdev-2.21.tar.gz) = 7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b