From ebc16a877a1cde11d02e1b48ef8a2cea9a03f70a Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Tue, 7 Jul 2015 16:24:18 +0200 Subject: [PATCH] New upstream release v2.02.125. --- .gitignore | 1 + LVM2.2.02.124.tgz.asc | 7 ------- LVM2.2.02.125.tgz.asc | 7 +++++++ lvm2.spec | 32 ++++++++++++++++++++++++-------- sources | 2 +- upstream | 2 +- 6 files changed, 34 insertions(+), 17 deletions(-) delete mode 100644 LVM2.2.02.124.tgz.asc create mode 100644 LVM2.2.02.125.tgz.asc diff --git a/.gitignore b/.gitignore index d439108..1106b4c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /LVM2.2.02.122.tgz /LVM2.2.02.123.tgz /LVM2.2.02.124.tgz +/LVM2.2.02.125.tgz diff --git a/LVM2.2.02.124.tgz.asc b/LVM2.2.02.124.tgz.asc deleted file mode 100644 index ce1c9d2..0000000 --- a/LVM2.2.02.124.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAlWWsIQACgkQIoGRwVZ+LBcn1ACff2BhFlH6lOpLTA3yxXUeBUpX -ogMAoNk+vVLLhCiAzHA6EMxmXGcYgeN6 -=yGU9 ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.125.tgz.asc b/LVM2.2.02.125.tgz.asc new file mode 100644 index 0000000..f6572cd --- /dev/null +++ b/LVM2.2.02.125.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAlWbzQIACgkQIoGRwVZ+LBc/qACgveYmxRmYAGflKnKABH0WJFuV +x0wAoNp+qqFv4dcDsfO051PzpJI2YAZd +=trNl +-----END PGP SIGNATURE----- diff --git a/lvm2.spec b/lvm2.spec index 0921ad6..c9cabdd 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%define device_mapper_version 1.02.101 +%define device_mapper_version 1.02.102 %define enable_cache 1 %define enable_cluster 1 @@ -23,6 +23,9 @@ %define persistent_data_version 0.3.2-1 %define sanlock_version 3.2.4-1 +%define enable_lockd_sanlock %{enable_lvmlockd} +%define enable_lockd_dlm %{enable_lvmlockd} + %if 0%{?rhel} %ifnarch i686 x86_64 %define enable_cluster 0 @@ -45,7 +48,7 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.124 +Version: 2.02.125 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -61,7 +64,7 @@ BuildRequires: readline-devel %if %{enable_cluster} BuildRequires: corosynclib-devel >= %{corosync_version} %endif -%if %{enable_cluster} || %{enable_lvmlockd} +%if %{enable_cluster} || %{enable_lockd_dlm} BuildRequires: dlm-devel >= %{dlm_version} %endif BuildRequires: module-init-tools @@ -76,7 +79,7 @@ BuildRequires: python-setuptools %if %{enable_thin} || %{enable_cache} BuildRequires: device-mapper-persistent-data >= %{persistent_data_version} %endif -%if %{enable_lvmlockd} +%if %{enable_lockd_sanlock} BuildRequires: sanlock-devel >= %{sanlock_version} %endif Requires: %{name}-libs = %{version}-%{release} @@ -126,8 +129,12 @@ or more physical volumes and creating one or more logical volumes %define configure_lvmetad --enable-lvmetad %endif -%if %{enable_lvmlockd} -%define configure_lvmlockd --enable-lvmlockd +%if %{enable_lockd_dlm} +%define configure_lockd_dlm --enable-lockd-dlm +%endif + +%if %{enable_lockd_sanlock} +%define configure_lockd_sanlock --enable-lockd-sanlock %endif %if %{enable_lvmpolld} @@ -139,7 +146,7 @@ or more physical volumes and creating one or more logical volumes %define configure_python3_flags PYTHON=/usr/bin/python3 PYTHON_CONFIG=/usr/bin/python3-config %endif -%define configure_final --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_python} %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lvmlockd} +%define configure_final --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_python} %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %if %{enable_python} rm -rf %{py3dir} @@ -478,7 +485,7 @@ logical volumes, physical volumes, and volume groups. ############################################################################## # LVM locking daemon ############################################################################## -%if %{enable_lvmlockd} +%if %{enable_lockd_dlm} || %{enable_lockd_sanlock} %package lockd Summary: LVM locking daemon Group: System Environment/Base @@ -781,6 +788,15 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Tue Jul 07 2015 Peter Rajnoha - 2.02.125-1 +- Fix getline memory usage in lvmpolld. +- Add support --clear-needs-check-flag for cache_check of cache pool metadata. +- Add lvmetactl for developer use only. +- Rename global/lock_retries to lvmlockd_retries. +- Replace --enable-lvmlockd by --enable-lockd-sanlock and --enable-lockd-dlm. +- Include tool.h for default non-library use. +- Introduce format macros with embedded % such as FMTu64. + * Fri Jul 03 2015 Peter Rajnoha - 2.02.124-1 - Move sending thin pool messages from resume to suspend phase. - Report warning when pool is overprovisioned and not auto resized. diff --git a/sources b/sources index b8433ab..c5a4af1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da8d81a6a2ea235025795d9e001a6ae3 LVM2.2.02.124.tgz +2d24ba982c8a85e8c837210f087a6a51 LVM2.2.02.125.tgz diff --git a/upstream b/upstream index 3b834ac..e2f9adf 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.123.tgz +LVM2.2.02.125.tgz