[Buildroot] [PATCH 1/2] package/cryptsetup: bump to version 2.4.2

[Buildroot] [PATCH 1/2] package/cryptsetup: bump to version 2.4.2

[James Hilliard]

Enable optional ssh-token support when available.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 .../0001-Remove-json_object-typedef.patch     | 48 -------------------
 package/cryptsetup/cryptsetup.hash            |  4 +-
 package/cryptsetup/cryptsetup.mk              | 12 ++++-
 3 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 package/cryptsetup/0001-Remove-json_object-typedef.patch

diff --git a/package/cryptsetup/0001-Remove-json_object-typedef.patch b/package/cryptsetup/0001-Remove-json_object-typedef.patch
deleted file mode 100644
index bbfd1aa075..0000000000
--- a/package/cryptsetup/0001-Remove-json_object-typedef.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 567e7f8664c621f8aeaa95d9f4ab4b590574f572 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Wed, 15 Aug 2018 14:13:46 +0300
-Subject: [PATCH] Remove json_object typedef
-
-The json-c header already defines the same typedef. While C11 allows
-typedef redefinition to the same type, older versions of gcc disallow
-that.
-
-In file included from lib/luks2/luks2_internal.h:32,
-                 from lib/luks2/luks2_disk_metadata.c:24:
-lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-[Upstream status:
-https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91]
----
- lib/luks2/luks2.h | 1 -
- lib/setup.c       | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h
-index ee57b41ba974..25e36190da45 100644
---- a/lib/luks2/luks2.h
-+++ b/lib/luks2/luks2.h
-@@ -83,7 +83,6 @@ struct luks2_hdr_disk {
- /*
-  * LUKS2 header in-memory.
-  */
--typedef struct json_object json_object;
- struct luks2_hdr {
- 	size_t		hdr_size;
- 	uint64_t	seqid;
-diff --git a/lib/setup.c b/lib/setup.c
-index fddbe7ef7897..856f6e80f465 100644
---- a/lib/setup.c
-+++ b/lib/setup.c
-@@ -28,6 +28,7 @@
- #include <sys/utsname.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <json-c/json.h>
- 
- #include "libcryptsetup.h"
- #include "luks.h"
--- 
-2.18.0
-
diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash
index 0aa3f79df7..b3bb859bdc 100644
--- a/package/cryptsetup/cryptsetup.hash
+++ b/package/cryptsetup/cryptsetup.hash
@@ -1,4 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc
-sha256  b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f  cryptsetup-2.3.6.tar.xz
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc
+sha256  170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c  cryptsetup-2.4.2.tar.xz
 sha256  45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
 sha256  8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 3cf6c8a301..980a36faa8 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 2.3
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6
+CRYPTSETUP_VERSION_MAJOR = 2.4
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = \
@@ -33,6 +33,13 @@ else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSSH),y)
+CRYPTSETUP_DEPENDENCIES += libssh
+CRYPTSETUP_CONF_OPTS += --enable-ssh-token
+else
+CRYPTSETUP_CONF_OPTS += --disable-ssh-token
+endif
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y)
 CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d
 else
@@ -49,6 +56,7 @@ HOST_CRYPTSETUP_DEPENDENCIES = \
 
 HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \
 	--disable-kernel_crypto \
+	--disable-ssh-token \
 	--enable-blkid \
 	--with-tmpfilesdir=no
 
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/systemd: bump to version 250

[James Hilliard]

Drop disable urlify patch that is now upstream.

Update license info based on LICENSES/README.md.

Most licenses are moved to SPDX LICENSES folder.

Add libcryptsetup-plugins support.

The efi-ld option expects either "bfd" or "gold", since we don't
support "gold" set it to "bfd" which is also the default fallback.

Set link-boot-shared to true since we build systemd at the same time
as the boot tools.

See link-boot-shared details:
https://github.com/systemd/systemd/commit/7964702007ae1ae1180dc9ff12f97a9b7651c8ab

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...1-Add-meson-option-to-disable-urlify.patch | 67 -------------------
 package/systemd/systemd.hash                  | 14 +++-
 package/systemd/systemd.mk                    | 34 ++++++++--
 3 files changed, 39 insertions(+), 76 deletions(-)
 delete mode 100644 package/systemd/0001-Add-meson-option-to-disable-urlify.patch

diff --git a/package/systemd/0001-Add-meson-option-to-disable-urlify.patch b/package/systemd/0001-Add-meson-option-to-disable-urlify.patch
deleted file mode 100644
index b0a59a9f0f..0000000000
--- a/package/systemd/0001-Add-meson-option-to-disable-urlify.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e5d86ebed5624ef62342c820a5868b1075deb300 Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Sun, 11 Jul 2021 04:39:33 -0600
-Subject: [PATCH] Add meson option to disable urlify.
-
-Useful for systems that don't use a version of less with hyperlink
-support.
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
-[james.hilliard1@gmail.com: backport from upstream commit
-e5d86ebed5624ef62342c820a5868b1075deb300]
----
- meson.build               | 1 +
- meson_options.txt         | 2 ++
- src/shared/pretty-print.c | 4 ++++
- 3 files changed, 7 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 5735cfc7ad..a2ee15bf32 100644
---- a/meson.build
-+++ b/meson.build
-@@ -278,6 +278,7 @@ conf.set_quoted('USER_PRESET_DIR',                            userpresetdir)
- conf.set_quoted('VENDOR_KEYRING_PATH',                        join_paths(rootlibexecdir, 'import-pubring.gpg'))
- 
- conf.set('ANSI_OK_COLOR',                                     'ANSI_' + get_option('ok-color').underscorify().to_upper())
-+conf.set10('ENABLE_URLIFY',                                   get_option('urlify'))
- conf.set10('ENABLE_FEXECVE',                                  get_option('fexecve'))
- conf.set10('MEMORY_ACCOUNTING_DEFAULT',                       memory_accounting_default)
- conf.set('STATUS_UNIT_FORMAT_DEFAULT',                        'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
-diff --git a/meson_options.txt b/meson_options.txt
-index 163c8df87d..b60261ac24 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -444,6 +444,8 @@ option('ok-color', type : 'combo',
-                   'highlight-cyan', 'highlight-white'],
-        value : 'green',
-        description: 'color of the "OK" status message')
-+option('urlify', type : 'boolean', value : 'true',
-+       description : 'enable pager Hyperlink ANSI sequence support')
- option('fexecve', type : 'boolean', value : 'false',
-        description : 'use fexecve() to spawn children')
- 
-diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
-index 137ba77b3a..7983c0a33a 100644
---- a/src/shared/pretty-print.c
-+++ b/src/shared/pretty-print.c
-@@ -19,6 +19,7 @@
- #include "util.h"
- 
- bool urlify_enabled(void) {
-+#if ENABLE_URLIFY
-         static int cached_urlify_enabled = -1;
- 
-         if (cached_urlify_enabled < 0) {
-@@ -32,6 +33,9 @@ bool urlify_enabled(void) {
-         }
- 
-         return cached_urlify_enabled;
-+#else
-+        return 0;
-+#endif
- }
- 
- int terminal_urlify(const char *url, const char *text, char **ret) {
--- 
-2.25.1
-
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
index a83ff7d989..cc33cd4c52 100644
--- a/package/systemd/systemd.hash
+++ b/package/systemd/systemd.hash
@@ -1,6 +1,14 @@
 # sha256 locally computed
-sha256  773ee546ad6df0921ea6f9e12294eb102bf68c1ac9eb3dcaca1764f8306d6e13  systemd-249.5.tar.gz
+sha256  41317fb443f7555de427aea69fda36c74661e77b58203cd6587eb8e1f612f46b  systemd-250.tar.gz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  LICENSE.GPL2
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENSE.LGPL2.1
-sha256  f5645b4b846479859d6618fa7a5a1722681aa7fc43c1e45f8bf8e1fe5738d618  README
-sha256  83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275  tools/chromiumos/LICENSE
+sha256  e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5  LICENSES/BSD-2-Clause.txt
+sha256  83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275  LICENSES/BSD-3-Clause.txt
+sha256  a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499  LICENSES/CC0-1.0.txt
+sha256  61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3  LICENSES/LGPL-2.0-or-later.txt
+sha256  5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764  LICENSES/Linux-syscall-note.txt
+sha256  790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216  LICENSES/lookup3-public-domain.txt
+sha256  b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0  LICENSES/MIT.txt
+sha256  2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73  LICENSES/murmurhash2-public-domain.txt
+sha256  1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec  LICENSES/OFL-1.1.txt
+sha256  11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b  LICENSES/README.md
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 619c2b48c9..3b0356ac9a 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -4,10 +4,31 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 249.5
+SYSTEMD_VERSION = 250
 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
-SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
-SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
+SYSTEMD_LICENSE = \
+	LGPL-2.1+, \
+	GPL-2.0+ (udev), \
+	Public Domain (few source files, see LICENSES/README.md), \
+	BSD-2-Clause (eBPF instruction mini library), \
+	BSD-3-Clause (tools/chromiumos), \
+	CC0-1.0 (few source files, see LICENSES/README.md), \
+	GPL-2.0 with Linux-syscall-note (linux kernel headers), \
+	MIT (few source files, see LICENSES/README.md), \
+	OFL-1.1 (Heebo fonts)
+SYSTEMD_LICENSE_FILES = \
+	LICENSE.GPL2 \
+	LICENSE.LGPL2.1 \
+	LICENSES/BSD-2-Clause.txt \
+	LICENSES/BSD-3-Clause.txt \
+	LICENSES/CC0-1.0.txt \
+	LICENSES/LGPL-2.0-or-later.txt \
+	LICENSES/Linux-syscall-note.txt \
+	LICENSES/lookup3-public-domain.txt \
+	LICENSES/MIT.txt \
+	LICENSES/murmurhash2-public-domain.txt \
+	LICENSES/OFL-1.1.txt \
+	LICENSES/README.md
 SYSTEMD_CPE_ID_VENDOR = freedesktop
 SYSTEMD_INSTALL_STAGING = YES
 SYSTEMD_DEPENDENCIES = \
@@ -31,6 +52,7 @@ SYSTEMD_CONF_OPTS += \
 	-Dkexec-path=/usr/sbin/kexec \
 	-Dkmod-path=/usr/bin/kmod \
 	-Dldconfig=false \
+	-Dlink-boot-shared=true \
 	-Dloadkeys-path=/usr/bin/loadkeys \
 	-Dman=false \
 	-Dmount-path=/usr/bin/mount \
@@ -81,9 +103,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_CRYPTSETUP),y)
 SYSTEMD_DEPENDENCIES += cryptsetup
-SYSTEMD_CONF_OPTS += -Dlibcryptsetup=true
+SYSTEMD_CONF_OPTS += -Dlibcryptsetup=true -Dlibcryptsetup-plugins=true
 else
-SYSTEMD_CONF_OPTS += -Dlibcryptsetup=false
+SYSTEMD_CONF_OPTS += -Dlibcryptsetup=false -Dlibcryptsetup-plugins=false
 endif
 
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
@@ -505,7 +527,7 @@ SYSTEMD_CONF_OPTS += \
 	-Defi=true \
 	-Dgnu-efi=true \
 	-Defi-cc=$(TARGET_CC) \
-	-Defi-ld=$(TARGET_LD) \
+	-Defi-ld=bfd \
 	-Defi-libdir=$(STAGING_DIR)/usr/lib \
 	-Defi-includedir=$(STAGING_DIR)/usr/include/efi
 
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/cryptsetup: bump to version 2.4.2

[Thomas Petazzoni]

On Fri, 24 Dec 2021 20:36:25 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> Enable optional ssh-token support when available.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  .../0001-Remove-json_object-typedef.patch     | 48 -------------------
>  package/cryptsetup/cryptsetup.hash            |  4 +-
>  package/cryptsetup/cryptsetup.mk              | 12 ++++-
>  3 files changed, 12 insertions(+), 52 deletions(-)
>  delete mode 100644 package/cryptsetup/0001-Remove-json_object-typedef.patch

Series applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot