From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 05 May 2022 21:11:20 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nmgsi-002y8E-MC for lore@lore.pengutronix.de; Thu, 05 May 2022 21:11:20 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nmgsi-0005Ee-29; Thu, 05 May 2022 21:11:20 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nmgs5-0005EA-KU for ptxdist@pengutronix.de; Thu, 05 May 2022 21:10:42 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Thu, 5 May 2022 21:10:25 +0200 Message-Id: <20220505191025.59042-1-ada@thorsis.com> Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] libxml2: Version bump 2.9.13 -> 2.9.14 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false - 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 --- 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 -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