Compare commits

..

5 commits

Author SHA1 Message Date
Fedora Release Engineering
d434040f6e Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:18:59 +00:00
Vitezslav Crhonek
28345a4717 Fix XXE (XML External Entity) vulnerability
Mark relevant test as expected to fail. Mark also
bigxml tests as expected to fail, probably due libxml2
changes in Rawhide.
2026-05-27 08:55:44 +02:00
Fedora Release Engineering
e6897d555c Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:46:12 +00:00
Fedora Release Engineering
45db8f21a8 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:56:32 +00:00
Fedora Release Engineering
3d004fe992 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:02:19 +00:00
2 changed files with 80 additions and 1 deletions

View file

@ -0,0 +1,62 @@
diff -Naur xmlstarlet-1.6.1.orig/examples/tests.mk xmlstarlet-1.6.1/examples/tests.mk
--- xmlstarlet-1.6.1.orig/examples/tests.mk 2013-06-22 17:36:56.000000000 +0200
+++ xmlstarlet-1.6.1/examples/tests.mk 2026-05-26 13:31:13.886894244 +0200
@@ -98,7 +98,13 @@
XFAIL_TESTS =\
examples/bigxml-dtd\
-examples/ed-namespace
+examples/ed-namespace\
+examples/external-entity\
+examples/bigxml-embed-ref\
+examples/bigxml-embed\
+examples/bigxml-relaxng\
+examples/bigxml-well-formed\
+examples/bigxml-xsd
if !HAVE_EXSLT_XPATH_REGISTER
XFAIL_TESTS += examples/exslt-ed
diff -Naur xmlstarlet-1.6.1.orig/src/trans.c xmlstarlet-1.6.1/src/trans.c
--- xmlstarlet-1.6.1.orig/src/trans.c 2012-08-12 17:18:59.000000000 +0200
+++ xmlstarlet-1.6.1/src/trans.c 2026-05-26 13:31:20.240064967 +0200
@@ -174,7 +174,10 @@
int i, options = 0;
options = XSLT_PARSE_OPTIONS;
-
+ /* Disable entity expansion to prevent XXE attacks */
+ options &= ~XML_PARSE_NOENT;
+ options |= XML_PARSE_NONET;
+
/*
* Compile XSLT Sylesheet
*/
diff -Naur xmlstarlet-1.6.1.orig/src/xml_C14N.c xmlstarlet-1.6.1/src/xml_C14N.c
--- xmlstarlet-1.6.1.orig/src/xml_C14N.c 2012-08-12 17:18:59.000000000 +0200
+++ xmlstarlet-1.6.1/src/xml_C14N.c 2026-05-26 13:31:20.240173256 +0200
@@ -62,8 +62,8 @@
*/
doc = xmlReadFile(xml_filename, NULL,
- XML_PARSE_NOENT | XML_PARSE_DTDLOAD |
- XML_PARSE_DTDATTR | (nonet? XML_PARSE_NONET:0));
+ XML_PARSE_DTDLOAD |
+ XML_PARSE_DTDATTR | XML_PARSE_NONET);
if (doc == NULL) {
fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_filename);
return(EXIT_BAD_FILE);
diff -Naur xmlstarlet-1.6.1.orig/src/xml_select.c xmlstarlet-1.6.1/src/xml_select.c
--- xmlstarlet-1.6.1.orig/src/xml_select.c 2014-03-03 01:15:08.000000000 +0100
+++ xmlstarlet-1.6.1/src/xml_select.c 2026-05-26 13:31:20.240276580 +0200
@@ -708,9 +708,9 @@
selInitOptions(&ops);
xsltInitOptions(&xsltOps);
start = selParseOptions(&ops, argc, argv);
- xml_options |= XML_PARSE_NOENT; /* substitute entities */
+ /* XML_PARSE_NOENT removed to prevent XXE attacks */
xml_options |= XML_PARSE_DTDATTR; /* use default attrib values */
- xml_options |= ops.nonet? XML_PARSE_NONET : 0;
+ xml_options |= XML_PARSE_NONET;
xsltOps.nonet = ops.nonet;
xsltOps.noblanks = ops.noblanks;
xsltInitLibXml(&xsltOps);

View file

@ -2,7 +2,7 @@
Name: xmlstarlet
Version: 1.6.1
Release: 26%{?dist}
Release: 31%{?dist}
Summary: Command Line XML Toolkit
License: MIT
URL: http://xmlstar.sourceforge.net/
@ -10,6 +10,8 @@ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz
# https://sourceforge.net/p/xmlstar/bugs/109/
Patch0: xmlstarlet-1.6.1-nogit.patch
# http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
# Fix for XXE (XML External Entity) vulnerability
Patch1: xmlstarlet-1.6.1-fix-xxe.patch
BuildRequires: make
BuildRequires: gcc
@ -53,6 +55,21 @@ make check
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Wed May 27 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.1-30
- Fix XXE (XML External Entity) vulnerability
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Nov 29 2024 Paul W. Frields <stickster@gmail.com> - 1.6.1-26
- Remove docbook5-schemas BR due to deprecation