diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2022-03-07 20:44:27 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-03-07 09:27:53 -0800 |
| commit | 362edb48502ef6ed0cf2657ae690ca8906d99da9 (patch) | |
| tree | 6b3bac933bce4f69d3807d85a21cea66b2ff46a2 | |
| parent | 7243835dab3a096a4d63acca8d164364b5184067 (diff) | |
| download | meta-openembedded-contrib-362edb48502ef6ed0cf2657ae690ca8906d99da9.tar.gz | |
poco: upgrade 1.11.0 -> 1.11.1
0001-fix-missing-expat-definition.patch
removed since it's included in 1.11.1
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco_1.11.1.bb (renamed from meta-oe/recipes-support/poco/poco_1.11.0.bb) | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch b/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch deleted file mode 100644 index 625aa31911..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3f288fefbd683d687bde3fc63964da64bc3c8a40 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Wed, 11 Aug 2021 15:11:49 +0200 -Subject: [PATCH] fix missing expat definition - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3414] -Signed-off-by: Pascal Bach <pascal.bach@siemens.com> ---- - XML/src/ParserEngine.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp -index 82d477478..6213e555b 100644 ---- a/XML/src/ParserEngine.cpp -+++ b/XML/src/ParserEngine.cpp -@@ -504,7 +504,7 @@ void ParserEngine::init() - XML_SetParamEntityParsing(_parser, _externalParameterEntities ? XML_PARAM_ENTITY_PARSING_ALWAYS : XML_PARAM_ENTITY_PARSING_NEVER); - XML_SetUnknownEncodingHandler(_parser, handleUnknownEncoding, this); - --#if XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4) -+#if XML_DTD && (XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4)) - if (_maximumAmplificationFactor > 1.0) - { - XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); --- -2.32.0 - diff --git a/meta-oe/recipes-support/poco/poco_1.11.0.bb b/meta-oe/recipes-support/poco/poco_1.11.1.bb index 027ff64692..3cfd49fcdd 100644 --- a/meta-oe/recipes-support/poco/poco_1.11.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.11.1.bb @@ -10,10 +10,9 @@ DEPENDS = "libpcre zlib" SRC_URI = " \ git://github.com/pocoproject/poco.git;branch=master;protocol=https \ - file://0001-fix-missing-expat-definition.patch \ file://run-ptest \ " -SRCREV = "f81a38057f1d240fe7b7a069612776f788bc88ea" +SRCREV = "de61f0049175a941cc83c2615c3bdc5e947b89f9" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |