diff options
| -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 @@ | |||
| 1 | From 3f288fefbd683d687bde3fc63964da64bc3c8a40 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Pascal Bach <pascal.bach@siemens.com> | ||
| 3 | Date: Wed, 11 Aug 2021 15:11:49 +0200 | ||
| 4 | Subject: [PATCH] fix missing expat definition | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3414] | ||
| 7 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> | ||
| 8 | --- | ||
| 9 | XML/src/ParserEngine.cpp | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp | ||
| 13 | index 82d477478..6213e555b 100644 | ||
| 14 | --- a/XML/src/ParserEngine.cpp | ||
| 15 | +++ b/XML/src/ParserEngine.cpp | ||
| 16 | @@ -504,7 +504,7 @@ void ParserEngine::init() | ||
| 17 | XML_SetParamEntityParsing(_parser, _externalParameterEntities ? XML_PARAM_ENTITY_PARSING_ALWAYS : XML_PARAM_ENTITY_PARSING_NEVER); | ||
| 18 | XML_SetUnknownEncodingHandler(_parser, handleUnknownEncoding, this); | ||
| 19 | |||
| 20 | -#if XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4) | ||
| 21 | +#if XML_DTD && (XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4)) | ||
| 22 | if (_maximumAmplificationFactor > 1.0) | ||
| 23 | { | ||
| 24 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ||
| 25 | -- | ||
| 26 | 2.32.0 | ||
| 27 | |||
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" | |||
| 10 | 10 | ||
| 11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
| 12 | git://github.com/pocoproject/poco.git;branch=master;protocol=https \ | 12 | git://github.com/pocoproject/poco.git;branch=master;protocol=https \ |
| 13 | file://0001-fix-missing-expat-definition.patch \ | ||
| 14 | file://run-ptest \ | 13 | file://run-ptest \ |
| 15 | " | 14 | " |
| 16 | SRCREV = "f81a38057f1d240fe7b7a069612776f788bc88ea" | 15 | SRCREV = "de61f0049175a941cc83c2615c3bdc5e947b89f9" |
| 17 | 16 | ||
| 18 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |
| 19 | 18 | ||
