Skip to contentSkip to conversation

minifi-cpp: upgrade libsodium 1.0.19 -> 1.0.20

PATCH New Li Zhou 1 participant 1 message Jun 16

lore
Share & tools
lore

Li Zhou

author
#0 lore raw

PATCH v2 1/1 minifi-cpp: upgrade libsodium 1.0.19 -> 1.0.20

Upgrade libsodium from 1.0.19 to 1.0.20 for minifi-cpp third party dependency.

Updated below patch for upgrading:
0003-Fix-libsodium-build.patch

Removed below patch because it is in the new version:
0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patcha

---
 .../files/0003-Fix-libsodium-build.patch      |   8 +-
 ...iler-attributes-after-including-arm_.patch | 141 ------------------
 .../minifi-cpp/minifi-cpp_0.99.2.bb           |   7 +-
 3 files changed, 8 insertions(+), 148 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch +5 -3
index db2434723b..9ce5600327 100644
@@ -9,8 +9,10 @@ Subject: [PATCH] Fix libsodium build
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yi Zhao <[email protected]>
-[lz: Adapted the patch for context changes when upgrading
-from 0.99.1 to 0.99.2.]
+[lz: Adapted the patch for context changes when upgrading minifi-cpp
+from 0.99.1 to 0.99.2; adapted the patch when upgrading libsodium
+from 1.0.19 to 1.0.20 because the top-level directory name inside the
+tarball changed from libsodium-stable to libsodium-1.0.20.]
 Signed-off-by: Li Zhou <[email protected]>
 ---
  cmake/BundledLibSodium.cmake | 6 ++----
@@ -33,7 +35,7 @@ index 001a90dad..87a3244fd 100644
 -                URL_HASH ${LIBSODIUM_URL_HASH}
                  BUILD_IN_SOURCE true
 -                SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
-+                SOURCE_DIR "${SOURCE_DIR}/thirdparty/libsodium-stable"
++                SOURCE_DIR "${SOURCE_DIR}/thirdparty/libsodium-1.0.20"
                  BUILD_COMMAND make
                  CMAKE_COMMAND ""
                  UPDATE_COMMAND ""
meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch deleted +0 -141

141 lines not on this page · raw message

meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb +3 -4
index 6c64046161..384b453688 100644
@@ -19,14 +19,13 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai
            git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;tag=v1.15.3;name=spdlog;destsuffix=${S}/thirdparty/spdlog-src \
            git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;name=jsoncons;destsuffix=${S}/thirdparty/jsoncons-src \
            ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=${S}/thirdparty \
-           https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz;name=libsodium;subdir=${S}/thirdparty \
+           https://download.libsodium.org/libsodium/releases/libsodium-1.0.20.tar.gz;name=libsodium;subdir=${S}/thirdparty \
            file://0001-Do-not-use-bundled-packages.patch \
            file://0002-Fix-osspuuid-build.patch \
            file://0003-Fix-libsodium-build.patch \
            file://0004-Pass-noline-flag-to-flex.patch \
            file://0005-generateVersion.sh-set-correct-buildrev.patch \
            file://0006-CMakeLists.txt-do-not-use-ccache.patch \
-           file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \
            file://0001-Add-missing-include-for-malloc-free.patch;patchdir=thirdparty/fmt-src \
            file://0001-generateVersion.sh-set-BUILD_DATE-to-SOURCE_DATE_EPO.patch \
            file://0001-Fix-build-with-gcc-16.patch \
@@ -61,8 +60,8 @@ SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_argparse_gsl-lite_date_asio
 
 # ossp-uuid: 1.6.2
 SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
-# libsodium: 1.0.19
-SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea"
+# libsodium: 1.0.20
+SRC_URI[libsodium.sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19"
 
 
 inherit pkgconfig cmake systemd
Signature · 1 line
2.34.1