diff --git a/.gitignore b/.gitignore index 7f084c4..19415b7 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /LVM2.2.02.172.tgz /LVM2.2.02.173.tgz /LVM2.2.02.174.tgz +/LVM2.2.02.175.tgz diff --git a/LVM2.2.02.174.tgz.asc b/LVM2.2.02.174.tgz.asc deleted file mode 100644 index a69d1f2..0000000 --- a/LVM2.2.02.174.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAlm5jGIACgkQIoGRwVZ+LBfm7gCghWAdO+3JRkl3kJP87n3DAlR8 -M9YAnjEHPo2IVr138u3RaYHIUXvvQdzQ -=T829 ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.175.tgz.asc b/LVM2.2.02.175.tgz.asc new file mode 100644 index 0000000..e90fa0e --- /dev/null +++ b/LVM2.2.02.175.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAlnX9XgACgkQIoGRwVZ+LBeZnQCg7JNQyFkEkfNptzLGNCVLlA2S +77oAoPAYBrpUR+ID/KAH6+MkNU9bmTK4 +=0AnW +-----END PGP SIGNATURE----- diff --git a/lvm2-2_02_175-liblvm-Deprecate-library-and-bindings.patch b/lvm2-2_02_175-liblvm-Deprecate-library-and-bindings.patch deleted file mode 100644 index 6fa7e76..0000000 --- a/lvm2-2_02_175-liblvm-Deprecate-library-and-bindings.patch +++ /dev/null @@ -1,78 +0,0 @@ - - configure | 6 ++++++ - configure.in | 3 +++ - liblvm/lvm2app.h | 2 ++ - python/liblvm.c | 2 ++ - 4 files changed, 13 insertions(+) - -diff --git a/configure b/configure -index 2afbe6e..78c738d 100755 ---- a/configure -+++ b/configure -@@ -12791,6 +12791,10 @@ $as_echo "$APPLIB" >&6; } - test "$APPLIB" = yes \ - && LVM2APP_LIB=-llvm2app \ - || LVM2APP_LIB= -+if test "$APPLIB"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python bindings are deprecated. Use D-Bus API" >&5 -+$as_echo "$as_me: WARNING: Python bindings are deprecated. Use D-Bus API" >&2;} -+fi - - ################################################################################ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile liblvm2cmd.so" >&5 -@@ -13868,6 +13872,8 @@ $as_echo "no" >&6; } - fi - - if test "$PYTHON_BINDINGS" = yes -o "$PYTHON2_BINDINGS" = yes -o "$PYTHON3_BINDINGS" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python bindings are deprecated. Use D-Bus API" >&5 -+$as_echo "$as_me: WARNING: Python bindings are deprecated. Use D-Bus API" >&2;} - test "$APPLIB" != yes && as_fn_error $? "Python_bindings require --enable-applib" "$LINENO" 5 - fi - -diff --git a/configure.in b/configure.in -index 43e8652..e2f448e 100644 ---- a/configure.in -+++ b/configure.in -@@ -1464,6 +1464,8 @@ AC_SUBST([LVM2APP_LIB]) - test "$APPLIB" = yes \ - && LVM2APP_LIB=-llvm2app \ - || LVM2APP_LIB= -+AS_IF([test "$APPLIB"], -+ [AC_MSG_WARN([Python bindings are deprecated. Use D-Bus API])]) - - ################################################################################ - dnl -- Enable cmdlib -@@ -1546,6 +1548,7 @@ if test "$BUILD_LVMDBUSD" = yes; then - fi - - if test "$PYTHON_BINDINGS" = yes -o "$PYTHON2_BINDINGS" = yes -o "$PYTHON3_BINDINGS" = yes; then -+ AC_MSG_WARN([Python bindings are deprecated. Use D-Bus API]) - test "$APPLIB" != yes && AC_MSG_ERROR([Python_bindings require --enable-applib]) - fi - -diff --git a/liblvm/lvm2app.h b/liblvm/lvm2app.h -index be53b2d..f64262d 100644 ---- a/liblvm/lvm2app.h -+++ b/liblvm/lvm2app.h -@@ -18,6 +18,8 @@ - - #include - -+#warning "liblvm2app is deprecated, use D-Bus API instead." -+ - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/python/liblvm.c b/python/liblvm.c -index 1b3534e..6d67b8b 100644 ---- a/python/liblvm.c -+++ b/python/liblvm.c -@@ -2085,6 +2085,8 @@ PyMODINIT_FUNC initlvm(void) - PyModule_AddObject(m, "LibLVMError", _LibLVMError); - } - -+ PyErr_Warn(PyExc_DeprecationWarning, "Python API is deprecated, use D-Bus API instead."); -+ - Py_AtExit(_liblvm_cleanup); - #ifdef IS_PY3K - return m; diff --git a/lvm2-2_02_175-revert-tidy-prefer-not-using-else-after-return.patch b/lvm2-2_02_175-revert-tidy-prefer-not-using-else-after-return.patch deleted file mode 100644 index eca5d63..0000000 --- a/lvm2-2_02_175-revert-tidy-prefer-not-using-else-after-return.patch +++ /dev/null @@ -1,117 +0,0 @@ -From d93a2bb74177397430ec21d6062987cb7da91217 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Thu, 14 Sep 2017 12:15:59 -0500 -Subject: [PATCH] revert tidy: prefer not using else after return - -Revert the lvmlockd.c changes from: - commit 0bf836aa14f98eb83969a6e81695a024f56a5eb5 - "tidy: prefer not using else after return" - -The commit introduced at least one regression, which broke -lvcreate of a thin pool in a shared VG. ---- - lib/locking/lvmlockd.c | 43 ++++++++++++++++++++----------------------- - 1 file changed, 20 insertions(+), 23 deletions(-) - -diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c -index a0e3f03..f4047d9 100644 ---- a/lib/locking/lvmlockd.c -+++ b/lib/locking/lvmlockd.c -@@ -1646,15 +1646,15 @@ int lockd_gl(struct cmd_context *cmd, const char *def_mode, uint32_t flags) - */ - log_error("Global lock failed: held by other host."); - return 0; -+ } else { -+ /* -+ * We don't intend to reach this. We should check -+ * any known/possible error specifically and print -+ * a more helpful message. This is for completeness. -+ */ -+ log_error("Global lock failed: error %d.", result); -+ return 0; - } -- -- /* -- * We don't intend to reach this. We should check -- * any known/possible error specifically and print -- * a more helpful message. This is for completeness. -- */ -- log_error("Global lock failed: error %d.", result); -- return 0; - } - - allow: -@@ -2380,16 +2380,15 @@ int lockd_init_lv(struct cmd_context *cmd, struct volume_group *vg, struct logic - if (!_lvmlockd_connected) - return 0; - -- if (!lp->needs_lockd_init) -+ if (!lp->needs_lockd_init) { - /* needs_lock_init is set for LVs that need a lockd lock. */ - return 1; - -- if (seg_is_cache(lp) || seg_is_cache_pool(lp)) { -+ } else if (seg_is_cache(lp) || seg_is_cache_pool(lp)) { - log_error("Use lvconvert for cache with lock type %s", vg->lock_type); - return 0; -- } - -- if (!seg_is_thin_volume(lp) && lp->snapshot) { -+ } else if (!seg_is_thin_volume(lp) && lp->snapshot) { - struct logical_volume *origin_lv; - - /* -@@ -2414,9 +2413,8 @@ int lockd_init_lv(struct cmd_context *cmd, struct volume_group *vg, struct logic - } - lv->lock_args = NULL; - return 1; -- } - -- if (seg_is_thin(lp)) { -+ } else if (seg_is_thin(lp)) { - if ((seg_is_thin_volume(lp) && !lp->create_pool) || - (!seg_is_thin_volume(lp) && lp->snapshot)) { - struct lv_list *lvl; -@@ -2437,9 +2435,8 @@ int lockd_init_lv(struct cmd_context *cmd, struct volume_group *vg, struct logic - } - lv->lock_args = NULL; - return 1; -- } - -- if (seg_is_thin_volume(lp) && lp->create_pool) { -+ } else if (seg_is_thin_volume(lp) && lp->create_pool) { - /* - * Creating a thin pool and a thin lv in it. We could - * probably make this work. -@@ -2447,21 +2444,21 @@ int lockd_init_lv(struct cmd_context *cmd, struct volume_group *vg, struct logic - log_error("Create thin pool and thin LV separately with lock type %s", - vg->lock_type); - return 0; -- } - -- if (!seg_is_thin_volume(lp) && lp->create_pool) { -+ } else if (!seg_is_thin_volume(lp) && lp->create_pool) { - /* Creating a thin pool only. */ - /* lv_name_lock = lp->pool_name; */ - -+ } else { -+ log_error("Unknown thin options for lock init."); -+ return 0; - } - -- log_error("Unknown thin options for lock init."); -- return 0; -+ } else { -+ /* Creating a normal lv. */ -+ /* lv_name_lock = lv_name; */ - } - -- /* Creating a normal lv. */ -- /* lv_name_lock = lv_name; */ -- - /* - * The LV gets its own lock, so set lock_args to non-NULL. - * --- -1.8.3.1 - diff --git a/lvm2.spec b/lvm2.spec index 730aeb1..d53985f 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%global device_mapper_version 1.02.143 +%global device_mapper_version 1.02.144 %global enable_cache 1 %global enable_cluster 1 @@ -53,16 +53,14 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.174 -Release: 2%{?dist} +Version: 2.02.175 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 Source0: ftp://sources.redhat.com/pub/lvm2/releases/LVM2.%{version}.tgz Patch0: lvm2-set-default-preferred_names.patch Patch1: lvm2-lvmetad-timeout.patch -Patch2: lvm2-2_02_175-revert-tidy-prefer-not-using-else-after-return.patch -Patch3: lvm2-2_02_175-liblvm-Deprecate-library-and-bindings.patch BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libblkid-devel >= %{util_linux_version} @@ -118,8 +116,6 @@ or more physical volumes and creating one or more logical volumes %setup -q -n LVM2.%{version} %patch0 -p1 -b .preferred_names %patch1 -p1 -b .lvmetad_timeout -%patch2 -p1 -b .revert_tidy -%patch3 -p1 -b .deprecate_liblvm %build %global _default_pid_dir /run @@ -412,7 +408,7 @@ Requires: pkgconfig This package contains files needed to develop applications that use the lvm2 libraries. -NOTE: lvm2app is deprectaed. Migration to DBus API provided by +NOTE: lvm2app is deprectaed. Migration to D-Bus API provided by %{name}-dbusd is recommended. %files devel @@ -465,7 +461,6 @@ Summary: Python module to access LVM (Deprecated) License: LGPLv2 Group: Development/Libraries %{?python_provide:%python_provide python2-lvm} -Obsoletes: python-lvm # For compatibility with old name: Provides: %{name}-python-libs = %{version}-%{release} Obsoletes: %{name}-python-libs < %{version}-%{release} @@ -476,7 +471,7 @@ Deprecated python module to allow the creation and use of LVM logical volumes, physical volumes, and volume groups. -Migration to DBus API provided by %{name}-dbusd is recommended. +Migration to D-Bus API provided by %{name}-dbusd is recommended. %files -n python2-lvm-deprecated %{python2_sitearch}/* @@ -485,7 +480,8 @@ Migration to DBus API provided by %{name}-dbusd is recommended. Summary: Python 3 module to access LVM (Deprecated) License: LGPLv2 Group: Development/Libraries -#%{?python_provide:%python_provide python3-lvm} +Provides: python3-lvm = %{version}-%{release} +%{?python_provide:%python_provide python3-lvm} # For compatibility with old name: Provides: %{name}-python3-libs = %{version}-%{release} Obsoletes: %{name}-python3-libs < %{version}-%{release} @@ -496,7 +492,7 @@ Deprecated python 3 module to allow the creation and use of LVM logical volumes, physical volumes, and volume groups. -Migration to DBus API provided by %{name}-dbusd is recommended. +Migration to D-Bus API provided by %{name}-dbusd is recommended. %files -n python3-lvm-deprecated %{python3_sitearch}/*.so @@ -866,6 +862,28 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Mon Oct 09 2017 Marian Csontos - 2.02.175-1 +- Use --help with blockdev when checking for --getsize64 support in fsadm. +- Dump lvmdbusd debug information with SIGUSR1. +- Fix metadata corruption in vgsplit and vgmerge intermediate states. +- Add PV_MOVED_VG PV status flag to mark PVs moving between VGs. +- Fix lvmdbus hang and recognise unknown VG correctly. +- Improve error messages when command rules fail. +- Require LV name with pvmove in a shared VG. +- Allow shared active mirror LVs with lvmlockd, dlm, and cmirrord. +- Support lvconvert --repair with cache and cachepool volumes. +- lvconvert --repair respects --poolmetadataspare option. +- Fix thin pool creation in a shared VG. (2.02.173) +- Schedule exit when received SIGTERM in dmeventd. +- Fix blkdeactivate regression with failing DM/MD devs deactivation (1.02.142). +- Add blkdeactivate -r wait option to wait for MD resync/recovery/reshape. +- Use blkdeactivate -r wait in blk-availability systemd service/initscript. +- Also try to unmount /boot on blkdeactivate -u if on top of supported device. +- Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name. +- Correct return value testing when get reserved values for reporting. +- Take -S with dmsetup suspend/resume/clear/wipe_table/remove/deps/status/table. +- Fix mistakenly commented out %%python_provide line for python3-lvm. + * Mon Oct 02 2017 Troy Dawson - 2.02.174-2 - Bump to rebuild on rebuilt corosync - Cleanup spec file conditionals diff --git a/sources b/sources index ca19ce7..cab6bc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LVM2.2.02.174.tgz) = dcf5c919e937583e0d0afbcedb011689d944a3c321aac049741f6564a48e07eb3ce49c5ef245e6b71686b5cfee3eca1969b7e0ebe90f084e2be391b805d3f588 +SHA512 (LVM2.2.02.175.tgz) = 73837edcad6c4165211be6a3528da62a189f1c97bcdd73a69746df9459d3716c0c44580a654b55e2bcafea48797ce4ecee0f1df22e32e599ddebf942807b2638 diff --git a/upstream b/upstream index bb6cb85..be7730a 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.174.tgz +LVM2.2.02.175.tgz