From c09138116c70e7636e93722dfe3c580cdc213c6c Mon Sep 17 00:00:00 2001 From: John Dennis Date: Thu, 12 Apr 2018 19:08:51 -0400 Subject: [PATCH 01/46] Resolves: rhbz#1566748 xmlSecOpenSSLX509DataNodeRead fails to return error --- xmlSecOpenSSLX509DataNodeRead-error.patch | 55 +++++++++++++++++++++++ xmlsec1.spec | 9 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 xmlSecOpenSSLX509DataNodeRead-error.patch diff --git a/xmlSecOpenSSLX509DataNodeRead-error.patch b/xmlSecOpenSSLX509DataNodeRead-error.patch new file mode 100644 index 0000000..16abbbf --- /dev/null +++ b/xmlSecOpenSSLX509DataNodeRead-error.patch @@ -0,0 +1,55 @@ +Please see this bug report for full details: +https://github.com/lsh123/xmlsec/issues/164 + +commit e303e077fb3e13654ba711b2816ff1a94247338b +Author: lsh123 +Date: Wed Apr 11 17:13:43 2018 -1000 + + Add missing return(-1). (#165) + + Fixed issue #164. All other crypto libraries are ok. + +diff --git a/src/openssl/x509.c b/src/openssl/x509.c +index 15fe70db..b98e62d1 100644 +--- a/src/openssl/x509.c ++++ b/src/openssl/x509.c +@@ -870,6 +870,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509CertificateNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509SubjectNameNodeRead(data, cur, keyInfoCtx); +@@ -877,6 +878,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509SubjectNameNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509IssuerSerialNodeRead(data, cur, keyInfoCtx); +@@ -884,6 +886,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509IssuerSerialNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509SKINodeRead(data, cur, keyInfoCtx); +@@ -891,6 +894,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509SKINodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509CRLNodeRead(data, cur, keyInfoCtx); +@@ -898,6 +902,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509CRLNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD) != 0) { + /* laxi schema validation: ignore unknown nodes */ diff --git a/xmlsec1.spec b/xmlsec1.spec index c97820e..66287a2 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.25 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: MIT Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -19,6 +19,8 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +Patch1: xmlSecOpenSSLX509DataNodeRead-error.patch + %description XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security @@ -101,6 +103,7 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q +%patch1 -p1 %build autoreconf -vfi @@ -177,6 +180,10 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* Thu Apr 12 2018 John Dennis - 1.2.25-4%{?extra_release} +- 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 From e373d503fd3cc39359178164b553ebb12ca81f1d Mon Sep 17 00:00:00 2001 From: John Dennis Date: Thu, 12 Apr 2018 19:20:39 -0400 Subject: [PATCH 02/46] Resolves: rhbz#1566748 xmlSecOpenSSLX509DataNodeRead fails to return error --- xmlSecOpenSSLX509DataNodeRead-error.patch | 55 +++++++++++++++++++++++ xmlsec1.spec | 9 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 xmlSecOpenSSLX509DataNodeRead-error.patch diff --git a/xmlSecOpenSSLX509DataNodeRead-error.patch b/xmlSecOpenSSLX509DataNodeRead-error.patch new file mode 100644 index 0000000..16abbbf --- /dev/null +++ b/xmlSecOpenSSLX509DataNodeRead-error.patch @@ -0,0 +1,55 @@ +Please see this bug report for full details: +https://github.com/lsh123/xmlsec/issues/164 + +commit e303e077fb3e13654ba711b2816ff1a94247338b +Author: lsh123 +Date: Wed Apr 11 17:13:43 2018 -1000 + + Add missing return(-1). (#165) + + Fixed issue #164. All other crypto libraries are ok. + +diff --git a/src/openssl/x509.c b/src/openssl/x509.c +index 15fe70db..b98e62d1 100644 +--- a/src/openssl/x509.c ++++ b/src/openssl/x509.c +@@ -870,6 +870,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509CertificateNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509SubjectNameNodeRead(data, cur, keyInfoCtx); +@@ -877,6 +878,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509SubjectNameNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509IssuerSerialNodeRead(data, cur, keyInfoCtx); +@@ -884,6 +886,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509IssuerSerialNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509SKINodeRead(data, cur, keyInfoCtx); +@@ -891,6 +894,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509SKINodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) { + ret = xmlSecOpenSSLX509CRLNodeRead(data, cur, keyInfoCtx); +@@ -898,6 +902,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI + xmlSecInternalError2("xmlSecOpenSSLX509CRLNodeRead", + xmlSecKeyDataGetName(data), + "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); ++ return(-1); + } + } else if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD) != 0) { + /* laxi schema validation: ignore unknown nodes */ diff --git a/xmlsec1.spec b/xmlsec1.spec index c97820e..9d32888 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.25 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: MIT Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -19,6 +19,8 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +Patch1: xmlSecOpenSSLX509DataNodeRead-error.patch + %description XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security @@ -101,6 +103,7 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q +%patch1 -p1 %build autoreconf -vfi @@ -177,6 +180,10 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 124ab2b26c422249cb4b8720f5138a0c6180008a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:24:07 +0000 Subject: [PATCH 03/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 9d32888..4159594 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.25 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: MIT Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -180,6 +180,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 37d17a5b084c9a3dc68e9d5e1f08e955c5da59c6 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 23 Oct 2018 16:21:01 -0400 Subject: [PATCH 04/46] New upstream release --- .gitignore | 1 + sources | 2 +- xmlSecOpenSSLX509DataNodeRead-error.patch | 55 ----------------------- xmlsec1.spec | 12 ++--- 4 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 xmlSecOpenSSLX509DataNodeRead-error.patch diff --git a/.gitignore b/.gitignore index ed6d054..e2bb774 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xmlsec1-1.2.16.tar.gz /xmlsec1-1.2.20.tar.gz /xmlsec1-1.2.23.tar.gz /xmlsec1-1.2.25.tar.gz +/xmlsec1-1.2.27.tar.gz diff --git a/sources b/sources index c9dcf4d..1b67741 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6 +SHA512 (xmlsec1-1.2.27.tar.gz) = 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920 diff --git a/xmlSecOpenSSLX509DataNodeRead-error.patch b/xmlSecOpenSSLX509DataNodeRead-error.patch deleted file mode 100644 index 16abbbf..0000000 --- a/xmlSecOpenSSLX509DataNodeRead-error.patch +++ /dev/null @@ -1,55 +0,0 @@ -Please see this bug report for full details: -https://github.com/lsh123/xmlsec/issues/164 - -commit e303e077fb3e13654ba711b2816ff1a94247338b -Author: lsh123 -Date: Wed Apr 11 17:13:43 2018 -1000 - - Add missing return(-1). (#165) - - Fixed issue #164. All other crypto libraries are ok. - -diff --git a/src/openssl/x509.c b/src/openssl/x509.c -index 15fe70db..b98e62d1 100644 ---- a/src/openssl/x509.c -+++ b/src/openssl/x509.c -@@ -870,6 +870,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI - xmlSecInternalError2("xmlSecOpenSSLX509CertificateNodeRead", - xmlSecKeyDataGetName(data), - "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); -+ return(-1); - } - } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName, xmlSecDSigNs)) { - ret = xmlSecOpenSSLX509SubjectNameNodeRead(data, cur, keyInfoCtx); -@@ -877,6 +878,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI - xmlSecInternalError2("xmlSecOpenSSLX509SubjectNameNodeRead", - xmlSecKeyDataGetName(data), - "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); -+ return(-1); - } - } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial, xmlSecDSigNs)) { - ret = xmlSecOpenSSLX509IssuerSerialNodeRead(data, cur, keyInfoCtx); -@@ -884,6 +886,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI - xmlSecInternalError2("xmlSecOpenSSLX509IssuerSerialNodeRead", - xmlSecKeyDataGetName(data), - "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); -+ return(-1); - } - } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) { - ret = xmlSecOpenSSLX509SKINodeRead(data, cur, keyInfoCtx); -@@ -891,6 +894,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI - xmlSecInternalError2("xmlSecOpenSSLX509SKINodeRead", - xmlSecKeyDataGetName(data), - "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); -+ return(-1); - } - } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) { - ret = xmlSecOpenSSLX509CRLNodeRead(data, cur, keyInfoCtx); -@@ -898,6 +902,7 @@ xmlSecOpenSSLX509DataNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyI - xmlSecInternalError2("xmlSecOpenSSLX509CRLNodeRead", - xmlSecKeyDataGetName(data), - "node=%s", xmlSecErrorsSafeString(xmlSecNodeGetName(cur))); -+ return(-1); - } - } else if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD) != 0) { - /* laxi schema validation: ignore unknown nodes */ diff --git a/xmlsec1.spec b/xmlsec1.spec index 4159594..2c03c34 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,9 +1,9 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.25 -Release: 5%{?dist}%{?extra_release} +Version: 1.2.27 +Release: 1%{?dist}%{?extra_release} License: MIT -Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz +Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 @@ -19,8 +19,6 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool -Patch1: xmlSecOpenSSLX509DataNodeRead-error.patch - %description XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security @@ -103,7 +101,6 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q -%patch1 -p1 %build autoreconf -vfi @@ -180,6 +177,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From f1b840682eec156b4958d2763907f5079c1b34d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:34:03 +0000 Subject: [PATCH 05/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 2c03c34..3abc96f 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.27 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -177,6 +177,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 652147fad0c99aa1b87af7ea8e170bc79f131d11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:21:45 +0000 Subject: [PATCH 06/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 3abc96f..620c0d0 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.27 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -177,6 +177,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 3d8f813791528c68809ace32e7c7ca5e2696fbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 29 Jan 2020 15:00:02 +0000 Subject: [PATCH 07/46] latest upstream release --- .gitignore | 9 +-------- sources | 2 +- xmlsec1.spec | 9 +++++---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e2bb774..a85e1ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -xmlsec1-1.2.16.tar.gz -/xmlsec1-1.2.17.tar.gz -/xmlsec1-1.2.18.tar.gz -/xmlsec1-1.2.19.tar.gz -/xmlsec1-1.2.20.tar.gz -/xmlsec1-1.2.23.tar.gz -/xmlsec1-1.2.25.tar.gz -/xmlsec1-1.2.27.tar.gz +/xmlsec1-1.2.29.tar.gz diff --git a/sources b/sources index 1b67741..58449bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.27.tar.gz) = 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920 +SHA512 (xmlsec1-1.2.29.tar.gz) = 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d diff --git a/xmlsec1.spec b/xmlsec1.spec index 620c0d0..d6025b9 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.27 -Release: 3%{?dist}%{?extra_release} +Version: 1.2.29 +Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -134,9 +134,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_bindir}/xmlsec1-config %dir %{_includedir}/xmlsec1 %dir %{_includedir}/xmlsec1/xmlsec -%dir %{_includedir}/xmlsec1/xmlsec/private %{_includedir}/xmlsec1/xmlsec/*.h -%{_includedir}/xmlsec1/xmlsec/private/*.h %{_libdir}/libxmlsec1.so %{_libdir}/pkgconfig/xmlsec1.pc %{_libdir}/xmlsec1Conf.sh @@ -177,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 33a7b0eb219a71513ec6b4cef58ed29728098b50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:51:04 +0000 Subject: [PATCH 08/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index d6025b9..5f4ad57 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.29 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 3644b932779ed98e3270c2371edb3f0237b159b5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:31:55 +0000 Subject: [PATCH 09/46] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlsec1.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlsec1.spec b/xmlsec1.spec index 5f4ad57..fa0ca28 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -5,6 +5,7 @@ Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ +BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 BuildRequires: pkgconfig(openssl) >= 1.0.0 From d681e9473344b8baf94beb6be19cde2ffa9e7c56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:10:25 +0000 Subject: [PATCH 10/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index fa0ca28..8e236a5 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.29 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 6da96285e756f7f9d7f9f249707aebe8b2b47086 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:43:41 +0000 Subject: [PATCH 11/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 8e236a5..591f0d5 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.29 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 7b823ab549f8fdb24b4c3de9de58c57275273c3c Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:18:08 +0200 Subject: [PATCH 12/46] Rebuilt with OpenSSL 3.0.0 --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 591f0d5..5561ab2 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.29 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 423ea5f1ebf549e75ff1a8142052c0ae12435654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 14 Nov 2021 20:01:32 +0000 Subject: [PATCH 13/46] Resolves: rhbz#1826433 latest upstream release --- .gitignore | 2 +- sources | 2 +- xmlsec1.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a85e1ee..6f972bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xmlsec1-1.2.29.tar.gz +/xmlsec1-1.2.33.tar.gz diff --git a/sources b/sources index 58449bf..56d88e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.29.tar.gz) = 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d +SHA512 (xmlsec1-1.2.33.tar.gz) = 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8 diff --git a/xmlsec1.spec b/xmlsec1.spec index 5561ab2..cd8052c 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.29 -Release: 5%{?dist}%{?extra_release} +Version: 1.2.33 +Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 786bb43da7b071e3cf9862406636afbef7a1aad8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:16:25 +0000 Subject: [PATCH 14/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index cd8052c..e5f0dd8 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.33 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From e85bcbe25d867fabc3480129de1dc673f2936f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 18 May 2022 09:07:18 +0100 Subject: [PATCH 15/46] Resolves: rhbz#2081413 latest upstream release --- .gitignore | 2 +- sources | 2 +- xmlsec1.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6f972bf..eb35685 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xmlsec1-1.2.33.tar.gz +/xmlsec1-1.2.34.tar.gz diff --git a/sources b/sources index 56d88e8..313ad44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.33.tar.gz) = 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8 +SHA512 (xmlsec1-1.2.34.tar.gz) = 4e3c17ab71c5ce3c76a80f2077393a5808a537d7eba861bae104c186be57f4be53499b52571913187e0a302962376bc033d7fe8ea769c6a181bf72d3f9eea1f2 diff --git a/xmlsec1.spec b/xmlsec1.spec index e5f0dd8..01ea519 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.33 -Release: 2%{?dist}%{?extra_release} +Version: 1.2.34 +Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 1028fa458d54cf322832af23e74283ed9b4117ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:18:22 +0000 Subject: [PATCH 16/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 01ea519..ae6d0e4 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.34 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 46025a5ae9166d84ae0765f6da8a331faa94dd6e Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 28 Jan 2022 10:36:34 +0000 Subject: [PATCH 17/46] Remove the unneeded dependency on libgcrypt for the gnutls subpackage the gnutls is not using libgcrypt for several years. --- xmlsec1.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index ae6d0e4..041a29c 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -78,7 +78,6 @@ for the xmlsec library. Summary: GNUTls crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} Requires: xmlsec1-openssl-devel%{?_isa} = %{version}-%{release} -Requires: libgcrypt-devel%{?_isa} >= 1.2.0 Requires: gnutls-devel%{?_isa} >= 1.0.20 %description gnutls-devel From d1f20c37d240504cd58f7f461082201aa117143c Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 24 Oct 2022 10:17:19 +0100 Subject: [PATCH 18/46] Rebuild against libxml2 (#2136800) --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 041a29c..025b424 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.34 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 4a6488817603130f57c307b8efb13e9aae30dff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 27 Oct 2022 09:07:43 +0100 Subject: [PATCH 19/46] Resolves: rhbz#2137430 latest upstream release --- .gitignore | 2 +- sources | 2 +- xmlsec1.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eb35685..e57cbb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xmlsec1-1.2.34.tar.gz +/xmlsec1-1.2.35.tar.gz diff --git a/sources b/sources index 313ad44..4dfa078 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.34.tar.gz) = 4e3c17ab71c5ce3c76a80f2077393a5808a537d7eba861bae104c186be57f4be53499b52571913187e0a302962376bc033d7fe8ea769c6a181bf72d3f9eea1f2 +SHA512 (xmlsec1-1.2.35.tar.gz) = 6e5f5c631eeff39d5f9df09415dab87b1160262784d3cf722d6dbbaa7b2437092989c6bd1377970f00667d6e7bf49f879c4cf28332b772bc86ff2ccf663081f6 diff --git a/xmlsec1.spec b/xmlsec1.spec index 025b424..d5f74c7 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.34 -Release: 3%{?dist}%{?extra_release} +Version: 1.2.35 +Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -20,6 +20,8 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +Patch1: fix-size_max-412.patch.1 + %description XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security @@ -101,6 +103,7 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q +%patch1 -p1 %build autoreconf -vfi @@ -125,7 +128,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %ldconfig_scriptlets openssl %files -%doc AUTHORS ChangeLog NEWS README Copyright +%doc AUTHORS ChangeLog NEWS Copyright %{_mandir}/man1/xmlsec1.1* %{_libdir}/libxmlsec1.so.* %{_bindir}/xmlsec1 @@ -175,6 +178,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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) From d9cb69f55ee952df9e1a0b2233f8ff8df3dd341f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 27 Oct 2022 09:31:28 +0100 Subject: [PATCH 20/46] Resolves: rhbz#2137430 latest upstream release --- fix-size_max-412.patch.1 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 fix-size_max-412.patch.1 diff --git a/fix-size_max-412.patch.1 b/fix-size_max-412.patch.1 new file mode 100644 index 0000000..5b4e2b6 --- /dev/null +++ b/fix-size_max-412.patch.1 @@ -0,0 +1,31 @@ +From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001 +From: lsh123 +Date: Mon, 24 Oct 2022 17:38:59 -0700 +Subject: [PATCH] fix size_max (#412) + +--- + src/cast_helpers.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/cast_helpers.h b/src/cast_helpers.h +index 67330822..2b670ad1 100644 +--- a/src/cast_helpers.h ++++ b/src/cast_helpers.h +@@ -17,13 +17,9 @@ + #endif /* XMLSEC_PRIVATE */ + + #include ++#include + #include "errors_helpers.h" + +-/* if it is missing */ +-#ifndef SIZE_MAX +-#define SIZE_MAX (~(size_t)0) +-#endif /* SIZE_MAX */ +- + /** + * Helpers for printing out enum values (mostly debugging). + */ +-- +2.38.0.rc2 + From 3d8154551e3d33b5b102f17c97e66917b3baa8f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 8 Nov 2022 08:48:10 +0000 Subject: [PATCH 21/46] Resolves: rhbz#2138484 latest upstream release --- .gitignore | 2 +- fix-size_max-412.patch.1 | 31 ------------------------------- sources | 2 +- xmlsec1.spec | 8 ++++---- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 fix-size_max-412.patch.1 diff --git a/.gitignore b/.gitignore index e57cbb9..f97aa53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xmlsec1-1.2.35.tar.gz +/xmlsec1-1.2.36.tar.gz diff --git a/fix-size_max-412.patch.1 b/fix-size_max-412.patch.1 deleted file mode 100644 index 5b4e2b6..0000000 --- a/fix-size_max-412.patch.1 +++ /dev/null @@ -1,31 +0,0 @@ -From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 24 Oct 2022 17:38:59 -0700 -Subject: [PATCH] fix size_max (#412) - ---- - src/cast_helpers.h | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/cast_helpers.h b/src/cast_helpers.h -index 67330822..2b670ad1 100644 ---- a/src/cast_helpers.h -+++ b/src/cast_helpers.h -@@ -17,13 +17,9 @@ - #endif /* XMLSEC_PRIVATE */ - - #include -+#include - #include "errors_helpers.h" - --/* if it is missing */ --#ifndef SIZE_MAX --#define SIZE_MAX (~(size_t)0) --#endif /* SIZE_MAX */ -- - /** - * Helpers for printing out enum values (mostly debugging). - */ --- -2.38.0.rc2 - diff --git a/sources b/sources index 4dfa078..95bd9cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.35.tar.gz) = 6e5f5c631eeff39d5f9df09415dab87b1160262784d3cf722d6dbbaa7b2437092989c6bd1377970f00667d6e7bf49f879c4cf28332b772bc86ff2ccf663081f6 +SHA512 (xmlsec1-1.2.36.tar.gz) = 7545935d33236bc8ec79b9173c8c0967df5c96bb9e2d5c8edacfb5ffb366ff8d087eada0cebb1de81a477f93d40544bf0a12abcdbc60874ecaecb9c8dd33dfe3 diff --git a/xmlsec1.spec b/xmlsec1.spec index d5f74c7..bae8f38 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,6 +1,6 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.35 +Version: 1.2.36 Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz @@ -20,8 +20,6 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool -Patch1: fix-size_max-412.patch.1 - %description XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security @@ -103,7 +101,6 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q -%patch1 -p1 %build autoreconf -vfi @@ -178,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 94becb95ba2209c1edc055edb010f4f222e04cff Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Tue, 29 Nov 2022 12:12:00 +0100 Subject: [PATCH 22/46] New upstream release 1.2.37 Resolves: rhbz#2149129 latest upstream release --- .gitignore | 1 + sources | 2 +- xmlsec1.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f97aa53..046db1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xmlsec1-1.2.36.tar.gz +/xmlsec1-1.2.37.tar.gz diff --git a/sources b/sources index 95bd9cc..9b63869 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.36.tar.gz) = 7545935d33236bc8ec79b9173c8c0967df5c96bb9e2d5c8edacfb5ffb366ff8d087eada0cebb1de81a477f93d40544bf0a12abcdbc60874ecaecb9c8dd33dfe3 +SHA512 (xmlsec1-1.2.37.tar.gz) = 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 diff --git a/xmlsec1.spec b/xmlsec1.spec index bae8f38..8601472 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,6 +1,6 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.36 +Version: 1.2.37 Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From b0b6225159e378cff5af9b6fef9a19133731b5c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:38:52 +0000 Subject: [PATCH 23/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 8601472..cdc28f7 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.37 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 7f45cd050aa3a541c68f209d249e3fb28c2742a8 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Tue, 7 Mar 2023 15:27:24 +0100 Subject: [PATCH 24/46] migrated to SPDX license --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index cdc28f7..21ad871 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.37 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 187f5ab9c95aea2b962021a4a0e21da2f21e3d29 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Fri, 14 Apr 2023 10:39:13 +0200 Subject: [PATCH 25/46] New upsream release 1.3.0 Resolves: rhbz#2186304 - rebase to version 1.3.0 --- .gitignore | 1 + sources | 2 +- xmlsec1.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 046db1b..7f24ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xmlsec1-1.2.36.tar.gz /xmlsec1-1.2.37.tar.gz +/xmlsec1-1.3.0.tar.gz diff --git a/sources b/sources index 9b63869..cc86799 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.37.tar.gz) = 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 +SHA512 (xmlsec1-1.3.0.tar.gz) = ac1b1b88336959f54ef7fcfd6b9ff0feb2ba00a966a8e5b4efb97e802a1f9bb7adf5f4524c7f169344a1b7258377b5a7e879a0ab5ce25cfae3b05eac9b54729d diff --git a/xmlsec1.spec b/xmlsec1.spec index 21ad871..1f8b8d4 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,18 +1,18 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.37 -Release: 3%{?dist}%{?extra_release} +Version: 1.3.0 +Release: 1%{?dist}%{?extra_release} License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 -BuildRequires: pkgconfig(openssl) >= 1.0.0 -BuildRequires: pkgconfig(nss) >= 3.11.1 -BuildRequires: pkgconfig(nspr) >= 4.4.1 +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) >= 2.8.0 +BuildRequires: pkgconfig(gnutls) >= 3.6.13 BuildRequires: libtool-ltdl-devel # autoreconf stuff BuildRequires: autoconf @@ -175,6 +175,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From a6b6191bc0ec1384a6d0894c5b454326ebcf30cf Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Fri, 23 Jun 2023 11:24:16 +0200 Subject: [PATCH 26/46] Revert to version 1.2.37 Resolves: rhbz#2187631 - Cannot load modules/mod_auth_mellon.so --- sources | 2 +- xmlsec1.spec | 35 ++++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/sources b/sources index cc86799..9b63869 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.3.0.tar.gz) = ac1b1b88336959f54ef7fcfd6b9ff0feb2ba00a966a8e5b4efb97e802a1f9bb7adf5f4524c7f169344a1b7258377b5a7e879a0ab5ce25cfae3b05eac9b54729d +SHA512 (xmlsec1-1.2.37.tar.gz) = 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 diff --git a/xmlsec1.spec b/xmlsec1.spec index 1f8b8d4..fbf85bd 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,8 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.3.0 -Release: 1%{?dist}%{?extra_release} +Version: 1.2.37 +Release: 4%{?dist}%{?extra_release} +Epoch: 1 License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ @@ -27,7 +28,7 @@ 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} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} Requires: openssl-devel%{?_isa} >= 1.0.0 %description devel @@ -36,7 +37,7 @@ Signatures and XML Encryption support. %package openssl Summary: OpenSSL crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description openssl OpenSSL plugin for XML Security Library provides OpenSSL based crypto services @@ -44,15 +45,15 @@ for the xmlsec library. %package openssl-devel Summary: OpenSSL crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-openssl%{?_isa} = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-openssl%{?_isa} = 1:%{version}-%{release} %description openssl-devel Libraries, includes, etc. for developing XML Security applications with OpenSSL %package gcrypt Summary: GCrypt crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description gcrypt GCrypt plugin for XML Security Library provides GCrypt based crypto services @@ -60,15 +61,15 @@ for the xmlsec library. %package gcrypt-devel Summary: GCrypt crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-gnutls-devel%{?_isa} = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-gnutls-devel%{?_isa} = 1:%{version}-%{release} %description gcrypt-devel Libraries, includes, etc. for developing XML Security applications with GCrypt. %package gnutls Summary: GNUTls crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description gnutls GNUTls plugin for XML Security Library provides GNUTls based crypto services @@ -76,8 +77,8 @@ for the xmlsec library. %package gnutls-devel Summary: GNUTls crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-openssl-devel%{?_isa} = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-openssl-devel%{?_isa} = 1:%{version}-%{release} Requires: gnutls-devel%{?_isa} >= 1.0.20 %description gnutls-devel @@ -85,7 +86,7 @@ Libraries, includes, etc. for developing XML Security applications with GNUTls. %package nss Summary: NSS crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description nss NSS plugin for XML Security Library provides NSS based crypto services @@ -93,8 +94,8 @@ for the xmlsec library %package nss-devel Summary: NSS crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-nss%{?_isa} = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-nss%{?_isa} = 1:%{version}-%{release} %description nss-devel Libraries, includes, etc. for developing XML Security applications with NSS. @@ -175,6 +176,10 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 6ea2eedf8dd04da94f024ea7068d689db550655e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:02:36 +0000 Subject: [PATCH 27/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index fbf85bd..1a8219a 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.37 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz @@ -176,6 +176,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 01da50c5c95560961015398cd4f4ee585abb0166 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 12 Dec 2023 20:15:59 -0500 Subject: [PATCH 28/46] Fix build with libxml2-2.12.0 https://github.com/lsh123/xmlsec/pull/729 --- 0001-Fix-libxml2-v2.12.0-includes.patch | 108 ++++++++++++++++++++++++ xmlsec1.spec | 10 ++- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-libxml2-v2.12.0-includes.patch diff --git a/0001-Fix-libxml2-v2.12.0-includes.patch b/0001-Fix-libxml2-v2.12.0-includes.patch new file mode 100644 index 0000000..d32619c --- /dev/null +++ b/0001-Fix-libxml2-v2.12.0-includes.patch @@ -0,0 +1,108 @@ +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/xmlsec1.spec b/xmlsec1.spec index 1a8219a..c4f58b8 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,11 +1,15 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.37 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://www.aleksey.com/xmlsec/download/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 + BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 @@ -102,6 +106,7 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q +%patch -P0 -p1 %build autoreconf -vfi @@ -176,6 +181,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 5fa86953f0c5de848ff0509adcc3613d609849ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:53:22 +0000 Subject: [PATCH 29/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index c4f58b8..ea5872c 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.37 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz @@ -181,6 +181,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %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 From 0ba3d3014429aa2a4c239b09d38fcf6a1c0612a8 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Wed, 5 Jun 2024 10:22:12 +0200 Subject: [PATCH 30/46] Rebase to 1.2.39 --- .gitignore | 1 + 0001-Fix-libxml2-v2.12.0-includes.patch | 108 ------------------------ sources | 2 +- xmlsec1.spec | 16 ++-- 4 files changed, 10 insertions(+), 117 deletions(-) delete mode 100644 0001-Fix-libxml2-v2.12.0-includes.patch diff --git a/.gitignore b/.gitignore index 7f24ad1..da8b24d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xmlsec1-1.2.36.tar.gz /xmlsec1-1.2.37.tar.gz /xmlsec1-1.3.0.tar.gz +/xmlsec1-1.2.39.tar.gz 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/sources b/sources index 9b63869..0475968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.37.tar.gz) = 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900 +SHA512 (xmlsec1-1.2.39.tar.gz) = bc8457bca8ada87c12d3be685bf8ad805f102b4ac1265e257ba12137e0430783973f27d22bfcb7559be5e89cb4c01b3556488fa641fc7c9d8f403972fdc8f2f7 diff --git a/xmlsec1.spec b/xmlsec1.spec index ea5872c..f3a3255 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,15 +1,13 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.37 -Release: 7%{?dist}%{?extra_release} +Version: 1.2.39 +%global uversion %%(echo %{version} | tr '.' '_') +Release: 1%{?dist}%{?extra_release} Epoch: 1 License: MIT -Source0: https://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz +Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/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 - BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 @@ -105,8 +103,7 @@ Requires: xmlsec1-nss%{?_isa} = 1:%{version}-%{release} Libraries, includes, etc. for developing XML Security applications with NSS. %prep -%setup -q -%patch -P0 -p1 +%autosetup -p1 %build autoreconf -vfi @@ -181,6 +178,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From 5d82267643204de2c45680d9a7c324f254a5168f Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Wed, 3 Jul 2024 10:15:24 +0200 Subject: [PATCH 31/46] Deprecate subpackages depending on gcrypt --- xmlsec1.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index f3a3255..4ee5fae 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -2,7 +2,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" stan Name: xmlsec1 Version: 1.2.39 %global uversion %%(echo %{version} | tr '.' '_') -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz @@ -56,6 +56,7 @@ Libraries, includes, etc. for developing XML Security applications with OpenSSL %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 @@ -65,6 +66,7 @@ for the xmlsec library. Summary: GCrypt crypto plugin for XML Security Library Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} Requires: xmlsec1-gnutls-devel%{?_isa} = 1:%{version}-%{release} +Provides: deprecated() %description gcrypt-devel Libraries, includes, etc. for developing XML Security applications with GCrypt. @@ -72,6 +74,7 @@ Libraries, includes, etc. for developing XML Security applications with GCrypt. %package gnutls Summary: GNUTls crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} +Provides: deprecated() %description gnutls GNUTls plugin for XML Security Library provides GNUTls based crypto services @@ -82,6 +85,7 @@ 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 +Provides: deprecated() %description gnutls-devel Libraries, includes, etc. for developing XML Security applications with GNUTls. @@ -178,6 +182,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From ac7184af8eed86cc485128cd9cf04efe3a99464d Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Wed, 3 Jul 2024 11:45:45 +0200 Subject: [PATCH 32/46] Add openssl-devel-engine dependency --- xmlsec1.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 4ee5fae..1d4c3cf 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -2,7 +2,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" stan Name: xmlsec1 Version: 1.2.39 %global uversion %%(echo %{version} | tr '.' '_') -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz @@ -22,6 +22,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +BuildRequires: openssl-devel-engine >= 3.0.0 %description XML Security Library is a C library based on LibXML2 and OpenSSL. @@ -182,6 +183,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From c95bda2fb7c739ebe6ef0b7e007e6e0ece1f8b25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:14:10 +0000 Subject: [PATCH 33/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 1d4c3cf..222918e 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -2,7 +2,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" stan Name: xmlsec1 Version: 1.2.39 %global uversion %%(echo %{version} | tr '.' '_') -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz @@ -183,6 +183,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* 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 From c19f5e5202fdc61e8f454fd116d3ba1bade36027 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Nov 2024 19:50:53 -0500 Subject: [PATCH 34/46] Conditionalize the backends This disables the gcrypt and gnutls backends in ELN builds to match c10s, and prepares for their eventual removal (now being deprecated()). --- xmlsec1.spec | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 222918e..782c768 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,8 +1,17 @@ +# widely used +%bcond openssl 1 +# used by libreoffice +%bcond nss 1 +# not used +%bcond gcrypt %{undefined rhel} +# not used; gnutls depends on gcrypt +%bcond gnutls %{with gcrypt} + Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.39 %global uversion %%(echo %{version} | tr '.' '_') -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz @@ -11,18 +20,26 @@ URL: http://www.aleksey.com/xmlsec/ BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 +%if %{with openssl} BuildRequires: pkgconfig(openssl) >= 3.0.0 +BuildRequires: openssl-devel-engine >= 3.0.0 +%endif +%if %{with nss} BuildRequires: pkgconfig(nss) >= 3.49.0 BuildRequires: pkgconfig(nspr) >= 4.25.0 +%endif +%if %{with gcrypt} BuildRequires: libgcrypt-devel >= 1.4.0 +%endif +%if %{with gnutls} BuildRequires: pkgconfig(gnutls) >= 3.6.13 +%endif BuildRequires: libtool-ltdl-devel # autoreconf stuff BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool -BuildRequires: openssl-devel-engine >= 3.0.0 %description XML Security Library is a C library based on LibXML2 and OpenSSL. @@ -38,6 +55,7 @@ Requires: openssl-devel%{?_isa} >= 1.0.0 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} @@ -53,7 +71,9 @@ Requires: xmlsec1-openssl%{?_isa} = 1:%{version}-%{release} %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} @@ -71,7 +91,9 @@ 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} @@ -90,7 +112,9 @@ Provides: deprecated() %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} @@ -106,6 +130,7 @@ Requires: xmlsec1-nss%{?_isa} = 1:%{version}-%{release} %description nss-devel Libraries, includes, etc. for developing XML Security applications with NSS. +%endif %prep %autosetup -p1 @@ -128,10 +153,6 @@ 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 %{_mandir}/man1/xmlsec1.1* @@ -150,6 +171,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 @@ -157,7 +179,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 @@ -165,7 +189,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 @@ -173,7 +199,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 @@ -181,8 +209,12 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files nss-devel %{_includedir}/xmlsec1/xmlsec/nss/ %{_libdir}/pkgconfig/xmlsec1-nss.pc +%endif %changelog +* Thu Nov 7 2024 Yaakov Selkowitz - 1:1.2.39-5 +- Conditionalize the backends + * Sat Jul 20 2024 Fedora Release Engineering - 1:1.2.39-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7c86c0dfc25af25e9b4404383bc9097854e21438 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Nov 2024 19:55:32 -0500 Subject: [PATCH 35/46] Remove openssl-devel-engine dependency Use of ENGINE APIs are already protected by OPENSSL_NO_ENGINE, which is automatically defined if openssl-devel-engine is absent; this match guards the header inclusion as well. Based on c10s: https://gitlab.com/redhat/centos-stream/rpms/xmlsec1/-/merge_requests/16 https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine --- ...ditional-include-for-openssl-engines.patch | 26 +++++++++++++++++++ xmlsec1.spec | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-Conditional-include-for-openssl-engines.patch diff --git a/0001-Conditional-include-for-openssl-engines.patch b/0001-Conditional-include-for-openssl-engines.patch new file mode 100644 index 0000000..cdf231d --- /dev/null +++ b/0001-Conditional-include-for-openssl-engines.patch @@ -0,0 +1,26 @@ +From 57e7e5eb0f9cbc8db2418bf7df6be0d70739408c Mon Sep 17 00:00:00 2001 +From: Tomas Halman +Date: Mon, 29 Jul 2024 12:08:50 +0200 +Subject: [PATCH] Conditional include for openssl engines + +--- + src/openssl/app.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/openssl/app.c b/src/openssl/app.c +index e68011be..11ca8f9a 100644 +--- a/src/openssl/app.c ++++ b/src/openssl/app.c +@@ -24,7 +24,9 @@ + #include + #include + #include ++#if !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES)) + #include ++#endif /* !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES)) */ + #include + + #include +-- +2.45.0 + diff --git a/xmlsec1.spec b/xmlsec1.spec index 782c768..c3a063e 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -17,12 +17,13 @@ License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ +Patch0: 0001-Conditional-include-for-openssl-engines.patch + BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.0.20 %if %{with openssl} BuildRequires: pkgconfig(openssl) >= 3.0.0 -BuildRequires: openssl-devel-engine >= 3.0.0 %endif %if %{with nss} BuildRequires: pkgconfig(nss) >= 3.49.0 @@ -214,6 +215,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %changelog * 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 From 90d9a6a541dcd989a409113f07c90faa31751b6e Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Tue, 10 Dec 2024 19:03:33 +0100 Subject: [PATCH 36/46] Rebase to 1.2.41 --- .gitignore | 1 + sources | 2 +- xmlsec1.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index da8b24d..5b4f449 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xmlsec1-1.2.37.tar.gz /xmlsec1-1.3.0.tar.gz /xmlsec1-1.2.39.tar.gz +/xmlsec1-1.2.41.tar.gz diff --git a/sources b/sources index 0475968..fb225df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.39.tar.gz) = bc8457bca8ada87c12d3be685bf8ad805f102b4ac1265e257ba12137e0430783973f27d22bfcb7559be5e89cb4c01b3556488fa641fc7c9d8f403972fdc8f2f7 +SHA512 (xmlsec1-1.2.41.tar.gz) = ee8bb7ff94a768aee349bb23571d5b1263e0747602c9fd2ba93017174fc8c863d625882114c626b9a4c15b14deef19dc4251cef834a9347571d3b0f97d8b9117 diff --git a/xmlsec1.spec b/xmlsec1.spec index c3a063e..0271659 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -9,12 +9,11 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.39 -%global uversion %%(echo %{version} | tr '.' '_') -Release: 5%{?dist}%{?extra_release} +Version: 1.2.41 +Release: 1%{?dist}%{?extra_release} Epoch: 1 License: MIT -Source0: https://github.com/lsh123/xmlsec/releases/download/xmlsec-%{uversion}/xmlsec1-%{version}.tar.gz +Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ Patch0: 0001-Conditional-include-for-openssl-engines.patch @@ -213,6 +212,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* 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 From b62d66a4e5e560e62db9c02d3dd9cf465221518d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:02:07 +0000 Subject: [PATCH 37/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 0271659..e8ef759 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.41 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz @@ -212,6 +212,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* 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 From cb530983f6c57adcf0547c93e0b6ce9458486115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:56:26 +0000 Subject: [PATCH 38/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index e8ef759..9fc8119 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.41 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz @@ -212,6 +212,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* 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 From ca35a3826dfdde5ae679d85814641da31f4dfbbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:46:06 +0000 Subject: [PATCH 39/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 9fc8119..e7fc51e 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.41 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz @@ -212,6 +212,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* 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 From c8f7861e6d1ea5e0dff180a6c1a039365fdfd252 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Nov 2024 19:50:53 -0500 Subject: [PATCH 40/46] Conditionalize the backends This disables the gcrypt and gnutls backends in ELN builds to match c10s, and prepares for their eventual removal (now being deprecated()). --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index e7fc51e..105eb28 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.2.41 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz @@ -212,6 +212,9 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* Thu Nov 7 2024 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 From f915cb55b4d42b044e50ff83682b0ba5706144b4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Nov 2024 19:55:32 -0500 Subject: [PATCH 41/46] Update to 1.3 and move to autochangelog --- 0000-so-name.patch | 15 + ...ditional-include-for-openssl-engines.patch | 26 -- changelog | 291 +++++++++++++++++ xmlsec1.spec | 304 +----------------- 4 files changed, 313 insertions(+), 323 deletions(-) create mode 100644 0000-so-name.patch delete mode 100644 0001-Conditional-include-for-openssl-engines.patch create mode 100644 changelog 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-Conditional-include-for-openssl-engines.patch b/0001-Conditional-include-for-openssl-engines.patch deleted file mode 100644 index cdf231d..0000000 --- a/0001-Conditional-include-for-openssl-engines.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57e7e5eb0f9cbc8db2418bf7df6be0d70739408c Mon Sep 17 00:00:00 2001 -From: Tomas Halman -Date: Mon, 29 Jul 2024 12:08:50 +0200 -Subject: [PATCH] Conditional include for openssl engines - ---- - src/openssl/app.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/openssl/app.c b/src/openssl/app.c -index e68011be..11ca8f9a 100644 ---- a/src/openssl/app.c -+++ b/src/openssl/app.c -@@ -24,7 +24,9 @@ - #include - #include - #include -+#if !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES)) - #include -+#endif /* !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES)) */ - #include - - #include --- -2.45.0 - diff --git a/changelog b/changelog new file mode 100644 index 0000000..68dd429 --- /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/xmlsec1.spec b/xmlsec1.spec index 105eb28..0e84377 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -3,20 +3,20 @@ # used by libreoffice %bcond nss 1 # not used -%bcond gcrypt %{undefined rhel} +%bcond gcrypt 0 # not used; gnutls depends on gcrypt -%bcond gnutls %{with gcrypt} +%bcond gnutls 1 Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.41 -Release: 5%{?dist}%{?extra_release} +Version: 1.3.11 +Release: 1%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ -Patch0: 0001-Conditional-include-for-openssl-engines.patch +Patch0: 0000-so-name.patch BuildRequires: make BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 @@ -154,7 +154,7 @@ rm -rf __tmp_doc ; mkdir __tmp_doc mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files -%doc AUTHORS ChangeLog NEWS Copyright +%doc AUTHORS.md ChangeLog NEWS Copyright %{_mandir}/man1/xmlsec1.1* %{_libdir}/libxmlsec1.so.* %{_bindir}/xmlsec1 @@ -212,294 +212,4 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog -* Thu Nov 7 2024 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 +%autochangelog From 6de27fa54ee40d9954243c75c7d37ea561835db5 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Mon, 25 May 2026 16:34:05 +0200 Subject: [PATCH 42/46] Fix changelog date --- .gitignore | 1 + changelog | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b4f449..d897270 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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/changelog b/changelog index 68dd429..a16bf2d 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,4 @@ -* Fri MAy 15 2026 Yaakov Selkowitz - 1:1.2.41-5 +* 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 diff --git a/sources b/sources index fb225df..0fa6162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlsec1-1.2.41.tar.gz) = ee8bb7ff94a768aee349bb23571d5b1263e0747602c9fd2ba93017174fc8c863d625882114c626b9a4c15b14deef19dc4251cef834a9347571d3b0f97d8b9117 +SHA512 (xmlsec1-1.3.11.tar.gz) = 5a1dc5c94af681a25a28f606d8ba966e589748aee2a3d1069859437f14c710156eb80a8ab77842bf177eaa2762ba2603ea805c50ce6d3c1a237196f54cb9e617 From 984d89d30413dc612e5e952b9d071977feb58e2b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 18 Jun 2026 23:21:54 -0400 Subject: [PATCH 43/46] Rebuilt for openssl 4.0 --- xmlsec1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 0e84377..893d58b 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.3.11 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz @@ -212,4 +212,7 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog +* Fri Jun 19 2026 Yaakov Selkowitz - 1:1.3.11-2 +- Rebuilt for openssl 4.0 + %autochangelog From ff82b7815a0b04eb68ed8d2cfbde058abdeb3e99 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 2 Jul 2026 00:09:45 -0400 Subject: [PATCH 44/46] autorelease and autochangelog are meant to be used together --- xmlsec1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index 893d58b..a230713 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -10,7 +10,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 Version: 1.3.11 -Release: 2%{?dist}%{?extra_release} +Release: %autorelease Epoch: 1 License: MIT Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz From 849f6648a34309fca76a3896cf065c6c778e872c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 2 Jul 2026 00:04:37 -0400 Subject: [PATCH 45/46] Fix dependencies, undeprecate gnutls Each backend devel subpackage depends on the main devel package, the corresponding backend runtime, and the underlying crypto implementation devel subpackage. Also, update the dependency versions per configure.ac. As of 1.3, the gnutls backend no longer depends on gcrypt, so it is not deprecated, and is used by aqbanking. --- xmlsec1.spec | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/xmlsec1.spec b/xmlsec1.spec index a230713..88a693d 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,11 +1,16 @@ # widely used %bcond openssl 1 +%define openssl_ver 3.0.13 # used by libreoffice %bcond nss 1 -# not used +%define nss_ver 3.91 +%define nspr_ver 4.34.1 +# not used; deprecated %bcond gcrypt 0 -# not used; gnutls depends on gcrypt +%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 @@ -19,20 +24,20 @@ URL: http://www.aleksey.com/xmlsec/ Patch0: 0000-so-name.patch BuildRequires: make -BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 -BuildRequires: pkgconfig(libxslt) >= 1.0.20 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.13 +BuildRequires: pkgconfig(libxslt) >= 1.1.35 %if %{with openssl} -BuildRequires: pkgconfig(openssl) >= 3.0.0 +BuildRequires: pkgconfig(openssl) >= %{openssl_ver} %endif %if %{with nss} -BuildRequires: pkgconfig(nss) >= 3.49.0 -BuildRequires: pkgconfig(nspr) >= 4.25.0 +BuildRequires: pkgconfig(nss) >= %{nss_ver} +BuildRequires: pkgconfig(nspr) >= %{nspr_ver} %endif %if %{with gcrypt} -BuildRequires: libgcrypt-devel >= 1.4.0 +BuildRequires: libgcrypt-devel >= %{gcrypt_ver} %endif %if %{with gnutls} -BuildRequires: pkgconfig(gnutls) >= 3.6.13 +BuildRequires: pkgconfig(gnutls) >= %{gnutls_ver} %endif BuildRequires: libtool-ltdl-devel # autoreconf stuff @@ -49,7 +54,6 @@ 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 @@ -68,6 +72,7 @@ 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 @@ -86,7 +91,8 @@ 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 @@ -97,7 +103,6 @@ Libraries, includes, etc. for developing XML Security applications with GCrypt. %package gnutls Summary: GNUTls crypto plugin for XML Security Library Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} -Provides: deprecated() %description gnutls GNUTls plugin for XML Security Library provides GNUTls based crypto services @@ -106,9 +111,8 @@ 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 -Provides: deprecated() +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. @@ -127,6 +131,8 @@ 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. @@ -212,7 +218,4 @@ mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %endif %changelog -* Fri Jun 19 2026 Yaakov Selkowitz - 1:1.3.11-2 -- Rebuilt for openssl 4.0 - %autochangelog From 1f72e780ec85a585de8f6e1996cd007bea130582 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:53 +0000 Subject: [PATCH 46/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild