commit 12705466ba7d65f3b2dcdabcf60ad401cf2f64a1
Author: Jakub Bogusz <[email protected]>
Date: Sat Oct 26 15:25:28 2024 +0200
- updated to 1.3.6
missing-includes.patch | 40 ----------------------------------------
xmlsec1-nss.patch | 12 ++++++------
xmlsec1.spec | 37 ++++++++++++++++++-------------------
3 files changed, 24 insertions(+), 65 deletions(-)
---
diff --git a/xmlsec1.spec b/xmlsec1.spec
index 0ff339e..1126de6 100644
--- a/xmlsec1.spec
+++ b/xmlsec1.spec
@@ -1,31 +1,30 @@
#
# Conditional build:
-%bcond_without static_libs # static libraries
+%bcond_without static_libs # static libraries
Summary: XML Security Library
Summary(pl.UTF-8): Biblioteka bezpieczeństwa XML
Name: xmlsec1
-Version: 1.2.37
-Release: 2
+Version: 1.3.6
+Release: 1
License: MIT
Group: Libraries
Source0:
https://www.aleksey.com/xmlsec/download/%{name}-%{version}.tar.gz
-# Source0-md5: 98dd3c884e2816c25c038a6e8af138fb
+# Source0-md5: f56d7fb32e3ec84305d2c1ffd6c2f466
Patch0: %{name}-nss.patch
-Patch1: missing-includes.patch
URL: https://www.aleksey.com/xmlsec/
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.7
-BuildRequires: gnutls-devel >= 2.8.0
+BuildRequires: gnutls-devel >= 3.6.13
BuildRequires: help2man
BuildRequires: libgcrypt-devel >= 1.4.0
BuildRequires: libltdl-devel >= 2:2.0
BuildRequires: libtool >= 2:2.0
BuildRequires: libxml2-devel >= 1:2.8.0
BuildRequires: libxslt-devel >= 1.0.20
-BuildRequires: nspr-devel >= 4.4.1
-BuildRequires: nss-devel >= 3.11.1
-BuildRequires: openssl-devel >= 1.1.0
+BuildRequires: nspr-devel >= 1:4.18
+BuildRequires: nss-devel >= 1:3.35
+BuildRequires: openssl-devel >= 1.1.1
BuildRequires: pkgconfig >= 1:0.9
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.527
@@ -157,7 +156,7 @@ Summary: GnuTLS Crypto library for XML Security Library
Summary(pl.UTF-8): Biblioteka kryptograficzna GnuTLS dla biblioteki XMLSec
Group: Libraries
Requires: %{name}-gcrypt = %{version}-%{release}
-Requires: gnutls >= 2.8.0
+Requires: gnutls >= 3.6.13
%description gnutls
GnuTLS Crypto library for XML Security Library provides GnuTLS based
@@ -173,7 +172,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe API GnuTLS XMLSec
Group: Development/Libraries
Requires: %{name}-gcrypt-devel = %{version}-%{release}
Requires: %{name}-gnutls = %{version}-%{release}
-Requires: gnutls-devel >= 2.8.0
+Requires: gnutls-devel >= 3.6.13
%description gnutls-devel
Header files for developing XML Security applications with GnuTLS.
@@ -199,8 +198,8 @@ Summary: NSS Crypto library for XML Security Library
Summary(pl.UTF-8): Biblioteka kryptograficzna NSS dla biblioteki XMLSec
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: nspr >= 4.4.1
-Requires: nss >= 3.11.1
+Requires: nspr >= 1:4.18
+Requires: nss >= 1:3.35
%description nss
NSS Crypto library for XML Security Library provides NSS based crypto
@@ -216,8 +215,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe API NSS XMLSec
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-nss = %{version}-%{release}
-Requires: nspr-devel >= 4.4.1
-Requires: nss-devel >= 3.11.1
+Requires: nspr-devel >= 1:4.18
+Requires: nss-devel >= 1:3.35
%description nss-devel
Header files for developing XML Security applications with NSS.
@@ -243,7 +242,7 @@ Summary: OpenSSL Crypto library for XML Security Library
Summary(pl.UTF-8): Biblioteka kryptograficzna OpenSSL dla biblioteki XMLSec
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: openssl >= 1.1.0
+Requires: openssl >= 1.1.1
%description openssl
OpenSSL Crypto library for XML Security Library provides OpenSSL based
@@ -259,7 +258,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe API OpenSSL XMLSec
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-openssl = %{version}-%{release}
-Requires: openssl-devel >= 1.1.0
+Requires: openssl-devel >= 1.1.1
%description openssl-devel
Header files for developing XML Security applications with OpenSSL.
@@ -283,7 +282,6 @@ Statyczna biblioteka kryptograficzna OpenSSL dla biblioteki
XMLSec.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%{__sed} -i -e '/\/lib\/[^ ]*_MARKER/ s,/lib/,/%{_lib}/,' configure.ac
@@ -295,6 +293,7 @@ Statyczna biblioteka kryptograficzna OpenSSL dla biblioteki
XMLSec.
%{__automake}
%configure \
CPPFLAGS='%{rpmcppflags} -DLTDL_OBJDIR=\".libs\"
-DLTDL_SHLIB_EXT=\".so\"' \
+ --enable-md5 \
--disable-silent-rules \
%{__enable_disable static_libs static} \
--with-html-dir=%{_gtkdocdir}/xmlsec1 \
diff --git a/missing-includes.patch b/missing-includes.patch
deleted file mode 100644
index 0fdaec5..0000000
--- a/missing-includes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- xmlsec1-1.2.37/src/buffer.c.orig 2022-11-28 22:40:24.000000000 +0100
-+++ xmlsec1-1.2.37/src/buffer.c 2023-11-26 14:19:14.291171485 +0100
-@@ -21,6 +21,7 @@
- #include <ctype.h>
-
- #include <libxml/tree.h>
-+#include <libxml/xmlIO.h>
-
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/xmltree.h>
---- xmlsec1-1.2.37/src/relationship.c.orig 2022-11-28 22:40:24.000000000
+0100
-+++ xmlsec1-1.2.37/src/relationship.c 2023-11-26 14:21:12.200917041 +0100
-@@ -78,6 +78,7 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#include <libxml/list.h>
- #include <libxml/tree.h>
- #include <libxml/xpointer.h>
- #include <libxml/c14n.h>
---- xmlsec1-1.2.37/src/xmlsec.c.orig 2022-11-28 22:40:24.000000000 +0100
-+++ xmlsec1-1.2.37/src/xmlsec.c 2023-11-26 14:22:42.454844716 +0100
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <string.h>
-
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
-
- #include <xmlsec/xmlsec.h>
---- xmlsec1-1.2.37/apps/xmlsec.c.orig 2022-11-28 22:40:24.000000000 +0100
-+++ xmlsec1-1.2.37/apps/xmlsec.c 2023-11-26 14:26:32.801209168 +0100
-@@ -15,6 +15,7 @@
-
- #include <libxml/tree.h>
- #include <libxml/xmlmemory.h>
-+#include <libxml/xmlsave.h>
- #include <libxml/parser.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
diff --git a/xmlsec1-nss.patch b/xmlsec1-nss.patch
index dbeefa4..8119285 100644
--- a/xmlsec1-nss.patch
+++ b/xmlsec1-nss.patch
@@ -1,25 +1,25 @@
---- xmlsec1-1.2.26/configure.ac.orig 2018-07-21 18:15:24.743837556 +0200
-+++ xmlsec1-1.2.26/configure.ac 2018-07-21 18:46:07.437149856 +0200
-@@ -1052,10 +1052,7 @@
+--- xmlsec1-1.3.6/configure.ac.orig 2024-10-26 15:01:36.309079752 +0200
++++ xmlsec1-1.3.6/configure.ac 2024-10-26 15:06:02.074306644 +0200
+@@ -1103,10 +1103,7 @@ if test "z$NSPR_FOUND" = "zyes" -a "z$NS
NSPR_CFLAGS="$NSPR_CFLAGS -I$NSPR_INCLUDE_PATH -I$NSPR_INCLUDE_PATH/nspr"
fi
if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_LIB_PATH" != "z" ; then
- if test "z$with_gnu_ld" = "zyes" ; then
- NSPR_LIBS="$NSPR_LIBS -Wl,-rpath-link -Wl,$NSPR_LIB_PATH"
- fi
-- NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH/lib $NSPR_LIBS_LIST"
+- NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH $NSPR_LIBS_LIST"
+ NSPR_LIBS="$NSPR_LIBS $NSPR_LIBS_LIST"
fi
dnl Priority 5 (NSS): Just try to compile/link and hope for the best
-@@ -1089,10 +1086,7 @@
+@@ -1140,10 +1137,7 @@ if test "z$NSS_FOUND" = "zyes" -a "z$NSS
NSS_CFLAGS="$NSS_CFLAGS -I$NSS_INCLUDE_PATH -I$NSS_INCLUDE_PATH/nss"
fi
if test "z$NSS_FOUND" = "zyes" -a "z$NSS_LIB_PATH" != "z" ; then
- if test "z$with_gnu_ld" = "zyes" ; then
- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$NSS_LIB_PATH"
- fi
-- NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH/lib $NSS_LIBS_LIST"
+- NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH $NSS_LIBS_LIST"
+ NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmlsec1.git/commitdiff/12705466ba7d65f3b2dcdabcf60ad401cf2f64a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
