Commit Graph

34 Commits

Author SHA1 Message Date
Romain Naour
3277694825 package/cryptsetup: really break circular dependency
The commit [1] should fix a circular dependency by
using util-linux-libs instead of util-linux if
BR2_PACKAGE_UTIL_LINUX_LIBS is set.

But util-linux is still in CRYPTSETUP_DEPENDENCIES.
Remove it to really break the circular dependency.

[1] e3c86f5c9e

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Reviewed-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-11-14 09:09:26 +01:00
Fabrice Fontaine
e3c86f5c9e package/cryptsetup: break circular dependency
Build fails because of the following circular dependency:

cryptsetup -> util-linux -> udev -> systemd -> cryptsetup

which results in the following build failure:

checking uuid/uuid.h usability... no
checking uuid/uuid.h presence... no
checking for uuid/uuid.h... no
configure: error: You need the uuid library.

To break it, apply the same ugly workaround that was applied for
libglib2 until a better solution is found:
https://patchwork.ozlabs.org/project/buildroot/patch/20201101150619.1709959-1-fontaine.fabrice@gmail.com/

Fixes:
 - http://autobuild.buildroot.org/results/a1a020a3e1c2383a030fcd73eae7c0fe5f82b022

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-11-07 15:27:55 +01:00
Fabrice Fontaine
baa28856f1 package/cryptsetup: security bump to version 2.3.4
Fix CVE-2020-14382: A vulnerability was found in upstream release
cryptsetup-2.2.0 where, there's a bug in LUKS2 format validation code,
that is effectively invoked on every device/image presenting itself as
LUKS2 container. The bug is in segments validation code in file
'lib/luks2/luks2_json_metadata.c' in function
hdr_validate_segments(struct crypt_device *cd, json_object *hdr_jobj)
where the code does not check for possible overflow on memory allocation
used for intervals array (see statement "intervals = malloc(first_backup
* sizeof(*intervals));"). Due to the bug, library can be *tricked* to
expect such allocation was successful but for far less memory then
originally expected. Later it may read data FROM image crafted by an
attacker and actually write such data BEYOND allocated memory.

https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.3/v2.3.4-ReleaseNotes

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-10-25 15:54:20 +01:00
Fabrice Fontaine
d1b8433ebd package/cryptsetup: needs iconv
iconv is a mantadory dependency since version 2.3.0 and
62c872eb49

Fixes:
 - http://autobuild.buildroot.org/results/a13c4b64e8ac673df07d8dc1d33fae42a4f80fff

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-06-29 22:31:38 +02:00
Fabrice Fontaine
a727574101 package/cryptsetup: bump to version 2.3.3
- Update indentation in hash file (two spaces)
- Send patch upstream

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-06-21 23:04:47 +02:00
Pascal de Bruijn
d9c0899753 package/cryptsetup: update to version 2.2.2
Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-01-10 23:00:44 +01:00
Pascal de Bruijn
fa5c71da72 package/cryptsetup: use external libargon2
don't use cryptsetup's intree libargon2

Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-12-08 21:59:15 +01:00
Baruch Siach
0bd2a1739e package/cryptsetup: bump to version 2.0.6
Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-01-16 20:58:25 +01:00
Baruch Siach
ae83389eed cryptsetup: bump to version 2.0.4
libblkid is a new optional dependency. Upstream "strongly discourages"
build without libblkid support. So enable libblkid unconditionally.

Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-08-18 11:23:54 +02:00
Baruch Siach
b44d4e0b09 cryptsetup: fix build with old host kernel headers
By default cryptsetup configure fails when the if_alg.h kernel header is
not available. Kernels older than 2.6.38, like the one in RHEL 6 hosts,
do not provide this header. Since we don't need the kernel crypto
feature for host tools, just disable this feature to allow successful
completion of the configure script.

While at it, fix a typo in the --with-crypto_backend option (hyphen ->
underscore).

Should fix:
http://autobuild.buildroot.net/results/ffd/ffda2579b215b53161025b7bc703091cb30ef95d/
http://autobuild.buildroot.net/results/c48/c48015f76b13fec38f650f66824e7b986eb28572/
http://autobuild.buildroot.net/results/be6/be621f71bf9da8719bf7fc943eccc9b4dc2cc43e/

Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-08-18 11:23:42 +02:00
Marcin Niestroj
dffbda3853 package/cryptsetup: bump version to 2.0.3
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-07-25 18:14:15 +02:00
Baruch Siach
5b85b59709 cryptsetup: bump to version 2.0.2
Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Martin Hicks <mort@bork.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-03-13 22:11:27 +01:00
Baruch Siach
19dd7f6025 cryptsetup: add json-c dependency to host build
Fixes:
http://autobuild.buildroot.net/results/ecf/ecf5d87791e0255c3fce117447105db88749f796/
http://autobuild.buildroot.net/results/384/38462d222f2a893d44de894c30dc1e53d09c377d/
http://autobuild.buildroot.net/results/c29/c2901415345d94ef2135e460f4c78c21ae7ad09a/
... and many more.

Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-12-26 19:56:37 +01:00
Baruch Siach
de7bd25bfa cryptsetup: bump to version 2.0.0
Add the now mandatory json-c depencecy. Propagate to reverse
dependencies.

Drop the no longer needed patch.

Add license files hashes.

[Peter: propagate _HAS_SYNC_4 dependency to comments as pointed out by
	Thomas]
Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-12-22 15:38:26 +01:00
Peter Korsgaard
456cd09fb9 cryptsetup: add host variant
E.G. for generating dm-verity hashes or dm-crypt data at build time in a
post-image script.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-10-05 22:45:46 +02:00
Thomas Petazzoni
eaf232dbd0 cryptsetup: use new gettext logic
This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 01:27:24 +02:00
Vicente Olivert Riera
accc675f2b cryptsetup: bump version to 1.7.5
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-05-08 21:02:37 +02:00
Rahul Bedarkar
30a3e8d108 boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv2.1/LGPLv2.1+ is LGPL-2.1/LGPL-2.1+.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2.1(\+)?/LGPL-2.1\1/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:18:10 +02:00
Rahul Bedarkar
af31c309e7 boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
We want to use SPDX identifier for license strings as much as possible.
SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.

This change is done by using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:16:38 +02:00
Vicente Olivert Riera
fa52abc036 cryptsetup: bump version to 1.7.4
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-03-15 21:42:12 +01:00
Thomas Petazzoni
d51a951435 cryptsetup: install to staging
cryptsetup installs a library and a header file, so it makes sense to
install it to staging.

Fixes bug #9691.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yann E. MORIN <yann.morin.1998@free.fr>
2017-03-05 21:31:24 +01:00
Vicente Olivert Riera
10189569ca cryptsetup: bump version to 1.7.3
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-16 16:02:55 +01:00
Gustavo Zacarias
8e1abc0bcd cryptsetup: bump to version 1.7.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-06-05 22:15:35 +02:00
Gustavo Zacarias
22f19a1cbf cryptsetup: bump to version 1.7.1
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-29 21:45:11 +01:00
Gustavo Zacarias
5f11f5d541 cryptsetup: bump to version 1.7.0
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-11-13 13:46:07 +01:00
Gustavo Zacarias
e24dfe8ba2 cryptsetup: bump to version 1.6.8
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-10-02 21:49:21 +02:00
Baruch Siach
0d67ffe596 cryptsetup: remove e2fsprogs dependency
cryptsetup does not actually depend on e2fsprogs, but on libuuid that is a
dependency of e2fsprogs. Remove the e2fsprogs dependency, and add a direct
dependency on util-linux (libuuid provider).

Cc: Martin Hicks <mort@bork.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-04 14:13:06 +02:00
Baruch Siach
dd5aa60abd cryptsetup: bump to version 1.6.7
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-02 23:43:01 +02:00
Floris Bos
7f57e79a7e cryptsetup: remove hard dependency on libgcrypt
- Add support for the alternative OpenSSL and Linux kernel crypto backends.
The latter does require that additional kernel modules (like algif_hash)
are present and loaded before invoking cryptsetup, so is used as last choice.

- Removes CRYPTSETUP_AUTORECONF as it is redundant, and reconf does
create a dependency on libgcrypt for the m4 macros used.

[Thomas: add an explicit --with-crypto_backend=gcrypt with the
libgcrypt backend is requested.]

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 22:15:57 +01:00
Gustavo Zacarias
40c341da78 cryptsetup: bump to version 1.6.6
Drop upstream patch, add hash file, switch to kernel.org mirror.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-29 21:41:54 +01:00
Axel Lin
d66c981aaa cryptsetup: fix build error after bump version
Fixes:
http://autobuild.buildroot.net/results/9ca/9cad1cf49ee6b5c58d8260ee33beef2e6c1ada4d/

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-09 12:12:07 +01:00
Axel Lin
cbf86418af cryptsetup: bump to version 1.6.3
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-27 09:41:17 +01:00
Clayton Shotwell
cd00a9d9eb cryptsetup: Add libintl for UCLIBC toolchain
Fixes autobuild error
http://autobuild.buildroot.net/results/cc1a65b9554bc2ece1b3ea8b51cd805b9bda7e86/

Adding libintl to the libraries list for cryptsetup when using a
uclibc toolchain and locale support is enabled.

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-11-04 21:55:54 +01:00
Martin Hicks
21028166a5 cryptsetup: new package package
[Thomas P: add license informations, fix header, adjust dependencies
in Config.in file on toolchain options.]

Signed-off-by: Martin Hicks <mort@bork.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-11 22:56:54 +02:00