Blame SOURCES/cryptsetup-configure.patch

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