"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure" between
cryptsetup-2.0.6.tar.xz and cryptsetup-2.1.0.tar.xz

About: cryptsetup is a utility used to conveniently setup disk encryption based on the dm-crypt kernel module. These include plain dm-crypt volumes, LUKS volumes, loop-AES and TrueCrypt compatible format.

configure  (cryptsetup-2.0.6.tar.xz):configure  (cryptsetup-2.1.0.tar.xz)
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for cryptsetup 2.0.6. # Generated by GNU Autoconf 2.69 for cryptsetup 2.1.0.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
# #
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it. # gives unlimited permission to copy, distribute and modify it.
## -------------------- ## ## -------------------- ##
## M4sh Initialization. ## ## M4sh Initialization. ##
## -------------------- ## ## -------------------- ##
skipping to change at line 583 skipping to change at line 583
ac_config_libobj_dir=. ac_config_libobj_dir=.
LIBOBJS= LIBOBJS=
cross_compiling=no cross_compiling=no
subdirs= subdirs=
MFLAGS= MFLAGS=
MAKEFLAGS= MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='cryptsetup' PACKAGE_NAME='cryptsetup'
PACKAGE_TARNAME='cryptsetup' PACKAGE_TARNAME='cryptsetup'
PACKAGE_VERSION='2.0.6' PACKAGE_VERSION='2.1.0'
PACKAGE_STRING='cryptsetup 2.0.6' PACKAGE_STRING='cryptsetup 2.1.0'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
ac_unique_file="src/cryptsetup.c" ac_unique_file="src/cryptsetup.c"
ac_default_prefix=/usr ac_default_prefix=/usr
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
# include <sys/types.h> # include <sys/types.h>
skipping to change at line 636 skipping to change at line 636
gt_needs= gt_needs=
ac_subst_vars='am__EXEEXT_FALSE ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIBOBJS LIBOBJS
DEFAULT_LUKS2_LOCK_DIR_PERMS DEFAULT_LUKS2_LOCK_DIR_PERMS
DEFAULT_LUKS2_LOCK_PATH DEFAULT_LUKS2_LOCK_PATH
CRYPTSETUP_TMPFILE_FALSE CRYPTSETUP_TMPFILE_FALSE
CRYPTSETUP_TMPFILE_TRUE CRYPTSETUP_TMPFILE_TRUE
DEFAULT_TMPFILESDIR DEFAULT_TMPFILESDIR
PYTHON_CRYPTSETUP_FALSE
PYTHON_CRYPTSETUP_TRUE
PYTHON_LIBS
PYTHON_INCLUDES
PYTHON_CONFIG
pkgpyexecdir
pyexecdir
pkgpythondir
pythondir
PYTHON_PLATFORM
PYTHON_EXEC_PREFIX
PYTHON_PREFIX
PYTHON_VERSION
PYTHON
LIBCRYPTSETUP_VERSION_INFO LIBCRYPTSETUP_VERSION_INFO
LIBCRYPTSETUP_VERSION LIBCRYPTSETUP_VERSION
CRYPTO_STATIC_LIBS CRYPTO_STATIC_LIBS
CRYPTO_LIBS CRYPTO_LIBS
CRYPTO_CFLAGS CRYPTO_CFLAGS
PASSWDQC_LIBS PASSWDQC_LIBS
PWQUALITY_STATIC_LIBS PWQUALITY_STATIC_LIBS
systemd_tmpfilesdir systemd_tmpfilesdir
DEVMAPPER_STATIC_LIBS DEVMAPPER_STATIC_LIBS
DEVMAPPER_STATIC_CFLAGS DEVMAPPER_STATIC_CFLAGS
skipping to change at line 887 skipping to change at line 873
enable_udev enable_udev
with_crypto_backend with_crypto_backend
enable_kernel_crypto enable_kernel_crypto
enable_gcrypt_pbkdf2 enable_gcrypt_pbkdf2
with_libgcrypt_prefix with_libgcrypt_prefix
enable_internal_argon2 enable_internal_argon2
enable_libargon2 enable_libargon2
enable_internal_sse_argon2 enable_internal_sse_argon2
enable_blkid enable_blkid
enable_dev_random enable_dev_random
enable_python
with_python_version
with_plain_hash with_plain_hash
with_plain_cipher with_plain_cipher
with_plain_mode with_plain_mode
with_plain_keybits with_plain_keybits
with_luks1_hash with_luks1_hash
with_luks1_cipher with_luks1_cipher
with_luks1_mode with_luks1_mode
with_luks1_keybits with_luks1_keybits
enable_luks_adjust_xts_keysize
with_luks2_pbkdf with_luks2_pbkdf
with_luks1_iter_time with_luks1_iter_time
with_luks2_iter_time with_luks2_iter_time
with_luks2_memory_kb with_luks2_memory_kb
with_luks2_parallel_threads with_luks2_parallel_threads
with_luks2_keyslot_cipher
with_luks2_keyslot_keybits
with_loopaes_cipher with_loopaes_cipher
with_loopaes_keybits with_loopaes_keybits
with_keyfile_size_maxkb with_keyfile_size_maxkb
with_passphrase_size_max with_passphrase_size_max
with_verity_hash with_verity_hash
with_verity_data_block with_verity_data_block
with_verity_hash_block with_verity_hash_block
with_verity_salt_size with_verity_salt_size
with_verity_fec_roots with_verity_fec_roots
with_tmpfilesdir with_tmpfilesdir
skipping to change at line 947 skipping to change at line 934
OPENSSL_STATIC_CFLAGS OPENSSL_STATIC_CFLAGS
OPENSSL_STATIC_LIBS OPENSSL_STATIC_LIBS
NSS_CFLAGS NSS_CFLAGS
NSS_LIBS NSS_LIBS
LIBARGON2_CFLAGS LIBARGON2_CFLAGS
LIBARGON2_LIBS LIBARGON2_LIBS
BLKID_CFLAGS BLKID_CFLAGS
BLKID_LIBS BLKID_LIBS
DEVMAPPER_STATIC_CFLAGS DEVMAPPER_STATIC_CFLAGS
DEVMAPPER_STATIC_LIBS DEVMAPPER_STATIC_LIBS
systemd_tmpfilesdir systemd_tmpfilesdir'
PYTHON'
# Initialize some variables set by options. # Initialize some variables set by options.
ac_init_help= ac_init_help=
ac_init_version=false ac_init_version=false
ac_unrecognized_opts= ac_unrecognized_opts=
ac_unrecognized_sep= ac_unrecognized_sep=
# The variables have the same names as the options, with # The variables have the same names as the options, with
# dashes changed to underlines. # dashes changed to underlines.
cache_file=/dev/null cache_file=/dev/null
exec_prefix=NONE exec_prefix=NONE
skipping to change at line 1496 skipping to change at line 1482
eval ac_cv_env_${ac_var}_value=\$${ac_var} eval ac_cv_env_${ac_var}_value=\$${ac_var}
done done
# #
# Report the --help message. # Report the --help message.
# #
if test "$ac_init_help" = "long"; then if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures cryptsetup 2.0.6 to adapt to many kinds of systems. \`configure' configures cryptsetup 2.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
To assign environment variables (e.g., CC, CFLAGS...), specify them as To assign environment variables (e.g., CC, CFLAGS...), specify them as
VAR=VALUE. See below for descriptions of some of the useful variables. VAR=VALUE. See below for descriptions of some of the useful variables.
Defaults for the options are specified in brackets. Defaults for the options are specified in brackets.
Configuration: Configuration:
-h, --help display this help and exit -h, --help display this help and exit
skipping to change at line 1567 skipping to change at line 1553
--program-transform-name=PROGRAM run sed PROGRAM on installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names
System types: System types:
--build=BUILD configure for building on BUILD [guessed] --build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD] --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF _ACEOF
fi fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of cryptsetup 2.0.6:";; short | recursive ) echo "Configuration of cryptsetup 2.1.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
Optional Features: Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: "make V=1") --enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0") --disable-silent-rules verbose build output (undo: "make V=0")
--enable-dependency-tracking --enable-dependency-tracking
skipping to change at line 1609 skipping to change at line 1595
--disable-cryptsetup disable cryptsetup support --disable-cryptsetup disable cryptsetup support
--disable-veritysetup disable veritysetup support --disable-veritysetup disable veritysetup support
--disable-cryptsetup-reencrypt --disable-cryptsetup-reencrypt
disable cryptsetup-reencrypt tool disable cryptsetup-reencrypt tool
--disable-integritysetup --disable-integritysetup
disable integritysetup support disable integritysetup support
--disable-selinux disable selinux support [default=auto] --disable-selinux disable selinux support [default=auto]
--disable-udev disable udev support --disable-udev disable udev support
--disable-kernel_crypto disable kernel userspace crypto (no benchmark and --disable-kernel_crypto disable kernel userspace crypto (no benchmark and
tcrypt) tcrypt)
--enable-gcrypt-pbkdf2 force enable internal gcrypt PBKDF2 --enable-gcrypt-pbkdf2 force enable internal gcrypt PBKDF2
--disable-internal-argon2 --disable-internal-argon2
disable internal implementation of Argon2 PBKDF disable internal implementation of Argon2 PBKDF
--enable-libargon2 enable external libargon2 (PHC) library (disables --enable-libargon2 enable external libargon2 (PHC) library (disables
internal bundled version) internal bundled version)
--enable-internal-sse-argon2 --enable-internal-sse-argon2
enable internal SSE implementation of Argon2 PBKDF enable internal SSE implementation of Argon2 PBKDF
--disable-blkid disable use of blkid for device signature detection --disable-blkid disable use of blkid for device signature detection
and wiping and wiping
--enable-dev-random use /dev/random by default for key generation --enable-dev-random use /dev/random by default for key generation
(otherwise use /dev/urandom) (otherwise use /dev/urandom)
--enable-python enable Python bindings --disable-luks-adjust-xts-keysize
XTS mode requires two keys, double default LUKS
keysize if needed
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both] both]
--with-aix-soname=aix|svr4|both --with-aix-soname=aix|svr4|both
shared library versioning (aka "SONAME") variant to shared library versioning (aka "SONAME") variant to
provide on AIX, [default=aix]. provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified). compiler's sysroot if not specified).
--with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libd ir --without-libiconv-prefix don't search for libiconv in includedir and libd ir
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir --without-libintl-prefix don't search for libintl in includedir and libdir
--with-crypto_backend=BACKEND --with-crypto_backend=BACKEND
crypto backend (gcrypt/openssl/nss/kernel/nettle) crypto backend (gcrypt/openssl/nss/kernel/nettle)
[gcrypt] [openssl]
--with-libgcrypt-prefix=PFX --with-libgcrypt-prefix=PFX
prefix where LIBGCRYPT is installed (optional) prefix where LIBGCRYPT is installed (optional)
--with-python_version=VERSION
required Python version [2.6]
--with-plain-hash default password hashing function for plain mode --with-plain-hash default password hashing function for plain mode
[ripemd160] [ripemd160]
--with-plain-cipher default cipher for plain mode [aes] --with-plain-cipher default cipher for plain mode [aes]
--with-plain-mode default cipher mode for plain mode --with-plain-mode default cipher mode for plain mode
[cbc-essiv:sha256] [cbc-essiv:sha256]
--with-plain-keybits default key length in bits for plain mode [256] --with-plain-keybits default key length in bits for plain mode [256]
--with-luks1-hash default hash function for LUKS1 header [sha256] --with-luks1-hash default hash function for LUKS1 header [sha256]
--with-luks1-cipher default cipher for LUKS1 [aes] --with-luks1-cipher default cipher for LUKS1 [aes]
--with-luks1-mode default cipher mode for LUKS1 [xts-plain64] --with-luks1-mode default cipher mode for LUKS1 [xts-plain64]
--with-luks1-keybits default key length in bits for LUKS1 [256] --with-luks1-keybits default key length in bits for LUKS1 [256]
skipping to change at line 1666 skipping to change at line 1652
argon2i/argon2id) for LUKS2 [argon2i] argon2i/argon2id) for LUKS2 [argon2i]
--with-luks1-iter-time default PBKDF2 iteration time for LUKS1 (in ms) --with-luks1-iter-time default PBKDF2 iteration time for LUKS1 (in ms)
[2000] [2000]
--with-luks2-iter-time default Argon2 PBKDF iteration time for LUKS2 (in --with-luks2-iter-time default Argon2 PBKDF iteration time for LUKS2 (in
ms) [2000] ms) [2000]
--with-luks2-memory-kb default Argon2 PBKDF memory cost for LUKS2 (in kB) --with-luks2-memory-kb default Argon2 PBKDF memory cost for LUKS2 (in kB)
[1048576] [1048576]
--with-luks2-parallel-threads --with-luks2-parallel-threads
default Argon2 PBKDF max parallel cost for LUKS2 (if default Argon2 PBKDF max parallel cost for LUKS2 (if
CPUs available) [4] CPUs available) [4]
--with-luks2-keyslot-cipher
default fallback cipher for LUKS2 keyslot (if data
encryption is incompatible) [aes-xts-plain64]
--with-luks2-keyslot-keybits
default fallback key size for LUKS2 keyslot (if data
encryption is incompatible) [512]
--with-loopaes-cipher default cipher for loop-AES mode [aes] --with-loopaes-cipher default cipher for loop-AES mode [aes]
--with-loopaes-keybits default key length in bits for loop-AES mode [256] --with-loopaes-keybits default key length in bits for loop-AES mode [256]
--with-keyfile-size-maxkb --with-keyfile-size-maxkb
default maximum keyfile size (in KiB) [8192] default maximum keyfile size (in KiB) [8192]
--with-passphrase-size-max --with-passphrase-size-max
default maximum keyfile size (in characters) [512] default maximum keyfile size (in characters) [512]
--with-verity-hash default hash function for verity mode [sha256] --with-verity-hash default hash function for verity mode [sha256]
--with-verity-data-block --with-verity-data-block
default data block size for verity mode [4096] default data block size for verity mode [4096]
--with-verity-hash-block --with-verity-hash-block
skipping to change at line 1687 skipping to change at line 1679
--with-verity-salt-size default salt size for verity mode [32] --with-verity-salt-size default salt size for verity mode [32]
--with-verity-fec-roots default parity bytes for verity FEC [2] --with-verity-fec-roots default parity bytes for verity FEC [2]
--with-tmpfilesdir default override default path to directory with --with-tmpfilesdir default override default path to directory with
systemd temporary files [] systemd temporary files []
--with-luks2-lock-path default path to directory for LUKSv2 locks --with-luks2-lock-path default path to directory for LUKSv2 locks
[/run/cryptsetup] [/run/cryptsetup]
--with-luks2-lock-dir-perms --with-luks2-lock-dir-perms
default default luks2 locking directory permissions default default luks2 locking directory permissions
[0700] [0700]
--with-default-luks-format=FORMAT --with-default-luks-format=FORMAT
default LUKS format version (LUKS1/LUKS2) [LUKS1] default LUKS format version (LUKS1/LUKS2) [LUKS2]
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
CFLAGS C compiler flags CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir> nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library> LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir> you have headers in a nonstandard directory <include dir>
CPP C preprocessor CPP C preprocessor
skipping to change at line 1739 skipping to change at line 1731
linker flags for LIBARGON2, overriding pkg-config linker flags for LIBARGON2, overriding pkg-config
BLKID_CFLAGS BLKID_CFLAGS
C compiler flags for BLKID, overriding pkg-config C compiler flags for BLKID, overriding pkg-config
BLKID_LIBS linker flags for BLKID, overriding pkg-config BLKID_LIBS linker flags for BLKID, overriding pkg-config
DEVMAPPER_STATIC_CFLAGS DEVMAPPER_STATIC_CFLAGS
C compiler flags for DEVMAPPER_STATIC, overriding pkg-config C compiler flags for DEVMAPPER_STATIC, overriding pkg-config
DEVMAPPER_STATIC_LIBS DEVMAPPER_STATIC_LIBS
linker flags for DEVMAPPER_STATIC, overriding pkg-config linker flags for DEVMAPPER_STATIC, overriding pkg-config
systemd_tmpfilesdir systemd_tmpfilesdir
value of tmpfilesdir for systemd, overriding pkg-config value of tmpfilesdir for systemd, overriding pkg-config
PYTHON the Python interpreter
Use these variables to override the choices made by `configure' or to help Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
Report bugs to the package provider. Report bugs to the package provider.
_ACEOF _ACEOF
ac_status=$? ac_status=$?
fi fi
if test "$ac_init_help" = "recursive"; then if test "$ac_init_help" = "recursive"; then
skipping to change at line 1807 skipping to change at line 1798
else else
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$? fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; } cd "$ac_pwd" || { ac_status=$?; break; }
done done
fi fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
cryptsetup configure 2.0.6 cryptsetup configure 2.1.0
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. gives unlimited permission to copy, distribute and modify it.
_ACEOF _ACEOF
exit exit
fi fi
## ------------------------ ## ## ------------------------ ##
skipping to change at line 2272 skipping to change at line 2263
eval ac_res=\$$3 eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; } $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_type } # ac_fn_c_check_type
cat >config.log <<_ACEOF cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by cryptsetup $as_me 2.0.6, which was It was created by cryptsetup $as_me 2.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
_ACEOF _ACEOF
exec 5>>config.log exec 5>>config.log
{ {
cat <<_ASUNAME cat <<_ASUNAME
## --------- ## ## --------- ##
## Platform. ## ## Platform. ##
skipping to change at line 2618 skipping to change at line 2609
## Main body of script. ## ## Main body of script. ##
## -------------------- ## ## -------------------- ##
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-) LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
LIBCRYPTSETUP_VERSION_INFO=15:0:3 LIBCRYPTSETUP_VERSION_INFO=16:0:4
# Check whether --enable-silent-rules was given. # Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then : if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules; enableval=$enable_silent_rules;
fi fi
case $enable_silent_rules in # ((( case $enable_silent_rules in # (((
yes) AM_DEFAULT_VERBOSITY=0;; yes) AM_DEFAULT_VERBOSITY=0;;
no) AM_DEFAULT_VERBOSITY=1;; no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=0;; *) AM_DEFAULT_VERBOSITY=0;;
skipping to change at line 3138 skipping to change at line 3129
if test -z "$CYGPATH_W"; then if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w' CYGPATH_W='cygpath -w'
else else
CYGPATH_W=echo CYGPATH_W=echo
fi fi
fi fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='cryptsetup' PACKAGE='cryptsetup'
VERSION='2.0.6' VERSION='2.1.0'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define PACKAGE "$PACKAGE" #define PACKAGE "$PACKAGE"
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION" #define VERSION "$VERSION"
_ACEOF _ACEOF
# Some tools Automake needs. # Some tools Automake needs.
skipping to change at line 16535 skipping to change at line 16526
To get pkg-config, see <http://pkg-config.freedesktop.org/>. To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5; }
else else
JSON_C_CFLAGS=$pkg_cv_JSON_C_CFLAGS JSON_C_CFLAGS=$pkg_cv_JSON_C_CFLAGS
JSON_C_LIBS=$pkg_cv_JSON_C_LIBS JSON_C_LIBS=$pkg_cv_JSON_C_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
fi fi
ac_fn_c_check_decl "$LINENO" "json_object_object_add_ex" "ac_cv_have_decl_json_o
bject_object_add_ex" "#include <json-c/json.h>
"
if test "x$ac_cv_have_decl_json_object_object_add_ex" = xyes; then :
ac_have_decl=1
else
ac_have_decl=0
fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_JSON_OBJECT_OBJECT_ADD_EX $ac_have_decl
_ACEOF
# Check whether --with-crypto_backend was given. # Check whether --with-crypto_backend was given.
if test "${with_crypto_backend+set}" = set; then : if test "${with_crypto_backend+set}" = set; then :
withval=$with_crypto_backend; withval=$with_crypto_backend;
else else
with_crypto_backend=gcrypt with_crypto_backend=openssl
fi fi
# Check whether --enable-kernel_crypto was given. # Check whether --enable-kernel_crypto was given.
if test "${enable_kernel_crypto+set}" = set; then : if test "${enable_kernel_crypto+set}" = set; then :
enableval=$enable_kernel_crypto; enableval=$enable_kernel_crypto;
else else
enable_kernel_crypto=yes enable_kernel_crypto=yes
fi fi
if test "x$enable_kernel_crypto" = "xyes"; then if test "x$enable_kernel_crypto" = "xyes"; then
skipping to change at line 16576 skipping to change at line 16578
fi fi
case $with_crypto_backend in case $with_crypto_backend in
gcrypt) gcrypt)
if test "x$enable_fips" = "xyes"; then if test "x$enable_fips" = "xyes"; then
GCRYPT_REQ_VERSION=1.4.5 GCRYPT_REQ_VERSION=1.4.5
else else
GCRYPT_REQ_VERSION=1.1.42 GCRYPT_REQ_VERSION=1.1.42
fi fi
# Check whether --enable-gcrypt-pbkdf2 was given.
# Check whether --enable-gcrypt-pbkdf2 was given.
if test "${enable_gcrypt_pbkdf2+set}" = set; then : if test "${enable_gcrypt_pbkdf2+set}" = set; then :
enableval=$enable_gcrypt_pbkdf2; if test "x$enableval" = "xyes"; then enableval=$enable_gcrypt_pbkdf2; if test "x$enableval" = "xyes"; then
use_internal_pbkdf2=0 use_internal_pbkdf2=0
else else
use_internal_pbkdf2=1 use_internal_pbkdf2=1
fi fi
else else
# Check whether --with-libgcrypt-prefix was given. # Check whether --with-libgcrypt-prefix was given.
if test "${with_libgcrypt_prefix+set}" = set; then : if test "${with_libgcrypt_prefix+set}" = set; then :
skipping to change at line 17311 skipping to change at line 17314
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_NETTLE_SHA_H 1 #define HAVE_NETTLE_SHA_H 1
_ACEOF _ACEOF
else else
as_fn_error $? "You need Nettle cryptographic library." "$LINENO" 5 as_fn_error $? "You need Nettle cryptographic library." "$LINENO" 5
fi fi
done done
for ac_header in nettle/version.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "nettle/version.h" "ac_cv_header_nettle
_version_h" "$ac_includes_default"
if test "x$ac_cv_header_nettle_version_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NETTLE_VERSION_H 1
_ACEOF
fi
done
saved_LIBS=$LIBS saved_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle_pbkdf2_hmac_ sha256 in -lnettle" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle_pbkdf2_hmac_ sha256 in -lnettle" >&5
$as_echo_n "checking for nettle_pbkdf2_hmac_sha256 in -lnettle... " >&6; } $as_echo_n "checking for nettle_pbkdf2_hmac_sha256 in -lnettle... " >&6; }
if ${ac_cv_lib_nettle_nettle_pbkdf2_hmac_sha256+:} false; then : if ${ac_cv_lib_nettle_nettle_pbkdf2_hmac_sha256+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lnettle $LIBS" LIBS="-lnettle $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
skipping to change at line 18280 skipping to change at line 18295
if test "x$enable_dev_random" = "xyes"; then if test "x$enable_dev_random" = "xyes"; then
default_rng=/dev/random default_rng=/dev/random
else else
default_rng=/dev/urandom default_rng=/dev/urandom
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_RNG "$default_rng" #define DEFAULT_RNG "$default_rng"
_ACEOF _ACEOF
# Check whether --enable-python was given.
if test "${enable_python+set}" = set; then :
enableval=$enable_python;
fi
# Check whether --with-python_version was given.
if test "${with_python_version+set}" = set; then :
withval=$with_python_version; PYTHON_VERSION=$withval
else
PYTHON_VERSION=2.6
fi
if test "x$enable_python" = "xyes"; then
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version
is >= $PYTHON_VERSION" >&5
$as_echo_n "checking whether $PYTHON version is >= $PYTHON_VERSION... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
# map returns an iterator in Python 3.0 and a list in 2.x
minver = list(map(int, '$PYTHON_VERSION'.split('.'))) + [0, 0, 0]
minverhex = 0
# xrange is not present in Python 3.0 and range returns an iterator
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
sys.exit(sys.hexversion < minverhex)"
if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "Python interpreter is too old" "$L
INENO" 5
fi
am_display_PYTHON=$PYTHON
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter
with version >= $PYTHON_VERSION" >&5
$as_echo_n "checking for a Python interpreter with version >= $PYTHON_VERSION...
" >&6; }
if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8
python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0
python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2
.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
# map returns an iterator in Python 3.0 and a list in 2.x
minver = list(map(int, '$PYTHON_VERSION'.split('.'))) + [0, 0, 0]
minverhex = 0
# xrange is not present in Python 3.0 and range returns an iterator
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
sys.exit(sys.hexversion < minverhex)"
if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then :
break
fi
done
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
$as_echo "$am_cv_pathless_PYTHON" >&6; }
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
if test "$am_cv_pathless_PYTHON" = none; then
PYTHON=:
else
# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a pro
gram name with args.
set dummy $am_cv_pathless_PYTHON; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PYTHON in
[\\/]* | ?:[\\/]*)
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >
&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
$as_echo "$PYTHON" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
am_display_PYTHON=$am_cv_pathless_PYTHON
fi
if test "$PYTHON" = :; then
as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON versi
on" >&5
$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3]
)"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
PYTHON_PREFIX='${prefix}'
PYTHON_EXEC_PREFIX='${exec_prefix}'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platf
orm" >&5
$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
if ${am_cv_python_platform+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"
`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
$as_echo "$am_cv_python_platform" >&6; }
PYTHON_PLATFORM=$am_cv_python_platform
# Just factor out some code duplication.
am_python_setup_sysconfig="\
import sys
# Prefer sysconfig over distutils.sysconfig, for better compatibility
# with python 3.x. See automake bug#10227.
try:
import sysconfig
except ImportError:
can_use_sysconfig = 0
else:
can_use_sysconfig = 1
# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
# <https://github.com/pypa/virtualenv/issues/118>
try:
from platform import python_implementation
if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
can_use_sysconfig = 0
except ImportError:
pass"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PY
THON script directory" >&5
$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
if ${am_cv_python_pythondir+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
then
am_py_prefix=$ac_default_prefix
else
am_py_prefix=$prefix
fi
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__str
ip_prefix,$PYTHON_PREFIX,"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-pa
ckages
;;
esac
;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
pkgpythondir=\${pythondir}/$PACKAGE
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON
extension module directory" >&5
$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6;
}
if ${am_cv_python_pyexecdir+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
then
am_py_exec_prefix=$am_py_prefix
else
am_py_exec_prefix=$exec_prefix
fi
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__str
ip_prefix,$PYTHON_EXEC_PREFIX,"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/s
ite-packages
;;
esac
;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
pkgpyexecdir=\${pyexecdir}/$PACKAGE
fi
for ac_prog in python${PYTHON_VERSION}-config python-config
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PYTHON_CONFIG="$PYTHON_CONFIG" # Let the user override the test wit
h a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >
&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CONFIG" >&5
$as_echo "$PYTHON_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$PYTHON_CONFIG" && break
done
test -n "$PYTHON_CONFIG" || PYTHON_CONFIG="no"
if test "${PYTHON_CONFIG}" = "no"; then
as_fn_error $? "cannot find python${PYTHON_VERSION}-config or pyt
hon-config in PATH" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python headers usin
g $PYTHON_CONFIG --includes" >&5
$as_echo_n "checking for python headers using $PYTHON_CONFIG --includes... " >&6
; }
PYTHON_INCLUDES=$($PYTHON_CONFIG --includes)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5
$as_echo "$PYTHON_INCLUDES" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python libraries us
ing $PYTHON_CONFIG --libs" >&5
$as_echo_n "checking for python libraries using $PYTHON_CONFIG --libs... " >&6;
}
PYTHON_LIBS=$($PYTHON_CONFIG --libs)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LIBS" >&5
$as_echo "$PYTHON_LIBS" >&6; }
fi
if test "x$enable_python" = "xyes"; then
PYTHON_CRYPTSETUP_TRUE=
PYTHON_CRYPTSETUP_FALSE='#'
else
PYTHON_CRYPTSETUP_TRUE='#'
PYTHON_CRYPTSETUP_FALSE=
fi
# Check whether --with-plain-hash was given. # Check whether --with-plain-hash was given.
if test "${with_plain_hash+set}" = set; then : if test "${with_plain_hash+set}" = set; then :
withval=$with_plain_hash; withval=$with_plain_hash;
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_PLAIN_HASH "$withval" #define DEFAULT_PLAIN_HASH "$withval"
_ACEOF _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
skipping to change at line 18722 skipping to change at line 18415
_ACEOF _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS1_KEYBITS 256 #define DEFAULT_LUKS1_KEYBITS 256
_ACEOF _ACEOF
fi fi
# Check whether --enable-luks_adjust_xts_keysize was given.
if test "${enable_luks_adjust_xts_keysize+set}" = set; then :
enableval=$enable_luks_adjust_xts_keysize;
else
enable_luks_adjust_xts_keysize=yes
fi
if test "x$enable_luks_adjust_xts_keysize" = "xyes"; then
$as_echo "#define ENABLE_LUKS_ADJUST_XTS_KEYSIZE 1" >>confdefs.h
fi
# Check whether --with-luks2-pbkdf was given. # Check whether --with-luks2-pbkdf was given.
if test "${with_luks2_pbkdf+set}" = set; then : if test "${with_luks2_pbkdf+set}" = set; then :
withval=$with_luks2_pbkdf; withval=$with_luks2_pbkdf;
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_PBKDF "$withval" #define DEFAULT_LUKS2_PBKDF "$withval"
_ACEOF _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
skipping to change at line 18797 skipping to change at line 18503
_ACEOF _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_PARALLEL_THREADS 4 #define DEFAULT_LUKS2_PARALLEL_THREADS 4
_ACEOF _ACEOF
fi fi
# Check whether --with-luks2-keyslot-cipher was given.
if test "${with_luks2_keyslot_cipher+set}" = set; then :
withval=$with_luks2_keyslot_cipher;
cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_KEYSLOT_CIPHER "$withval"
_ACEOF
else
cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_KEYSLOT_CIPHER "aes-xts-plain64"
_ACEOF
fi
# Check whether --with-luks2-keyslot-keybits was given.
if test "${with_luks2_keyslot_keybits+set}" = set; then :
withval=$with_luks2_keyslot_keybits;
cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_KEYSLOT_KEYBITS $withval
_ACEOF
else
cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS2_KEYSLOT_KEYBITS 512
_ACEOF
fi
# Check whether --with-loopaes-cipher was given. # Check whether --with-loopaes-cipher was given.
if test "${with_loopaes_cipher+set}" = set; then : if test "${with_loopaes_cipher+set}" = set; then :
withval=$with_loopaes_cipher; withval=$with_loopaes_cipher;
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_LOOPAES_CIPHER "$withval" #define DEFAULT_LOOPAES_CIPHER "$withval"
_ACEOF _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
skipping to change at line 19012 skipping to change at line 18748
fi fi
test -z "$with_luks2_lock_dir_perms" && with_luks2_lock_dir_perms=0700 test -z "$with_luks2_lock_dir_perms" && with_luks2_lock_dir_perms=0700
DEFAULT_LUKS2_LOCK_DIR_PERMS=$with_luks2_lock_dir_perms DEFAULT_LUKS2_LOCK_DIR_PERMS=$with_luks2_lock_dir_perms
# Check whether --with-default_luks_format was given. # Check whether --with-default_luks_format was given.
if test "${with_default_luks_format+set}" = set; then : if test "${with_default_luks_format+set}" = set; then :
withval=$with_default_luks_format; withval=$with_default_luks_format;
else else
with_default_luks_format=LUKS1 with_default_luks_format=LUKS2
fi fi
case $with_default_luks_format in case $with_default_luks_format in
LUKS1) default_luks=CRYPT_LUKS1 ;; LUKS1) default_luks=CRYPT_LUKS1 ;;
LUKS2) default_luks=CRYPT_LUKS2 ;; LUKS2) default_luks=CRYPT_LUKS2 ;;
*) as_fn_error $? "Unknown default LUKS format. Use LUKS1 or LUKS2 only." "$LINENO" 5 ;; *) as_fn_error $? "Unknown default LUKS format. Use LUKS1 or LUKS2 only." "$LINENO" 5 ;;
esac esac
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DEFAULT_LUKS_FORMAT $default_luks #define DEFAULT_LUKS_FORMAT $default_luks
skipping to change at line 19232 skipping to change at line 18968
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${HAVE_BLKID_WIPE_TRUE}" && test -z "${HAVE_BLKID_WIPE_FALSE}"; then if test -z "${HAVE_BLKID_WIPE_TRUE}" && test -z "${HAVE_BLKID_WIPE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_BLKID_WIPE\" was never defined. as_fn_error $? "conditional \"HAVE_BLKID_WIPE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${HAVE_BLKID_STEP_BACK_TRUE}" && test -z "${HAVE_BLKID_STEP_BACK_FAL SE}"; then if test -z "${HAVE_BLKID_STEP_BACK_TRUE}" && test -z "${HAVE_BLKID_STEP_BACK_FAL SE}"; then
as_fn_error $? "conditional \"HAVE_BLKID_STEP_BACK\" was never defined. as_fn_error $? "conditional \"HAVE_BLKID_STEP_BACK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${PYTHON_CRYPTSETUP_TRUE}" && test -z "${PYTHON_CRYPTSETUP_FALSE}";
then
as_fn_error $? "conditional \"PYTHON_CRYPTSETUP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CRYPTSETUP_TMPFILE_TRUE}" && test -z "${CRYPTSETUP_TMPFILE_FALSE}" ; then if test -z "${CRYPTSETUP_TMPFILE_TRUE}" && test -z "${CRYPTSETUP_TMPFILE_FALSE}" ; then
as_fn_error $? "conditional \"CRYPTSETUP_TMPFILE\" was never defined. as_fn_error $? "conditional \"CRYPTSETUP_TMPFILE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
: "${CONFIG_STATUS=./config.status}" : "${CONFIG_STATUS=./config.status}"
ac_write_fail=0 ac_write_fail=0
ac_clean_files_save=$ac_clean_files ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS" ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
skipping to change at line 19628 skipping to change at line 19360
## Main body of $CONFIG_STATUS script. ## ## Main body of $CONFIG_STATUS script. ##
## ----------------------------------- ## ## ----------------------------------- ##
_ASEOF _ASEOF
test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Save the log message, to keep $0 and so on meaningful, and to # Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by cryptsetup $as_me 2.0.6, which was This file was extended by cryptsetup $as_me 2.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_LINKS = $CONFIG_LINKS CONFIG_LINKS = $CONFIG_LINKS
CONFIG_COMMANDS = $CONFIG_COMMANDS CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@ $ $0 $@
on `(hostname || uname -n) 2>/dev/null | sed 1q` on `(hostname || uname -n) 2>/dev/null | sed 1q`
" "
skipping to change at line 19693 skipping to change at line 19425
Configuration commands: Configuration commands:
$config_commands $config_commands
Report bugs to the package provider." Report bugs to the package provider."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g '`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g '`"
ac_cs_version="\\ ac_cs_version="\\
cryptsetup config.status 2.0.6 cryptsetup config.status 2.1.0
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it." gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd' ac_pwd='$ac_pwd'
srcdir='$srcdir' srcdir='$srcdir'
INSTALL='$INSTALL' INSTALL='$INSTALL'
 End of changes. 31 change blocks. 
393 lines changed or deleted 99 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)