diff options
| author | wangmy <wangmy@fujitsu.com> | 2022-08-02 21:43:11 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-08-06 09:12:15 -0700 |
| commit | 21233e7ac9da885fe37acacd9e793de6a8e27efd (patch) | |
| tree | ebdd83b92102cd592d8b4373b8d2193f101238ae /meta-oe | |
| parent | 11d5fe77c874f3edce5d3d6bd8ecedba1ba77f90 (diff) | |
| download | meta-openembedded-21233e7ac9da885fe37acacd9e793de6a8e27efd.tar.gz | |
poco: upgrade 1.12.0 -> 1.12.1
The following patches removed since they're included in 1.12.1:
0001-fix-unbundled-PCRE2-dependency.patch
0002-remove-providers-unitialization.patch
Changelog:
==========
- GH #3677 PocoFoundationConfig.cmake should now check for PCRE2
- GH #3686 SIGSEGV in OSSL_PROVIDER_unload with static OpenSSL3
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco_1.12.1.bb (renamed from meta-oe/recipes-support/poco/poco_1.12.0.bb) | 11 |
3 files changed, 4 insertions, 67 deletions
diff --git a/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch b/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch deleted file mode 100644 index 1a9d23cee4..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From f049898c8bf058ed187de8e5fab20abeaab1f3b6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Fabijanic <alex@pocoproject.org> | ||
| 3 | Date: Sat, 9 Jul 2022 19:13:04 +0200 | ||
| 4 | Subject: [PATCH] fix(cmake): PocoFoundationConfig.cmake should now check for | ||
| 5 | PCRE2 #3677 | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3677] | ||
| 8 | |||
| 9 | --- | ||
| 10 | Foundation/cmake/PocoFoundationConfig.cmake | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake | ||
| 14 | index 46c2d3fc00..82c5788940 100644 | ||
| 15 | --- a/Foundation/cmake/PocoFoundationConfig.cmake | ||
| 16 | +++ b/Foundation/cmake/PocoFoundationConfig.cmake | ||
| 17 | @@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) | ||
| 18 | include(CMakeFindDependencyMacro) | ||
| 19 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") | ||
| 20 | find_dependency(ZLIB REQUIRED) | ||
| 21 | - find_dependency(PCRE REQUIRED) | ||
| 22 | + find_dependency(PCRE2 REQUIRED) | ||
| 23 | endif() | ||
| 24 | |||
| 25 | include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") | ||
diff --git a/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch b/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch deleted file mode 100644 index 7d24b79f14..0000000000 --- a/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From c976c32e5249cb8a2433e7abfa095c1fe8dc4f8e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Fabijanic <alex@pocoproject.org> | ||
| 3 | Date: Wed, 13 Jul 2022 12:53:52 +0200 | ||
| 4 | Subject: [PATCH] fix(OpenSSLInitializer): remove providers unitialization | ||
| 5 | #3562 #3567 | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3562] | ||
| 8 | |||
| 9 | --- | ||
| 10 | Crypto/src/OpenSSLInitializer.cpp | 12 ------------ | ||
| 11 | 1 file changed, 12 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp | ||
| 14 | index 4678d22299..c537c3f9c2 100644 | ||
| 15 | --- a/Crypto/src/OpenSSLInitializer.cpp | ||
| 16 | +++ b/Crypto/src/OpenSSLInitializer.cpp | ||
| 17 | @@ -157,18 +157,6 @@ void OpenSSLInitializer::uninitialize() | ||
| 18 | #endif | ||
| 19 | delete [] _mutexes; | ||
| 20 | #endif | ||
| 21 | - | ||
| 22 | -#if OPENSSL_VERSION_NUMBER >= 0x30000000L | ||
| 23 | - OSSL_PROVIDER* provider = nullptr; | ||
| 24 | - if ((provider = _defaultProvider.exchange(nullptr))) | ||
| 25 | - { | ||
| 26 | - OSSL_PROVIDER_unload(provider); | ||
| 27 | - } | ||
| 28 | - if ((provider = _legacyProvider.exchange(nullptr))) | ||
| 29 | - { | ||
| 30 | - OSSL_PROVIDER_unload(provider); | ||
| 31 | - } | ||
| 32 | -#endif | ||
| 33 | } | ||
| 34 | } | ||
| 35 | |||
diff --git a/meta-oe/recipes-support/poco/poco_1.12.0.bb b/meta-oe/recipes-support/poco/poco_1.12.1.bb index c3b52c8885..daf9ec00b6 100644 --- a/meta-oe/recipes-support/poco/poco_1.12.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.12.1.bb | |||
| @@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" | |||
| 8 | # These dependencies are required by Foundation | 8 | # These dependencies are required by Foundation |
| 9 | DEPENDS = "libpcre2 zlib" | 9 | DEPENDS = "libpcre2 zlib" |
| 10 | 10 | ||
| 11 | SRC_URI = " \ | 11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ |
| 12 | git://github.com/pocoproject/poco.git;branch=master;protocol=https \ | 12 | file://run-ptest \ |
| 13 | file://0001-fix-unbundled-PCRE2-dependency.patch \ | 13 | " |
| 14 | file://0002-remove-providers-unitialization.patch \ | 14 | SRCREV = "92fac970d4b6161fd58335bfe1492689ba5a80a3" |
| 15 | file://run-ptest \ | ||
| 16 | " | ||
| 17 | SRCREV = "4ba8595ed83841d1fa240716b5652adc3772c36b" | ||
| 18 | 15 | ||
| 19 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |
| 20 | 17 | ||
