Reviewed-by: Peter Müller > - Update from version 1.1.34 to 1.1.35 > - Update of rootfile > - Changelog > v1.1.35: Feb 16 2022: > - Security: > [CVE-2021-30560] Fix use-after-free in xsltApplyTemplates > Fix memory leak in xsltDocumentElem (David King) > Fix memory leak in xsltCompileIdKeyPattern (David King) > Fix double-free with stylesheets containing entity nodes > - Fixed regressions: > Fix performance regression with predicates in patterns > Fix regression in xsltComputeSortResult > - Bug fixes: > Fix conflict resolution for templates with same priority > Fix xsl:number generating invalid UTF-8 > Support attribute value templates in xsl:sort lang attributes > Don't pass first in twice > Fix quadratic runtime with text and > Don't allow empty EXSLT durations > - Improvements: > Add xsltproc --huge Argument via libxml XML_PARSE_HUGE (William N. Braswell, Jr.) > - Tests, code quality, fuzzing: > Remove .travis.yml > Fix some misleading indentation (David King) > Use actual types for templates in struct _xsltStylesheet > Add CI for CMake on MSVC (Markus Rickert) > Check for null pointer before calling freelocale > Add CI test for Python 3 > Don't set maxDepth in XPath contexts > Transfer XPath limits to XPtr context > Stop using maxParserDepth XPath limit > Make long-to-double cast explicit in date.c > Disable LeakSanitizer > Run clang CI tests with -Wimplicit-int-conversion > Fix implicit-int-conversion warning in exslt/crypto.c > Fix clang -Wimplicit-int-conversion warning (David Kilzer) > Fix clang -Wconditional-uninitialized warning in libxslt/numbers.c (David Kilzer) > Fix -Wshadow warnings in libexslt/dynamic.c (David Kilzer) > Also search parent dir for source XML when fuzzing > - Build system, portability: > Add CMake build files (Markus Rickert) > Initial support for Python 3 (Suleyman Poyraz) > Call ANSI versions of WinAPI functions explicitly > Remove redundant flags from pkg-config files > Suppress automake warning in tests/XSLTMark > Fix linking libexslt dynamic library when using MinGW (Vadim Zeitlin) > Added platform specific path separators (Dmitriy Korovkin) > win32: allow passing *FLAGS on command line > Fix export of xsltExtMarker on Windows (David Kilzer) > Fix redundant includes already in libexslt.h (David Kilzer) > Minor fixes to configure.js > Fix variable syntax in Python configuration > Add new EXSLT string tests to EXTRA_DIST > Fix xml2-config check in configure script > win32: Add configuration for profiler (Chun-wei Fan) > Check whether 'xml2-config --dynamic' is supported > - Documentation: > Add Makefile rule to regenerate xsltproc.html > Update links > Remove MAINTAINERS > Upload documentation to GitLab Pages > Add documentation in devhelp format > Add --enable-rebuild-docs configure option > Fix libexslt header summaries > Fix validity of tutorial XML (David King) > Use DocBook URL for tutorial DTD (David King) > Update libxslt.doap > Add missing options to xsltproc man page > > Signed-off-by: Adolf Belka > --- > config/rootfiles/common/libxslt | 235 +++++++++++++++++++------------- > lfs/libxslt | 8 +- > 2 files changed, 143 insertions(+), 100 deletions(-) > > diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt > index fc96538ab..eae4b26bd 100644 > --- a/config/rootfiles/common/libxslt > +++ b/config/rootfiles/common/libxslt > @@ -26,6 +26,9 @@ usr/bin/xsltproc > #usr/include/libxslt/xsltexports.h > #usr/include/libxslt/xsltlocale.h > #usr/include/libxslt/xsltutils.h > +#usr/lib/cmake/libxslt > +#usr/lib/cmake/libxslt/FindGcrypt.cmake > +#usr/lib/cmake/libxslt/libxslt-config.cmake > #usr/lib/libexslt.la > #usr/lib/libexslt.so > usr/lib/libexslt.so.0 > @@ -34,106 +37,146 @@ usr/lib/libexslt.so.0.8.20 > #usr/lib/libxslt.la > #usr/lib/libxslt.so > usr/lib/libxslt.so.1 > -usr/lib/libxslt.so.1.1.34 > +usr/lib/libxslt.so.1.1.35 > #usr/lib/pkgconfig/libexslt.pc > #usr/lib/pkgconfig/libxslt.pc > #usr/lib/xsltConf.sh > #usr/share/aclocal/libxslt.m4 > -#usr/share/doc/libxslt-1.1.34 > -#usr/share/doc/libxslt-1.1.34/html > -#usr/share/doc/libxslt-1.1.34/html/API.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk0.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk1.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk10.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk11.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk12.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk2.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk3.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk4.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk5.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk6.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk7.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk8.html > -#usr/share/doc/libxslt-1.1.34/html/APIchunk9.html > -#usr/share/doc/libxslt-1.1.34/html/APIconstructors.html > -#usr/share/doc/libxslt-1.1.34/html/APIfiles.html > -#usr/share/doc/libxslt-1.1.34/html/APIfunctions.html > -#usr/share/doc/libxslt-1.1.34/html/APIsymbols.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/APIchunk0.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/APIconstructors.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/APIfiles.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/APIfunctions.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/APIsymbols.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/bugs.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/docs.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/downloads.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/exslt.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/help.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/index.html > -#usr/share/doc/libxslt-1.1.34/html/EXSLT/intro.html > -#usr/share/doc/libxslt-1.1.34/html/FAQ.html > -#usr/share/doc/libxslt-1.1.34/html/Libxslt-Logo-180x168.gif > -#usr/share/doc/libxslt-1.1.34/html/Libxslt-Logo-90x34.gif > -#usr/share/doc/libxslt-1.1.34/html/bugs.html > -#usr/share/doc/libxslt-1.1.34/html/contexts.gif > -#usr/share/doc/libxslt-1.1.34/html/contribs.html > -#usr/share/doc/libxslt-1.1.34/html/docbook.html > -#usr/share/doc/libxslt-1.1.34/html/docs.html > -#usr/share/doc/libxslt-1.1.34/html/downloads.html > -#usr/share/doc/libxslt-1.1.34/html/extensions.html > -#usr/share/doc/libxslt-1.1.34/html/help.html > -#usr/share/doc/libxslt-1.1.34/html/html > -#usr/share/doc/libxslt-1.1.34/html/html/book1.html > -#usr/share/doc/libxslt-1.1.34/html/html/home.png > -#usr/share/doc/libxslt-1.1.34/html/html/index.html > -#usr/share/doc/libxslt-1.1.34/html/html/left.png > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-attributes.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-documents.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-extensions.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-extra.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-functions.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-imports.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-keys.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-lib.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-namespaces.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-numbersInternals.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-pattern.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-preproc.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-security.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-templates.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-transform.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-variables.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-xslt.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-xsltInternals.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-xsltexports.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-xsltlocale.html > -#usr/share/doc/libxslt-1.1.34/html/html/libxslt-xsltutils.html > -#usr/share/doc/libxslt-1.1.34/html/html/right.png > -#usr/share/doc/libxslt-1.1.34/html/html/up.png > -#usr/share/doc/libxslt-1.1.34/html/index.html > -#usr/share/doc/libxslt-1.1.34/html/internals.html > -#usr/share/doc/libxslt-1.1.34/html/intro.html > -#usr/share/doc/libxslt-1.1.34/html/news.html > -#usr/share/doc/libxslt-1.1.34/html/node.gif > -#usr/share/doc/libxslt-1.1.34/html/object.gif > -#usr/share/doc/libxslt-1.1.34/html/processing.gif > -#usr/share/doc/libxslt-1.1.34/html/python.html > -#usr/share/doc/libxslt-1.1.34/html/redhat.gif > -#usr/share/doc/libxslt-1.1.34/html/smallfootonly.gif > -#usr/share/doc/libxslt-1.1.34/html/stylesheet.gif > -#usr/share/doc/libxslt-1.1.34/html/templates.gif > -#usr/share/doc/libxslt-1.1.34/html/tutorial > -#usr/share/doc/libxslt-1.1.34/html/tutorial/libxslt_tutorial.c > -#usr/share/doc/libxslt-1.1.34/html/tutorial/libxslttutorial.html > -#usr/share/doc/libxslt-1.1.34/html/tutorial/libxslttutorial.xml > -#usr/share/doc/libxslt-1.1.34/html/tutorial2 > -#usr/share/doc/libxslt-1.1.34/html/tutorial2/libxslt_pipes.c > -#usr/share/doc/libxslt-1.1.34/html/tutorial2/libxslt_pipes.html > -#usr/share/doc/libxslt-1.1.34/html/tutorial2/libxslt_pipes.xml > -#usr/share/doc/libxslt-1.1.34/html/xslt.html > -#usr/share/doc/libxslt-1.1.34/html/xsltproc.html > -#usr/share/doc/libxslt-1.1.34/html/xsltproc2.html > +#usr/share/doc/libxslt-1.1.35 > +#usr/share/doc/libxslt-1.1.35/html > +#usr/share/doc/libxslt-1.1.35/html/API.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk0.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk1.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk10.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk11.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk12.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk2.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk3.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk4.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk5.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk6.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk7.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk8.html > +#usr/share/doc/libxslt-1.1.35/html/APIchunk9.html > +#usr/share/doc/libxslt-1.1.35/html/APIconstructors.html > +#usr/share/doc/libxslt-1.1.35/html/APIfiles.html > +#usr/share/doc/libxslt-1.1.35/html/APIfunctions.html > +#usr/share/doc/libxslt-1.1.35/html/APIsymbols.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIchunk0.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIconstructors.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIfiles.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIfunctions.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/APIsymbols.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/bugs.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/docs.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/downloads.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/exslt.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/help.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/index.html > +#usr/share/doc/libxslt-1.1.35/html/EXSLT/intro.html > +#usr/share/doc/libxslt-1.1.35/html/FAQ.html > +#usr/share/doc/libxslt-1.1.35/html/Libxslt-Logo-180x168.gif > +#usr/share/doc/libxslt-1.1.35/html/Libxslt-Logo-90x34.gif > +#usr/share/doc/libxslt-1.1.35/html/bugs.html > +#usr/share/doc/libxslt-1.1.35/html/contexts.gif > +#usr/share/doc/libxslt-1.1.35/html/contribs.html > +#usr/share/doc/libxslt-1.1.35/html/docbook.html > +#usr/share/doc/libxslt-1.1.35/html/docs.html > +#usr/share/doc/libxslt-1.1.35/html/downloads.html > +#usr/share/doc/libxslt-1.1.35/html/extensions.html > +#usr/share/doc/libxslt-1.1.35/html/help.html > +#usr/share/doc/libxslt-1.1.35/html/html > +#usr/share/doc/libxslt-1.1.35/html/html/book1.html > +#usr/share/doc/libxslt-1.1.35/html/html/home.png > +#usr/share/doc/libxslt-1.1.35/html/html/index.html > +#usr/share/doc/libxslt-1.1.35/html/html/left.png > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-attributes.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-documents.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-extensions.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-extra.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-functions.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-imports.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-keys.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-lib.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-namespaces.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-numbersInternals.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-pattern.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-preproc.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-security.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-templates.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-transform.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-variables.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xslt.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltInternals.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltexports.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltlocale.html > +#usr/share/doc/libxslt-1.1.35/html/html/libxslt-xsltutils.html > +#usr/share/doc/libxslt-1.1.35/html/html/right.png > +#usr/share/doc/libxslt-1.1.35/html/html/up.png > +#usr/share/doc/libxslt-1.1.35/html/index.html > +#usr/share/doc/libxslt-1.1.35/html/internals.html > +#usr/share/doc/libxslt-1.1.35/html/intro.html > +#usr/share/doc/libxslt-1.1.35/html/news.html > +#usr/share/doc/libxslt-1.1.35/html/node.gif > +#usr/share/doc/libxslt-1.1.35/html/object.gif > +#usr/share/doc/libxslt-1.1.35/html/processing.gif > +#usr/share/doc/libxslt-1.1.35/html/python.html > +#usr/share/doc/libxslt-1.1.35/html/redhat.gif > +#usr/share/doc/libxslt-1.1.35/html/smallfootonly.gif > +#usr/share/doc/libxslt-1.1.35/html/stylesheet.gif > +#usr/share/doc/libxslt-1.1.35/html/templates.gif > +#usr/share/doc/libxslt-1.1.35/html/tutorial > +#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslt_tutorial.c > +#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslttutorial.html > +#usr/share/doc/libxslt-1.1.35/html/tutorial/libxslttutorial.xml > +#usr/share/doc/libxslt-1.1.35/html/tutorial2 > +#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.c > +#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.html > +#usr/share/doc/libxslt-1.1.35/html/tutorial2/libxslt_pipes.xml > +#usr/share/doc/libxslt-1.1.35/html/xslt.html > +#usr/share/doc/libxslt-1.1.35/html/xsltproc.html > +#usr/share/doc/libxslt-1.1.35/html/xsltproc2.html > +#usr/share/gtk-doc/html/libexslt > +#usr/share/gtk-doc/html/libexslt/general.html > +#usr/share/gtk-doc/html/libexslt/home.png > +#usr/share/gtk-doc/html/libexslt/index.html > +#usr/share/gtk-doc/html/libexslt/left.png > +#usr/share/gtk-doc/html/libexslt/libexslt-exslt.html > +#usr/share/gtk-doc/html/libexslt/libexslt-exsltexports.html > +#usr/share/gtk-doc/html/libexslt/libexslt.devhelp2 > +#usr/share/gtk-doc/html/libexslt/right.png > +#usr/share/gtk-doc/html/libexslt/style.css > +#usr/share/gtk-doc/html/libexslt/up.png > +#usr/share/gtk-doc/html/libxslt > +#usr/share/gtk-doc/html/libxslt/general.html > +#usr/share/gtk-doc/html/libxslt/home.png > +#usr/share/gtk-doc/html/libxslt/index.html > +#usr/share/gtk-doc/html/libxslt/left.png > +#usr/share/gtk-doc/html/libxslt/libxslt-attributes.html > +#usr/share/gtk-doc/html/libxslt/libxslt-documents.html > +#usr/share/gtk-doc/html/libxslt/libxslt-extensions.html > +#usr/share/gtk-doc/html/libxslt/libxslt-extra.html > +#usr/share/gtk-doc/html/libxslt/libxslt-functions.html > +#usr/share/gtk-doc/html/libxslt/libxslt-imports.html > +#usr/share/gtk-doc/html/libxslt/libxslt-keys.html > +#usr/share/gtk-doc/html/libxslt/libxslt-namespaces.html > +#usr/share/gtk-doc/html/libxslt/libxslt-numbersInternals.html > +#usr/share/gtk-doc/html/libxslt/libxslt-pattern.html > +#usr/share/gtk-doc/html/libxslt/libxslt-preproc.html > +#usr/share/gtk-doc/html/libxslt/libxslt-security.html > +#usr/share/gtk-doc/html/libxslt/libxslt-templates.html > +#usr/share/gtk-doc/html/libxslt/libxslt-transform.html > +#usr/share/gtk-doc/html/libxslt/libxslt-variables.html > +#usr/share/gtk-doc/html/libxslt/libxslt-xslt.html > +#usr/share/gtk-doc/html/libxslt/libxslt-xsltInternals.html > +#usr/share/gtk-doc/html/libxslt/libxslt-xsltexports.html > +#usr/share/gtk-doc/html/libxslt/libxslt-xsltlocale.html > +#usr/share/gtk-doc/html/libxslt/libxslt-xsltutils.html > +#usr/share/gtk-doc/html/libxslt/libxslt.devhelp2 > +#usr/share/gtk-doc/html/libxslt/right.png > +#usr/share/gtk-doc/html/libxslt/style.css > +#usr/share/gtk-doc/html/libxslt/up.png > #usr/share/man/man1/xsltproc.1 > #usr/share/man/man3/libexslt.3 > #usr/share/man/man3/libxslt.3 > diff --git a/lfs/libxslt b/lfs/libxslt > index 1c082b98a..21767b2e3 100644 > --- a/lfs/libxslt > +++ b/lfs/libxslt > @@ -24,10 +24,10 @@ > > include Config > > -VER = 1.1.34 > +VER = 1.1.35 > > THISAPP = libxslt-$(VER) > -DL_FILE = $(THISAPP).tar.gz > +DL_FILE = $(THISAPP).tar.xz > DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > @@ -40,7 +40,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_BLAKE2 = f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 > +$(DL_FILE)_BLAKE2 = 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d > > install : $(TARGET) > > @@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) : > > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > $(UPDATE_AUTOMAKE) > cd $(DIR_APP) && ./configure \ > --prefix=/usr \