Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 3f288fefbd683d687bde3fc63964da64bc3c8a40 Mon Sep 17 00:00:00 2001
From: Pascal Bach <[email protected]>
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 <[email protected]>
---
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

Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
DEPENDS = "libpcre zlib"

SRC_URI = " \
git://github.com/pocoproject/poco.git;branch=poco-${PV} \
file://0001-Add-support-of-arch-riscv32.patch \
git://github.com/pocoproject/poco.git;branch=master \
file://0001-fix-missing-expat-definition.patch \
file://run-ptest \
"
SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019"
SRCREV = "f81a38057f1d240fe7b7a069612776f788bc88ea"

UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"

Expand Down