Blame SOURCES/lvm2-drop-unavailable-libblkid-2_24-BLKID_SUBLKS_BADCSUM-for-signature-detection.patch

5f1a1f
 configure             | 20 ++++++++++----------
5e29a5
 configure.ac          |  4 ++--
5f1a1f
 lib/device/dev-type.c |  3 +--
4c7ee1
 3 files changed, 13 insertions(+), 14 deletions(-)
4c7ee1
4c7ee1
diff --git a/configure b/configure
5e29a5
index 7d945df..ef24b31 100755
4c7ee1
--- a/configure
4c7ee1
+++ b/configure
5e29a5
@@ -12111,12 +12111,12 @@ if test -n "$BLKID_CFLAGS"; then
4c7ee1
     pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
4c7ee1
  elif test -n "$PKG_CONFIG"; then
4c7ee1
     if test -n "$PKG_CONFIG" && \
4c7ee1
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
4c7ee1
-  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
4c7ee1
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
4c7ee1
+  ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
4c7ee1
   ac_status=$?
4c7ee1
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4c7ee1
   test $ac_status = 0; }; then
4c7ee1
-  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
4c7ee1
+  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.23" 2>/dev/null`
5f1a1f
 		      test "x$?" != "x0" && pkg_failed=yes
4c7ee1
 else
4c7ee1
   pkg_failed=yes
5e29a5
@@ -12128,12 +12128,12 @@ if test -n "$BLKID_LIBS"; then
4c7ee1
     pkg_cv_BLKID_LIBS="$BLKID_LIBS"
4c7ee1
  elif test -n "$PKG_CONFIG"; then
4c7ee1
     if test -n "$PKG_CONFIG" && \
4c7ee1
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
4c7ee1
-  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
4c7ee1
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
4c7ee1
+  ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
4c7ee1
   ac_status=$?
4c7ee1
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4c7ee1
   test $ac_status = 0; }; then
4c7ee1
-  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
4c7ee1
+  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.23" 2>/dev/null`
5f1a1f
 		      test "x$?" != "x0" && pkg_failed=yes
4c7ee1
 else
4c7ee1
   pkg_failed=yes
5e29a5
@@ -12154,9 +12154,9 @@ else
4c7ee1
         _pkg_short_errors_supported=no
4c7ee1
 fi
4c7ee1
         if test $_pkg_short_errors_supported = yes; then
5f1a1f
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
5f1a1f
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.23" 2>&1`
4c7ee1
         else
5f1a1f
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
5f1a1f
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.23" 2>&1`
4c7ee1
         fi
4c7ee1
 	# Put the nasty error message in config.log where it belongs
4c7ee1
 	echo "$BLKID_PKG_ERRORS" >&5
5e29a5
@@ -12164,7 +12164,7 @@ fi
5f1a1f
 	if test "$BLKID_WIPING" = maybe; then
5f1a1f
 				BLKID_WIPING=no
5f1a1f
 			   else
5f1a1f
-			        as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
5f1a1f
+			        as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
5f1a1f
 			   fi
4c7ee1
 elif test $pkg_failed = untried; then
5f1a1f
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5e29a5
@@ -12172,7 +12172,7 @@ $as_echo "no" >&6; }
5f1a1f
 	if test "$BLKID_WIPING" = maybe; then
5f1a1f
 				BLKID_WIPING=no
5f1a1f
 			   else
5f1a1f
-			        as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
5f1a1f
+			        as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
5f1a1f
 			   fi
4c7ee1
 else
5f1a1f
 	BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
5e29a5
diff --git a/configure.ac b/configure.ac
5e29a5
index e427708..935ea08 100644
5e29a5
--- a/configure.ac
5e29a5
+++ b/configure.ac
5e29a5
@@ -1235,7 +1235,7 @@ AC_ARG_ENABLE(blkid_wiping,
f0aa83
 DEFAULT_USE_BLKID_WIPING=0
5f1a1f
 if test "$BLKID_WIPING" != no; then
5f1a1f
 	pkg_config_init
4c7ee1
-	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
4c7ee1
+	PKG_CHECK_MODULES(BLKID, blkid >= 2.23,
f0aa83
 			  [ BLKID_WIPING=yes
f0aa83
 			    BLKID_PC="blkid"
f0aa83
 			    DEFAULT_USE_BLKID_WIPING=1
5e29a5
@@ -1243,7 +1243,7 @@ if test "$BLKID_WIPING" != no; then
f0aa83
 			  ], [if test "$BLKID_WIPING" = maybe; then
5f1a1f
 				BLKID_WIPING=no
5f1a1f
 			   else
5f1a1f
-			        AC_MSG_ERROR([bailing out... blkid library >= 2.24 is required])
5f1a1f
+			        AC_MSG_ERROR([bailing out... blkid library >= 2.23 is required])
5f1a1f
 			   fi])
f0aa83
 fi
f0aa83
 AC_MSG_CHECKING([whether to enable libblkid detection of signatures when wiping])
4c7ee1
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
5e29a5
index af4b407..eda7982 100644
4c7ee1
--- a/lib/device/dev-type.c
4c7ee1
+++ b/lib/device/dev-type.c
5e29a5
@@ -712,8 +712,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam
4c7ee1
 						 BLKID_SUBLKS_TYPE |
4c7ee1
 						 BLKID_SUBLKS_USAGE |
4c7ee1
 						 BLKID_SUBLKS_VERSION |
4c7ee1
-						 BLKID_SUBLKS_MAGIC |
4c7ee1
-						 BLKID_SUBLKS_BADCSUM);
4c7ee1
+						 BLKID_SUBLKS_MAGIC);
4c7ee1
 
4c7ee1
 	while (!blkid_do_probe(probe)) {
c0e5af
 		if ((r_wipe = _blkid_wipe(probe, dev, name, types_to_exclude, types_no_prompt, yes, force)) == 1) {