ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cryptsetup-2.3' of https://github.com/hardenedvault/heads into tpm2

Browse Source
This commit is contained in:
Trammell Hudson 2020-11-20 10:45:57 -05:00
commit aebcdbf31e
6 changed files with 157 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -167,7 +167,7 @@ heads_cc := $(CROSS)gcc \
-fdebug-prefix-map=$(pwd)=heads \ -fdebug-prefix-map=$(pwd)=heads \
-gno-record-gcc-switches \ -gno-record-gcc-switches \
-D__MUSL__ \ -D__MUSL__ \
-I$(INSTALL)/include \ -isystem $(INSTALL)/include \
-L$(INSTALL)/lib \ -L$(INSTALL)/lib \
CROSS_TOOLS_NOCC := \ CROSS_TOOLS_NOCC := \

0
initrd/run/cryptsetup/.placeholder Normal file
View File

18
modules/cryptsetup
View File

@ -1,12 +1,12 @@
modules-$(CONFIG_CRYPTSETUP) += cryptsetup modules-$(CONFIG_CRYPTSETUP) += cryptsetup
cryptsetup_depends := util-linux popt lvm2 $(musl_dep) cryptsetup_depends := util-linux popt lvm2 json-c $(musl_dep)
cryptsetup_version := 1.7.3 cryptsetup_version := 2.3.3
cryptsetup_dir := cryptsetup-$(cryptsetup_version) cryptsetup_dir := cryptsetup-$(cryptsetup_version)
cryptsetup_tar := cryptsetup-$(cryptsetup_version).tar.xz cryptsetup_tar := cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-$(cryptsetup_version).tar.xz cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_hash := af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 cryptsetup_hash := 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df
# Use an empty prefix so that the executables will not include the # Use an empty prefix so that the executables will not include the
# build path. # build path.
@ -14,9 +14,11 @@ cryptsetup_configure := ./configure \
$(CROSS_TOOLS) \ $(CROSS_TOOLS) \
--host i386-elf-linux \ --host i386-elf-linux \
--prefix "/" \ --prefix "/" \
--disable-rpath \
--disable-gcrypt-pbkdf2 \ --disable-gcrypt-pbkdf2 \
--enable-cryptsetup-reencrypt \ --enable-cryptsetup-reencrypt \
--with-crypto_backend=kernel \ --with-crypto_backend=kernel \
--with-tmpfilesdir=$(INSTALL)/lib/tmpfiles.d
# but after building, replace prefix so that they will be installed # but after building, replace prefix so that they will be installed
# in the correct directory. # in the correct directory.
@ -28,10 +30,10 @@ cryptsetup_target := \
install install
cryptsetup_output := \ cryptsetup_output := \
src/.libs/cryptsetup \ .libs/cryptsetup \
src/.libs/cryptsetup-reencrypt \ .libs/cryptsetup-reencrypt \
src/.libs/veritysetup \ .libs/veritysetup \
cryptsetup_libraries := \ cryptsetup_libraries := \
lib/.libs/libcryptsetup.so.4 \ .libs/libcryptsetup.so.12 \

37
modules/json-c Normal file
View File

@ -0,0 +1,37 @@
modules-$(CONFIG_CRYPTSETUP) += json-c
json-c_version := 0.14
json-c_dir := json-c-$(json-c_version)
json-c_tar := json-c-$(json-c_version).tar.gz
json-c_url := https://s3.amazonaws.com/json-c_releases/releases/json-c-$(json-c_version)-nodoc.tar.gz
json-c_hash := 99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa
# there is a bug in cmake-configure so that it can not be used with a "=", fxed in next
# release though (then it needs to read '--prefix="$(INSTALL)"' here instead
define toolchain_file =
set\(CMAKE_SYSTEM_NAME Linux\)\n\
set\(CMAKE_SYSROOT $(INSTALL)\)\n\
set\(CMAKE_C_COMPILER $(CROSS)gcc\)\n\
set\(CMAKE_AR $(CROSS)ar\)\n\
set\(CMAKE_LINKER $(CROSS)ld\)\n\
set\(CMAKE_NM $(CROSS)nm\)\n\
set\(CMAKE_OBJCOPY $(CROSS)objcopy\)\n\
set\(CMAKE_OBJDUMP $(CROSS)objdump\)\n\
set\(INSTALL_PKGCONFIG_DIR $(INSTALL)/lib/pkgconfig\)\n\
set\(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER\)\n\
set\(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY\)\n\
set\(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY\)\n\
set\(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY\)
endef
json-c_configure := \
echo -e "$(toolchain_file)" | sed 's/\\//g' > toolchain && \
mkdir -p build && \
cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$(INSTALL)" -DCMAKE_TOOLCHAIN_FILE=../toolchain
json-c_target := \
$(CROSS_TOOLS) -C $(build)/$(json-c_dir)/build \
all install
json-c_libraries := build/libjson-c.so.5

11
modules/util-linux
View File

@ -26,11 +26,12 @@ util-linux_target := \
$(MAKE_JOBS) \ $(MAKE_JOBS) \
$(CROSS_TOOLS) \ $(CROSS_TOOLS) \
DESTDIR="$(INSTALL)" \ DESTDIR="$(INSTALL)" \
install install && \
rm $(INSTALL)/lib/libblkid.la && \
rm $(INSTALL)/lib/libuuid.la
util-linux_libraries += .libs/libuuid.so.1 util-linux_libraries += \
.libs/libuuid.so.1 \
# libblkid is not needed by lvm2, so it is not installed now .libs/libblkid.so.1 \
#util-linux_libraries += .libs/libblkid.so.1
util-linux_depends := $(musl_dep) util-linux_depends := $(musl_dep)

183
patches/cryptsetup-1.7.3.patch → patches/cryptsetup-2.3.3.patch
View File

@ -1,7 +1,7 @@
diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure diff -u -r cryptsetup-2.3.3-clean/configure cryptsetup-2.3.3/configure
--- cryptsetup-1.7.3-clean/configure 2016-10-28 06:45:06.000000000 -0700 --- cryptsetup-2.3.3-clean/configure 2020-06-10 14:05:45.784925972 +0200
+++ cryptsetup-1.7.3/configure 2020-01-12 14:12:13.835035728 -0800 +++ cryptsetup-2.3.3/configure 2020-06-10 14:12:03.811651237 +0200
@@ -10113,7 +10113,7 @@ @@ -10206,7 +10206,7 @@
hardcode_automatic=no hardcode_automatic=no
hardcode_direct=no hardcode_direct=no
hardcode_direct_absolute=no hardcode_direct_absolute=no
@ -10,7 +10,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator= hardcode_libdir_separator=
hardcode_minus_L=no hardcode_minus_L=no
hardcode_shlibpath_var=unsupported hardcode_shlibpath_var=unsupported
@@ -10197,7 +10197,7 @@ @@ -10290,7 +10290,7 @@
# are reset later if shared libraries are not supported. Putting them # are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary. # here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH runpath_var=LD_RUN_PATH
@ -19,7 +19,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
export_dynamic_flag_spec='$wl--export-dynamic' export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al. # ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
@@ -10243,7 +10243,7 @@ @@ -10336,7 +10336,7 @@
;; ;;
m68k) 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)' 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)'
@ -28,7 +28,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_minus_L=yes hardcode_minus_L=yes
;; ;;
esac esac
@@ -10263,7 +10263,7 @@ @@ -10356,7 +10356,7 @@
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs. # as there is no search path for DLLs.
@ -37,7 +37,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
export_dynamic_flag_spec='$wl--export-all-symbols' export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
always_export_symbols=no always_export_symbols=no
@@ -10293,7 +10293,7 @@ @@ -10386,7 +10386,7 @@
;; ;;
os2*) os2*)
@ -46,7 +46,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_minus_L=yes hardcode_minus_L=yes
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
shrext_cmds=.dll shrext_cmds=.dll
@@ -10323,7 +10323,7 @@ @@ -10416,7 +10416,7 @@
interix[3-9]*) interix[3-9]*)
hardcode_direct=no hardcode_direct=no
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
@ -55,7 +55,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
export_dynamic_flag_spec='$wl-E' export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # 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 # Instead, shared libraries are loaded at an image base (0x10000000 by
@@ -10399,7 +10399,7 @@ @@ -10492,7 +10492,7 @@
xlf* | bgf* | bgxlf* | mpixlf*) xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@ -64,7 +64,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test yes = "$supports_anon_versioning"; then if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10466,7 +10466,7 @@ @@ -10559,7 +10559,7 @@
# DT_RUNPATH tag from executables and libraries. But doing so # DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain. # requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@ -73,7 +73,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 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' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else else
@@ -10495,7 +10495,7 @@ @@ -10588,7 +10588,7 @@
if test no = "$ld_shlibs"; then if test no = "$ld_shlibs"; then
runpath_var= runpath_var=
@ -82,7 +82,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
export_dynamic_flag_spec= export_dynamic_flag_spec=
whole_archive_flag_spec= whole_archive_flag_spec=
fi fi
@@ -10613,7 +10613,7 @@ @@ -10706,7 +10706,7 @@
# path is not listed in the libpath. Setting hardcode_minus_L # path is not listed in the libpath. Setting hardcode_minus_L
# to unsupported forces relinking # to unsupported forces relinking
hardcode_minus_L=yes hardcode_minus_L=yes
@ -91,7 +91,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator= hardcode_libdir_separator=
fi fi
;; ;;
@@ -10697,11 +10697,11 @@ @@ -10790,11 +10790,11 @@
aix_libpath=$lt_cv_aix_libpath_ aix_libpath=$lt_cv_aix_libpath_
fi fi
@ -105,7 +105,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
allow_undefined_flag="-z nodefs" 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" 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 else
@@ -10750,7 +10750,7 @@ @@ -10843,7 +10843,7 @@
aix_libpath=$lt_cv_aix_libpath_ aix_libpath=$lt_cv_aix_libpath_
fi fi
@ -114,7 +114,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
# Warning - without using the other run time loading flags, # Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library. # -berok will link without error, but may produce a broken library.
no_undefined_flag=' $wl-bernotok' no_undefined_flag=' $wl-bernotok'
@@ -10790,7 +10790,7 @@ @@ -10883,7 +10883,7 @@
;; ;;
m68k) 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)' 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)'
@ -123,7 +123,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_minus_L=yes hardcode_minus_L=yes
;; ;;
esac esac
@@ -10808,7 +10808,7 @@ @@ -10901,7 +10901,7 @@
case $cc_basename in case $cc_basename in
cl*) cl*)
# Native MSVC # Native MSVC
@ -132,7 +132,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
always_export_symbols=yes always_export_symbols=yes
file_list_spec='@' file_list_spec='@'
@@ -10849,7 +10849,7 @@ @@ -10942,7 +10942,7 @@
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC wrapper
@ -141,7 +141,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
# Tell ltmain to make .lib files, not .a files. # Tell ltmain to make .lib files, not .a files.
libext=lib libext=lib
@@ -10900,7 +10900,7 @@ @@ -10993,7 +10993,7 @@
dgux*) dgux*)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@ -150,7 +150,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -10910,7 +10910,7 @@ @@ -11003,7 +11003,7 @@
# extra space). # extra space).
freebsd2.2*) freebsd2.2*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
@ -159,7 +159,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -10926,7 +10926,7 @@ @@ -11019,7 +11019,7 @@
# FreeBSD 3 and greater uses gcc -shared to do shared libraries. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*) freebsd* | dragonfly*)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@ -168,7 +168,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -10937,7 +10937,7 @@ @@ -11030,7 +11030,7 @@
else 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' 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 fi
@ -177,7 +177,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
hardcode_direct=yes hardcode_direct=yes
@@ -10954,7 +10954,7 @@ @@ -11047,7 +11047,7 @@
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi fi
if test no = "$with_gnu_ld"; then if test no = "$with_gnu_ld"; then
@ -186,7 +186,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
hardcode_direct=yes hardcode_direct=yes
hardcode_direct_absolute=yes hardcode_direct_absolute=yes
@@ -11031,7 +11031,7 @@ @@ -11124,7 +11124,7 @@
esac esac
fi fi
if test no = "$with_gnu_ld"; then if test no = "$with_gnu_ld"; then
@ -195,7 +195,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
case $host_cpu in case $host_cpu in
@@ -11090,7 +11090,7 @@ @@ -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' 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 fi
archive_cmds_need_lc='no' archive_cmds_need_lc='no'
@ -204,7 +204,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
inherit_rpath=yes inherit_rpath=yes
link_all_deplibs=yes link_all_deplibs=yes
@@ -11112,7 +11112,7 @@ @@ -11205,7 +11205,7 @@
else else
archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
fi fi
@ -213,7 +213,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -11120,7 +11120,7 @@ @@ -11213,7 +11213,7 @@
newsos6) newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes hardcode_direct=yes
@ -222,7 +222,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -11136,11 +11136,11 @@ @@ -11229,11 +11229,11 @@
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 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' archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
@ -236,7 +236,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
fi fi
else else
ld_shlibs=no ld_shlibs=no
@@ -11148,7 +11148,7 @@ @@ -11241,7 +11241,7 @@
;; ;;
os2*) os2*)
@ -245,7 +245,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_minus_L=yes hardcode_minus_L=yes
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
shrext_cmds=.dll shrext_cmds=.dll
@@ -11184,7 +11184,7 @@ @@ -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' 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 fi
archive_cmds_need_lc='no' archive_cmds_need_lc='no'
@ -254,7 +254,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=: hardcode_libdir_separator=:
;; ;;
@@ -11192,7 +11192,7 @@ @@ -11285,7 +11285,7 @@
if test yes = "$GCC"; then if test yes = "$GCC"; then
allow_undefined_flag=' $wl-expect_unresolved $wl\*' 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' 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'
@ -263,7 +263,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
else else
allow_undefined_flag=' -expect_unresolved \*' 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' 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'
@@ -11200,7 +11200,7 @@ @@ -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' $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 # Both c and cxx compiler support -rpath directly
@ -272,7 +272,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
fi fi
archive_cmds_need_lc='no' archive_cmds_need_lc='no'
hardcode_libdir_separator=: hardcode_libdir_separator=:
@@ -11229,7 +11229,7 @@ @@ -11322,7 +11322,7 @@
;; ;;
esac esac
fi fi
@ -281,7 +281,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
case $host_os in case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;; solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11256,7 +11256,7 @@ @@ -11349,7 +11349,7 @@
else else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi fi
@ -290,7 +290,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_direct=yes hardcode_direct=yes
hardcode_minus_L=yes hardcode_minus_L=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
@@ -11326,7 +11326,7 @@ @@ -11419,7 +11419,7 @@
allow_undefined_flag='$wl-z,nodefs' allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no archive_cmds_need_lc=no
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
@ -299,7 +299,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator=':' hardcode_libdir_separator=':'
link_all_deplibs=yes link_all_deplibs=yes
export_dynamic_flag_spec='$wl-Bexport' export_dynamic_flag_spec='$wl-Bexport'
@@ -11343,7 +11343,7 @@ @@ -11436,7 +11436,7 @@
uts4*) uts4*)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@ -308,7 +308,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
@@ -11711,7 +11711,7 @@ @@ -11804,7 +11804,7 @@
version_type=linux # correct to gnu/linux during the next big refactor version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
@ -317,7 +317,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
if test ia64 = "$host_cpu"; then if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
@@ -12001,16 +12001,16 @@ @@ -12094,16 +12094,16 @@
;; ;;
freebsd3.[01]* | freebsdelf3.[01]*) freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
@ -337,7 +337,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
esac esac
;; ;;
@@ -12025,7 +12025,7 @@ @@ -12118,7 +12118,7 @@
shlibpath_var=LIBRARY_PATH shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@ -346,7 +346,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
hpux9* | hpux10* | hpux11*) hpux9* | hpux10* | hpux11*)
@@ -12037,7 +12037,7 @@ @@ -12130,7 +12130,7 @@
case $host_cpu in case $host_cpu in
ia64*) ia64*)
shrext_cmds='.so' shrext_cmds='.so'
@ -355,7 +355,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
dynamic_linker="$host_os dld.so" dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
@@ -12053,7 +12053,7 @@ @@ -12146,7 +12146,7 @@
;; ;;
hppa*64*) hppa*64*)
shrext_cmds='.sl' shrext_cmds='.sl'
@ -364,7 +364,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
dynamic_linker="$host_os dld.sl" dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
@@ -12086,7 +12086,7 @@ @@ -12179,7 +12179,7 @@
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
@ -373,7 +373,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6* | nonstopux*)
@@ -12123,7 +12123,7 @@ @@ -12216,7 +12216,7 @@
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
@ -382,7 +382,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
# No shared lib support for Linux oldld, aout, or coff. # No shared lib support for Linux oldld, aout, or coff.
@@ -12144,11 +12144,11 @@ @@ -12237,11 +12237,11 @@
# This implies no fast_install, which is unacceptable. # This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install # Some rework will be needed to allow for fast_install
# before this can be enabled. # before this can be enabled.
@ -396,7 +396,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
# This must be glibc/ELF. # This must be glibc/ELF.
@@ -12199,7 +12199,7 @@ @@ -12292,7 +12292,7 @@
# This implies no fast_install, which is unacceptable. # This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install # Some rework will be needed to allow for fast_install
# before this can be enabled. # before this can be enabled.
@ -405,7 +405,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
# Ideally, we could use ldconfig to report *all* directores which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
@@ -12229,7 +12229,7 @@ @@ -12322,7 +12322,7 @@
soname_spec='${libname}${release}${shared_ext}$major' soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
@ -414,7 +414,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
dynamic_linker='NetBSD ld.elf_so' dynamic_linker='NetBSD ld.elf_so'
;; ;;
@@ -12248,7 +12248,7 @@ @@ -12341,7 +12341,7 @@
fi fi
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
@ -423,7 +423,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
newsos6) newsos6)
@@ -12266,7 +12266,7 @@ @@ -12359,7 +12359,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
@ -432,7 +432,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
dynamic_linker='ldqnx.so' dynamic_linker='ldqnx.so'
;; ;;
@@ -12338,7 +12338,7 @@ @@ -12431,7 +12431,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
@ -441,7 +441,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
# ldd complains unless libraries are executable # ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib' postinstall_cmds='chmod +x $lib'
;; ;;
@@ -12395,7 +12395,7 @@ @@ -12488,7 +12488,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
@ -450,7 +450,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
if test yes = "$with_gnu_ld"; then if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else else
@@ -12417,7 +12417,7 @@ @@ -12510,7 +12510,7 @@
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
@ -459,16 +459,16 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
;; ;;
uts4*) uts4*)
@@ -14964,7 +14964,7 @@ @@ -13610,7 +13610,7 @@
wl="$acl_cv_wl" acl_shlibext="$acl_cv_shlibext"
libext="$acl_cv_libext" acl_libname_spec="$acl_cv_libname_spec"
shlibext="$acl_cv_shlibext" acl_library_names_spec="$acl_cv_library_names_spec"
- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_flag_spec=" " + acl_hardcode_libdir_flag_spec=" "
hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_direct="$acl_cv_hardcode_direct"
hardcode_minus_L="$acl_cv_hardcode_minus_L" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
@@ -19683,7 +19683,7 @@ @@ -21296,7 +21296,7 @@
with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $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"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
@ -477,7 +477,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
hardcode_direct='`$ECHO "$hardcode_direct" | $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"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -19714,7 +19714,7 @@ @@ -21327,7 +21327,7 @@
postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
finish_cmds='`$ECHO "$finish_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"`' finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
@ -486,7 +486,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' 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_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"`' configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
@@ -20877,7 +20877,7 @@ @@ -22485,7 +22485,7 @@
finish_eval=$lt_finish_eval finish_eval=$lt_finish_eval
# Whether we should hardcode library paths into libraries. # Whether we should hardcode library paths into libraries.
@ -495,7 +495,7 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
# Compile-time system search path for libraries. # Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
@@ -20974,7 +20974,7 @@ @@ -22582,7 +22582,7 @@
# Flag to hardcode \$libdir into a binary during linking. # Flag to hardcode \$libdir into a binary during linking.
# This must work even if \$libdir does not exist # This must work even if \$libdir does not exist
@ -504,24 +504,43 @@ diff -u -r cryptsetup-1.7.3-clean/configure cryptsetup-1.7.3/configure
# Whether we need a single "-rpath" flag with a separated argument. # Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator hardcode_libdir_separator=$lt_hardcode_libdir_separator
diff -u -r cryptsetup-1.7.3-clean/src/Makefile.in cryptsetup-1.7.3/src/Makefile.in diff -u -r cryptsetup-2.3.3-clean/Makefile.in cryptsetup-2.3.3/Makefile.in
--- cryptsetup-1.7.3-clean/src/Makefile.in 2016-10-28 06:45:06.000000000 -0700 --- cryptsetup-2.3.3-clean/Makefile.in 2020-06-10 14:05:45.781594282 +0200
+++ cryptsetup-1.7.3/src/Makefile.in 2020-01-12 13:42:22.744734385 -0800 +++ cryptsetup-2.3.3/Makefile.in 2020-06-10 14:30:09.512375745 +0200
@@ -479,6 +479,8 @@ @@ -1032,6 +1032,8 @@
cryptsetup_LDADD = \ @CRYPTSETUP_TRUE@cryptsetup_LDADD = $(LDADD) \
$(top_builddir)/lib/libcryptsetup.la \ @CRYPTSETUP_TRUE@ libcryptsetup.la \
@POPT_LIBS@ \ @CRYPTSETUP_TRUE@ @POPT_LIBS@ \
+ @UUID_LIBS@ \ +@CRYPTSETUP_TRUE@ @DEVMAPPER_LIBS@ \
+ @DEVMAPPER_LIBS@ \ +@CRYPTSETUP_TRUE@ @JSON_C_LIBS@ \
@PWQUALITY_LIBS@ \ @CRYPTSETUP_TRUE@ @PWQUALITY_LIBS@ \
@PASSWDQC_LIBS@ @CRYPTSETUP_TRUE@ @PASSWDQC_LIBS@ \
@CRYPTSETUP_TRUE@ @UUID_LIBS@ \
@@ -503,6 +505,8 @@ @@ -1060,6 +1062,9 @@
@VERITYSETUP_TRUE@veritysetup_LDADD = $(LDADD) \
@VERITYSETUP_TRUE@veritysetup_LDADD = \ @VERITYSETUP_TRUE@ libcryptsetup.la \
@VERITYSETUP_TRUE@ $(top_builddir)/lib/libcryptsetup.la \ @VERITYSETUP_TRUE@ @POPT_LIBS@ \
+@VERITYSETUP_TRUE@ @UUID_LIBS@ \ +@VERITYSETUP_TRUE@ @UUID_LIBS@ \
+@VERITYSETUP_TRUE@ @DEVMAPPER_LIBS@ \ +@VERITYSETUP_TRUE@ @DEVMAPPER_LIBS@ \
@VERITYSETUP_TRUE@ @POPT_LIBS@ +@VERITYSETUP_TRUE@ @JSON_C_LIBS@ \
@VERITYSETUP_TRUE@ @PWQUALITY_LIBS@ \
@VERITYSETUP_TRUE@ @PASSWDQC_LIBS@ \
@VERITYSETUP_TRUE@ @BLKID_LIBS@
@@ -1093,6 +1093,8 @@
@INTEGRITYSETUP_TRUE@ libcryptsetup.la \
@INTEGRITYSETUP_TRUE@ @POPT_LIBS@ \
@INTEGRITYSETUP_TRUE@ @UUID_LIBS@ \
+@INTEGRITYSETUP_TRUE@ @DEVMAPPER_LIBS@ \
+@INTEGRITYSETUP_TRUE@ @JSON_C_LIBS@ \
@INTEGRITYSETUP_TRUE@ @BLKID_LIBS@
@INTEGRITYSETUP_TRUE@@STATIC_TOOLS_TRUE@integritysetup_static_SOURCES = $(integritysetup_SOURCES)
@@ -1122,6 +1122,8 @@
@REENCRYPT_TRUE@ @POPT_LIBS@ \
@REENCRYPT_TRUE@ @PWQUALITY_LIBS@ \
@REENCRYPT_TRUE@ @PASSWDQC_LIBS@ \
+@REENCRYPT_TRUE@ @DEVMAPPER_LIBS@ \
+@REENCRYPT_TRUE@ @JSON_C_LIBS@ \
@REENCRYPT_TRUE@ @UUID_LIBS@ \
@REENCRYPT_TRUE@ @BLKID_LIBS@
@VERITYSETUP_TRUE@veritysetup_CFLAGS = $(cryptsetup_CFLAGS)