From c40db9d10f9353f476993c18f395a0d640d11546 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 6 Dec 2022 19:34:12 +0100 Subject: [PATCH 1/3] Revert "coreos-base/update_engine: remove `-Werror` flag" This reverts commit 5f720f7b9987bf8b7d15a9569b4a340bdf253260. --- .../update_engine/files/disable-werror.patch | 12 ------------ .../update_engine/update_engine-9999.ebuild | 4 ---- 2 files changed, 16 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/disable-werror.patch diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/disable-werror.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/disable-werror.patch deleted file mode 100644 index 13be66cc35..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/disable-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 90beb50..08febe6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -14,7 +14,6 @@ AM_CFLAGS = -fno-exceptions \ - -Wall \ - -Wclobbered \ - -Wempty-body \ -- -Werror \ - -Wignored-qualifiers \ - -Wmissing-field-initializers \ - -Wsign-compare \ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index f31b251008..ddbfb675af 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -42,10 +42,6 @@ DEPEND="dev-cpp/gtest ${BDEPEND} ${RDEPEND}" -PATCHES=( - "${FILESDIR}/disable-werror.patch" -) - src_prepare() { default eautoreconf From 018198129a19675f75f17c1db6857d6591404079 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 6 Dec 2022 19:34:53 +0100 Subject: [PATCH 2/3] coreos-base/update_engine: bump commit ID this pulls the OpenSSL 3 upgrade. Signed-off-by: Mathieu Tortuyaux --- ...e_engine-0.4.10-r8.ebuild => update_engine-0.4.10-r9.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r8.ebuild => update_engine-0.4.10-r9.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index ddbfb675af..2416a5ec2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="1c290db26e5591c5fe3497d91040e186e12b4315" # flatcar-master + CROS_WORKON_COMMIT="12d43a8e71293567f10d940465113550188a4ce8" # flatcar-master KEYWORDS="amd64 arm64" fi From 1fab9ca500eb06d96472f0ed108de96e427a6c92 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 7 Dec 2022 10:26:13 +0100 Subject: [PATCH 3/3] coreos-base/coreos: add libsodium update_engine needs to access context from SHA256 to store it and restore it for further computations on it. With OpenSSL SHA256 v3 implementation is not possible, let's use the libsodium implementation. Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + .../coreos-base/update_engine/update_engine-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 6798b65dc4..de884561b6 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -114,6 +114,7 @@ RDEPEND="${RDEPEND} coreos-base/update-ssh-keys coreos-base/update_engine dev-db/etcdctl + dev-libs/libsodium dev-libs/openssl dev-util/bpftool dev-util/bsdiff diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 2416a5ec2e..edd06be950 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -30,6 +30,7 @@ RDEPEND="!coreos-base/coreos-installer dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib + dev-libs/libsodium dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:=