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.179
1 files changed, 33 insertions, 46 deletions
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/libxmlsec/xmlsec1-configure.patch.1
index 91ffb9a20970..2c0df5b4d038 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -1,54 +1,50 @@
-From a6200ded4c697408d00eb79cbc712acceb8aef83 Mon Sep 17 00:00:00 2001
+From 3a8aaa9a5baf91ef6bf9c24b4080896fb8615b0c 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] xmlsec1-configure.patch
Conflicts:
- configure.in
+ Makefile.am
+ Makefile.in
+ configure.ac
---
- Makefile.am | 5 +++--
- Makefile.in | 5 +++--
- configure.in | 52 ++++++++++++++++++++++++++++++++++++++++------------
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ configure.ac | 50 +++++++++++++++++++++++++++++++++++++++-----------
win32/Makefile.msvc | 2 +-
- 4 files changed, 47 insertions(+), 17 deletions(-)
+ 4 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 669f996..0cf0798 100644
+index 3453c01..da71139 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -1,8 +1,9 @@
+@@ -1,7 +1,7 @@
NULL =
SAFE_VERSION = @XMLSEC_VERSION_SAFE@
--SUBDIRS = include src apps man docs
--TEST_APP = apps/xmlsec1$(EXEEXT)
-+#Do not build xmlsec1 app. It is not needed. Also the libtool includes
-+#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
-+SUBDIRS = include src man docs
- DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
+-SUBDIRS = include src apps man docs
++SUBDIRS = include src man docs
+ TEST_APP = apps/xmlsec1$(EXEEXT)
+ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
- bin_SCRIPTS = xmlsec1-config
diff --git a/Makefile.in b/Makefile.in
-index 9b252ff..c42b984 100644
+index 6b23543..759b33e 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -452,8 +452,9 @@ top_builddir = @top_builddir@
+@@ -469,7 +469,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
SAFE_VERSION = @XMLSEC_VERSION_SAFE@
-SUBDIRS = include src apps man docs
--TEST_APP = apps/xmlsec1$(EXEEXT)
-+#Do not build xmlsec1 app. It is not needed. Also the libtool includes
-+#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
+SUBDIRS = include src man docs
- DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
+ TEST_APP = apps/xmlsec1$(EXEEXT)
+ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
bin_SCRIPTS = xmlsec1-config
- pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
-diff --git a/configure.in b/configure.in
-index 7690e7a..f2c98e3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -188,8 +188,8 @@ dnl find libxml
+diff --git a/configure.ac b/configure.ac
+index 8fb8740..67905b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,8 +230,8 @@ dnl find libxml
dnl ==========================================================================
LIBXML_MIN_VERSION="2.7.4"
LIBXML_CONFIG="xml2-config"
@@ -59,7 +55,7 @@ index 7690e7a..f2c98e3 100644
LIBXML_FOUND="no"
AC_ARG_WITH(libxml,
[ --with-libxml=[PFX] libxml2 location]
-@@ -198,6 +198,8 @@ AC_ARG_WITH(libxml-src,
+@@ -240,6 +240,8 @@ AC_ARG_WITH(libxml-src,
[ --with-libxml-src=[PFX] not installed yet libxml2 location]
)
@@ -68,7 +64,7 @@ index 7690e7a..f2c98e3 100644
if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION)
AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE)
-@@ -246,6 +248,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
+@@ -288,6 +290,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
fi
fi
@@ -77,7 +73,7 @@ index 7690e7a..f2c98e3 100644
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
AC_SUBST(LIBXML_CONFIG)
-@@ -570,12 +574,26 @@ dnl ==========================================================================
+@@ -601,12 +605,26 @@ dnl ==========================================================================
XMLSEC_NO_NSS="1"
SEAMONKEY_MIN_VERSION="1.0"
MOZILLA_MIN_VERSION="1.4"
@@ -106,7 +102,7 @@ index 7690e7a..f2c98e3 100644
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
NSS_FOUND="no"
NSPR_PACKAGE=mozilla-nspr
-@@ -602,6 +620,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
+@@ -633,6 +651,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
@@ -123,7 +119,7 @@ index 7690e7a..f2c98e3 100644
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])
-@@ -633,8 +661,8 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -664,8 +692,8 @@ if test "z$NSS_FOUND" = "zno" ; then
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
fi
@@ -134,7 +130,7 @@ index 7690e7a..f2c98e3 100644
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
NSPR_INCLUDES_FOUND="no"
-@@ -655,21 +683,21 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -686,21 +714,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
@@ -160,7 +156,7 @@ index 7690e7a..f2c98e3 100644
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"
-@@ -740,7 +768,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -771,7 +799,7 @@ if test "z$NSS_FOUND" = "zno" ; then
done
for dir in $ac_nss_lib_dir ; do
@@ -169,20 +165,11 @@ index 7690e7a..f2c98e3 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"
-@@ -759,7 +787,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
-- CPPFLAGS="$NSS_CFLAGS"
-+ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
- AC_EGREP_CPP(yes,[
- #include <nss.h>
- #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 2712a0a..d833497 100644
+index 357a890..30b9dfb 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -394,7 +394,7 @@ APP_LIBS = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
+@@ -392,7 +392,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
@@ -192,5 +179,5 @@ index 2712a0a..d833497 100644
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
--
-2.6.2
+2.6.6
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 21:12:22 +0000