- fix conditional

[packages/lvm2.git] / lvm2-thin.patch

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index 90078e82c24fbbe92ca45e82db812ffe58e57d76..ea210e67aed6e55f54b6c2bf01fa42a555dcd965 100644 (file)
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,57 +1,48 @@
-diff -urp LVM2.2.03.00.orig/configure.ac LVM2.2.03.00/configure.ac
---- LVM2.2.03.00.orig/configure.ac     2018-10-21 14:38:26.196416609 +0000
-+++ LVM2.2.03.00/configure.ac  2018-10-21 14:38:47.235416609 +0000
-@@ -388,7 +388,7 @@ dnl -- thin_check needs-check flag
+diff -urNpa LVM2.2.03.23.orig/configure.ac LVM2.2.03.23/configure.ac
+--- LVM2.2.03.23.orig/configure.ac     2023-12-03 19:58:43.179205581 +0100
++++ LVM2.2.03.23/configure.ac  2023-12-03 19:59:54.935057131 +0100
+@@ -409,7 +409,7 @@ dnl -- thin_check needs-check flag
  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)
+-            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
-@@ -403,7 +403,7 @@ case "$THIN" in
-                       THIN_CONFIGURE_WARN=y
-               fi
-       fi
--      if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
-+      if test "$THIN_CHECK_NEEDS_CHECK" = autodetect; 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}'`
-@@ -416,6 +416,8 @@ case "$THIN" in
+@@ -424,7 +424,7 @@ AS_CASE(["$THIN"],
+                       THIN_CONFIGURE_WARN="y"
+               ])
+       ])
+-      AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [
++      AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "autodetect" && test "$THIN_CONFIGURE_WARN" != "y"], [
+               THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
+               THIN_CHECK_VSN=${THIN_CHECK_VSN##* }  # trim away all before the first space
+               THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
+@@ -438,7 +438,7 @@ AS_CASE(["$THIN"],
                        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
-@@ -502,7 +504,7 @@ dnl -- cache_check needs-check flag
+       AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [
+@@ -522,7 +522,7 @@ dnl -- cache_check needs-check flag
  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)
+-            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
-@@ -517,7 +519,7 @@ case "$CACHE" in
-                       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
-@@ -541,6 +543,8 @@ case "$CACHE" in
+@@ -562,7 +562,7 @@ AS_CASE(["$CACHE"],
                                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"], [