diff --git a/.gitignore b/.gitignore index 61be055..d897270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -xmlsec1-1.2.16.tar.gz -/xmlsec1-1.2.17.tar.gz -/xmlsec1-1.2.18.tar.gz +/xmlsec1-1.2.36.tar.gz +/xmlsec1-1.2.37.tar.gz +/xmlsec1-1.3.0.tar.gz +/xmlsec1-1.2.39.tar.gz +/xmlsec1-1.2.41.tar.gz +/xmlsec1-1.3.11.tar.gz diff --git a/0000-so-name.patch b/0000-so-name.patch new file mode 100644 index 0000000..47d1bd1 --- /dev/null +++ b/0000-so-name.patch @@ -0,0 +1,15 @@ +diff -up xmlsec1-1.3.11/configure.ac.orig xmlsec1-1.3.11/configure.ac +--- xmlsec1-1.3.11/configure.ac.orig 2026-05-15 17:19:56.892068331 +0200 ++++ xmlsec1-1.3.11/configure.ac 2026-05-15 17:36:10.629714699 +0200 +@@ -21,10 +21,7 @@ XMLSEC_VERSION_SAFE="${XMLSEC_VERSION_MA + # * If any interfaces have been removed or changed since the last public release, then + # set age to 0. + # +-# For simplicity we just bump current all the time and don't bother +-# +-XMLSEC_VERSION_CURRENT=$((10000 * XMLSEC_VERSION_MAJOR + 100 * XMLSEC_VERSION_MINOR + XMLSEC_VERSION_SUBMINOR)) +-XMLSEC_VERSION_INFO="${XMLSEC_VERSION_CURRENT}:0:0" ++XMLSEC_VERSION_INFO="$((XMLSEC_VERSION_MAJOR + XMLSEC_VERSION_MINOR)):${XMLSEC_VERSION_SUBMINOR}:${XMLSEC_VERSION_MINOR}" + + AC_SUBST(XMLSEC_VERSION) + AC_SUBST(XMLSEC_PACKAGE) diff --git a/changelog b/changelog new file mode 100644 index 0000000..a16bf2d --- /dev/null +++ b/changelog @@ -0,0 +1,291 @@ +* Fri May 15 2026 Yaakov Selkowitz - 1:1.2.41-5 +- Conditionalize the backends + +* Sat Jan 17 2026 Fedora Release Engineering - 1:1.2.41-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.2.41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.2.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Dec 10 2024 Tomas Halman - 1:1.2.41-1 +- Rebase to 1.2.41 + +* Thu Nov 7 2024 Yaakov Selkowitz - 1:1.2.39-5 +- Conditionalize the backends +- Remove openssl-devel-engine dependency + +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.2.39-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 3 2024 Tomas Halman - 1:1.2.39-3 +- Add openssl-devel-engine dependency + +* Wed Jul 3 2024 Tomas Halman - 1:1.2.39-2 +- Deprecate subpackages depending on gcrypt + +* Wed Jun 5 2024 Tomas Halman - 1.2.39-1 +- Rebase to 1.2.39 + +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.2.37-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 13 2023 Yaakov Selkowitz - 1:1.2.37-6 +- Fix build with libxml2-2.12.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.2.37-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 22 2023 Tomas Halman - 1.2.37-4 +- Resolves: rhbz#2187631 - Cannot load modules/mod_auth_mellon.so + Revert to previous version + +* Fri Apr 14 2023 Tomas Halman - 1.3.0-1 +- Resolves: rhbz#2186304 - rebase to version 1.3.0 + +* Tue Mar 7 2023 Tomas Halman - 1.2.37-3 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 29 2022 Tomas Halman - 1.2.37-1 +- Resolves: rhbz#2149129 latest upstream release + +* Tue Nov 08 2022 Caolán McNamara - 1.2.36-1 +- Resolves: rhbz#2138484 latest upstream release + +* Thu Oct 27 2022 Caolán McNamara - 1.2.35-1 +- Resolves: rhbz#2137430 latest upstream release + +* Mon Oct 24 2022 David King - 1.2.34-3 +- Rebuild against libxml2 (#2136800) + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed May 18 2022 Caolán McNamara - 1.2.34-1 +- Resolves: rhbz#2081413 latest upstream release + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Nov 14 2021 Caolán McNamara - 1.2.33-1 +- Resolves: rhbz#1826433 latest upstream release + +* Tue Sep 14 2021 Sahana Prasad - 1.2.29-5 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 1.2.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Caolán McNamara - 1.2.29-1 +- New upstream release + +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 23 2018 Simo Sorce - 1.2.27-1 +- New upstream release + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 12 2018 John Dennis - 1.2.25-4 +- Resolves: rhbz#1566748 + xmlSecOpenSSLX509DataNodeRead fails to return error + +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Igor Gnatenko - 1.2.25-2 +- Switch to %%ldconfig_scriptlets + +* Wed Nov 08 2017 Igor Gnatenko - 1.2.25-1 +- Update to 1.2.25 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 17 2016 Simo Sorce - 1.2.23-1 +- New Upstream relase 1.2.23 +- Adds compatibility for OpenSSL 1.1.0 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Sep 19 2014 Simo Sorce - 1.2.20-1 +- Update to new upstream release 1.2.20 +- This release fixes a number of miscellaneous bugs and updates expired or + soon-to-be-expired certificates in the test suite. +- Also drops the no-ecdsa patch + +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tomáš Mráz - 1.2.19-4 +- Rebuild for new libgcrypt + +* Fri Dec 13 2013 Michael Schwendt - 1.2.19-3 +- Fix duplicate documentation (#1001250) +- Turn on verbose build output via V=1 make +- Use %%?_isa in explicit package deps +- Fix base package Group tag to "System Environment/Libraries" +- Remove %%defattr + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Daniel Veillard - 1.2.19-1 +- Update to upstream release 1.2.19 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.2.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu May 12 2011 Daniel Veillard - 1.2.18-1 +- Update to upstream release 1.2.18 + +* Mon Apr 11 2011 Daniel Veillard - 1.2.17-1 +- Update to upstream release 1.2.17 +- fixes CVE-2011-1425 on xslt file creation + +* Tue Mar 22 2011 Daniel Veillard - 1.2.16-4 +- Fix missing links to unversioned shared library files 541599 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-2 +- add missing BuildRequires: libtool-ltdl-devel + +* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-1 +- update to 1.2.16 +- cleanup spec file +- disable static libs +- disable rpath +- enable gcrypt subpackage + +* Wed Aug 26 2009 Tomas Mraz - 1.2.12-2 +- rebuilt with new openssl + +* Tue Aug 11 2009 Daniel Veillard - 1.2.12-1 +- update to new upstream release 1.2.12 +- includes fix for CVE-2009-0217 +- cleanup spec file + +* Mon Jul 27 2009 Fedora Release Engineering - 1.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 1.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Tomas Mraz - 1.2.11-2 +- rebuild with new openssl + +* Fri Jul 11 2008 Daniel Veillard - 1.2.11-1 +- update to new upstream release 1.2.11 +- rebuild for gnutls update + +* Wed Feb 20 2008 Fedora Release Engineering - 1.2.9-10.1 +- Autorebuild for GCC 4.3 + +* Wed Dec 05 2007 Release Engineering - 1.2.9-9 + - Rebuild for deps + +* Wed Jul 12 2006 Jesse Keating - 1.2.9-8.1 +- rebuild + +* Wed Jun 14 2006 Tomas Mraz - 1.2.9-8 +- rebuilt with new gnutls + +* Thu Jun 8 2006 Daniel Veillard - 1.2.9-7 +- oops libxmlsec1.la was still there, should fix #171410 and #154142 + +* Thu Jun 8 2006 Daniel Veillard - 1.2.9-6 +- Ugly patch and sed based changes to work around #192756 xmlsec1-config + multilib problem + +* Wed Jun 7 2006 Jeremy Katz - 1.2.9-5 +- move .so symlinks to -devel subpackage + +* Fri Feb 10 2006 Jesse Keating - 1.2.9-4.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.2.9-4.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Thu Dec 15 2005 Christopher Aillon 1.2.9-4 +- NSS has been split out of the mozilla package, so require that now + and update separate_nspr.patch to account for the new NSS as well + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Nov 23 2005 Tomas Mraz 1.2.9-3 +- rebuilt due to gnutls library revision +* Wed Nov 9 2005 1.2.9-2 +- rebuilt due to openssl library revision +* Tue Sep 20 2005 1.2.9-1 +- update from upstream, release done in July +- apparently nss is now available on ppc64 +* Mon Aug 8 2005 1.2.8-3 +- rebuilt with new gnutls +- nspr has been split to a separate package +* Fri Jul 8 2005 Daniel Veillard 1.2.8-2 +- Enabling the mozilla-nss crypto backend +* Fri Jul 8 2005 Daniel Veillard 1.2.8-1 +- update from upstream, needed for openoffice +* Tue Mar 8 2005 Daniel Veillard 1.2.7-4 +- rebuilt with gcc4 +* Wed Feb 23 2005 Daniel Veillard 1.2.7-1 +- Upstream release of 1.2.7, mostly bug fixes plus new functions + to GetKeys from simple store and X509 handling. +* Wed Feb 9 2005 Daniel Veillard 1.2.6-4 +- Adding support for GNUTls crypto backend +* Wed Sep 1 2004 Daniel Veillard 1.2.6-3 +- adding missing ldconfig calls +* Thu Aug 26 2004 Daniel Veillard 1.2.6-2 +- updated with upstream release from Aleksey +* Mon Jun 21 2004 Daniel Veillard 1.2.5-2 +- rebuilt +* Mon Apr 19 2004 Daniel Veillard 1.2.5-1 +- updated with upstream release from Aleksey +* Wed Feb 11 2004 Daniel Veillard 1.2.4-1 +- updated with upstream release from Aleksey +* Tue Jan 6 2004 Daniel Veillard 1.2.3-1 +- updated with upstream release from Aleksey +* Wed Nov 12 2003 Daniel Veillard 1.2.2-1 +- updated with upstream release from Aleksey, specific patches should + have been integrated now. +* Thu Nov 6 2003 Daniel Veillard 1.2.1-1 +- initial packaging based on the upstream one and libxml2 one. +- desactivated mozilla-nss due to detection/architecture problems diff --git a/sources b/sources index 4909e43..0fa6162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8694b4609aab647186607f79e1da7f1a xmlsec1-1.2.18.tar.gz +SHA512 (xmlsec1-1.3.11.tar.gz) = 5a1dc5c94af681a25a28f606d8ba966e589748aee2a3d1069859437f14c710156eb80a8ab77842bf177eaa2762ba2603ea805c50ce6d3c1a237196f54cb9e617 diff --git a/xmlsec1-1.2.12-openssl10.patch b/xmlsec1-1.2.12-openssl10.patch deleted file mode 100644 index 8b8ae3f..0000000 --- a/xmlsec1-1.2.12-openssl10.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up xmlsec1-1.2.12/src/openssl/x509vfy.c.ossl10 xmlsec1-1.2.12/src/openssl/x509vfy.c ---- xmlsec1-1.2.12/src/openssl/x509vfy.c.ossl10 2009-06-25 22:53:18.000000000 +0200 -+++ xmlsec1-1.2.12/src/openssl/x509vfy.c 2009-08-26 16:40:04.000000000 +0200 -@@ -173,7 +173,7 @@ xmlSecOpenSSLX509StoreVerify(xmlSecKeyDa - XMLSEC_STACK_OF_X509_CRL* crls, xmlSecKeyInfoCtx* keyInfoCtx) { - xmlSecOpenSSLX509StoreCtxPtr ctx; - STACK_OF(X509)* certs2 = NULL; -- STACK_OF(X509_CRLS)* crls2 = NULL; -+ STACK_OF(X509_CRL)* crls2 = NULL; - X509* res = NULL; - X509* cert; - X509 *err_cert = NULL; -@@ -802,8 +802,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509) - return(NULL); - } - -- for(i = 0; i < certs->num; ++i) { -- cert = ((X509**)(certs->data))[i]; -+ for(i = 0; i < sk_X509_num(certs); ++i) { -+ cert = sk_X509_value(certs, i); - subj = X509_get_subject_name(cert); - if(xmlSecOpenSSLX509NamesCompare(nm, subj) == 0) { - X509_NAME_free(nm); -@@ -863,8 +863,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509) - BN_free(bn); - - -- for(i = 0; i < certs->num; ++i) { -- cert = ((X509**)(certs->data))[i]; -+ for(i = 0; i < sk_X509_num(certs); ++i) { -+ cert = sk_X509_value(certs, i); - if(ASN1_INTEGER_cmp(X509_get_serialNumber(cert), serial) != 0) { - continue; - } -@@ -895,8 +895,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509) - xmlSecErrorsSafeString(ski)); - return(NULL); - } -- for(i = 0; i < certs->num; ++i) { -- cert = ((X509**)(certs->data))[i]; -+ for(i = 0; i < sk_X509_num(certs); ++i) { -+ cert = sk_X509_value(certs, i); - index = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1); - if((index >= 0) && (ext = X509_get_ext(cert, index))) { - keyId = X509V3_EXT_d2i(ext); -@@ -982,9 +982,9 @@ xmlSecOpenSSLX509VerifyCertAgainstCrls(S - /* - * Check if the current certificate is revoked by this CRL - */ -- n = sk_num(X509_CRL_get_REVOKED(crl)); -+ n = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl)); - for (i = 0; i < n; i++) { -- revoked = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i); -+ revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i); - if (ASN1_INTEGER_cmp(revoked->serialNumber, X509_get_serialNumber(cert)) == 0) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, diff --git a/xmlsec1.spec b/xmlsec1.spec index e0a965b..88a693d 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,20 +1,50 @@ +# widely used +%bcond openssl 1 +%define openssl_ver 3.0.13 +# used by libreoffice +%bcond nss 1 +%define nss_ver 3.91 +%define nspr_ver 4.34.1 +# not used; deprecated +%bcond gcrypt 0 +%define gcrypt_ver 1.4.0 +# used by aqbanking +%bcond gnutls 1 +%define gnutls_ver 3.8.3 + Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.18 -Release: 2%{?dist}%{?extra_release} +Version: 1.3.11 +Release: %autorelease +Epoch: 1 License: MIT -Group: Development/Libraries -Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: https://github.com/lsh123/xmlsec/releases/download/%{version}/xmlsec1-%{version}.tar.gz URL: http://www.aleksey.com/xmlsec/ -BuildRequires: libxml2-devel >= 2.6.0 -BuildRequires: libxslt-devel >= 1.1.0 -BuildRequires: openssl-devel >= 0.9.6 -BuildRequires: libgcrypt-devel >= 1.2.0 -BuildRequires: gnutls-devel >= 1.0.20 -BuildRequires: nss-devel >= 3.2 -BuildRequires: nspr-devel + +Patch0: 0000-so-name.patch + +BuildRequires: make +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.13 +BuildRequires: pkgconfig(libxslt) >= 1.1.35 +%if %{with openssl} +BuildRequires: pkgconfig(openssl) >= %{openssl_ver} +%endif +%if %{with nss} +BuildRequires: pkgconfig(nss) >= %{nss_ver} +BuildRequires: pkgconfig(nspr) >= %{nspr_ver} +%endif +%if %{with gcrypt} +BuildRequires: libgcrypt-devel >= %{gcrypt_ver} +%endif +%if %{with gnutls} +BuildRequires: pkgconfig(gnutls) >= %{gnutls_ver} +%endif BuildRequires: libtool-ltdl-devel +# autoreconf stuff +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel +BuildRequires: libtool %description XML Security Library is a C library based on LibXML2 and OpenSSL. @@ -23,22 +53,16 @@ standards "XML Digital Signature" and "XML Encryption". %package devel Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support. -Group: Development/Libraries -Requires: xmlsec1%{?_isa} = %{version}-%{release} -Requires: libxml2-devel >= 2.6.0 -Requires: libxslt-devel >= 1.1.0 -Requires: openssl-devel >= 0.9.6 -Requires: zlib-devel -Requires: pkgconfig +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description devel Libraries, includes, etc. you can use to develop applications with XML Digital Signatures and XML Encryption support. +%if %{with openssl} %package openssl Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1 = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description openssl OpenSSL plugin for XML Security Library provides OpenSSL based crypto services @@ -46,17 +70,19 @@ for the xmlsec library. %package openssl-devel Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1-devel = %{version}-%{release} -Requires: xmlsec1-openssl = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-openssl%{?_isa} = 1:%{version}-%{release} +Requires: openssl-devel%{?_isa} >= 1:%{openssl_ver} %description openssl-devel Libraries, includes, etc. for developing XML Security applications with OpenSSL +%endif +%if %{with gcrypt} %package gcrypt Summary: GCrypt crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} +Provides: deprecated() %description gcrypt GCrypt plugin for XML Security Library provides GCrypt based crypto services @@ -64,17 +90,19 @@ for the xmlsec library. %package gcrypt-devel Summary: GCrypt crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1-devel = %{version}-%{release} -Requires: xmlsec1-gnutls-devel = %{version}-%{release} +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-gcrypt%{?_isa} = 1:%{version}-%{release} +Requires: libgcrypt-devel%{?_isa} >= %{gcrypt_ver} +Provides: deprecated() %description gcrypt-devel Libraries, includes, etc. for developing XML Security applications with GCrypt. +%endif +%if %{with gnutls} %package gnutls Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description gnutls GNUTls plugin for XML Security Library provides GNUTls based crypto services @@ -82,19 +110,18 @@ for the xmlsec library. %package gnutls-devel Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1-devel = %{version}-%{release} -Requires: xmlsec1-openssl-devel = %{version}-%{release} -Requires: libgcrypt-devel >= 1.2.0 -Requires: gnutls-devel >= 1.0.20 +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-gnutls%{?_isa} = 1:%{version}-%{release} +Requires: gnutls-devel%{?_isa} >= %{gnutls_ver} %description gnutls-devel Libraries, includes, etc. for developing XML Security applications with GNUTls. +%endif +%if %{with nss} %package nss Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1%{?_isa} = %{version}-%{release} +Requires: xmlsec1%{?_isa} = 1:%{version}-%{release} %description nss NSS plugin for XML Security Library provides NSS based crypto services @@ -102,232 +129,93 @@ for the xmlsec library %package nss-devel Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries -Requires: xmlsec1-devel = %{version}-%{release} -Requires: xmlsec1-nss = %{version}-%{release} -Requires: nss-devel >= 3.2 -Requires: nspr-devel +Requires: xmlsec1-devel%{?_isa} = 1:%{version}-%{release} +Requires: xmlsec1-nss%{?_isa} = 1:%{version}-%{release} +Requires: nspr-devel%{?_isa} >= %{nspr_ver} +Requires: nss-devel%{?_isa} >= %{nss_ver} %description nss-devel Libraries, includes, etc. for developing XML Security applications with NSS. +%endif %prep -%setup -q +%autosetup -p1 %build +autoreconf -vfi %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make +%make_build V=1 # positively ugly but only sane way to get around #192756 sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/usr/include/xmlsec1 -mkdir -p $RPM_BUILD_ROOT%{_libdir} -mkdir -p $RPM_BUILD_ROOT/usr/man/man1 +%make_install +rm -vf %{buildroot}%{_libdir}/*.la -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - -%clean -rm -fr %{buildroot} - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%post gnutls -p /sbin/ldconfig -%postun gnutls -p /sbin/ldconfig - -%post openssl -p /sbin/ldconfig -%postun openssl -p /sbin/ldconfig +# move installed docs to include them in -devel package via %%doc magic +rm -rf __tmp_doc ; mkdir __tmp_doc +mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc %files -%defattr(-, root, root, -) -%doc AUTHORS ChangeLog NEWS README Copyright -%doc %{_mandir}/man1/xmlsec1.1* +%doc AUTHORS.md ChangeLog NEWS Copyright +%{_mandir}/man1/xmlsec1.1* %{_libdir}/libxmlsec1.so.* %{_bindir}/xmlsec1 %files devel -%defattr(-, root, root, -) %{_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 -%dir %{_docdir}/xmlsec1 -%{_docdir}/xmlsec1/* -%doc AUTHORS HACKING ChangeLog NEWS README Copyright -%doc %{_mandir}/man1/xmlsec1-config.1* %{_datadir}/aclocal/xmlsec1.m4 +%{_mandir}/man1/xmlsec1-config.1* +%doc HACKING __tmp_doc/* +%if %{with openssl} %files openssl -%defattr(-, root, root, -) %{_libdir}/libxmlsec1-openssl.so.* %{_libdir}/libxmlsec1-openssl.so %files openssl-devel -%defattr(-, root, root, -) %{_includedir}/xmlsec1/xmlsec/openssl/ %{_libdir}/pkgconfig/xmlsec1-openssl.pc +%endif +%if %{with gcrypt} %files gcrypt -%defattr(-, root, root, -) %{_libdir}/libxmlsec1-gcrypt.so.* %{_libdir}/libxmlsec1-gcrypt.so %files gcrypt-devel -%defattr(-, root, root, -) %{_includedir}/xmlsec1/xmlsec/gcrypt/ %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc +%endif +%if %{with gnutls} %files gnutls -%defattr(-, root, root, -) %{_libdir}/libxmlsec1-gnutls.so.* %{_libdir}/libxmlsec1-gnutls.so %files gnutls-devel -%defattr(-, root, root, -) %{_includedir}/xmlsec1/xmlsec/gnutls/ %{_libdir}/pkgconfig/xmlsec1-gnutls.pc +%endif +%if %{with nss} %files nss -%defattr(-, root, root, -) %{_libdir}/libxmlsec1-nss.so.* %{_libdir}/libxmlsec1-nss.so %files nss-devel -%defattr(-, root, root, -) %{_includedir}/xmlsec1/xmlsec/nss/ %{_libdir}/pkgconfig/xmlsec1-nss.pc +%endif %changelog -* 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