From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 May 2022 08:32:37 +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 1nnwwf-006r9v-TQ for lore@lore.pengutronix.de; Mon, 09 May 2022 08:32:37 +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 1nnwwf-0005CZ-7J; Mon, 09 May 2022 08:32:37 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nnwtW-0001Ak-9R; Mon, 09 May 2022 08:29:22 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nnwtW-001F7F-UA; Mon, 09 May 2022 08:29:21 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nnwtU-00FoOu-Do; Mon, 09 May 2022 08:29:20 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 9 May 2022 08:29:20 +0200 Message-Id: <20220509062920.3768516-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220505191025.59042-1-ada@thorsis.com> References: <20220505191025.59042-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as dd3ca51f9270b3565e49a391601cc8e095003b52. Michael [sent from post-receive hook] On Mon, 09 May 2022 08:29:20 +0200, Alexander Dahl wrote: > - 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 > Message-Id: <20220505191025.59042-1-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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 121918d6662b..000000000000 > --- 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 7fe2357fbe45..05ba5ddea3dd 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 a38acacc8704..d59d8f7dc441 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)