summaryrefslogtreecommitdiff
path: root/external/libxmlsec/xmlsec1-configure.patch.1
diff options
context:
space:
mode:
Diffstat (limited to 'external/libxmlsec/xmlsec1-configure.patch.1')
-rw-r--r--external/libxmlsec/xmlsec1-configure.patch.160
1 files changed, 30 insertions, 30 deletions
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/libxmlsec/xmlsec1-configure.patch.1
index 54e713f43dcb..e4cea46792bb 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -1,4 +1,4 @@
-From e48dde538ebdf7e76b824d65bb600fc7d1e60e17 Mon Sep 17 00:00:00 2001
+From 2b28d9692065859dc8701c08ba7ad1210a451df3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 4 Mar 2016 16:06:19 +0100
Subject: [PATCH 01/14] xmlsec1-configure.patch
@@ -13,7 +13,7 @@ Conflicts:
4 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 3fce548..a3befe8 100644
+index 669f996..0cf0798 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
@@ -29,10 +29,10 @@ index 3fce548..a3befe8 100644
bin_SCRIPTS = xmlsec1-config
diff --git a/Makefile.in b/Makefile.in
-index 9e5401b..47c3cf4 100644
+index 23effe0..0547429 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -341,8 +341,9 @@ top_builddir = @top_builddir@
+@@ -349,8 +349,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
SAFE_VERSION = @XMLSEC_VERSION_SAFE@
@@ -45,7 +45,7 @@ index 9e5401b..47c3cf4 100644
bin_SCRIPTS = xmlsec1-config
pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
diff --git a/configure.in b/configure.in
-index bd5837d..14cb432 100644
+index 502a374..1fa401e 100644
--- a/configure.in
+++ b/configure.in
@@ -183,8 +183,8 @@ dnl find libxml
@@ -77,9 +77,9 @@ index bd5837d..14cb432 100644
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
AC_SUBST(LIBXML_CONFIG)
-@@ -546,12 +550,26 @@ dnl ==========================================================================
-
+@@ -533,12 +537,26 @@ dnl ==========================================================================
XMLSEC_NO_NSS="1"
+ SEAMONKEY_MIN_VERSION="1.0"
MOZILLA_MIN_VERSION="1.4"
+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
+ MOZILLA_MIN_VERSION="1.0"
@@ -90,40 +90,40 @@ index bd5837d..14cb432 100644
NSS_LIBS=""
-NSS_LIBS_LIST="-lnss3 -lsmime3"
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+
++
+case $host_os in
+cygwin* | mingw* | pw32*)
-+ NSS_LIBS_LIST="-lnss3 -lsmime3"
-+ NSPR_LIBS_LIST="-lnspr4"
-+ ;;
++ NSS_LIBS_LIST="-lnss3 -lsmime3"
++ NSPR_LIBS_LIST="-lnspr4"
++ ;;
+
+*)
-+ NSS_LIBS_LIST="-lnss3 -lsmime3"
-+ NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+ ;;
++ NSS_LIBS_LIST="-lnss3 -lsmime3"
++ NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
++ ;;
+esac
+
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
NSS_FOUND="no"
NSPR_PACKAGE=mozilla-nspr
-@@ -577,6 +595,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
+@@ -565,6 +583,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
dnl We are going to try all options
dnl
if test "z$NSS_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION,
-+ [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
-+ [NSS_FOUND=no])
++ [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
++ [NSS_FOUND=no])
+ fi
+ if test "z$NSS_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8,
-+ [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
-+ [NSS_FOUND=no])
++ [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
++ [NSS_FOUND=no])
+ fi
+ if test "z$NSS_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
- [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
+ PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
+ [NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss],
[NSS_FOUND=no])
-@@ -603,8 +631,8 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -596,8 +624,8 @@ if test "z$NSS_FOUND" = "zno" ; then
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
fi
@@ -134,18 +134,18 @@ index bd5837d..14cb432 100644
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
NSPR_INCLUDES_FOUND="no"
-@@ -625,21 +653,21 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -618,21 +646,21 @@ if test "z$NSS_FOUND" = "zno" ; then
NSPR_PRINIT_H="$with_nspr/include/prinit.h"
else
for dir in $ac_nss_inc_dir ; do
- if test -f $dir/nspr/prinit.h ; then
-+ if test -f $dir/prinit.h ; then
++ if test -f $dir/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"
-+ NSPR_CFLAGS="-I$dir"
++ NSPR_CFLAGS="-I$dir"
fi
NSPR_INCLUDES_FOUND="yes"
- NSPR_PRINIT_H="$dir/nspr/prinit.h"
@@ -156,11 +156,11 @@ index bd5837d..14cb432 100644
for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnspr4$shrext ; then
-+ if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
++ if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; 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"
-@@ -710,7 +738,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -703,7 +731,7 @@ if test "z$NSS_FOUND" = "zno" ; then
done
for dir in $ac_nss_lib_dir ; do
@@ -169,7 +169,7 @@ index bd5837d..14cb432 100644
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"
-@@ -729,7 +757,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -722,7 +750,7 @@ if test "z$NSS_FOUND" = "zno" ; then
if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
OLD_CPPFLAGS=$CPPFLAGS
@@ -179,10 +179,10 @@ index bd5837d..14cb432 100644
#include <nss.h>
#if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 2577a1e..cfa0a46 100644
+index b1d8869..5269202 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -388,7 +388,7 @@ APP_LIBS = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
+@@ -394,7 +394,7 @@ APP_LIBS = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
XMLSEC_OPENSSL_SOLIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 01:49:30 +0000