From f674a479972e26fa774ab2787aab110504e3170d Mon Sep 17 00:00:00 2001
From: alex-nitrokey <alex@nitrokey.com>
Date: Wed, 10 Jun 2020 16:55:25 +0200
Subject: [PATCH] Add patch for cryptsetup 2.3.3

Following commit ed3602f0ba62ccdb806cda5a5a055bbc386c2185 (maintain
reproducibility by removing rpath) and applying the same changes for new
version of cryptsetup.
---
 patches/cryptsetup-2.3.3.patch | 527 +++++++++++++++++++++++++++++++++
 1 file changed, 527 insertions(+)
 create mode 100644 patches/cryptsetup-2.3.3.patch

diff --git a/patches/cryptsetup-2.3.3.patch b/patches/cryptsetup-2.3.3.patch
new file mode 100644
index 00000000..644d9a6c
--- /dev/null
+++ b/patches/cryptsetup-2.3.3.patch
@@ -0,0 +1,527 @@
+diff -u -r cryptsetup-2.3.3-clean/configure cryptsetup-2.3.3/configure
+--- cryptsetup-2.3.3-clean/configure	2020-06-10 14:05:45.784925972 +0200
++++ cryptsetup-2.3.3/configure	2020-06-10 14:12:03.811651237 +0200
+@@ -10206,7 +10206,7 @@
+   hardcode_automatic=no
+   hardcode_direct=no
+   hardcode_direct_absolute=no
+-  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec=" "
+   hardcode_libdir_separator=
+   hardcode_minus_L=no
+   hardcode_shlibpath_var=unsupported
+@@ -10290,7 +10290,7 @@
+     # are reset later if shared libraries are not supported. Putting them
+     # here allows them to be overridden if necessary.
+     runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++    hardcode_libdir_flag_spec=" "
+     export_dynamic_flag_spec='$wl--export-dynamic'
+     # ancient GNU ld didn't support --whole-archive et. al.
+     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+@@ -10336,7 +10336,7 @@
+         ;;
+       m68k)
+             archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_libdir_flag_spec=" "
+             hardcode_minus_L=yes
+         ;;
+       esac
+@@ -10356,7 +10356,7 @@
+     cygwin* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       export_dynamic_flag_spec='$wl--export-all-symbols'
+       allow_undefined_flag=unsupported
+       always_export_symbols=no
+@@ -10386,7 +10386,7 @@
+       ;;
+ 
+     os2*)
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_minus_L=yes
+       allow_undefined_flag=unsupported
+       shrext_cmds=.dll
+@@ -10416,7 +10416,7 @@
+     interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++      hardcode_libdir_flag_spec=" "
+       export_dynamic_flag_spec='$wl-E'
+       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+       # Instead, shared libraries are loaded at an image base (0x10000000 by
+@@ -10492,7 +10492,7 @@
+ 	xlf* | bgf* | bgxlf* | mpixlf*)
+ 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++	  hardcode_libdir_flag_spec=" "
+ 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ 	  if test yes = "$supports_anon_versioning"; then
+ 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+@@ -10559,7 +10559,7 @@
+ 	  # DT_RUNPATH tag from executables and libraries.  But doing so
+ 	  # requires that you compile everything twice, which is a pain.
+ 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++	    hardcode_libdir_flag_spec=" "
+ 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ 	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ 	  else
+@@ -10588,7 +10588,7 @@
+ 
+     if test no = "$ld_shlibs"; then
+       runpath_var=
+-      hardcode_libdir_flag_spec=
++      hardcode_libdir_flag_spec=" "
+       export_dynamic_flag_spec=
+       whole_archive_flag_spec=
+     fi
+@@ -10706,7 +10706,7 @@
+ 	  # path is not listed in the libpath.  Setting hardcode_minus_L
+ 	  # to unsupported forces relinking
+ 	  hardcode_minus_L=yes
+-	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_flag_spec=" "
+ 	  hardcode_libdir_separator=
+ 	  fi
+ 	  ;;
+@@ -10790,11 +10790,11 @@
+   aix_libpath=$lt_cv_aix_libpath_
+ fi
+ 
+-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
++        hardcode_libdir_flag_spec=" "
+         archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+       else
+ 	if test ia64 = "$host_cpu"; then
+-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
++	  hardcode_libdir_flag_spec=" "
+ 	  allow_undefined_flag="-z nodefs"
+ 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+ 	else
+@@ -10843,7 +10843,7 @@
+   aix_libpath=$lt_cv_aix_libpath_
+ fi
+ 
+-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
++	 hardcode_libdir_flag_spec=" "
+ 	  # Warning - without using the other run time loading flags,
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  no_undefined_flag=' $wl-bernotok'
+@@ -10883,7 +10883,7 @@
+         ;;
+       m68k)
+             archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_libdir_flag_spec=" "
+             hardcode_minus_L=yes
+         ;;
+       esac
+@@ -10901,7 +10901,7 @@
+       case $cc_basename in
+       cl*)
+ 	# Native MSVC
+-	hardcode_libdir_flag_spec=' '
++	hardcode_libdir_flag_spec=" "
+ 	allow_undefined_flag=unsupported
+ 	always_export_symbols=yes
+ 	file_list_spec='@'
+@@ -10942,7 +10942,7 @@
+ 	;;
+       *)
+ 	# Assume MSVC wrapper
+-	hardcode_libdir_flag_spec=' '
++	hardcode_libdir_flag_spec=" "
+ 	allow_undefined_flag=unsupported
+ 	# Tell ltmain to make .lib files, not .a files.
+ 	libext=lib
+@@ -10993,7 +10993,7 @@
+ 
+     dgux*)
+       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_shlibpath_var=no
+       ;;
+ 
+@@ -11003,7 +11003,7 @@
+     # extra space).
+     freebsd2.2*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -11019,7 +11019,7 @@
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd* | dragonfly*)
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -11030,7 +11030,7 @@
+       else
+ 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+       fi
+-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_libdir_separator=:
+       hardcode_direct=yes
+ 
+@@ -11047,7 +11047,7 @@
+ 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+       fi
+       if test no = "$with_gnu_ld"; then
+-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++	hardcode_libdir_flag_spec=" "
+ 	hardcode_libdir_separator=:
+ 	hardcode_direct=yes
+ 	hardcode_direct_absolute=yes
+@@ -11124,7 +11124,7 @@
+ 	esac
+       fi
+       if test no = "$with_gnu_ld"; then
+-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++	hardcode_libdir_flag_spec=" "
+ 	hardcode_libdir_separator=:
+ 
+ 	case $host_cpu in
+@@ -11183,7 +11183,7 @@
+ 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+       fi
+       archive_cmds_need_lc='no'
+-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_libdir_separator=:
+       inherit_rpath=yes
+       link_all_deplibs=yes
+@@ -11205,7 +11205,7 @@
+       else
+ 	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+       fi
+-      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -11213,7 +11213,7 @@
+     newsos6)
+       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_direct=yes
+-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_libdir_separator=:
+       hardcode_shlibpath_var=no
+       ;;
+@@ -11229,11 +11229,11 @@
+ 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++	  hardcode_libdir_flag_spec=" "
+ 	  export_dynamic_flag_spec='$wl-E'
+ 	else
+ 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++	  hardcode_libdir_flag_spec=" "
+ 	fi
+       else
+ 	ld_shlibs=no
+@@ -11241,7 +11241,7 @@
+       ;;
+ 
+     os2*)
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_minus_L=yes
+       allow_undefined_flag=unsupported
+       shrext_cmds=.dll
+@@ -11277,7 +11277,7 @@
+ 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+       fi
+       archive_cmds_need_lc='no'
+-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_libdir_separator=:
+       ;;
+ 
+@@ -11285,7 +11285,7 @@
+       if test yes = "$GCC"; then
+ 	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ 	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++	hardcode_libdir_flag_spec=" "
+       else
+ 	allow_undefined_flag=' -expect_unresolved \*'
+ 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+@@ -11293,7 +11293,7 @@
+           $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec='-rpath $libdir'
++	hardcode_libdir_flag_spec=" "
+       fi
+       archive_cmds_need_lc='no'
+       hardcode_libdir_separator=:
+@@ -11322,7 +11322,7 @@
+ 	  ;;
+ 	esac
+       fi
+-      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_shlibpath_var=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+@@ -11349,7 +11349,7 @@
+       else
+ 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_direct=yes
+       hardcode_minus_L=yes
+       hardcode_shlibpath_var=no
+@@ -11419,7 +11419,7 @@
+       allow_undefined_flag='$wl-z,nodefs'
+       archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+-      hardcode_libdir_flag_spec='$wl-R,$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_libdir_separator=':'
+       link_all_deplibs=yes
+       export_dynamic_flag_spec='$wl-Bexport'
+@@ -11436,7 +11436,7 @@
+ 
+     uts4*)
+       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_libdir_flag_spec=" "
+       hardcode_shlibpath_var=no
+       ;;
+ 
+@@ -11804,7 +11804,7 @@
+   version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   if test ia64 = "$host_cpu"; then
+     # AIX 5 supports IA64
+     library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+@@ -12094,16 +12094,16 @@
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++    hardcode_into_libs=no
+     ;;
+   freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+   freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
++    hardcode_into_libs=no
+     ;;
+   *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++    hardcode_into_libs=no
+     ;;
+   esac
+   ;;
+@@ -12118,7 +12118,7 @@
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+@@ -12130,7 +12130,7 @@
+   case $host_cpu in
+   ia64*)
+     shrext_cmds='.so'
+-    hardcode_into_libs=yes
++    hardcode_into_libs=no
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+@@ -12146,7 +12146,7 @@
+     ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+-    hardcode_into_libs=yes
++    hardcode_into_libs=no
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+@@ -12179,7 +12179,7 @@
+   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+@@ -12216,7 +12216,7 @@
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+   sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+@@ -12237,11 +12237,11 @@
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+ 
+   dynamic_linker='Android linker'
+   # Don't embed -rpath directories since the linker doesn't support them.
+-  hardcode_libdir_flag_spec='-L$libdir'
++  hardcode_libdir_flag_spec=" "
+   ;;
+ 
+ # This must be glibc/ELF.
+@@ -12292,7 +12292,7 @@
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+ 
+   # Ideally, we could use ldconfig to report *all* directores which are
+   # searched for libraries, however this is still not possible.  Aside from not
+@@ -12322,7 +12322,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+@@ -12341,7 +12341,7 @@
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   ;;
+ 
+ newsos6)
+@@ -12359,7 +12359,7 @@
+   soname_spec='$libname$release$shared_ext$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   dynamic_linker='ldqnx.so'
+   ;;
+ 
+@@ -12431,7 +12431,7 @@
+   soname_spec='$libname$release$shared_ext$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   # ldd complains unless libraries are executable
+   postinstall_cmds='chmod +x $lib'
+   ;;
+@@ -12488,7 +12488,7 @@
+   soname_spec='$libname$release$shared_ext$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   if test yes = "$with_gnu_ld"; then
+     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+   else
+@@ -12510,7 +12510,7 @@
+   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
++  hardcode_into_libs=no
+   ;;
+ 
+ uts4*)
+@@ -13610,7 +13610,7 @@
+   acl_shlibext="$acl_cv_shlibext"
+   acl_libname_spec="$acl_cv_libname_spec"
+   acl_library_names_spec="$acl_cv_library_names_spec"
+-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++  acl_hardcode_libdir_flag_spec=" "
+   acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+   acl_hardcode_direct="$acl_cv_hardcode_direct"
+   acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+@@ -21296,7 +21296,7 @@
+ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec=" "
+ hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+@@ -21327,7 +21327,7 @@
+ postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
++hardcode_into_libs=no
+ sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+ configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+ configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+@@ -22485,7 +22485,7 @@
+ finish_eval=$lt_finish_eval
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+ 
+ # Compile-time system search path for libraries.
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+@@ -22582,7 +22582,7 @@
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++hardcode_libdir_flag_spec=" "
+ 
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+diff -u -r cryptsetup-2.3.3-clean/Makefile.in cryptsetup-2.3.3/Makefile.in
+--- cryptsetup-2.3.3-clean/Makefile.in	2020-06-10 14:05:45.781594282 +0200
++++ cryptsetup-2.3.3/Makefile.in	2020-06-10 14:30:09.512375745 +0200
+@@ -1032,6 +1032,8 @@
+ @CRYPTSETUP_TRUE@cryptsetup_LDADD = $(LDADD)	\
+ @CRYPTSETUP_TRUE@	libcryptsetup.la	\
+ @CRYPTSETUP_TRUE@	@POPT_LIBS@		\
++@CRYPTSETUP_TRUE@	@UUID_LIBS@		\
++@CRYPTSETUP_TRUE@	@DEVMAPPER_LIBS@	\
+ @CRYPTSETUP_TRUE@	@PWQUALITY_LIBS@	\
+ @CRYPTSETUP_TRUE@	@PASSWDQC_LIBS@		\
+ @CRYPTSETUP_TRUE@	@UUID_LIBS@		\
+@@ -1060,6 +1062,8 @@
+ @VERITYSETUP_TRUE@veritysetup_LDADD = $(LDADD)	\
+ @VERITYSETUP_TRUE@	libcryptsetup.la	\
+ @VERITYSETUP_TRUE@	@POPT_LIBS@		\
++@VERITYSETUP_TRUE@	@UUID_LIBS@		\
++@VERITYSETUP_TRUE@	@DEVMAPPER_LIBS@	\
+ @VERITYSETUP_TRUE@	@PWQUALITY_LIBS@	\
+ @VERITYSETUP_TRUE@	@PASSWDQC_LIBS@		\
+ @VERITYSETUP_TRUE@	@BLKID_LIBS@