From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 22 Jan 2022 19:07:08 +0000 (+0100)
Subject: - updated to 2.03.14
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=765e2390d61eeaa5f65ee8ad304d74292d57acd8;p=packages%2Flvm2.git

- updated to 2.03.14
---

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index f1a74c3..3b56167 100644
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,25 +1,25 @@
 diff -ur LVM2.2.03.02.orig/configure.ac LVM2.2.03.02/configure.ac
 --- LVM2.2.03.02.orig/configure.ac	2019-03-22 17:10:13.162000000 +0100
 +++ LVM2.2.03.02/configure.ac	2019-03-22 17:10:38.684000000 +0100
-@@ -396,7 +396,7 @@
+@@ -411,7 +411,7 @@
  AC_ARG_ENABLE(thin_check_needs_check,
- 	      AC_HELP_STRING([--disable-thin_check_needs_check],
+ 	      AS_HELP_STRING([--disable-thin_check_needs_check],
  			     [required if thin_check version is < 0.3.0]),
 -	      THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes)
 +	      THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=autodetect)
  
  # Test if necessary thin tools are available
  # if not - use plain defaults and warn user
-@@ -411,7 +411,7 @@
+@@ -426,7 +426,7 @@
  			THIN_CONFIGURE_WARN=y
  		fi
  	fi
--	if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
-+	if test "$THIN_CHECK_NEEDS_CHECK" = autodetect; then
+-	if test "$THIN_CHECK_NEEDS_CHECK" = yes && test "$THIN_CONFIGURE_WARN" != y ; then
++	if test "$THIN_CHECK_NEEDS_CHECK" = autodetect && test "$THIN_CONFIGURE_WARN" != y ; then
  		THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
  		THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
  		THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
-@@ -424,6 +424,8 @@
+@@ -439,6 +439,8 @@
  			AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
  			THIN_CHECK_VERSION_WARN=y
  			THIN_CHECK_NEEDS_CHECK=no
@@ -28,25 +28,16 @@ diff -ur LVM2.2.03.02.orig/configure.ac LVM2.2.03.02/configure.ac
  		fi
  	fi
  	# Empty means a config way to ignore thin dumping
-@@ -510,7 +512,7 @@
+@@ -524,7 +526,7 @@
  AC_ARG_ENABLE(cache_check_needs_check,
- 	      AC_HELP_STRING([--disable-cache_check_needs_check],
+ 	      AS_HELP_STRING([--disable-cache_check_needs_check],
  			     [required if cache_check version is < 0.5]),
 -	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=yes)
 +	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=autodetect)
  
  # Test if necessary cache tools are available
  # if not - use plain defaults and warn user
-@@ -525,7 +527,7 @@
- 			CACHE_CONFIGURE_WARN=y
- 		fi
- 	fi
--	if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
-+	if test "$CACHE_CHECK_NEEDS_CHECK" = autodetect; then
- 		$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
- 		read -r CACHE_CHECK_VSN < conftest.tmp
- 		IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
-@@ -549,6 +551,8 @@
+@@ -563,6 +565,8 @@
  				AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
  				CACHE_CHECK_VERSION_WARN=y
  			fi
diff --git a/lvm2.spec b/lvm2.spec
index 7c6693e..76fb812 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,7 +28,7 @@
 %undefine	with_lvmdbusd
 %endif
 
-%define		ver	2.03.13
+%define		ver	2.03.14
 %define		tgz_ver	%(echo %{version} | tr . _)
 
 Summary:	The new version of Logical Volume Manager for Linux
@@ -39,7 +39,7 @@ Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	https://github.com/lvmteam/lvm2/archive/v%{tgz_ver}.tar.gz
-# Source0-md5:	dbf58a0fc297ea87ff90ba5c825b2286
+# Source0-md5:	f71929487aa39e049797b5b7abe8d9dd
 Patch0:		%{name}-selinux.patch
 Patch1:		device-mapper-dmsetup-export.patch
 Patch2:		%{name}-tld_init.patch
@@ -418,6 +418,7 @@ fi
 %attr(755,root,root) %{_sbindir}/lvdisplay
 %attr(755,root,root) %{_sbindir}/lvextend
 %attr(755,root,root) %{_sbindir}/lvm
+%attr(755,root,root) %{_sbindir}/lvm_import_vdo
 %attr(755,root,root) %{_sbindir}/lvmconfig
 %attr(755,root,root) %{_sbindir}/lvmdevices
 %attr(755,root,root) %{_sbindir}/lvmdiskscan
@@ -439,7 +440,6 @@ fi
 %attr(755,root,root) %{_sbindir}/pvresize
 %attr(755,root,root) %{_sbindir}/pvs
 %attr(755,root,root) %{_sbindir}/pvscan
-%attr(755,root,root) %{_sbindir}/vdoimport
 %attr(755,root,root) %{_sbindir}/vgcfgbackup
 %attr(755,root,root) %{_sbindir}/vgcfgrestore
 %attr(755,root,root) %{_sbindir}/vgchange
@@ -479,6 +479,7 @@ fi
 %{_mandir}/man8/lvm-fullreport.8*
 %{_mandir}/man8/lvm-lvpoll.8*
 %{_mandir}/man8/lvm.8*
+%{_mandir}/man8/lvm_import_vdo.8*
 %{_mandir}/man8/lvmconfig.8*
 %{_mandir}/man8/lvmdevices.8*
 %{_mandir}/man8/lvmdiskscan.8*
@@ -500,7 +501,6 @@ fi
 %{_mandir}/man8/pvresize.8*
 %{_mandir}/man8/pvs.8*
 %{_mandir}/man8/pvscan.8*
-%{_mandir}/man8/vdoimport.8*
 %{_mandir}/man8/vgcfgbackup.8*
 %{_mandir}/man8/vgcfgrestore.8*
 %{_mandir}/man8/vgchange.8*
@@ -592,7 +592,7 @@ fi
 /lib/udev/rules.d/10-dm.rules
 /lib/udev/rules.d/11-dm-lvm.rules
 /lib/udev/rules.d/13-dm-disk.rules
-/lib/udev/rules.d/69-dm-lvm-metad.rules
+/lib/udev/rules.d/69-dm-lvm.rules
 /lib/udev/rules.d/95-dm-notify.rules
 %attr(755,root,root) %{_sbindir}/dmeventd
 %attr(755,root,root) %{_sbindir}/dmsetup