- updated to 2.03.15

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

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index f1a74c34047c6b2838f251b0f50daab452c870c8..3b5616728328b0fe4ae4d2be617f6e3e493b23ef 100644 (file)
--- 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