Accepting request 1001274 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1001274
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxslt?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2022-10-19 11:17:21 +00:00 committed by Git OBS Bridge
commit 8f4c6c32a6
13 changed files with 178 additions and 1163 deletions

View File

@ -7,8 +7,8 @@ Author: Jérémy Bobbio <lunar@debian.org>
Index: libxslt-1.1.29/libxslt/functions.c
===================================================================
--- libxslt-1.1.29.orig/libxslt/functions.c
+++ libxslt-1.1.29/libxslt/functions.c
--- a/libxslt/functions.c
+++ b/libxslt/functions.c
@@ -661,10 +661,10 @@ xsltFormatNumberFunction(xmlXPathParserC
*/
void

View File

@ -1,888 +0,0 @@
From f165525fe744e6fe3b377b480d6cc5f9c546d360 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sun, 20 Sep 2020 16:59:23 +0200
Subject: [PATCH] Recreate xsltproc man page with old Docbook stylesheet URL
Fixes #31.
Reviewed-by: Petr Vorel <pvorel@suse.cz>
---
doc/xsltproc.1 | 627 ++++++++++++-----------------------------------
doc/xsltproc.xml | 2 +-
2 files changed, 161 insertions(+), 468 deletions(-)
diff --git a/doc/xsltproc.1 b/doc/xsltproc.1
index 7393b6db..bbf4098f 100644
--- a/doc/xsltproc.1
+++ b/doc/xsltproc.1
@@ -1,7 +1,7 @@
'\" t
.\" Title: xsltproc
.\" Author: John Fleck <jfleck@inkstain.net>
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: $Date$
.\" Manual: xsltproc Manual
.\" Source: libxslt
@@ -27,72 +27,13 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
-
-
-
-
-
.SH "NAME"
xsltproc \- command line XSLT processor
-
.SH "SYNOPSIS"
-
- .HP \w'\fBxsltproc\fR\ 'u
-
- \fBxsltproc\fR
- [
- [
- | \fB\-V\fR
- | \fB\-\-version\fR
- ]
- [
- | \fB\-v\fR
- | \fB\-\-verbose\fR
- ]
- [
- {
- | \fB\-o\fR
- | \fB\-\-output\fR
- }
- {
- | \fIFILE\fR
- | \fIDIRECTORY\fR
- }
- ]
- | \fB\-\-timing\fR
- | \fB\-\-repeat\fR
- | \fB\-\-debug\fR
- | \fB\-\-novalid\fR
- | \fB\-\-noout\fR
- | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR
- | \fB\-\-html\fR
- | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR
- | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
- | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
- | \fB\-\-nonet\fR
- | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
- | \fB\-\-load\-trace\fR
- | \fB\-\-catalogs\fR
- | \fB\-\-xinclude\fR
- | [\ |\ \fB\-\-profile\fR\ |\ \fB\-\-norman\fR\ ]
- | \fB\-\-dumpextensions\fR
- | \fB\-\-nowrite\fR
- | \fB\-\-nomkdir\fR
- | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR
- | \fB\-\-nodtdattr\fR
- ]
- [\fISTYLESHEET\fR]
- {
- | \fIXML\-FILE\fR...
- | \-
- }
-
-
-
+.HP \w'\fBxsltproc\fR\ 'u
+\fBxsltproc\fR [[\fB\-V\fR | \fB\-\-version\fR] [\fB\-v\fR | \fB\-\-verbose\fR] [{\fB\-o\fR | \fB\-\-output\fR} {\fIFILE\fR | \fIDIRECTORY\fR}] | \fB\-\-timing\fR | \fB\-\-repeat\fR | \fB\-\-debug\fR | \fB\-\-novalid\fR | \fB\-\-noout\fR | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR | \fB\-\-maxvars\ \fR\fB\fIVALUE\fR\fR | \fB\-\-maxparserdepth\ \fR\fB\fIVALUE\fR\fR | \fB\-\-huge\fR | \fB\-\-seed\-rand\ \fR\fB\fIVALUE\fR\fR | \fB\-\-html\fR | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-catalogs\fR | \fB\-\-xinclude\fR | \fB\-\-xincludestyle\fR | [\fB\-\-profile\fR\ |\ \fB\-\-norman\fR] | \fB\-\-dumpextensions\fR | \fB\-\-nowrite\fR | \fB\-\-nomkdir\fR | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR | \fB\-\-nodtdattr\fR] [\fISTYLESHEET\fR] {\fIXML\-FILE\fR... | \-}
.SH "DESCRIPTION"
-
-
- .PP
+.PP
\fBxsltproc\fR
is a command line tool for applying
XSLT
@@ -100,46 +41,32 @@ stylesheets to
XML
documents\&. It is part of
\fBlibxslt\fR(3), the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
-
- .PP
+.PP
\fBxsltproc\fR
is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is
\fB\-\fR
\&.
-
- .PP
+.PP
If a stylesheet is included in an
XML
document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\&.
\fBxsltproc\fR
will automatically detect the included stylesheet and use it\&.
-
- .PP
+.PP
By default, output is to
stdout\&. You can specify a file for output using the
\fB\-o\fR
or
\fB\-\-output\fR
option\&.
-
-
.SH "OPTIONS"
-
-
- .PP
+.PP
\fBxsltproc\fR
accepts the following options (in alphabetical order):
-
-
-
-
- .PP
+.PP
\fB\-\-catalogs\fR
.RS 4
-
-
-
- Use the
+Use the
SGML
catalog specified in
\fBSGML_CATALOG_FILES\fR
@@ -148,154 +75,101 @@ to resolve the location of external entities\&. By default,
looks for the catalog specified in
\fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses
/etc/xml/catalog\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-debug\fR
.RS 4
-
-
-
- Output an
+Output an
XML
tree of the transformed document for debugging purposes\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-dumpextensions\fR
.RS 4
-
-
-
- Dumps the list of all registered extensions on
+Dumps the list of all registered extensions on
stdout\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-html\fR
.RS 4
-
-
-
- The input document is an
+The input document is an
HTML
file\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-load\-trace\fR
.RS 4
-
-
-
- Display all the documents loaded during the processing to
+Display all the documents loaded during the processing to
stderr\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-maxdepth \fR\fB\fIVALUE\fR\fR
.RS 4
-
-
-
- Adjust the maximum depth of the template stack before
+Adjust the maximum depth of the template stack before
\fBlibxslt\fR(3)
concludes it is in an infinite loop\&. The default is 3000\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
+\fB\-\-maxvars \fR\fB\fIVALUE\fR\fR
+.RS 4
+Maximum number of variables\&. The default is 15000\&.
+.RE
+.PP
+\fB\-\-maxparserdepth \fR\fB\fIVALUE\fR\fR
+.RS 4
+Maximum element nesting level of parsed XML documents\&. The default is 256\&.
+.RE
+.PP
+\fB\-\-huge\fR
+.RS 4
+Relax hardcoded limits of the XML parser by setting the XML_PARSE_HUGE parser option\&.
+.RE
+.PP
+\fB\-\-seed\-rand \fR\fB\fIVALUE\fR\fR
+.RS 4
+Initialize pseudo random number generator with specific seed\&.
+.RE
+.PP
\fB\-\-nodtdattr\fR
.RS 4
-
-
-
- Do not apply default attributes from the document\*(Aqs
+Do not apply default attributes from the document\*(Aqs
DTD\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-nomkdir\fR
.RS 4
-
-
-
- Refuses to create directories\&.
-
-
- .RE
-
- .PP
+Refuses to create directories\&.
+.RE
+.PP
\fB\-\-nonet\fR
.RS 4
-
-
-
- Do not use the Internet to fetch
+Do not use the Internet to fetch
DTDs, entities or documents\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-noout\fR
.RS 4
-
-
-
- Do not output the result\&.
-
-
- .RE
-
- .PP
+Do not output the result\&.
+.RE
+.PP
\fB\-\-novalid\fR
.RS 4
-
-
-
- Skip loading the document\*(Aqs
+Skip loading the document\*(Aqs
DTD\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-nowrite\fR
.RS 4
-
-
-
- Refuses to write to any file or resource\&.
-
-
- .RE
-
- .PP
+Refuses to write to any file or resource\&.
+.RE
+.PP
\fB\-o\fR or \fB\-\-output\fR \fIFILE\fR | \fIDIRECTORY\fR
.RS 4
-
-
-
- Direct output to the given
+Direct output to the given
\fIFILE\fR\&. Using the option with a
\fIDIRECTORY\fR
directs the output files to the specified directory\&. This can be useful for multiple outputs (also known as "chunking") or manpage processing\&.
-
- .if n \{\
+.if n \{\
.sp
.\}
.RS 4
@@ -307,14 +181,12 @@ directs the output files to the specified directory\&. This can be useful for mu
\fBImportant\fR
.ps -1
.br
-
- The given directory
+The given directory
\fBmust\fR
already exist\&.
-
- .sp .5v
+.sp .5v
.RE
- .if n \{\
+.if n \{\
.sp
.\}
.RS 4
@@ -326,8 +198,7 @@ already exist\&.
\fBNote\fR
.ps -1
.br
-
- Make sure that
+Make sure that
\fIFILE\fR
and
\fIDIRECTORY\fR
@@ -338,82 +209,47 @@ as described in RFC 2396 and laters\&. This means, that e\&.g\&.
will maybe not work, but
\fB\-o directory/\fR
will\&.
-
- .sp .5v
+.sp .5v
.RE
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-encoding \fR\fB\fIENCODING\fR\fR
.RS 4
-
-
-
- Allow to specify the encoding for the input\&.
-
-
- .RE
- .PP
+Allow to specify the encoding for the input\&.
+.RE
+.PP
\fB\-\-param \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
.RS 4
-
-
-
- Pass a parameter of name
+Pass a parameter of name
\fIPARAMNAME\fR
and value
\fIPARAMVALUE\fR
to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string, you can use
\fB\-\-stringparam\fR
instead, to avoid additional quote characters that appear in string expressions\&. Note: the XPath expression must be UTF\-8 encoded\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-path "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
.RS 4
-
-
-
- Use the (space\- or colon\-separated) list of filesystem paths specified by
+Use the (space\- or colon\-separated) list of filesystem paths specified by
\fIPATHS\fR
to load
DTDs, entities or documents\&. Enclose space\-separated lists by quotation marks\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-profile\fR or \fB\-\-norman\fR
.RS 4
-
-
-
- Output profiling information detailing the amount of time spent in each part of the stylesheet\&. This is useful in optimizing stylesheet performance\&.
-
-
- .RE
-
- .PP
+Output profiling information detailing the amount of time spent in each part of the stylesheet\&. This is useful in optimizing stylesheet performance\&.
+.RE
+.PP
\fB\-\-repeat\fR
.RS 4
-
-
-
- Run the transformation 20 times\&. Used for timing tests\&.
-
-
- .RE
-
- .PP
+Run the transformation 20 times\&. Used for timing tests\&.
+.RE
+.PP
\fB\-\-stringparam \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
.RS 4
-
-
-
- Pass a parameter of name
+Pass a parameter of name
\fIPARAMNAME\fR
and value
\fIPARAMVALUE\fR
@@ -422,268 +258,136 @@ where
is a string rather than a node identifier\&.
\fBNote:\fR
The string must be UTF\-8 encoded\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-timing\fR
.RS 4
-
-
-
- Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\&. Displayed in milliseconds\&.
-
-
- .RE
-
- .PP
+Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\&. Displayed in milliseconds\&.
+.RE
+.PP
\fB\-v\fR or \fB\-\-verbose\fR
.RS 4
-
-
-
- Output each step taken by
+Output each step taken by
\fBxsltproc\fR
in processing the stylesheet and the document\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-V\fR or \fB\-\-version\fR
.RS 4
-
-
-
- Show the version of
+Show the version of
\fBlibxml\fR(3)
and
\fBlibxslt\fR(3)
used\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-writesubtree \fR\fB\fIPATH\fR\fR
.RS 4
-
-
-
- Allow file write only within the
+Allow file write only within the
\fIPATH\fR
subtree\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fB\-\-xinclude\fR
.RS 4
-
-
-
- Process the input document using the XInclude specification\&. More details on this can be found in the XInclude specification:
+Process the input document using the XInclude specification\&. More details on this can be found in the XInclude specification:
\m[blue]\fB\%http://www.w3.org/TR/xinclude/\fR\m[]
-
-
- .RE
-
-
-
+.RE
+.PP
+\fB\-\-xincludestyle\fR
+.RS 4
+Process the stylesheet with XInclude\&.
+.RE
.SH "ENVIRONMENT"
-
-
-
-
-
- .PP
+.PP
\fBSGML_CATALOG_FILES\fR
.RS 4
-
-
-
- SGML
+SGML
catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
\fBSGML_CATALOG_FILES\fR
environment variable to a list of catalogs\&. An empty one should deactivate loading the default
/etc/sgml/catalog
catalog\&.
-
-
- .RE
-
- .PP
+.RE
+.PP
\fBXML_CATALOG_FILES\fR
.RS 4
-
-
-
- XML
+XML
catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
\fBXML_CATALOG_FILES\fR
environment variable to a list of catalogs\&. An empty one should deactivate loading the default
/etc/xml/catalog
catalog\&.
-
-
- .RE
-
-
-
+.RE
.SH "DIAGNOSTICS"
-
-
- .PP
+.PP
\fBxsltproc\fR
return codes provide information that can be used when calling it from scripts\&.
-
-
-
-
- .PP
+.PP
\fB0\fR
.RS 4
-
-
-
- No error (normal operation)
-
-
- .RE
-
- .PP
+No error (normal operation)
+.RE
+.PP
\fB1\fR
.RS 4
-
-
-
- No argument
-
-
- .RE
-
- .PP
+No argument
+.RE
+.PP
\fB2\fR
.RS 4
-
-
-
- Too many parameters
-
-
- .RE
-
- .PP
+Too many parameters
+.RE
+.PP
\fB3\fR
.RS 4
-
-
-
- Unknown option
-
-
- .RE
-
- .PP
+Unknown option
+.RE
+.PP
\fB4\fR
.RS 4
-
-
-
- Failed to parse the stylesheet
-
-
- .RE
-
- .PP
+Failed to parse the stylesheet
+.RE
+.PP
\fB5\fR
.RS 4
-
-
-
- Error in the stylesheet
-
-
- .RE
-
- .PP
+Error in the stylesheet
+.RE
+.PP
\fB6\fR
.RS 4
-
-
-
- Error in one of the documents
-
-
- .RE
-
- .PP
+Error in one of the documents
+.RE
+.PP
\fB7\fR
.RS 4
-
-
-
- Unsupported xsl:output method
-
-
- .RE
-
- .PP
+Unsupported xsl:output method
+.RE
+.PP
\fB8\fR
.RS 4
-
-
-
- String parameter contains both quote and double\-quotes
-
-
- .RE
-
- .PP
+String parameter contains both quote and double\-quotes
+.RE
+.PP
\fB9\fR
.RS 4
-
-
-
- Internal processing error
-
-
- .RE
-
- .PP
+Internal processing error
+.RE
+.PP
\fB10\fR
.RS 4
-
-
-
- Processing was stopped by a terminating message
-
-
- .RE
-
- .PP
+Processing was stopped by a terminating message
+.RE
+.PP
\fB11\fR
.RS 4
-
-
-
- Could not write the result to the output file
-
-
- .RE
-
-
-
+Could not write the result to the output file
+.RE
.SH "SEE ALSO"
-
-
- .PP
+.PP
\fBlibxml\fR(3),
\fBlibxslt\fR(3)
-
- .PP
+.PP
More information can be found at
.sp
.RS 4
@@ -694,12 +398,10 @@ More information can be found at
.sp -1
.IP \(bu 2.3
.\}
-
- \fBlibxml\fR(3)
+\fBlibxml\fR(3)
web page
\m[blue]\fB\%http://www.xmlsoft.org/\fR\m[]
-
- .RE
+.RE
.sp
.RS 4
.ie n \{\
@@ -709,24 +411,15 @@ web page
.sp -1
.IP \(bu 2.3
.\}
-
- W3C
+W3C
XSLT
page
\m[blue]\fB\%http://www.w3.org/TR/xslt\fR\m[]
-
- .RE
+.RE
.sp
-
-
-
.SH "AUTHOR"
.PP
\fBJohn Fleck\fR <\&jfleck@inkstain\&.net\&>
-.br
-
-
-
.RS 4
Author.
.RE
diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml
index 8b78693e..051cbc01 100644
--- a/doc/xsltproc.xml
+++ b/doc/xsltproc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"
- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
+ href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
--
2.31.1

View File

@ -1,5 +1,5 @@
--- xsltproc/xsltproc.c
+++ xsltproc/xsltproc.c
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -544,7 +544,7 @@
sec = xsltNewSecurityPrefs();

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
size 3552258

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl257GgACgkQFViLJllr
6l2vVggAjJEHmASiS56SxhPOsGqbfBihM66gQFoIymQfMu2430N1GSTkLsfbkJO8
8yBX11NjzK/m9uxwshMW3rVCU7EpL3PUimN3reXdPiQj9hAOAWF1V3BZNevbQC2E
FCIraioukaidf8sjUG4/sGpK/gOcP/3hYoN0HUoBigCNJjDqhijxM3M3GJJtCASp
jL4CQbs2OmxW8ixOZbuWEESvFFHUgYRsdZjRVN+GRfSOvJjxypurmYwQ3RjO7JxL
2FY8qKQ+xpeID8NV8F5OUEvWBjk1QS133VTqBZNlONdnEtV/og6jNu5k0O/Kvhup
caR+8TMErOcLr9OgDklO6DoYyAsf9Q==
=g4i4
-----END PGP SIGNATURE-----

3
libxslt-1.1.37.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4
size 1588572

View File

@ -1,54 +0,0 @@
From 77c26bad0433541f486b1e7ced44ca9979376908 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Wed, 26 Aug 2020 00:34:38 +0200
Subject: [PATCH] Don't set maxDepth in XPath contexts
The maximum recursion depth is hardcoded in libxml2 now.
---
libxslt/functions.c | 2 +-
tests/fuzz/fuzz.c | 11 ++---------
2 files changed, 3 insertions(+), 10 deletions(-)
Index: libxslt-1.1.34/tests/fuzz/fuzz.c
===================================================================
--- libxslt-1.1.34.orig/tests/fuzz/fuzz.c
+++ libxslt-1.1.34/tests/fuzz/fuzz.c
@@ -168,7 +168,6 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_
xpctxt = tctxt->xpathCtxt;
/* Resource limits to avoid timeouts and call stack overflows */
- xpctxt->maxDepth = 500;
xpctxt->opLimit = 500000;
/* Test namespaces used in xpath.xml */
@@ -299,12 +298,6 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_U
return 0;
}
-static void
-xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
- ctxt->maxDepth = 200;
- ctxt->opLimit = 100000;
-}
-
xmlChar *
xsltFuzzXslt(const char *data, size_t size) {
xmlDocPtr xsltDoc;
@@ -334,7 +327,7 @@ xsltFuzzXslt(const char *data, size_t si
xmlFreeDoc(xsltDoc);
return NULL;
}
- xsltSetXPathResourceLimits(sheet->xpathCtxt);
+ sheet->xpathCtxt->opLimit = 100000;
sheet->xpathCtxt->opCount = 0;
if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) {
xsltFreeStylesheet(sheet);
@@ -346,7 +339,7 @@ xsltFuzzXslt(const char *data, size_t si
xsltSetCtxtSecurityPrefs(sec, ctxt);
ctxt->maxTemplateDepth = 100;
ctxt->opLimit = 20000;
- xsltSetXPathResourceLimits(ctxt->xpathCtxt);
+ ctxt->xpathCtxt->opLimit = 100000;
ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount;
result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt);

View File

@ -1,37 +0,0 @@
From 9ae2f94df1721e002941b40665efb762aefcea1a Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 17 Aug 2020 03:42:11 +0200
Subject: [PATCH] Stop using maxParserDepth XPath limit
This will be removed again from libxml2.
---
tests/fuzz/fuzz.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
index f502ca2c..75234ad6 100644
--- a/tests/fuzz/fuzz.c
+++ b/tests/fuzz/fuzz.c
@@ -183,8 +183,7 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
xpctxt = tctxt->xpathCtxt;
/* Resource limits to avoid timeouts and call stack overflows */
- xpctxt->maxParserDepth = 15;
- xpctxt->maxDepth = 100;
+ xpctxt->maxDepth = 500;
xpctxt->opLimit = 500000;
/* Test namespaces used in xpath.xml */
@@ -317,8 +316,7 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
static void
xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
- ctxt->maxParserDepth = 15;
- ctxt->maxDepth = 100;
+ ctxt->maxDepth = 200;
ctxt->opLimit = 100000;
}
--
GitLab

View File

@ -1,13 +0,0 @@
Index: xsltConf.sh.in
===================================================================
--- xsltConf.sh.in.orig
+++ xsltConf.sh.in
@@ -2,7 +2,7 @@
# Configuration file for using the xslt library
#
XSLT_LIBDIR="@XSLT_LIBDIR@"
-XSLT_LIBS="@XSLT_LIBS@"
+XSLT_LIBS="-lxslt"
XSLT_PRIVATE_LIBS="@XSLT_PRIVATE_LIBS@"
XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
MODULE_VERSION="xslt-@VERSION@"

View File

@ -4,14 +4,14 @@ Date: Tue Apr 4 16:27:39 2017 +0200
initialize the random seed
diff --git a/libexslt/math.c b/libexslt/math.c
index 6b24dbe0..b7a8d6e1 100644
--- a/libexslt/math.c
+++ b/libexslt/math.c
@@ -23,6 +23,14 @@
#ifdef HAVE_STDLIB_H
Index: libxslt-v1.1.36/libexslt/math.c
===================================================================
--- libxslt-v1.1.36.orig/libexslt/math.c
+++ libxslt-v1.1.36/libexslt/math.c
@@ -12,6 +12,14 @@
#include <math.h>
#include <stdlib.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
@ -20,10 +20,10 @@ index 6b24dbe0..b7a8d6e1 100644
+#include <time.h>
+#endif
+
#include "exslt.h"
@@ -474,6 +482,20 @@ static double
/**
@@ -460,6 +468,20 @@ static double
exsltMathRandom (void) {
double ret;
int num;
@ -44,4 +44,3 @@ index 6b24dbe0..b7a8d6e1 100644
num = rand();
ret = (double)num / (double)RAND_MAX;

View File

@ -1,3 +1,113 @@
-------------------------------------------------------------------
Tue Aug 30 14:42:27 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.1.37:
* Improvements:
+ Don't use deprecated libxml2 macros
+ Don't mess with xmlDefaultSAXHandler
* Build system:
+ Require automake-1.16.3 or later
+ Remove generated files from distribution
+ Add missing compile definition for static builds to Autotools
-------------------------------------------------------------------
Thu Aug 18 07:50:04 UTC 2022 - David Anes <david.anes@suse.com>
- Update to 1.1.36:
* Removals and deprecations
+ Remove SVN keyword anchors
+ Remove CVS and SVN-related code
+ Remove README.cvs-commits
+ Remove ChangeLog
+ Remove xsltwin32config.h
* Improvements
+ Simplify xsltexports.h and exsltexports.h
+ Don't overlink executables with gcrypt
+ Fix quadratic behavior with variables and parameters
+ Remove case labels with XPointer location types
+ Add configure~ to .gitignore
+ Stop calling deprecated libxml2 functions
* Portability
+ Use portable python shebangs (David Seifert)
+ Remove useless __CYGWIN__ checks
+ Remove cruft from win32config.h
+ crypto.c: Silence a compiler warning on Windows (Chun-wei Fan)
* Build system
+ Add missing compile definition for static builds to CMake
+ Avoid obsolescent `test -a` constructs (David Seifert)
+ Only link libxml2 statically in purely static build
+ Set AC_CONFIG_MACRO_DIR
+ Allow AM_MAINTAINER_MODE to be disabled
+ Streamline and fix documentation installation
+ Don't try to recreate COPYING symlink
+ Remove special configuration for certain maintainers
+ configure.ac: produce tar.xz only (GNOME policy) (David Seifert)
+ Detect libm using libtool's macros (David Seifert)
+ configure.ac: disable static libraries by default (David Seifert)
+ python/Makefile.am: nest python docs in $(docdir) (David Seifert)
+ python/Makefile.am: rely on global AM_INIT_AUTOMAKE (David Seifert)
+ configure.ac: remove useless AC_SUBST (David Seifert)
+ Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert)
+ Change libxml2 Python config
+ Don't check for standard C89 library functions
+ Don't check for standard C89 headers
+ Remove --with-html-dir option
+ Also check for glibtoolize in autogen.sh
+ Rework documentation build system
+ Remove old website
+ CMake: Relax check for enabling crypto support on Windows (Chun-wei Fan)
+ Remove obsolete AC_HEADER_STDC autoconf macro (Vadim Zeitlin)
+ Remove special configuration for old maintainers
* Test suite, CI
+ Remove test involving XPointer range-to function
+ Test recursion in EXSLT dynamic functions
+ Add CI job for static build
* Documentation
+ Move tutorial images
-------------------------------------------------------------------
Wed Mar 9 05:07:32 UTC 2022 - Luciano Santos <luc14n0@opensuse.org>
- Update to version 1.1.35:
* Security fixes:
+ [CVE-2021-30560] Use-after-free in xsltApplyTemplates;
+ A couple of memory leak and a double-free fixes.
* A couple of regression fixes.
* Many bug fixes.
* New xsltproc --huge option, provided by libxml XML_PARSE_HUGE.
* Numerous tests and code and fuzzing fixes and improvements.
* Updated documentation.
- The full Libxslt 2.9.13 NEWS can be found here:
https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.\
news
- Switch libxml2-devel package with its pkgconfig module
counterpart (libxml-2.0) to align with CONFIGURE script's checks.
- Add fdupes build requirement/macro to hard-link duplicate files
in the DATADIR inside the buildroot.
- Add explicit 'gcc' build requirement to align with CONFIGURE
checks.
- Update http://xmlsoft.org URL tag to Libxslt's new web home:
https://gitlab.gnome.org/GNOME/libxslt.
- Update ftp://xmlsoft.org Source tag to Libxslt's new download
host: https://download.gnome.org.
- Drop no longer needed/used libgpg-error-devel. Note that despite
'lgpg-error' being linked against some libraries, there's no
automatic generation of run-time requirements on libgpg-error*
symbols our build system. And there's no mention of gpg-error in
the whole source tarball at all.
- Drop no longer needed explicit libtool build requirement and
`autoreconf` call in build section since we don't touch the build
system scripts nor use checked out git trees anymore.
- Drop libxslt.keyring source file as the new download host doesn't
offer GPG signatures.
- Drop fixed upstream patches:
libxslt-config-fixes.patch (glgo#GNOME/libxslt!3);
libxslt-Stop-using-maxParserDepth-XPath-limit.patch;
libxslt-Do-not-set-maxDepth-in-XPath-contexts.patch; and
Recreate-xsltproc-man-page-with-old-Docbook-styleshe.patch.
- Use ldconfig_scriptlets macro for post(un) handling of ldconfig
calls.
-------------------------------------------------------------------
Wed Nov 10 09:58:52 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

View File

@ -1,102 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
AJ9Yj+vFte9+FNTqObFprqnf2Q+rdA==
=60Pb
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package libxslt
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,32 +18,44 @@
%define libver 1
%define libexver 0
Name: libxslt
Version: 1.1.34
Version: 1.1.37
Release: 0
Summary: XSL Transformation Library
License: GPL-2.0-or-later AND MIT
Group: Development/Libraries/C and C++
URL: http://xmlsoft.org/XSLT/
Source0: ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz
Source1: ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz.asc
Source2: %{name}.keyring
Source3: xslt-config.1
Source99: baselibs.conf
Patch0: %{name}-1.1.24-no-net-autobuild.patch
Patch1: libxslt-config-fixes.patch
URL: https://gitlab.gnome.org/GNOME/libxslt
Source0: https://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.xz
Source1: baselibs.conf
Source2: xslt-config.1
# PATCH-FIX-OPENSUSE -- libxslt-1.1.24-no-net-autobuild.patch
# The xmlGetExternalEntityLoader() tries to fetch/parse some information via
# internet, which OBS's build environment does not allow it.
Patch0: libxslt-1.1.24-no-net-autobuild.patch
# PATCH-FIX-UPSTREAM -- libxslt-random-seed.patch
# https://bugzilla.suse.com/show_bug.cgi?id=934119
# https://bugzilla.gnome.org/show_bug.cgi?id=758400
# Initialize the random seed to ensure libxslt's math.random() function
# produces unpredictable outputs.
Patch1: libxslt-random-seed.patch
# PATCH-FIX-UPSTREAM -- 0009-Make-generate-id-deterministic.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=751621
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902051
# Make generate-id() return identifiers in a deterministic way. It used to
# return identifiers based on the memory address of the node object.
Patch2: 0009-Make-generate-id-deterministic.patch
Patch3: libxslt-random-seed.patch
# PATCH-FIX-UPSTREAM gitlab.gnome.org/GNOME/libxslt/commit/9ae2f94df1721e002941b40665efb762aefcea1a
Patch4: libxslt-Stop-using-maxParserDepth-XPath-limit.patch
# PATCH-FIX-UPSTREAM gitlab.gnome.org/GNOME/libxslt/commit/77c26bad0433541f486b1e7ced44ca9979376908
Patch5: libxslt-Do-not-set-maxDepth-in-XPath-contexts.patch
Patch6: Recreate-xsltproc-man-page-with-old-Docbook-styleshe.patch
#
### SUSE patches starts on 1000
# PATCH-FIX-SUSE
#Patch1000:
#
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.9.12
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libxml-2.0) >= 2.9.12
Obsoletes: libxslt-python
%description
@ -90,7 +102,6 @@ Requires: %{name}-tools = %{version}
Requires: glibc-devel
Requires: libexslt%{libexver} = %{version}
Requires: libgcrypt-devel
Requires: libgpg-error-devel
Requires: libxslt%{libver} = %{version}
%description devel
@ -113,17 +124,9 @@ This package contains xsltproc, a command line interface to the XSLT engine.
xtend the
%prep
%setup -q
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%autosetup -p1
%build
autoreconf -fvi
%configure \
--disable-static \
--without-python \
@ -138,15 +141,16 @@ autoreconf -fvi
# Unwanted doc stuff
rm -fr %{buildroot}%{_datadir}/doc
# the manual page is required
install -D -m0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/xslt-config.1
# Install the manual page for xslt-config
install -D -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/xslt-config.1
#kill all "la" files
find %{buildroot} -type f -name "*.la" -delete -print
%post -n libxslt%{libver} -p /sbin/ldconfig
%postun -n libxslt%{libver} -p /sbin/ldconfig
%post -n libexslt%{libexver} -p /sbin/ldconfig
%postun -n libexslt%{libexver} -p /sbin/ldconfig
# Hardlink same-content files
%fdupes %{buildroot}%{_datadir}
%ldconfig_scriptlets -n libxslt%{libver}
%ldconfig_scriptlets -n libexslt%{libexver}
%files -n libxslt%{libver}
%license COPYING* Copyright
@ -169,11 +173,18 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/*.sh
%{_libdir}/pkgconfig/libxslt.pc
%{_libdir}/pkgconfig/libexslt.pc
%dir %{_libdir}/cmake/libxslt/
%{_libdir}/cmake/libxslt/FindGcrypt.cmake
%{_libdir}/cmake/libxslt/libxslt-config.cmake
%{_includedir}/*
%{_datadir}/aclocal/*
%{_bindir}/xslt-config
%{_mandir}/man1/xslt-config.1%{?ext_man}
%{_mandir}/man3/*
%doc doc/*.html doc/html doc/tutorial doc/*.gif
%dir %{_datadir}/gtk-doc/
%dir %{_datadir}/gtk-doc/html/
%{_datadir}/gtk-doc/html/libexslt/
%{_datadir}/gtk-doc/html/libxslt/
%doc doc/*.html doc/tutorial doc/tutorial2
%changelog