From 97e589fe22de735f9b18450415bd291b181ba4cd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:10:01 +0000 Subject: [PATCH 01/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index dee2396..558b54d 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -57,6 +57,9 @@ rm -fr %{buildroot} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Dec 8 2014 Paul W. Frields - 1.6.1-3 - Fix noisy git related spew (#1171864) From 15a181171eabcd5026808d3adfec37cd79e56120 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:36:57 +0000 Subject: [PATCH 02/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 558b54d..686eabd 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -57,6 +57,9 @@ rm -fr %{buildroot} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 6348ce016b51f78f5b37e413091d45a082bc099d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 1 Mar 2016 11:59:07 -0600 Subject: [PATCH 03/34] Mark installed documentation as %doc (#1308255) --- xmlstarlet.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 686eabd..67a5093 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,8 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Name: xmlstarlet Version: 1.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -30,7 +32,7 @@ commands. %build autoreconf -i -%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} # --libdir=%{_libdir} +%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{_pkgdocdir} # --libdir=%{_libdir} make %{?_smp_mflags} @@ -52,11 +54,15 @@ rm -fr %{buildroot} %files %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README Copyright TODO +%doc %{_pkgdocdir}/* %{_mandir}/man1/xmlstarlet.1* %{_bindir}/xmlstarlet %changelog +* Tue Mar 01 2016 Yaakov Selkowitz - 1.6.1-6 +- Mark installed documentation as %%doc (#1308255) + * Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 53d4a6abdf74ed94fcaf688cdccf828076eb2325 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:58:15 +0000 Subject: [PATCH 04/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 67a5093..dc0ac28 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -60,6 +60,9 @@ rm -fr %{buildroot} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Mar 01 2016 Yaakov Selkowitz - 1.6.1-6 - Mark installed documentation as %%doc (#1308255) From 986578e124185cc1d795b1bec27769c3fef5d6d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:14:21 +0000 Subject: [PATCH 05/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index dc0ac28..cb1dc1c 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -60,6 +60,9 @@ rm -fr %{buildroot} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4976dc1636fe8eb573ff9d7176f0b2b44d63e3ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:47:46 +0000 Subject: [PATCH 06/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index cb1dc1c..fce1675 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -60,6 +60,9 @@ rm -fr %{buildroot} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 75fbd791c4dae2d2023c70be8eaba5888ba4d350 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:48:18 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index fce1675..87744bc 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -60,6 +60,9 @@ rm -fr %{buildroot} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 19fd6284d4d4ca164a2e9be4dabba141b3c5e876 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:51:23 +0100 Subject: [PATCH 08/34] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- xmlstarlet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 87744bc..2ab236e 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -11,7 +11,6 @@ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmlto automake autoconf libxslt-devel BuildRequires: libxml2-devel >= 2.6.23 From 271be5206b5c07e48d9f7eac9d28584445f0813e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:28:32 +0100 Subject: [PATCH 09/34] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- xmlstarlet.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 2ab236e..41e4147 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -46,9 +46,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet make check -%clean -rm -fr %{buildroot} - %files %defattr(-, root, root) From 69c6e60db1d759341ed4649336cd1940ac643305 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 10/34] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xmlstarlet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 41e4147..b5fc0f8 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz Patch0: xmlstarlet-1.6.1-nogit.patch # http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106 +BuildRequires: gcc BuildRequires: xmlto automake autoconf libxslt-devel BuildRequires: libxml2-devel >= 2.6.23 BuildRequires: docbook5-schemas From 11751f3d1d180601c525db78ee4aadf729e9834b Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:55:13 -0500 Subject: [PATCH 11/34] Remove needless use of %defattr --- xmlstarlet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b5fc0f8..704c9bd 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -49,7 +49,6 @@ make check %files -%defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README Copyright TODO %doc %{_pkgdocdir}/* %{_mandir}/man1/xmlstarlet.1* From 7203f113be7fea6dbaea5642b689405a9be5aafd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:24:13 +0000 Subject: [PATCH 12/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 704c9bd..ca28cf1 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -56,6 +56,9 @@ make check %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c2100ba91a9aa2b86ff8d83f8bddfd02dad39872 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 13/34] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xmlstarlet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index ca28cf1..7d08e1f 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -4,7 +4,6 @@ Name: xmlstarlet Version: 1.6.1 Release: 11%{?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 From 34d83bad8f282d06496598d409dda3737fd86e67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:34:13 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 7d08e1f..9a5018f 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -55,6 +55,9 @@ make check %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.6.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 86c45b831d81df8d0a6906e6a3feca9b544b812e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:21:55 +0000 Subject: [PATCH 15/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 9a5018f..88e6ea8 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -55,6 +55,9 @@ make check %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.6.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c210f86730feb508baaa31cfbd64abfdba71d386 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:36:59 +0000 Subject: [PATCH 16/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 88e6ea8..dfe8926 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -55,6 +55,9 @@ make check %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.6.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b1c5603abfdf4af62ba205a05a48c13d4aff72b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:51:12 +0000 Subject: [PATCH 17/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index dfe8926..48134dd 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -55,6 +55,9 @@ make check %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.6.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 09eba891f5c2cd308f5d1c6eea4552cce6a7ff97 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:32:20 +0000 Subject: [PATCH 18/34] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlstarlet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 48134dd..991a74f 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz Patch0: xmlstarlet-1.6.1-nogit.patch # http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106 +BuildRequires: make BuildRequires: gcc BuildRequires: xmlto automake autoconf libxslt-devel BuildRequires: libxml2-devel >= 2.6.23 From eb9d53da9733c7cae8b3ee3c64926cf76e358bba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:10:33 +0000 Subject: [PATCH 19/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 991a74f..b912c93 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -56,6 +56,9 @@ make check %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.6.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.6.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f348c88612b8c7b21792b1d6a0e47b5cd0276c61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:43:50 +0000 Subject: [PATCH 20/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b912c93..f097afe 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -56,6 +56,9 @@ make check %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 1.6.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dde5bd5bc8013efcb313e5c3c4a60edf964d22ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:16:34 +0000 Subject: [PATCH 21/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index f097afe..4a52eb0 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -56,6 +56,9 @@ make check %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6633b1b61e94dc82e810a7d9e0f5d4716809d399 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 17 Mar 2022 14:57:41 -0400 Subject: [PATCH 22/34] Minor spec improvements --- xmlstarlet.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 4a52eb0..8b8bff7 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -12,7 +12,7 @@ Patch0: xmlstarlet-1.6.1-nogit.patch # http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106 BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: xmlto automake autoconf libxslt-devel BuildRequires: libxml2-devel >= 2.6.23 BuildRequires: docbook5-schemas @@ -26,21 +26,19 @@ plain text files using UNIX grep, sed, awk, diff, patch, join, etc commands. %prep -%setup -q -%patch0 -p1 -b .nogit +%autosetup -p1 %build autoreconf -i %configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{_pkgdocdir} # --libdir=%{_libdir} -make %{?_smp_mflags} +%make_build %install -rm -fr %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Avoid name kludging in autotools -mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet +mv %{buildroot}%{_bindir}/xml %{buildroot}%{_bindir}/xmlstarlet %check @@ -56,6 +54,9 @@ make check %changelog +* Thu Mar 17 2022 Neal Gompa - 1.6.1-19 +- Minor spec improvements + * Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 48c222fb0708ec2c54f137f2b2e9dd6b787d3c80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:18:31 +0000 Subject: [PATCH 23/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 8b8bff7..c320788 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Mar 17 2022 Neal Gompa - 1.6.1-19 - Minor spec improvements From 1ba8b0210b8c3ce513ed4db10be7099dea254b93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:39:05 +0000 Subject: [PATCH 24/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index c320788..048a999 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2957a091d439d844df0484fe487bf1d13f6ae0ae Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 5 Jun 2023 09:01:25 +0200 Subject: [PATCH 25/34] SPDX migration Signed-off-by: Vitezslav Crhonek --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 048a999..ea76e98 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Mon Jun 05 2023 Vitezslav Crhonek - 1.6.1-22 +- SPDX migration + * Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2d84f4f62d2f7b6ce90b32c9802049c7246fe8e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:02:48 +0000 Subject: [PATCH 26/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index ea76e98..868f841 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.6.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 05 2023 Vitezslav Crhonek - 1.6.1-22 - SPDX migration From 98d1996b5955ff7c6aaa16bfe21186310b8688ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:53:31 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 868f841..f871f7d 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.6.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.6.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d51a3bd967d4dc49fb08d76907d30a84791f5512 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:14:19 +0000 Subject: [PATCH 28/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index f871f7d..897ce27 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -54,6 +54,9 @@ make check %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.6.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.6.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f1a31df5832edda3705ea2d6824965d54f9266e8 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 29 Nov 2024 13:11:18 -0500 Subject: [PATCH 29/34] Remove docbook5-schemas BR due to deprecation --- xmlstarlet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 897ce27..be2e351 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -15,7 +15,6 @@ BuildRequires: make BuildRequires: gcc BuildRequires: xmlto automake autoconf libxslt-devel BuildRequires: libxml2-devel >= 2.6.23 -BuildRequires: docbook5-schemas %description @@ -54,6 +53,9 @@ make check %changelog +* Fri Nov 29 2024 Paul W. Frields - 1.6.1-26 +- Remove docbook5-schemas BR due to deprecation + * Sat Jul 20 2024 Fedora Release Engineering - 1.6.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3d004fe992e55d9c5f3ac9222b51b59b4f15439c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:02:19 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index be2e351..4aa62d7 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -53,6 +53,9 @@ make check %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 29 2024 Paul W. Frields - 1.6.1-26 - Remove docbook5-schemas BR due to deprecation From 45db8f21a8eb004b26160dd53dcea0913f0c0c7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:56:32 +0000 Subject: [PATCH 31/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 4aa62d7..b6bd42f 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -53,6 +53,9 @@ make check %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.6.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6897d555c47cc1fe21e30f80f015fcc7b8eb9db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:46:12 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b6bd42f..3eb4433 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -53,6 +53,9 @@ make check %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.6.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.6.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 28345a47173054f5de79b15b6cc5ec23a9bf30b9 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 27 May 2026 08:55:44 +0200 Subject: [PATCH 33/34] 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. --- xmlstarlet-1.6.1-fix-xxe.patch | 62 ++++++++++++++++++++++++++++++++++ xmlstarlet.spec | 7 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 xmlstarlet-1.6.1-fix-xxe.patch diff --git a/xmlstarlet-1.6.1-fix-xxe.patch b/xmlstarlet-1.6.1-fix-xxe.patch new file mode 100644 index 0000000..270747c --- /dev/null +++ b/xmlstarlet-1.6.1-fix-xxe.patch @@ -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); diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 3eb4433..f23783b 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 29%{?dist} +Release: 30%{?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,9 @@ make check %changelog +* Wed May 27 2026 Vitezslav Crhonek - 1.6.1-30 +- Fix XXE (XML External Entity) vulnerability + * Sat Jan 17 2026 Fedora Release Engineering - 1.6.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d434040f6ea3dc7f9b1eb947382aca7dc39a2d96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:59 +0000 Subject: [PATCH 34/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index f23783b..3a58dd2 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -2,7 +2,7 @@ Name: xmlstarlet Version: 1.6.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Command Line XML Toolkit License: MIT URL: http://xmlstar.sourceforge.net/ @@ -55,6 +55,9 @@ make check %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.6.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed May 27 2026 Vitezslav Crhonek - 1.6.1-30 - Fix XXE (XML External Entity) vulnerability