From: Jakub Bogusz Date: Sat, 21 Jul 2018 16:49:02 +0000 (+0200) Subject: - updated to 1.2.26 X-Git-Tag: auto/th/xmlsec1-1.2.26-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxmlsec1.git;a=commitdiff_plain;h=5e8e8251428f6a4b0b53eb963afc53818e20b047 - updated to 1.2.26 - updated nss patch --- diff --git a/xmlsec1-nss.patch b/xmlsec1-nss.patch index ed16073..dbeefa4 100644 --- a/xmlsec1-nss.patch +++ b/xmlsec1-nss.patch @@ -1,100 +1,26 @@ ---- xmlsec1-1.2.23/configure.ac.orig 2016-10-17 00:48:17.000000000 +0200 -+++ xmlsec1-1.2.23/configure.ac 2016-12-18 21:51:03.254443658 +0100 -@@ -673,23 +673,14 @@ - if test "z$with_nspr" != "z" ; then - NSPR_PREFIX="$with_nspr" - NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr" -- if test "z$with_gnu_ld" = "zyes" ; then -- NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" -- else -- NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST" -- fi -+ NSPR_LIBS="$NSPR_LIBS_LIST" - NSPR_INCLUDES_FOUND="yes" - NSPR_LIBS_FOUND="yes" -- NSPR_PRINIT_H="$with_nspr/include/prinit.h" -+ NSPR_PRINIT_H="$with_nspr/include/nspr/prinit.h" - else - for dir in $ac_nss_inc_dir ; do - if test -f $dir/nspr/prinit.h ; then -- dnl do not add -I/usr/include because compiler does it anyway -- if test "z$dir" = "z/usr/include" ; then -- NSPR_CFLAGS="" -- else -- NSPR_CFLAGS="-I$dir/nspr" -- fi -+ NSPR_CFLAGS="-I$dir/nspr" - NSPR_INCLUDES_FOUND="yes" - NSPR_PRINIT_H="$dir/nspr/prinit.h" - break -@@ -698,16 +689,7 @@ - - for dir in $ac_nss_lib_dir ; do - if test -f $dir/libnspr4$shrext ; then -- dnl do not add -L/usr/lib because compiler does it anyway -- if test "z$dir" = "z/usr/lib" ; then - NSPR_LIBS="$NSPR_LIBS_LIST" -- else -- if test "z$with_gnu_ld" = "zyes" ; then -- NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST" -- else -- NSPR_LIBS="-L$dir $NSPR_LIBS_LIST" -- fi -- fi - NSPR_LIBS_FOUND="yes" - break - fi -@@ -743,24 +725,15 @@ - NSS_NSS_H="" +--- 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 @@ + 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 $NSPR_LIBS_LIST" + fi - if test "z$with_nss" != "z" ; then -- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" -- if test "z$with_gnu_ld" = "zyes" ; then -- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" -- else -- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST" -- fi -+ NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr" -+ NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST" - NSS_INCLUDES_FOUND="yes" - NSS_LIBS_FOUND="yes" -- NSS_NSS_H="$with_nss/include/nss.h" -+ NSS_NSS_H="$with_nss/include/nss/nss.h" - else - for dir in $ac_nss_inc_dir ; do - if test -f $dir/nss/nss.h ; then -- dnl do not add -I/usr/include because compiler does it anyway -- if test "z$dir" = "z/usr/include" ; then -- NSS_CFLAGS="$NSS_CFLAGS" -- else -- NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss" -- fi -+ NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss" - NSS_INCLUDES_FOUND="yes" - NSS_NSS_H="$dir/nss/nss.h" - break -@@ -770,15 +743,7 @@ - for dir in $ac_nss_lib_dir ; do - if test -f $dir/libnss3$shrext ; then - dnl do not add -L/usr/lib because compiler does it anyway -- if test "z$dir" = "z/usr/lib" ; then - NSS_LIBS="$NSS_LIBS_LIST" -- else -- if test "z$with_gnu_ld" = "zyes" ; then -- NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST" -- else -- NSS_LIBS="-L$dir $NSS_LIBS_LIST" -- fi -- fi - NSS_LIBS_FOUND="yes" - break - fi -@@ -940,7 +905,7 @@ - SAVE_LDFLAGS="$LDFLAGS" - if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" ; then - GNUTLS_CFLAGS="-I$with_gnutls/include" -- GNUTLS_LIBS="-L$with_gnutls/lib -lgnutls" -+ GNUTLS_LIBS="-lgnutls" - CFLAGS="$GNUTLS_CFLAGS $CFLAGS" - LDFLAGS="$GNUTLS_LIBS $LDFLAGS" - fi + dnl Priority 5 (NSS): Just try to compile/link and hope for the best +@@ -1089,10 +1086,7 @@ + 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 $NSS_LIBS_LIST" + fi + + dnl Check NSS and NSPR versions diff --git a/xmlsec1.spec b/xmlsec1.spec index a1b154a..5e1d8c9 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,12 +1,12 @@ Summary: XML Security Library Summary(pl.UTF-8): Biblioteka bezpieczeństwa XML Name: xmlsec1 -Version: 1.2.25 +Version: 1.2.26 Release: 1 License: MIT Group: Libraries Source0: https://www.aleksey.com/xmlsec/download/%{name}-%{version}.tar.gz -# Source0-md5: dbbef1efc69e61bc4629650205a05b41 +# Source0-md5: 9c4aaf9ff615a73921b9e3bf4988d878 Patch0: %{name}-nss.patch URL: https://www.aleksey.com/xmlsec/ BuildRequires: autoconf >= 2.53 @@ -19,7 +19,7 @@ BuildRequires: libtool >= 2:2.0 BuildRequires: libxml2-devel >= 1:2.7.4 BuildRequires: libxslt-devel >= 1.0.20 BuildRequires: nspr-devel >= 4.4.1 -BuildRequires: nss-devel >= 3.9 +BuildRequires: nss-devel >= 3.11.1 BuildRequires: openssl-devel >= 1.0.0 BuildRequires: pkgconfig >= 1:0.9 Requires: libxml2 >= 1:2.7.4 @@ -195,7 +195,7 @@ Summary(pl.UTF-8): Biblioteka kryptograficzna NSS dla biblioteki XMLSec Group: Libraries Requires: %{name} = %{version}-%{release} Requires: nspr >= 4.4.1 -Requires: nss >= 3.9 +Requires: nss >= 3.11.1 %description nss NSS Crypto library for XML Security Library provides NSS based crypto @@ -212,7 +212,7 @@ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-nss = %{version}-%{release} Requires: nspr-devel >= 4.4.1 -Requires: nss-devel >= 3.9 +Requires: nss-devel >= 3.11.1 %description nss-devel Header files for developing XML Security applications with NSS.