- fix run dir problems (got messed up during update)

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

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index ce2e788d57d9fa21ea297c772c04095a4b9d8504..90078e82c24fbbe92ca45e82db812ffe58e57d76 100644 (file)
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,6 +1,7 @@
---- LVM2.2.02.149/configure.in.orig    2016-04-06 16:05:03.799248008 +0200
-+++ LVM2.2.02.149/configure.in 2016-04-06 20:23:12.388598015 +0200
-@@ -463,7 +463,7 @@
+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
  AC_ARG_ENABLE(thin_check_needs_check,
              AC_HELP_STRING([--disable-thin_check_needs_check],
                             [required if thin_check version is < 0.3.0]),
@@ -9,7 +10,7 @@
  
  # Test if necessary thin tools are available
  # if not - use plain defaults and warn user
-@@ -478,7 +478,7 @@
+@@ -403,7 +403,7 @@ case "$THIN" in
                        THIN_CONFIGURE_WARN=y
                fi
        fi
@@ -18,7 +19,7 @@
                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}'`
-@@ -491,6 +491,8 @@
+@@ -416,6 +416,8 @@ case "$THIN" in
                        AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
                        THIN_CHECK_VERSION_WARN=y
                        THIN_CHECK_NEEDS_CHECK=no
@@ -27,7 +28,7 @@
                fi
        fi
        # Empty means a config way to ignore thin dumping
-@@ -577,7 +579,7 @@
+@@ -502,7 +504,7 @@ dnl -- cache_check needs-check flag
  AC_ARG_ENABLE(cache_check_needs_check,
              AC_HELP_STRING([--disable-cache_check_needs_check],
                             [required if cache_check version is < 0.5]),
@@ -36,7 +37,7 @@
  
  # Test if necessary cache tools are available
  # if not - use plain defaults and warn user
-@@ -592,7 +594,7 @@
+@@ -517,7 +519,7 @@ case "$CACHE" in
                        CACHE_CONFIGURE_WARN=y
                fi
        fi
@@ -45,9 +46,9 @@
                $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
-@@ -612,6 +614,8 @@
+@@ -541,6 +543,8 @@ case "$CACHE" in
+                               AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
                                CACHE_CHECK_VERSION_WARN=y
-                               CACHE_CHECK_NEEDS_CHECK=no
                        fi
 +              else
 +                              CACHE_CHECK_NEEDS_CHECK=yes