aboutsummaryrefslogtreecommitdiff
path: root/libs/libxml2
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
committerIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
commit5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch)
treed0754921833f413b7eb93fb6bb1b1c8a22fb0498 /libs/libxml2
parentd651082447b4392399a40ea1ae11d0bce4bfe83a (diff)
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'libs/libxml2')
-rw-r--r--libs/libxml2/patches/001-CVE-2019-20388.patch7
-rw-r--r--libs/libxml2/patches/002-CVE-2020-24977.patch5
-rw-r--r--libs/libxml2/patches/003-CVE-2020-7595.patch7
3 files changed, 2 insertions, 17 deletions
diff --git a/libs/libxml2/patches/001-CVE-2019-20388.patch b/libs/libxml2/patches/001-CVE-2019-20388.patch
index 653b5701d..80d4ca45f 100644
--- a/libs/libxml2/patches/001-CVE-2019-20388.patch
+++ b/libs/libxml2/patches/001-CVE-2019-20388.patch
@@ -16,11 +16,9 @@ Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
xmlschemas.c | 1 -
1 file changed, 1 deletion(-)
-diff --git a/xmlschemas.c b/xmlschemas.c
-index 301c84499..39d92182f 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
-@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
+@@ -28095,7 +28095,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vc
vctxt->nberrors = 0;
vctxt->depth = -1;
vctxt->skipDepth = -1;
@@ -28,6 +26,3 @@ index 301c84499..39d92182f 100644
vctxt->hasKeyrefs = 0;
#ifdef ENABLE_IDC_NODE_TABLES_TEST
vctxt->createIDCNodeTables = 1;
---
-GitLab
-
diff --git a/libs/libxml2/patches/002-CVE-2020-24977.patch b/libs/libxml2/patches/002-CVE-2020-24977.patch
index fe4b39800..dbba4f059 100644
--- a/libs/libxml2/patches/002-CVE-2020-24977.patch
+++ b/libs/libxml2/patches/002-CVE-2020-24977.patch
@@ -14,8 +14,6 @@ Fixes #178.
xmllint.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/xmllint.c b/xmllint.c
-index f6a8e4636..c647486f3 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -528,6 +528,12 @@ static void
@@ -31,6 +29,3 @@ index f6a8e4636..c647486f3 100644
result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
if (result) {
xmlGenericError(xmlGenericErrorContext, "%s", result);
---
-GitLab
-
diff --git a/libs/libxml2/patches/003-CVE-2020-7595.patch b/libs/libxml2/patches/003-CVE-2020-7595.patch
index 4f12bff9f..b80f0b384 100644
--- a/libs/libxml2/patches/003-CVE-2020-7595.patch
+++ b/libs/libxml2/patches/003-CVE-2020-7595.patch
@@ -13,11 +13,9 @@ Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
parser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/parser.c b/parser.c
-index d1c319631..a34bb6cdd 100644
--- a/parser.c
+++ b/parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
+@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxt
else
c = 0;
while ((c != 0) && (c != end) && /* non input consuming loop */
@@ -27,6 +25,3 @@ index d1c319631..a34bb6cdd 100644
if (c == 0) break;
if ((c == '&') && (str[1] == '#')) {
---
-GitLab
-