X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-thin.patch;fp=lvm2-thin.patch;h=0f0cd216a9cc7bfff59b52475234de45f7f9f227;hp=3b5616728328b0fe4ae4d2be617f6e3e493b23ef;hb=f229bb081cff2272e043112feeb1960a8da0a4c4;hpb=381cdd7d90021c8cf1aa9a0a23adcdc4dfded1e0

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index 3b56167..0f0cd21 100644
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,48 +1,47 @@
-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
-@@ -411,7 +411,7 @@
+--- LVM2.2.03.19/configure.ac.orig	2023-02-21 15:37:53.000000000 +0100
++++ LVM2.2.03.19/configure.ac	2023-02-22 10:52:41.267893915 +0100
+@@ -393,7 +393,7 @@
  AC_ARG_ENABLE(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)
+-	      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
-@@ -426,7 +426,7 @@
- 			THIN_CONFIGURE_WARN=y
- 		fi
- 	fi
--	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}'`
-@@ -439,6 +439,8 @@
+@@ -421,7 +421,7 @@
  			AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
- 			THIN_CHECK_VERSION_WARN=y
- 			THIN_CHECK_NEEDS_CHECK=no
-+		else
-+			THIN_CHECK_NEEDS_CHECK=yes
- 		fi
- 	fi
+ 			THIN_CHECK_VERSION_WARN="y"
+ 			THIN_CHECK_NEEDS_CHECK="no"
+-		])
++		], [ THIN_CHECK_NEEDS_CHECK="yes" ])
+ 	])
  	# Empty means a config way to ignore thin dumping
-@@ -524,7 +526,7 @@
+ 	AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [
+@@ -505,7 +505,7 @@
  AC_ARG_ENABLE(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)
+-	      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
-@@ -563,6 +565,8 @@
+@@ -520,7 +520,7 @@
+ 			CACHE_CONFIGURE_WARN="y"
+ 		])
+ 	])
+-	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [
++	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "autodetect" && test "$CACHE_CONFIGURE_WARN" != "y"], [
+ 		$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
+@@ -544,7 +544,7 @@
  				AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
  				CACHE_CHECK_VERSION_WARN=y
- 			fi
-+		else
-+				CACHE_CHECK_NEEDS_CHECK=yes
- 		fi
- 	fi
+ 			])
+-		])
++		], [ CACHE_CHECK_NEEDS_CHECK="yes" ])
+ 	])
  	# Empty means a config way to ignore cache dumping
+ 	AS_IF([test "$CACHE_DUMP_CMD" = "autodetect"], [