Compare commits
No commits in common. "rawhide" and "f20" have entirely different histories.
2 changed files with 15 additions and 159 deletions
|
|
@ -1,62 +0,0 @@
|
|||
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);
|
||||
112
xmlstarlet.spec
112
xmlstarlet.spec
|
|
@ -1,22 +1,19 @@
|
|||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
Name: xmlstarlet
|
||||
Version: 1.6.1
|
||||
Release: 31%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Command Line XML Toolkit
|
||||
Group: Applications/Text
|
||||
License: MIT
|
||||
URL: http://xmlstar.sourceforge.net/
|
||||
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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: xmlto automake autoconf libxslt-devel
|
||||
BuildRequires: libxml2-devel >= 2.6.23
|
||||
BuildRequires: docbook5-schemas
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -27,118 +24,39 @@ plain text files using UNIX grep, sed, awk, diff, patch, join, etc
|
|||
commands.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch0 -p1 -b .nogit
|
||||
|
||||
|
||||
%build
|
||||
autoreconf -i
|
||||
%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{_pkgdocdir} # --libdir=%{_libdir}
|
||||
%make_build
|
||||
%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} # --libdir=%{_libdir}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -fr %{buildroot}
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# Avoid name kludging in autotools
|
||||
mv %{buildroot}%{_bindir}/xml %{buildroot}%{_bindir}/xmlstarlet
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
|
||||
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
|
||||
%clean
|
||||
rm -fr %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS ChangeLog NEWS README Copyright TODO
|
||||
%doc %{_pkgdocdir}/*
|
||||
%{_mandir}/man1/xmlstarlet.1*
|
||||
%{_bindir}/xmlstarlet
|
||||
|
||||
|
||||
%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
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jun 05 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.1-22
|
||||
- SPDX migration
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Mar 17 2022 Neal Gompa <ngompa@datto.com> - 1.6.1-19
|
||||
- Minor spec improvements
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Mar 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1.6.1-6
|
||||
- Mark installed documentation as %%doc (#1308255)
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Dec 8 2014 Paul W. Frields <stickster@gmail.com> - 1.6.1-3
|
||||
- Fix noisy git related spew (#1171864)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue