From 02c1e68864ca3d200c13ce0143ee7cc69d66c5c7 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Wed, 5 Jun 2024 10:22:12 +0200 Subject: [PATCH 1/2] 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 4a574720018962b883c56234163e57d87e8682ec Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Wed, 3 Jul 2024 10:15:24 +0200 Subject: [PATCH 2/2] 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..70f6c3a 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.2.39-2 +- Deprecate subpackages depending on gcrypt + * Wed Jun 5 2024 Tomas Halman - 1.2.39-1 - Rebase to 1.2.39