Thanks, applied as 4b8662b04fe9be595d113b0a6c73c150c3cccda2. Michael
[sent from post-receive hook] On Mon, 14 Mar 2022 11:14:29 +0100, Alexander Dahl <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 <[email protected]> > -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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
