Blame SOURCES/cryptsetup-configure.patch

88d6be
diff -rupN cryptsetup-2.0.3.old/config.h.in cryptsetup-2.0.3.new/config.h.in
88d6be
--- cryptsetup-2.0.3.old/config.h.in	2019-08-27 18:30:14.342521239 +0200
88d6be
+++ cryptsetup-2.0.3.new/config.h.in	2019-08-27 18:30:48.212105267 +0200
ad2d76
@@ -106,6 +106,12 @@
ad2d76
 /* Define to 1 if you have the <argon2.h> header file. */
ad2d76
 #undef HAVE_ARGON2_H
ad2d76
 
ad2d76
+/* Define to 1 to use blkid for detection of disk signatures. */
ad2d76
+#undef HAVE_BLKID
ad2d76
+
ad2d76
+/* Define to 1 if you have the <blkid/blkid.h> header file. */
ad2d76
+#undef HAVE_BLKID_BLKID_H
ad2d76
+
ad2d76
 /* Define to 1 if you have the <byteswap.h> header file. */
ad2d76
 #undef HAVE_BYTESWAP_H
ad2d76
 
ad2d76
@@ -127,6 +133,30 @@
ad2d76
    */
ad2d76
 #undef HAVE_DCGETTEXT
ad2d76
 
ad2d76
+/* Define to 1 if you have the declaration of `blkid_do_probe', and to 0 if
ad2d76
+   you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_DO_PROBE
ad2d76
+
ad2d76
+/* Define to 1 if you have the declaration of `blkid_do_safeprobe', and to 0
ad2d76
+   if you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_DO_SAFEPROBE
ad2d76
+
ad2d76
+/* Define to 1 if you have the declaration of
ad2d76
+   `blkid_probe_filter_superblocks_type', and to 0 if you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_PROBE_FILTER_SUPERBLOCKS_TYPE
ad2d76
+
ad2d76
+/* Define to 1 if you have the declaration of `blkid_probe_lookup_value ', and
ad2d76
+   to 0 if you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_PROBE_LOOKUP_VALUE__________
ad2d76
+
ad2d76
+/* Define to 1 if you have the declaration of `blkid_probe_set_device', and to
ad2d76
+   0 if you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_PROBE_SET_DEVICE
ad2d76
+
ad2d76
+/* Define to 1 if you have the declaration of `blkid_reset_probe', and to 0 if
ad2d76
+   you don't. */
ad2d76
+#undef HAVE_DECL_BLKID_RESET_PROBE
ad2d76
+
ad2d76
 /* Define to 1 if you have the declaration of `dm_device_has_holders', and to
ad2d76
    0 if you don't. */
ad2d76
 #undef HAVE_DECL_DM_DEVICE_HAS_HOLDERS
88d6be
diff -rupN cryptsetup-2.0.3.old/configure cryptsetup-2.0.3.new/configure
88d6be
--- cryptsetup-2.0.3.old/configure	2019-08-27 18:30:14.342521239 +0200
88d6be
+++ cryptsetup-2.0.3.new/configure	2019-08-27 18:30:48.212105267 +0200
ad2d76
@@ -664,6 +664,10 @@ PWQUALITY_STATIC_LIBS
ad2d76
 systemd_tmpfilesdir
ad2d76
 DEVMAPPER_STATIC_LIBS
ad2d76
 DEVMAPPER_STATIC_CFLAGS
ad2d76
+HAVE_BLKID_FALSE
ad2d76
+HAVE_BLKID_TRUE
ad2d76
+BLKID_LIBS
ad2d76
+BLKID_CFLAGS
ad2d76
 CRYPTO_INTERNAL_ARGON2_FALSE
ad2d76
 CRYPTO_INTERNAL_ARGON2_TRUE
ad2d76
 LIBARGON2_LIBS
ad2d76
@@ -878,6 +882,7 @@ enable_gcrypt_pbkdf2
ad2d76
 with_libgcrypt_prefix
ad2d76
 enable_internal_argon2
ad2d76
 enable_libargon2
ad2d76
+enable_blkid
ad2d76
 enable_dev_random
ad2d76
 enable_python
ad2d76
 with_python_version
ad2d76
@@ -935,6 +940,8 @@ NSS_CFLAGS
ad2d76
 NSS_LIBS
ad2d76
 LIBARGON2_CFLAGS
ad2d76
 LIBARGON2_LIBS
ad2d76
+BLKID_CFLAGS
ad2d76
+BLKID_LIBS
ad2d76
 DEVMAPPER_STATIC_CFLAGS
ad2d76
 DEVMAPPER_STATIC_LIBS
ad2d76
 systemd_tmpfilesdir
ad2d76
@@ -1607,6 +1614,8 @@ Optional Features:
ad2d76
                           disable internal implementation of Argon2 PBKDF
ad2d76
   --enable-libargon2      enable external libargon2 (PHC) library (disables
ad2d76
                           internal bundled version)
ad2d76
+  --disable-blkid         disable use of blkid for device signature detection
ad2d76
+                          and wiping.
ad2d76
   --enable-dev-random     use blocking /dev/random by default for key
ad2d76
                           generator (otherwise use /dev/urandom)
ad2d76
   --enable-python         enable Python bindings
ad2d76
@@ -1719,6 +1728,9 @@ Some influential environment variables:
ad2d76
               C compiler flags for LIBARGON2, overriding pkg-config
ad2d76
   LIBARGON2_LIBS
ad2d76
               linker flags for LIBARGON2, overriding pkg-config
ad2d76
+  BLKID_CFLAGS
ad2d76
+              C compiler flags for BLKID, overriding pkg-config
ad2d76
+  BLKID_LIBS  linker flags for BLKID, overriding pkg-config
ad2d76
   DEVMAPPER_STATIC_CFLAGS
ad2d76
               C compiler flags for DEVMAPPER_STATIC, overriding pkg-config
ad2d76
   DEVMAPPER_STATIC_LIBS
ad2d76
@@ -18580,6 +18592,211 @@ else
ad2d76
 fi
ad2d76
 
ad2d76
 
ad2d76
+# Check whether --enable-blkid was given.
ad2d76
+if test "${enable_blkid+set}" = set; then :
ad2d76
+  enableval=$enable_blkid;
ad2d76
+else
ad2d76
+  enable_blkid=yes
ad2d76
+fi
ad2d76
+
ad2d76
+
ad2d76
+if test x$enable_blkid = xyes ; then
ad2d76
+
ad2d76
+pkg_failed=no
ad2d76
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
ad2d76
+$as_echo_n "checking for BLKID... " >&6; }
ad2d76
+
ad2d76
+if test -n "$BLKID_CFLAGS"; then
ad2d76
+    pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
ad2d76
+ elif test -n "$PKG_CONFIG"; then
ad2d76
+    if test -n "$PKG_CONFIG" && \
ad2d76
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid\""; } >&5
ad2d76
+  ($PKG_CONFIG --exists --print-errors "blkid") 2>&5
ad2d76
+  ac_status=$?
ad2d76
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
ad2d76
+  test $ac_status = 0; }; then
ad2d76
+  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid" 2>/dev/null`
ad2d76
+		      test "x$?" != "x0" && pkg_failed=yes
ad2d76
+else
ad2d76
+  pkg_failed=yes
ad2d76
+fi
ad2d76
+ else
ad2d76
+    pkg_failed=untried
ad2d76
+fi
ad2d76
+if test -n "$BLKID_LIBS"; then
ad2d76
+    pkg_cv_BLKID_LIBS="$BLKID_LIBS"
ad2d76
+ elif test -n "$PKG_CONFIG"; then
ad2d76
+    if test -n "$PKG_CONFIG" && \
ad2d76
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid\""; } >&5
ad2d76
+  ($PKG_CONFIG --exists --print-errors "blkid") 2>&5
ad2d76
+  ac_status=$?
ad2d76
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
ad2d76
+  test $ac_status = 0; }; then
ad2d76
+  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid" 2>/dev/null`
ad2d76
+		      test "x$?" != "x0" && pkg_failed=yes
ad2d76
+else
ad2d76
+  pkg_failed=yes
ad2d76
+fi
ad2d76
+ else
ad2d76
+    pkg_failed=untried
ad2d76
+fi
ad2d76
+
ad2d76
+
ad2d76
+
ad2d76
+if test $pkg_failed = yes; then
ad2d76
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ad2d76
+$as_echo "no" >&6; }
ad2d76
+
ad2d76
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
ad2d76
+        _pkg_short_errors_supported=yes
ad2d76
+else
ad2d76
+        _pkg_short_errors_supported=no
ad2d76
+fi
ad2d76
+        if test $_pkg_short_errors_supported = yes; then
ad2d76
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid" 2>&1`
ad2d76
+        else
ad2d76
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid" 2>&1`
ad2d76
+        fi
ad2d76
+	# Put the nasty error message in config.log where it belongs
ad2d76
+	echo "$BLKID_PKG_ERRORS" >&5
ad2d76
+
ad2d76
+	LIBBLKID_LIBS="-lblkid"
ad2d76
+elif test $pkg_failed = untried; then
ad2d76
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
ad2d76
+$as_echo "no" >&6; }
ad2d76
+	LIBBLKID_LIBS="-lblkid"
ad2d76
+else
ad2d76
+	BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
ad2d76
+	BLKID_LIBS=$pkg_cv_BLKID_LIBS
ad2d76
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
ad2d76
+$as_echo "yes" >&6; }
ad2d76
+
ad2d76
+$as_echo "#define HAVE_BLKID 1" >>confdefs.h
ad2d76
+
ad2d76
+fi
ad2d76
+
ad2d76
+	for ac_header in blkid/blkid.h
ad2d76
+do :
ad2d76
+  ac_fn_c_check_header_mongrel "$LINENO" "blkid/blkid.h" "ac_cv_header_blkid_blkid_h" "$ac_includes_default"
ad2d76
+if test "x$ac_cv_header_blkid_blkid_h" = xyes; then :
ad2d76
+  cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_BLKID_BLKID_H 1
ad2d76
+_ACEOF
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "You need blkid development library installed." "$LINENO" 5
ad2d76
+fi
ad2d76
+
ad2d76
+done
ad2d76
+
ad2d76
+	ac_fn_c_check_decl "$LINENO" "blkid_reset_probe" "ac_cv_have_decl_blkid_reset_probe" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_reset_probe" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_RESET_PROBE $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+ac_fn_c_check_decl "$LINENO" "blkid_probe_set_device" "ac_cv_have_decl_blkid_probe_set_device" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_probe_set_device" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_PROBE_SET_DEVICE $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+ac_fn_c_check_decl "$LINENO" "blkid_probe_filter_superblocks_type" "ac_cv_have_decl_blkid_probe_filter_superblocks_type" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_probe_filter_superblocks_type" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_PROBE_FILTER_SUPERBLOCKS_TYPE $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+ac_fn_c_check_decl "$LINENO" "blkid_do_safeprobe" "ac_cv_have_decl_blkid_do_safeprobe" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_do_safeprobe" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_DO_SAFEPROBE $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+ac_fn_c_check_decl "$LINENO" "blkid_do_probe" "ac_cv_have_decl_blkid_do_probe" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_do_probe" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_DO_PROBE $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+ac_fn_c_check_decl "$LINENO" "blkid_probe_lookup_value
ad2d76
+		       " "ac_cv_have_decl_blkid_probe_lookup_value__________" "#include <blkid/blkid.h>
ad2d76
+"
ad2d76
+if test "x$ac_cv_have_decl_blkid_probe_lookup_value__________" = xyes; then :
ad2d76
+  ac_have_decl=1
ad2d76
+else
ad2d76
+  ac_have_decl=0
ad2d76
+fi
ad2d76
+
ad2d76
+cat >>confdefs.h <<_ACEOF
ad2d76
+#define HAVE_DECL_BLKID_PROBE_LOOKUP_VALUE__________ $ac_have_decl
ad2d76
+_ACEOF
ad2d76
+if test $ac_have_decl = 1; then :
ad2d76
+
ad2d76
+else
ad2d76
+  as_fn_error $? "Can not compile with blkid support, disable it by --disable-blkid." "$LINENO" 5
ad2d76
+fi
ad2d76
+
ad2d76
+fi
ad2d76
+ if test x$enable_blkid = xyes; then
ad2d76
+  HAVE_BLKID_TRUE=
ad2d76
+  HAVE_BLKID_FALSE='#'
ad2d76
+else
ad2d76
+  HAVE_BLKID_TRUE='#'
ad2d76
+  HAVE_BLKID_FALSE=
ad2d76
+fi
ad2d76
+
ad2d76
+
ad2d76
 if test x$enable_static_cryptsetup = xyes; then
ad2d76
 	saved_PKG_CONFIG=$PKG_CONFIG
ad2d76
 	PKG_CONFIG="$PKG_CONFIG --static"
ad2d76
@@ -19043,6 +19260,7 @@ $as_echo "$systemd_tmpfilesdir" >&6; }
ad2d76
 
ad2d76
 
ad2d76
 
ad2d76
+
ad2d76
 # Check whether --enable-dev-random was given.
ad2d76
 if test "${enable_dev_random+set}" = set; then :
ad2d76
   enableval=$enable_dev_random; default_rng=/dev/random
ad2d76
@@ -20146,6 +20364,10 @@ if test -z "${CRYPTO_INTERNAL_ARGON2_TRU
ad2d76
   as_fn_error $? "conditional \"CRYPTO_INTERNAL_ARGON2\" was never defined.
ad2d76
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
ad2d76
 fi
ad2d76
+if test -z "${HAVE_BLKID_TRUE}" && test -z "${HAVE_BLKID_FALSE}"; then
ad2d76
+  as_fn_error $? "conditional \"HAVE_BLKID\" was never defined.
ad2d76
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
ad2d76
+fi
ad2d76
 if test -z "${PYTHON_CRYPTSETUP_TRUE}" && test -z "${PYTHON_CRYPTSETUP_FALSE}"; then
ad2d76
   as_fn_error $? "conditional \"PYTHON_CRYPTSETUP\" was never defined.
ad2d76
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
88d6be
diff -rupN cryptsetup-2.0.3.old/Makefile.in cryptsetup-2.0.3.new/Makefile.in
88d6be
--- cryptsetup-2.0.3.old/Makefile.in	2019-08-27 18:30:14.223519187 +0200
88d6be
+++ cryptsetup-2.0.3.new/Makefile.in	2019-08-27 18:34:03.679475168 +0200
88d6be
@@ -270,7 +270,8 @@ am_libcryptsetup_la_OBJECTS = lib/libcry
88d6be
 	lib/luks2/libcryptsetup_la-luks2_keyslot.lo \
88d6be
 	lib/luks2/libcryptsetup_la-luks2_keyslot_luks2.lo \
88d6be
 	lib/luks2/libcryptsetup_la-luks2_token_keyring.lo \
88d6be
-	lib/luks2/libcryptsetup_la-luks2_token.lo
88d6be
+	lib/luks2/libcryptsetup_la-luks2_token.lo \
88d6be
+	lib/libcryptsetup_la-utils_blkid.lo
88d6be
 libcryptsetup_la_OBJECTS = $(am_libcryptsetup_la_OBJECTS)
88d6be
 libcryptsetup_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
88d6be
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
88d6be
@@ -308,12 +309,14 @@ am__cryptsetup_SOURCES_DIST = lib/utils_
88d6be
 cryptsetup_OBJECTS = $(am_cryptsetup_OBJECTS)
88d6be
 @CRYPTSETUP_TRUE@cryptsetup_DEPENDENCIES = libcryptsetup.la
88d6be
 am__cryptsetup_reencrypt_SOURCES_DIST = lib/utils_crypt.c \
88d6be
-	lib/utils_io.c src/utils_tools.c src/utils_password.c \
88d6be
-	src/cryptsetup_reencrypt.c src/cryptsetup.h
88d6be
+	lib/utils_io.c src/utils_tools.c lib/utils_loop.c \
88d6be
+	src/utils_password.c src/cryptsetup_reencrypt.c \
88d6be
+	src/cryptsetup.h
88d6be
 @REENCRYPT_TRUE@am_cryptsetup_reencrypt_OBJECTS =  \
88d6be
 @REENCRYPT_TRUE@	lib/utils_crypt.$(OBJEXT) \
88d6be
 @REENCRYPT_TRUE@	lib/utils_io.$(OBJEXT) \
88d6be
 @REENCRYPT_TRUE@	src/utils_tools.$(OBJEXT) \
88d6be
+@REENCRYPT_TRUE@	lib/utils_loop.$(OBJEXT) \
88d6be
 @REENCRYPT_TRUE@	src/utils_password.$(OBJEXT) \
88d6be
 @REENCRYPT_TRUE@	src/cryptsetup_reencrypt.$(OBJEXT)
88d6be
 cryptsetup_reencrypt_OBJECTS = $(am_cryptsetup_reencrypt_OBJECTS)
88d6be
@@ -591,6 +594,8 @@ AUTOCONF = @AUTOCONF@
88d6be
 AUTOHEADER = @AUTOHEADER@
88d6be
 AUTOMAKE = @AUTOMAKE@
88d6be
 AWK = @AWK@
88d6be
+BLKID_CFLAGS = @BLKID_CFLAGS@
88d6be
+BLKID_LIBS = @BLKID_LIBS@
88d6be
 CC = @CC@
88d6be
 CCDEPMODE = @CCDEPMODE@
88d6be
 CFLAGS = @CFLAGS@
88d6be
@@ -846,6 +851,7 @@ libcryptsetup_la_LIBADD = \
88d6be
 	@CRYPTO_LIBS@		\
88d6be
 	@LIBARGON2_LIBS@	\
88d6be
 	@JSON_C_LIBS@		\
88d6be
+	@BLKID_LIBS@		\
88d6be
 	libcrypto_backend.la
88d6be
 
88d6be
 libcryptsetup_la_SOURCES = \
88d6be
@@ -908,7 +914,9 @@ libcryptsetup_la_SOURCES = \
88d6be
 	lib/luks2/luks2_token_keyring.c	\
88d6be
 	lib/luks2/luks2_token.c		\
88d6be
 	lib/luks2/luks2_internal.h	\
88d6be
-	lib/luks2/luks2.h
88d6be
+	lib/luks2/luks2.h		\
88d6be
+	lib/utils_blkid.c		\
88d6be
+	lib/utils_blkid.h
88d6be
 
88d6be
 
88d6be
 # cryptsetup
88d6be
@@ -1351,6 +1359,8 @@ lib/luks2/libcryptsetup_la-luks2_token_k
88d6be
 	lib/luks2/$(am__dirstamp) lib/luks2/$(DEPDIR)/$(am__dirstamp)
88d6be
 lib/luks2/libcryptsetup_la-luks2_token.lo: lib/luks2/$(am__dirstamp) \
88d6be
 	lib/luks2/$(DEPDIR)/$(am__dirstamp)
88d6be
+lib/libcryptsetup_la-utils_blkid.lo: lib/$(am__dirstamp) \
88d6be
+	lib/$(DEPDIR)/$(am__dirstamp)
88d6be
 
88d6be
 libcryptsetup.la: $(libcryptsetup_la_OBJECTS) $(libcryptsetup_la_DEPENDENCIES) $(EXTRA_libcryptsetup_la_DEPENDENCIES) 
88d6be
 	$(AM_V_CCLD)$(libcryptsetup_la_LINK) -rpath $(libdir) $(libcryptsetup_la_OBJECTS) $(libcryptsetup_la_LIBADD) $(LIBS)
88d6be
@@ -1507,6 +1517,7 @@ distclean-compile:
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-setup.Plo@am__quote@
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils.Plo@am__quote@
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils_benchmark.Plo@am__quote@
88d6be
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils_blkid.Plo@am__quote@
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils_crypt.Plo@am__quote@
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils_device.Plo@am__quote@
88d6be
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/libcryptsetup_la-utils_device_locking.Plo@am__quote@
88d6be
@@ -1991,6 +2002,13 @@ lib/luks2/libcryptsetup_la-luks2_token.l
88d6be
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
88d6be
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcryptsetup_la_CPPFLAGS) $(CPPFLAGS) $(libcryptsetup_la_CFLAGS) $(CFLAGS) -c -o lib/luks2/libcryptsetup_la-luks2_token.lo `test -f 'lib/luks2/luks2_token.c' || echo '$(srcdir)/'`lib/luks2/luks2_token.c
88d6be
 
88d6be
+lib/libcryptsetup_la-utils_blkid.lo: lib/utils_blkid.c
88d6be
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcryptsetup_la_CPPFLAGS) $(CPPFLAGS) $(libcryptsetup_la_CFLAGS) $(CFLAGS) -MT lib/libcryptsetup_la-utils_blkid.lo -MD -MP -MF lib/$(DEPDIR)/libcryptsetup_la-utils_blkid.Tpo -c -o lib/libcryptsetup_la-utils_blkid.lo `test -f 'lib/utils_blkid.c' || echo '$(srcdir)/'`lib/utils_blkid.c
88d6be
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lib/$(DEPDIR)/libcryptsetup_la-utils_blkid.Tpo lib/$(DEPDIR)/libcryptsetup_la-utils_blkid.Plo
88d6be
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lib/utils_blkid.c' object='lib/libcryptsetup_la-utils_blkid.lo' libtool=yes @AMDEPBACKSLASH@
88d6be
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
88d6be
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcryptsetup_la_CPPFLAGS) $(CPPFLAGS) $(libcryptsetup_la_CFLAGS) $(CFLAGS) -c -o lib/libcryptsetup_la-utils_blkid.lo `test -f 'lib/utils_blkid.c' || echo '$(srcdir)/'`lib/utils_blkid.c
88d6be
+
88d6be
 python/pycryptsetup_la-pycryptsetup.lo: python/pycryptsetup.c
88d6be
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pycryptsetup_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT python/pycryptsetup_la-pycryptsetup.lo -MD -MP -MF python/$(DEPDIR)/pycryptsetup_la-pycryptsetup.Tpo -c -o python/pycryptsetup_la-pycryptsetup.lo `test -f 'python/pycryptsetup.c' || echo '$(srcdir)/'`python/pycryptsetup.c
88d6be
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) python/$(DEPDIR)/pycryptsetup_la-pycryptsetup.Tpo python/$(DEPDIR)/pycryptsetup_la-pycryptsetup.Plo