diff --git a/.gitignore b/.gitignore index 7f24ad1..d897270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /xmlsec1-1.2.36.tar.gz /xmlsec1-1.2.37.tar.gz /xmlsec1-1.3.0.tar.gz +/xmlsec1-1.2.39.tar.gz +/xmlsec1-1.2.41.tar.gz +/xmlsec1-1.3.11.tar.gz diff --git a/0000-so-name.patch b/0000-so-name.patch new file mode 100644 index 0000000..47d1bd1 --- /dev/null +++ b/0000-so-name.patch @@ -0,0 +1,15 @@ +diff -up xmlsec1-1.3.11/configure.ac.orig xmlsec1-1.3.11/configure.ac +--- xmlsec1-1.3.11/configure.ac.orig 2026-05-15 17:19:56.892068331 +0200 ++++ xmlsec1-1.3.11/configure.ac 2026-05-15 17:36:10.629714699 +0200 +@@ -21,10 +21,7 @@ XMLSEC_VERSION_SAFE="${XMLSEC_VERSION_MA + # * If any interfaces have been removed or changed since the last public release, then + # set age to 0. + # +-# For simplicity we just bump current all the time and don't bother +-# +-XMLSEC_VERSION_CURRENT=$((10000 * XMLSEC_VERSION_MAJOR + 100 * XMLSEC_VERSION_MINOR + XMLSEC_VERSION_SUBMINOR)) +-XMLSEC_VERSION_INFO="${XMLSEC_VERSION_CURRENT}:0:0" ++XMLSEC_VERSION_INFO="$((XMLSEC_VERSION_MAJOR + XMLSEC_VERSION_MINOR)):${XMLSEC_VERSION_SUBMINOR}:${XMLSEC_VERSION_MINOR}" + + AC_SUBST(XMLSEC_VERSION) + AC_SUBST(XMLSEC_PACKAGE) diff --git a/0001-Fix-libxml2-v2.12.0-includes.patch b/0001-Fix-libxml2-v2.12.0-includes.patch deleted file mode 100644 index d32619c..0000000 --- a/0001-Fix-libxml2-v2.12.0-includes.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - ---- -Dropped mscrypto changes as unused and conflicting with older sources - - apps/crypto.c | 1 + - apps/xmlsec.c | 3 ++- - include/xmlsec/xmlsec.h | 1 + - src/errors_helpers.h | 10 +++++----- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/apps/crypto.c b/apps/crypto.c -index 8561dd659..4411233da 100644 ---- a/apps/crypto.c -+++ b/apps/crypto.c -@@ -12,6 +12,7 @@ - #endif - - #include -+#include - - #include - #include -diff --git a/apps/xmlsec.c b/apps/xmlsec.c -index 7655c1dbd..4bedb16a7 100644 ---- a/apps/xmlsec.c -+++ b/apps/xmlsec.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #ifndef XMLSEC_NO_XSLT -@@ -3030,7 +3031,7 @@ xmlSecAppInit(void) { - /* Init libxml */ - xmlInitParser(); - LIBXML_TEST_VERSION -- xmlTreeIndentString = "\t"; -+ xmlThrDefTreeIndentString("\t"); - #ifndef XMLSEC_NO_XSLT - xmlIndentTreeOutput = 1; - #endif /* XMLSEC_NO_XSLT */ -diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h -index 5757fc570..6f9101229 100644 ---- a/include/xmlsec/xmlsec.h -+++ b/include/xmlsec/xmlsec.h -@@ -12,6 +12,7 @@ - #define __XMLSEC_H__ - - #include -+#include - - #include - #include -diff --git a/src/errors_helpers.h b/src/errors_helpers.h -index 1a4f41837..470fdde65 100644 ---- a/src/errors_helpers.h -+++ b/src/errors_helpers.h -@@ -136,7 +136,7 @@ extern "C" { - */ - #define xmlSecXmlError(errorFunction, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -159,7 +159,7 @@ extern "C" { - */ - #define xmlSecXmlError2(errorFunction, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -181,7 +181,7 @@ extern "C" { - */ - #define xmlSecXmlParserError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -205,7 +205,7 @@ extern "C" { - */ - #define xmlSecXmlParserError2(errorFunction, ctxt, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -227,7 +227,7 @@ extern "C" { - */ - #define xmlSecXsltError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ diff --git a/changelog b/changelog new file mode 100644 index 0000000..a16bf2d --- /dev/null +++ b/changelog @@ -0,0 +1,291 @@ +* Fri May 15 2026 Yaakov Selkowitz - 1:1.2.41-5 +- Conditionalize the backends + +* Sat Jan 17 2026 Fedora Release Engineering - 1:1.2.41-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.2.41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.2.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Dec 10 2024 Tomas Halman - 1:1.2.41-1 +- Rebase to 1.2.41 + +* Thu Nov 7 2024 Yaakov Selkowitz - 1:1.2.39-5 +- Conditionalize the backends +- Remove openssl-devel-engine dependency + +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.2.39-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 3 2024 Tomas Halman - 1:1.2.39-3 +- Add openssl-devel-engine dependency + +* Wed Jul 3 2024 Tomas Halman - 1:1.2.39-2 +- Deprecate subpackages depending on gcrypt + +* Wed Jun 5 2024 Tomas Halman - 1.2.39-1 +- Rebase to 1.2.39 + +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.2.37-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 13 2023 Yaakov Selkowitz - 1:1.2.37-6 +- Fix build with libxml2-2.12.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.2.37-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 22 2023 Tomas Halman - 1.2.37-4 +- Resolves: rhbz#2187631 - Cannot load modules/mod_auth_mellon.so + Revert to previous version + +* Fri Apr 14 2023 Tomas Halman - 1.3.0-1 +- Resolves: rhbz#2186304 - rebase to version 1.3.0 + +* Tue Mar 7 2023 Tomas Halman - 1.2.37-3 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 29 2022 Tomas Halman - 1.2.37-1 +- Resolves: rhbz#2149129 latest upstream release + +* Tue Nov 08 2022 Caolán McNamara - 1.2.36-1 +- Resolves: rhbz#2138484 latest upstream release + +* Thu Oct 27 2022 Caolán McNamara - 1.2.35-1 +- Resolves: rhbz#2137430 latest upstream release + +* Mon Oct 24 2022 David King - 1.2.34-3 +- Rebuild against libxml2 (#2136800) + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed May 18 2022 Caolán McNamara - 1.2.34-1 +- Resolves: rhbz#2081413 latest upstream release + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Nov 14 2021 Caolán McNamara - 1.2.33-1 +- Resolves: rhbz#1826433 latest upstream release + +* Tue Sep 14 2021 Sahana Prasad - 1.2.29-5 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 1.2.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Caolán McNamara - 1.2.29-1 +- New upstream release + +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 23 2018 Simo Sorce - 1.2.27-1 +- New upstream release + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 12 2018 John Dennis - 1.2.25-4 +- Resolves: rhbz#1566748 + xmlSecOpenSSLX509DataNodeRead fails to return error + +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Igor Gnatenko - 1.2.25-2 +- Switch to %%ldconfig_scriptlets + +* Wed Nov 08 2017 Igor Gnatenko - 1.2.25-1 +- Update to 1.2.25 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 17 2016 Simo Sorce - 1.2.23-1 +- New Upstream relase 1.2.23 +- Adds compatibility for OpenSSL 1.1.0 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Sep 19 2014 Simo Sorce - 1.2.20-1 +- Update to new upstream release 1.2.20 +- This release fixes a number of miscellaneous bugs and updates expired or + soon-to-be-expired certificates in the test suite. +- Also drops the no-ecdsa patch + +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tomáš Mráz - 1.2.19-4 +- Rebuild for new libgcrypt + +* Fri Dec 13 2013 Michael Schwendt - 1.2.19-3 +- Fix duplicate documentation (#1001250) +- Turn on verbose build output via V=1 make +- Use %%?_isa in explicit package deps +- Fix base package Group tag to "System Environment/Libraries" +- Remove %%defattr + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Daniel Veillard - 1.2.19-1 +- Update to upstream release 1.2.19 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.2.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu May 12 2011 Daniel Veillard - 1.2.18-1 +- Update to upstream release 1.2.18 + +* Mon Apr 11 2011 Daniel Veillard - 1.2.17-1 +- Update to upstream release 1.2.17 +- fixes CVE-2011-1425 on xslt file creation + +* Tue Mar 22 2011 Daniel Veillard - 1.2.16-4 +- Fix missing links to unversioned shared library files 541599 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-2 +- add missing BuildRequires: libtool-ltdl-devel + +* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-1 +- update to 1.2.16 +- cleanup spec file +- disable static libs +- disable rpath +- enable gcrypt subpackage + +* Wed Aug 26 2009 Tomas Mraz - 1.2.12-2 +- rebuilt with new openssl + +* Tue Aug 11 2009 Daniel Veillard - 1.2.12-1 +- update to new upstream release 1.2.12 +- includes fix for CVE-2009-0217 +- cleanup spec file + +* Mon Jul 27 2009 Fedora Release Engineering - 1.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 1.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Tomas Mraz - 1.2.11-2 +- rebuild with new openssl + +* Fri Jul 11 2008 Daniel Veillard - 1.2.11-1 +- update to new upstream release 1.2.11 +- rebuild for gnutls update + +* Wed Feb 20 2008 Fedora Release Engineering - 1.2.9-10.1 +- Autorebuild for GCC 4.3 + +* Wed Dec 05 2007 Release Engineering - 1.2.9-9 + - Rebuild for deps + +* Wed Jul 12 2006 Jesse Keating - 1.2.9-8.1 +- rebuild + +* Wed Jun 14 2006 Tomas Mraz - 1.2.9-8 +- rebuilt with new gnutls + +* Thu Jun 8 2006 Daniel Veillard - 1.2.9-7 +- oops libxmlsec1.la was still there, should fix #171410 and #154142 + +* Thu Jun 8 2006 Daniel Veillard - 1.2.9-6 +- Ugly patch and sed based changes to work around #192756 xmlsec1-config + multilib problem + +* Wed Jun 7 2006 Jeremy Katz - 1.2.9-5 +- move .so symlinks to -devel subpackage + +* Fri Feb 10 2006 Jesse Keating - 1.2.9-4.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.2.9-4.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Thu Dec 15 2005 Christopher Aillon 1.2.9-4 +- NSS has been split out of the mozilla package, so require that now + and update separate_nspr.patch to account for the new NSS as well + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Nov 23 2005 Tomas Mraz 1.2.9-3 +- rebuilt due to gnutls library revision +* Wed Nov 9 2005 1.2.9-2 +- rebuilt due to openssl library revision +* Tue Sep 20 2005 1.2.9-1 +- update from upstream, release done in July +- apparently nss is now available on ppc64 +* Mon Aug 8 2005 1.2.8-3 +- rebuilt with new gnutls +- nspr has been split to a separate package +* Fri Jul 8 2005 Daniel Veillard 1.2.8-2 +- Enabling the mozilla-nss crypto backend +* Fri Jul 8 2005 Daniel Veillard 1.2.8-1 +- update from upstream, needed for openoffice +* Tue Mar 8 2005 Daniel Veillard 1.2.7-4 +- rebuilt with gcc4 +* Wed Feb 23 2005 Daniel Veillard 1.2.7-1 +- Upstream release of 1.2.7, mostly bug fixes plus new functions + to GetKeys from simple store and X509 handling. +* Wed Feb 9 2005 Daniel Veillard 1.2.6-4 +- Adding support for GNUTls crypto backend +* Wed Sep 1 2004 Daniel Veillard 1.2.6-3 +- adding missing ldconfig calls +* Thu Aug 26 2004 Daniel Veillard 1.2.6-2 +- updated with upstream release from Aleksey +* Mon Jun 21 2004 Daniel Veillard 1.2.5-2 +- rebuilt +* Mon Apr 19 2004 Daniel Veillard 1.2.5-1 +- updated with upstream release from Aleksey +* Wed Feb 11 2004 Daniel Veillard 1.2.4-1 +- updated with upstream release from Aleksey +* Tue Jan 6 2004 Daniel Veillard 1.2.3-1 +- updated with upstream release from Aleksey +* Wed Nov 12 2003 Daniel Veillard 1.2.2-1 +- updated with upstream release from Aleksey, specific patches should + have been integrated now. +* Thu Nov 6 2003 Daniel Veillard 1.2.1-1 +- initial packaging based on the upstream one and libxml2 one. +- desactivated mozilla-nss due to detection/architecture problems diff --git a/sources b/sources index 9b63869..0fa6162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.37.tar.gz) = 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 +SHA512 (xmlsec1-1.3.11.tar.gz) = 5a1dc5c94af681a25a28f606d8ba966e589748aee2a3d1069859437f14c710156eb80a8ab77842bf177eaa2762ba2603ea805c50ce6d3c1a237196f54cb9e617 diff --git a/xmlsec1.spec b/xmlsec1.spec index ea5872c..88a693d 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,23 +1,44 @@ +# widely used +%bcond openssl 1 +%define openssl_ver 3.0.13 +# used by libreoffice +%bcond nss 1 +%define nss_ver 3.91 +%define nspr_ver 4.34.1 +# not used; deprecated +%bcond gcrypt 0 +%define gcrypt_ver 1.4.0 +# used by aqbanking +%bcond gnutls 1 +%define gnutls_ver 3.8.3 + Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.37 -Release: 7%{?dist}%{?extra_release} +Version: 1.3.11 +Release: %autorelease Epoch: 1 License: MIT -Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz +Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ -# https://github.com/lsh123/xmlsec/pull/729 -Patch0: 0001-Fix-libxml2-v2.12.0-includes.patch +Patch0: 0000-so-name.patch BuildRequires: make -BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 -BuildRequires: pkgconfig(libxslt) >= 1.0.20 -BuildRequires: pkgconfig(openssl) >= 3.0.0 -BuildRequires: pkgconfig(nss) >= 3.49.0 -BuildRequires: pkgconfig(nspr) >= 4.25.0 -BuildRequires: libgcrypt-devel >= 1.4.0 -BuildRequires: pkgconfig(gnutls) >= 3.6.13 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.13 +BuildRequires: pkgconfig(libxslt) >= 1.1.35 +%if %{with openssl} +BuildRequires: pkgconfig(openssl) >= %{openssl_ver} +%endif +%if %{with nss} +BuildRequires: pkgconfig(nss) >= %{nss_ver} +BuildRequires: pkgconfig(nspr) >= %{nspr_ver} +%endif +%if %{with gcrypt} +BuildRequires: libgcrypt-devel >= %{gcrypt_ver} +%endif +%if %{with gnutls} +BuildRequires: pkgconfig(gnutls) >= %{gnutls_ver} +%endif BuildRequires: libtool-ltdl-devel # autoreconf stuff BuildRequires: autoconf @@ -33,12 +54,12 @@ standards "XML Digital Signature" and "XML Encryption". %package devel Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support. Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} -Requires: openssl-devel%{?_isa} >= 1.0.0 %description devel Libraries, includes, etc. you can use to develop applications with XML Digital Signatures and XML Encryption support. +%if %{with openssl} %package openssl Summary: OpenSSL crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} @@ -51,13 +72,17 @@ for the xmlsec library. Summary: OpenSSL crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} Requires: xmlsec1-openssl%{?_isa} = 1:%{version}-%{release} +Requires: openssl-devel%{?_isa} >= 1:%{openssl_ver} %description openssl-devel Libraries, includes, etc. for developing XML Security applications with OpenSSL +%endif +%if %{with gcrypt} %package gcrypt Summary: GCrypt crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} +Provides: deprecated() %description gcrypt GCrypt plugin for XML Security Library provides GCrypt based crypto services @@ -66,11 +91,15 @@ for the xmlsec library. %package gcrypt-devel Summary: GCrypt crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} -Requires: xmlsec1-gnutls-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-gcrypt%{?_isa} = 1:%{version}-%{release} +Requires: libgcrypt-devel%{?_isa} >= %{gcrypt_ver} +Provides: deprecated() %description gcrypt-devel Libraries, includes, etc. for developing XML Security applications with GCrypt. +%endif +%if %{with gnutls} %package gnutls Summary: GNUTls crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} @@ -82,12 +111,14 @@ for the xmlsec library. %package gnutls-devel Summary: GNUTls crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} -Requires: xmlsec1-openssl-devel%{?_isa} = 1:%{version}-%{release} -Requires: gnutls-devel%{?_isa} >= 1.0.20 +Requires: xmlsec1-gnutls%{?_isa} = 1:%{version}-%{release} +Requires: gnutls-devel%{?_isa} >= %{gnutls_ver} %description gnutls-devel Libraries, includes, etc. for developing XML Security applications with GNUTls. +%endif +%if %{with nss} %package nss Summary: NSS crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} @@ -100,13 +131,15 @@ for the xmlsec library Summary: NSS crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} Requires: xmlsec1-nss%{?_isa} = 1:%{version}-%{release} +Requires: nspr-devel%{?_isa} >= %{nspr_ver} +Requires: nss-devel%{?_isa} >= %{nss_ver} %description nss-devel Libraries, includes, etc. for developing XML Security applications with NSS. +%endif %prep -%setup -q -%patch -P0 -p1 +%autosetup -p1 %build autoreconf -vfi @@ -126,12 +159,8 @@ rm -vf %{buildroot}%{_libdir}/*.la rm -rf __tmp_doc ; mkdir __tmp_doc mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc -%ldconfig_scriptlets -%ldconfig_scriptlets gnutls -%ldconfig_scriptlets openssl - %files -%doc AUTHORS ChangeLog NEWS Copyright +%doc AUTHORS.md ChangeLog NEWS Copyright %{_mandir}/man1/xmlsec1.1* %{_libdir}/libxmlsec1.so.* %{_bindir}/xmlsec1 @@ -148,6 +177,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_mandir}/man1/xmlsec1-config.1* %doc HACKING __tmp_doc/* +%if %{with openssl} %files openssl %{_libdir}/libxmlsec1-openssl.so.* %{_libdir}/libxmlsec1-openssl.so @@ -155,7 +185,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files openssl-devel %{_includedir}/xmlsec1/xmlsec/openssl/ %{_libdir}/pkgconfig/xmlsec1-openssl.pc +%endif +%if %{with gcrypt} %files gcrypt %{_libdir}/libxmlsec1-gcrypt.so.* %{_libdir}/libxmlsec1-gcrypt.so @@ -163,7 +195,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files gcrypt-devel %{_includedir}/xmlsec1/xmlsec/gcrypt/ %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc +%endif +%if %{with gnutls} %files gnutls %{_libdir}/libxmlsec1-gnutls.so.* %{_libdir}/libxmlsec1-gnutls.so @@ -171,7 +205,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files gnutls-devel %{_includedir}/xmlsec1/xmlsec/gnutls/ %{_libdir}/pkgconfig/xmlsec1-gnutls.pc +%endif +%if %{with nss} %files nss %{_libdir}/libxmlsec1-nss.so.* %{_libdir}/libxmlsec1-nss.so @@ -179,265 +215,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files nss-devel %{_includedir}/xmlsec1/xmlsec/nss/ %{_libdir}/pkgconfig/xmlsec1-nss.pc +%endif %changelog -* Sat Jan 27 2024 Fedora Release Engineering - 1:1.2.37-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 13 2023 Yaakov Selkowitz - 1:1.2.37-6 -- Fix build with libxml2-2.12.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 1:1.2.37-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 22 2023 Tomas Halman - 1.2.37-4 -- Resolves: rhbz#2187631 - Cannot load modules/mod_auth_mellon.so - Revert to previous version - -* Fri Apr 14 2023 Tomas Halman - 1.3.0-1 -- Resolves: rhbz#2186304 - rebase to version 1.3.0 - -* Tue Mar 7 2023 Tomas Halman - 1.2.37-3 -- migrated to SPDX license - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2.37-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 29 2022 Tomas Halman - 1.2.37-1 -- Resolves: rhbz#2149129 latest upstream release - -* Tue Nov 08 2022 Caolán McNamara - 1.2.36-1 -- Resolves: rhbz#2138484 latest upstream release - -* Thu Oct 27 2022 Caolán McNamara - 1.2.35-1 -- Resolves: rhbz#2137430 latest upstream release - -* Mon Oct 24 2022 David King - 1.2.34-3 -- Rebuild against libxml2 (#2136800) - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2.34-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed May 18 2022 Caolán McNamara - 1.2.34-1 -- Resolves: rhbz#2081413 latest upstream release - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Nov 14 2021 Caolán McNamara - 1.2.33-1 -- Resolves: rhbz#1826433 latest upstream release - -* Tue Sep 14 2021 Sahana Prasad - 1.2.29-5 -- Rebuilt with OpenSSL 3.0.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.29-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.2.29-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Caolán McNamara - 1.2.29-1 -- New upstream release - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 23 2018 Simo Sorce - 1.2.27-1 -- New upstream release - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.25-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 12 2018 John Dennis - 1.2.25-4 -- Resolves: rhbz#1566748 - xmlSecOpenSSLX509DataNodeRead fails to return error - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Igor Gnatenko - 1.2.25-2 -- Switch to %%ldconfig_scriptlets - -* Wed Nov 08 2017 Igor Gnatenko - 1.2.25-1 -- Update to 1.2.25 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 17 2016 Simo Sorce - 1.2.23-1 -- New Upstream relase 1.2.23 -- Adds compatibility for OpenSSL 1.1.0 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Sep 19 2014 Simo Sorce - 1.2.20-1 -- Update to new upstream release 1.2.20 -- This release fixes a number of miscellaneous bugs and updates expired or - soon-to-be-expired certificates in the test suite. -- Also drops the no-ecdsa patch - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.19-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.19-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tomáš Mráz - 1.2.19-4 -- Rebuild for new libgcrypt - -* Fri Dec 13 2013 Michael Schwendt - 1.2.19-3 -- Fix duplicate documentation (#1001250) -- Turn on verbose build output via V=1 make -- Use %%?_isa in explicit package deps -- Fix base package Group tag to "System Environment/Libraries" -- Remove %%defattr - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Daniel Veillard - 1.2.19-1 -- Update to upstream release 1.2.19 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu May 12 2011 Daniel Veillard - 1.2.18-1 -- Update to upstream release 1.2.18 - -* Mon Apr 11 2011 Daniel Veillard - 1.2.17-1 -- Update to upstream release 1.2.17 -- fixes CVE-2011-1425 on xslt file creation - -* Tue Mar 22 2011 Daniel Veillard - 1.2.16-4 -- Fix missing links to unversioned shared library files 541599 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-2 -- add missing BuildRequires: libtool-ltdl-devel - -* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-1 -- update to 1.2.16 -- cleanup spec file -- disable static libs -- disable rpath -- enable gcrypt subpackage - -* Wed Aug 26 2009 Tomas Mraz - 1.2.12-2 -- rebuilt with new openssl - -* Tue Aug 11 2009 Daniel Veillard - 1.2.12-1 -- update to new upstream release 1.2.12 -- includes fix for CVE-2009-0217 -- cleanup spec file - -* Mon Jul 27 2009 Fedora Release Engineering - 1.2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 1.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Tomas Mraz - 1.2.11-2 -- rebuild with new openssl - -* Fri Jul 11 2008 Daniel Veillard - 1.2.11-1 -- update to new upstream release 1.2.11 -- rebuild for gnutls update - -* Wed Feb 20 2008 Fedora Release Engineering - 1.2.9-10.1 -- Autorebuild for GCC 4.3 - -* Wed Dec 05 2007 Release Engineering - 1.2.9-9 - - Rebuild for deps - -* Wed Jul 12 2006 Jesse Keating - 1.2.9-8.1 -- rebuild - -* Wed Jun 14 2006 Tomas Mraz - 1.2.9-8 -- rebuilt with new gnutls - -* Thu Jun 8 2006 Daniel Veillard - 1.2.9-7 -- oops libxmlsec1.la was still there, should fix #171410 and #154142 - -* Thu Jun 8 2006 Daniel Veillard - 1.2.9-6 -- Ugly patch and sed based changes to work around #192756 xmlsec1-config - multilib problem - -* Wed Jun 7 2006 Jeremy Katz - 1.2.9-5 -- move .so symlinks to -devel subpackage - -* Fri Feb 10 2006 Jesse Keating - 1.2.9-4.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.2.9-4.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Thu Dec 15 2005 Christopher Aillon 1.2.9-4 -- NSS has been split out of the mozilla package, so require that now - and update separate_nspr.patch to account for the new NSS as well - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Nov 23 2005 Tomas Mraz 1.2.9-3 -- rebuilt due to gnutls library revision -* Wed Nov 9 2005 1.2.9-2 -- rebuilt due to openssl library revision -* Tue Sep 20 2005 1.2.9-1 -- update from upstream, release done in July -- apparently nss is now available on ppc64 -* Mon Aug 8 2005 1.2.8-3 -- rebuilt with new gnutls -- nspr has been split to a separate package -* Fri Jul 8 2005 Daniel Veillard 1.2.8-2 -- Enabling the mozilla-nss crypto backend -* Fri Jul 8 2005 Daniel Veillard 1.2.8-1 -- update from upstream, needed for openoffice -* Tue Mar 8 2005 Daniel Veillard 1.2.7-4 -- rebuilt with gcc4 -* Wed Feb 23 2005 Daniel Veillard 1.2.7-1 -- Upstream release of 1.2.7, mostly bug fixes plus new functions - to GetKeys from simple store and X509 handling. -* Wed Feb 9 2005 Daniel Veillard 1.2.6-4 -- Adding support for GNUTls crypto backend -* Wed Sep 1 2004 Daniel Veillard 1.2.6-3 -- adding missing ldconfig calls -* Thu Aug 26 2004 Daniel Veillard 1.2.6-2 -- updated with upstream release from Aleksey -* Mon Jun 21 2004 Daniel Veillard 1.2.5-2 -- rebuilt -* Mon Apr 19 2004 Daniel Veillard 1.2.5-1 -- updated with upstream release from Aleksey -* Wed Feb 11 2004 Daniel Veillard 1.2.4-1 -- updated with upstream release from Aleksey -* Tue Jan 6 2004 Daniel Veillard 1.2.3-1 -- updated with upstream release from Aleksey -* Wed Nov 12 2003 Daniel Veillard 1.2.2-1 -- updated with upstream release from Aleksey, specific patches should - have been integrated now. -* Thu Nov 6 2003 Daniel Veillard 1.2.1-1 -- initial packaging based on the upstream one and libxml2 one. -- desactivated mozilla-nss due to detection/architecture problems +%autochangelog