- updated to 1.2.26

[packages/xmlsec1.git] / xmlsec1-nss.patch

diff --git a/xmlsec1-nss.patch b/xmlsec1-nss.patch
index ed16073f6855223a8194ca4f7d9fe57d50d5e8dd..dbeefa4aa681a888ef72c922c02d9a71d17dcee3 100644 (file)
--- 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