diff mbox series

[meta-oe] poco: upgrade 1.12.0 -> 1.12.1

Message ID 1659447791-24448-5-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe] poco: upgrade 1.12.0 -> 1.12.1 | expand

Commit Message

Mingyu Wang (Fujitsu) Aug. 2, 2022, 1:43 p.m. UTC 
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>
---
 .../0001-fix-unbundled-PCRE2-dependency.patch | 25 -------------
 ...0002-remove-providers-unitialization.patch | 35 -------------------
 .../poco/{poco_1.12.0.bb => poco_1.12.1.bb}   | 11 +++---
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch
 delete mode 100644 meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch
 rename meta-oe/recipes-support/poco/{poco_1.12.0.bb => poco_1.12.1.bb} (94%)
diff mbox series

Patch

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 @@ 
-From f049898c8bf058ed187de8e5fab20abeaab1f3b6 Mon Sep 17 00:00:00 2001
-From: Alex Fabijanic <alex@pocoproject.org>
-Date: Sat, 9 Jul 2022 19:13:04 +0200
-Subject: [PATCH] fix(cmake): PocoFoundationConfig.cmake should now check for
- PCRE2 #3677
-
-Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3677]
-
----
- Foundation/cmake/PocoFoundationConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake
-index 46c2d3fc00..82c5788940 100644
---- a/Foundation/cmake/PocoFoundationConfig.cmake
-+++ b/Foundation/cmake/PocoFoundationConfig.cmake
-@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@)
- 	include(CMakeFindDependencyMacro)
- 	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
- 	find_dependency(ZLIB REQUIRED)
--	find_dependency(PCRE REQUIRED)
-+	find_dependency(PCRE2 REQUIRED)
- endif()
- 
- 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 @@ 
-From c976c32e5249cb8a2433e7abfa095c1fe8dc4f8e Mon Sep 17 00:00:00 2001
-From: Alex Fabijanic <alex@pocoproject.org>
-Date: Wed, 13 Jul 2022 12:53:52 +0200
-Subject: [PATCH] fix(OpenSSLInitializer): remove providers unitialization
- #3562 #3567
-
-Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3562]
-
----
- Crypto/src/OpenSSLInitializer.cpp | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
-index 4678d22299..c537c3f9c2 100644
---- a/Crypto/src/OpenSSLInitializer.cpp
-+++ b/Crypto/src/OpenSSLInitializer.cpp
-@@ -157,18 +157,6 @@ void OpenSSLInitializer::uninitialize()
- #endif
- 		delete [] _mutexes;
- #endif
--
--#if OPENSSL_VERSION_NUMBER >= 0x30000000L
--		OSSL_PROVIDER* provider = nullptr;
--		if ((provider = _defaultProvider.exchange(nullptr)))
--		{
--			OSSL_PROVIDER_unload(provider);
--		}
--		if ((provider = _legacyProvider.exchange(nullptr)))
--		{
--			OSSL_PROVIDER_unload(provider);
--		}
--#endif
- 	}
- }
- 
diff --git a/meta-oe/recipes-support/poco/poco_1.12.0.bb b/meta-oe/recipes-support/poco/poco_1.12.1.bb
similarity index 94%
rename from meta-oe/recipes-support/poco/poco_1.12.0.bb
rename to 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"
 # These dependencies are required by Foundation
 DEPENDS = "libpcre2 zlib"
 
-SRC_URI = " \
-    git://github.com/pocoproject/poco.git;branch=master;protocol=https \
-    file://0001-fix-unbundled-PCRE2-dependency.patch \
-    file://0002-remove-providers-unitialization.patch \
-    file://run-ptest \
-   "
-SRCREV = "4ba8595ed83841d1fa240716b5652adc3772c36b"
+SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \
+           file://run-ptest \
+           "
+SRCREV = "92fac970d4b6161fd58335bfe1492689ba5a80a3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"