diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.recipe b/dev-libs/jsoncpp/jsoncpp-1.9.2.recipe similarity index 92% rename from dev-libs/jsoncpp/jsoncpp-1.9.1.recipe rename to dev-libs/jsoncpp/jsoncpp-1.9.2.recipe index 2c625c171..7f07a2039 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.9.1.recipe +++ b/dev-libs/jsoncpp/jsoncpp-1.9.2.recipe @@ -8,13 +8,14 @@ COPYRIGHT="2007-2018 Baptiste Lepilleur and The JsonCpp Authors" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/open-source-parsers/jsoncpp/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697" +CHECKSUM_SHA256="77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0" SOURCE_FILENAME="jsoncpp-$portVersion.tar.gz" +PATCHES="jsoncpp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="21" +libVersion="22" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/dev-libs/jsoncpp/patches/jsoncpp-1.9.2.patchset b/dev-libs/jsoncpp/patches/jsoncpp-1.9.2.patchset new file mode 100644 index 000000000..70ff69ba8 --- /dev/null +++ b/dev-libs/jsoncpp/patches/jsoncpp-1.9.2.patchset @@ -0,0 +1,22 @@ +From bb65fc8bc61a9af3063f3bbb9cc55ed8313d4b1c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 20 Mar 2020 17:54:32 +0100 +Subject: protect EOF + + +diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp +index 0c1e88d..a8957a8 100644 +--- a/src/lib_json/json_reader.cpp ++++ b/src/lib_json/json_reader.cpp +@@ -107,7 +107,7 @@ bool Reader::parse(std::istream& is, Value& root, bool collectComments) { + // Since String is reference-counted, this at least does not + // create an extra copy. + String doc; +- std::getline(is, doc, static_cast EOF); ++ std::getline(is, doc, static_cast (EOF)); + return parse(doc.data(), doc.data() + doc.size(), root, collectComments); + } + +-- +2.24.0 +