From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Mar 2022 11:15:39 +0100 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 1nThjn-002lht-4E for lore@lore.pengutronix.de; Mon, 14 Mar 2022 11:15:39 +0100 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 1nThjm-0006Bu-Ey; Mon, 14 Mar 2022 11:15:38 +0100 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 1nThih-0005Pb-8x; Mon, 14 Mar 2022 11:14:31 +0100 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 1nThih-000cf2-Ta; Mon, 14 Mar 2022 11:14:30 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nThif-00Ab3q-OU; Mon, 14 Mar 2022 11:14:29 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 14 Mar 2022 11:14:29 +0100 Message-Id: <20220314101429.2525690-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220308125316.82895-3-ada@thorsis.com> References: <20220308125316.82895-3-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] libxslt: version bump 1.1.34 -> 1.1.35 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 4b8662b04fe9be595d113b0a6c73c150c3cccda2. Michael [sent from post-receive hook] On Mon, 14 Mar 2022 11:14:29 +0100, Alexander Dahl wrote: > - Security fix for CVE-2021-30560, memory leaks and a double free > - Regression fixes > - Bug fixes > - Tests, build, and documentation improvements > > One patch has gone upstream. > > The download location and tarball compression format changed. > While the old location is still there, it does not have the new tarball. > The new location however has only tarballs in .xz format, no .gz > anymore. Thus both have to be changed. > > Link: https://mail.gnome.org/archives/xslt/2022-February/msg00003.html > Signed-off-by: Alexander Dahl > Message-Id: <20220308125316.82895-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch > deleted file mode 100644 > index ab722734438a..000000000000 > --- a/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Nick Wellnhofer > -Date: Fri, 15 Nov 2019 11:53:11 +0100 > -Subject: [PATCH] Fix xml2-config check in configure script > - > -A 'print' option has never been supported. After a recent change to > -libxml2, invalid options cause xml2-config to fail. > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 325a7bea0dcf..d6b5594ad477 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable, > - dnl test version and init our variables > - dnl > - > --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > - then > - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > - XMLVERS=`$XML_CONFIG --version` > diff --git a/patches/libxslt-1.1.34/autogen.sh b/patches/libxslt-1.1.34/autogen.sh > deleted file mode 120000 > index 9f8a4cb7ddcb..000000000000 > --- a/patches/libxslt-1.1.34/autogen.sh > +++ /dev/null > @@ -1 +0,0 @@ > -../autogen.sh > \ No newline at end of file > diff --git a/patches/libxslt-1.1.34/series b/patches/libxslt-1.1.34/series > deleted file mode 100644 > index 1ede19a8c3fb..000000000000 > --- a/patches/libxslt-1.1.34/series > +++ /dev/null > @@ -1,7 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -#tag:upstream --start-number 1 > -0001-Fix-xml2-config-check-in-configure-script.patch > -#tag:ptx --start-number 200 > -0200-xslt-config-add-SYSROOT-support.patch > -# c8a532c629ee7654cb91733eefc0814b - git-ptx-patches magic > diff --git a/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch > similarity index 100% > rename from patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch > rename to patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch > diff --git a/patches/libxslt-1.1.35/series b/patches/libxslt-1.1.35/series > new file mode 100644 > index 000000000000..e7aa0f393c83 > --- /dev/null > +++ b/patches/libxslt-1.1.35/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +#tag:ptx --start-number 200 > +0200-xslt-config-add-SYSROOT-support.patch > +# d971b2e05382256c96c63c656e15719c - git-ptx-patches magic > diff --git a/rules/libxslt.make b/rules/libxslt.make > index 504fe8f01d59..1ffe657a29df 100644 > --- a/rules/libxslt.make > +++ b/rules/libxslt.make > @@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt > # > # Paths and names > # > -LIBXSLT_VERSION := 1.1.34 > -LIBXSLT_MD5 := db8765c8d076f1b6caafd9f2542a304a > +LIBXSLT_VERSION := 1.1.35 > +LIBXSLT_MD5 := 5b3a634b77effd8a6268c21173575053 > LIBXSLT := libxslt-$(LIBXSLT_VERSION) > -LIBXSLT_SUFFIX := tar.gz > +LIBXSLT_SUFFIX := tar.xz > LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX) > LIBXSLT_DIR := $(BUILDDIR)/$(LIBXSLT) > LIBXSLT_LICENSE := MIT > @@ -27,10 +27,7 @@ LIBXSLT_LICENSE_FILES := \ > file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 > > LIBXSLT_URL := \ > - http://xmlsoft.org/sources/$(LIBXSLT).$(LIBXSLT_SUFFIX) \ > - http://xmlsoft.org/sources/old/$(LIBXSLT).$(LIBXSLT_SUFFIX) \ > - ftp://xmlsoft.org/libxslt/$(LIBXSLT).$(LIBXSLT_SUFFIX) \ > - ftp://xmlsoft.org/libxslt/old/$(LIBXSLT).$(LIBXSLT_SUFFIX) > + https://download.gnome.org/sources/libxslt/$(basename $(LIBXSLT_VERSION))/$(LIBXSLT).$(LIBXSLT_SUFFIX) > > # ---------------------------------------------------------------------------- > # Prepare > @@ -45,6 +42,7 @@ LIBXSLT_ENV := \ > # > LIBXSLT_AUTOCONF := \ > $(CROSS_AUTOCONF_USR) \ > + --disable-rebuild-docs \ > --disable-static \ > --without-python \ > --$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de