From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: [ptxdist] [PATCH] libxml2: Version bump 2.9.13 -> 2.9.14
Date: Thu, 5 May 2022 21:10:25 +0200 [thread overview]
Message-ID: <20220505191025.59042-1-ada@thorsis.com> (raw)
- security fixes, including CVE-2022-29824
- bug fixes
- build fixes (one upstream patch could be removed here)
Link: https://mail.gnome.org/archives/xml/2022-May/msg00000.html
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
Notes:
build tested only
.../0001-Fix-without-valid-build.patch | 85 -------------------
...200-xml2-config-is-not-SYSROOT-aware.patch | 0
.../{libxml2-2.9.13 => libxml2-2.9.14}/series | 3 +-
rules/libxml2.make | 4 +-
4 files changed, 3 insertions(+), 89 deletions(-)
delete mode 100644 patches/libxml2-2.9.13/0001-Fix-without-valid-build.patch
rename patches/{libxml2-2.9.13 => libxml2-2.9.14}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
rename patches/{libxml2-2.9.13 => libxml2-2.9.14}/series (62%)
diff --git a/patches/libxml2-2.9.13/0001-Fix-without-valid-build.patch b/patches/libxml2-2.9.13/0001-Fix-without-valid-build.patch
deleted file mode 100644
index 121918d66..000000000
--- a/patches/libxml2-2.9.13/0001-Fix-without-valid-build.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Tue, 22 Feb 2022 11:51:08 +0100
-Subject: [PATCH] Fix --without-valid build
-
-Regressed in commit 652dd12a.
----
- valid.c | 58 +++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/valid.c b/valid.c
-index 8e596f1db3db..9684683a0801 100644
---- a/valid.c
-+++ b/valid.c
-@@ -479,35 +479,6 @@ nodeVPop(xmlValidCtxtPtr ctxt)
- return (ret);
- }
-
--/**
-- * xmlValidNormalizeString:
-- * @str: a string
-- *
-- * Normalize a string in-place.
-- */
--static void
--xmlValidNormalizeString(xmlChar *str) {
-- xmlChar *dst;
-- const xmlChar *src;
--
-- if (str == NULL)
-- return;
-- src = str;
-- dst = str;
--
-- while (*src == 0x20) src++;
-- while (*src != 0) {
-- if (*src == 0x20) {
-- while (*src == 0x20) src++;
-- if (*src != 0)
-- *dst++ = 0x20;
-- } else {
-- *dst++ = *src++;
-- }
-- }
-- *dst = 0;
--}
--
- #ifdef DEBUG_VALID_ALGO
- static void
- xmlValidPrintNode(xmlNodePtr cur) {
-@@ -2636,6 +2607,35 @@ xmlDumpNotationTable(xmlBufferPtr buf, xmlNotationTablePtr table) {
- (xmlDictOwns(dict, (const xmlChar *)(str)) == 0))) \
- xmlFree((char *)(str));
-
-+/**
-+ * xmlValidNormalizeString:
-+ * @str: a string
-+ *
-+ * Normalize a string in-place.
-+ */
-+static void
-+xmlValidNormalizeString(xmlChar *str) {
-+ xmlChar *dst;
-+ const xmlChar *src;
-+
-+ if (str == NULL)
-+ return;
-+ src = str;
-+ dst = str;
-+
-+ while (*src == 0x20) src++;
-+ while (*src != 0) {
-+ if (*src == 0x20) {
-+ while (*src == 0x20) src++;
-+ if (*src != 0)
-+ *dst++ = 0x20;
-+ } else {
-+ *dst++ = *src++;
-+ }
-+ }
-+ *dst = 0;
-+}
-+
- static int
- xmlIsStreaming(xmlValidCtxtPtr ctxt) {
- xmlParserCtxtPtr pctxt;
diff --git a/patches/libxml2-2.9.13/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 100%
rename from patches/libxml2-2.9.13/0200-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
diff --git a/patches/libxml2-2.9.13/series b/patches/libxml2-2.9.14/series
similarity index 62%
rename from patches/libxml2-2.9.13/series
rename to patches/libxml2-2.9.14/series
index 7fe2357fb..05ba5ddea 100644
--- a/patches/libxml2-2.9.13/series
+++ b/patches/libxml2-2.9.14/series
@@ -1,7 +1,6 @@
# generated by git-ptx-patches
#tag:base --start-number 1
#tag:upstream --start-number 1
-0001-Fix-without-valid-build.patch
#tag:ptx --start-number 200
0200-xml2-config-is-not-SYSROOT-aware.patch
-# df28c85ff842fd7fd31a18d4f65f58f2 - git-ptx-patches magic
+# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic
diff --git a/rules/libxml2.make b/rules/libxml2.make
index a38acacc8..d59d8f7dc 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.9.13
-LIBXML2_MD5 := 824470f8cc325ae6b01f174b842c321f
+LIBXML2_VERSION := 2.9.14
+LIBXML2_MD5 := b7b3029ac6beb32a7925225515f83ca3
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.xz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
base-commit: e1eac6754383f08b0f8dba65bb8671c78aa635cc
--
2.20.1
next reply other threads:[~2022-05-05 19:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 19:10 Alexander Dahl [this message]
2022-05-09 6:29 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220505191025.59042-1-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox