[Libreoffice-commits] core.git: external/libxmlsec
Miklos Vajna
vmiklos at collabora.co.uk
Thu Nov 17 09:14:26 UTC 2016
external/libxmlsec/UnpackedTarball_xmlsec.mk | 7
external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 | 81 -------
external/libxmlsec/xmlsec1-mingw32.patch | 167 ---------------
3 files changed, 255 deletions(-)
New commits:
commit 586a461af3a8212939b2e3287c6af450932f23d6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 17 08:48:26 2016 +0100
libxmlsec: remove no longer applying mingw patches
One from the two patches do not apply anymore. Remove both of them for
now.
Change-Id: I8e06cc28810a9dac13054282a630b0e9b716af86
Reviewed-on: https://gerrit.libreoffice.org/30924
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 3a0469c..aa3ff0c 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -12,7 +12,6 @@ xmlsec_patches += xmlsec1-configure.patch.1
xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
xmlsec_patches += xmlsec1-noverify.patch.1
-xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
xmlsec_patches += xmlsec1-vc.patch.1
xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
xmlsec_patches += xmlsec1-customkeymanage.patch.1
@@ -25,10 +24,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
$(foreach patch,$(xmlsec_patches),external/libxmlsec/$(patch)) \
))
-ifeq ($(OS)$(COM),WNTGCC)
-$(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
- external/libxmlsec/xmlsec1-mingw32.patch \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1
deleted file mode 100644
index 31e3f07..0000000
--- a/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1
+++ /dev/null
@@ -1,81 +0,0 @@
-From f7c31f73a103226c9f8b334f071d70243e27f6ff Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at collabora.co.uk>
-Date: Fri, 4 Mar 2016 16:11:52 +0100
-Subject: [PATCH] xmlsec1-mingw-keymgr-mscrypto.patch
-
-Conflicts:
- src/mscrypto/Makefile.in
----
- src/mscrypto/Makefile.am | 1 +
- src/mscrypto/Makefile.in | 15 +++++++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/mscrypto/Makefile.am b/src/mscrypto/Makefile.am
-index 5cea654..3dc6452 100644
---- a/src/mscrypto/Makefile.am
-+++ b/src/mscrypto/Makefile.am
-@@ -39,6 +39,7 @@ libxmlsec1_mscrypto_la_SOURCES =\
- csp_calg.h \
- csp_oid.h \
- xmlsec-mingw.h \
-+ akmngr.c \
- $(NULL)
-
- if SHAREDLIB_HACK
-diff --git a/src/mscrypto/Makefile.in b/src/mscrypto/Makefile.in
-index f8ad32b..36c4765 100644
---- a/src/mscrypto/Makefile.in
-+++ b/src/mscrypto/Makefile.in
-@@ -135,7 +135,8 @@ am__DEPENDENCIES_1 =
- am__libxmlsec1_mscrypto_la_SOURCES_DIST = globals.h private.h app.c \
- certkeys.c ciphers.c crypto.c digests.c hmac.c keysstore.c \
- kw_aes.c kw_des.c kt_rsa.c signatures.c symkeys.c x509.c \
-- x509vfy.c csp_calg.h csp_oid.h xmlsec-mingw.h ../strings.c
-+ x509vfy.c csp_calg.h csp_oid.h xmlsec-mingw.h ../strings.c \
-+ akmngr.c
- am__objects_1 =
- am__dirstamp = $(am__leading_dot)dirstamp
- @SHAREDLIB_HACK_TRUE at am__objects_2 = \
-@@ -153,7 +154,8 @@ am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \
- libxmlsec1_mscrypto_la-signatures.lo \
- libxmlsec1_mscrypto_la-symkeys.lo \
- libxmlsec1_mscrypto_la-x509.lo \
-- libxmlsec1_mscrypto_la-x509vfy.lo $(am__objects_1) \
-+ libxmlsec1_mscrypto_la-x509vfy.lo \
-+ libxmlsec1_mscrypto_la-akmngr.lo $(am__objects_1) \
- $(am__objects_2)
- libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
- AM_V_lt = $(am__v_lt_ at AM_V@)
-@@ -471,6 +473,7 @@ libxmlsec1_mscrypto_la_CPPFLAGS = \
- libxmlsec1_mscrypto_la_SOURCES = globals.h private.h app.c certkeys.c \
- ciphers.c crypto.c digests.c hmac.c keysstore.c kw_aes.c \
- kw_des.c kt_rsa.c signatures.c symkeys.c x509.c x509vfy.c \
-+ akmngr.c \
- csp_calg.h csp_oid.h xmlsec-mingw.h $(NULL) $(am__append_1)
- libxmlsec1_mscrypto_la_LIBADD = \
- $(MSCRYPTO_LIBS) \
-@@ -591,6 +594,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo at am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@@ -623,6 +627,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
-
-+libxmlsec1_mscrypto_la-akmngr.lo: akmngr.c
-+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-akmngr.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
-+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='akmngr.c' object='libxmlsec1_mscrypto_la-akmngr.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
-+
- libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo
---
-2.6.6
-
diff --git a/external/libxmlsec/xmlsec1-mingw32.patch b/external/libxmlsec/xmlsec1-mingw32.patch
deleted file mode 100644
index 879b25c..0000000
--- a/external/libxmlsec/xmlsec1-mingw32.patch
+++ /dev/null
@@ -1,167 +0,0 @@
---- misc/xmlsec1-1.2.14/configure.in 2009-09-29 15:55:33.282288142 +0200
-+++ misc/build/xmlsec1-1.2.14/configure.in 2009-09-29 15:49:39.614223428 +0200
-@@ -33,6 +33,8 @@
- AC_HEADER_STDC
-
- LT_INIT
-+dnl force the right implib extension for mingw
-+libext=dll.a
-
- dnl
- dnl Find programs
-@@ -672,6 +674,26 @@
- done
-
- for dir in $ac_nss_lib_dir ; do
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ if test -f $dir/libnspr4.$libext ; 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
-+ ;;
-+
-+ *)
-+
- 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
-@@ -686,6 +708,8 @@
- NSPR_LIBS_FOUND="yes"
- break
- fi
-+ ;;
-+ esac
- done
- fi
-
-@@ -743,6 +767,25 @@
- done
-
- for dir in $ac_nss_lib_dir ; do
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ if test -f $dir/libnss3.$libext ; 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
-+ ;;
-+
-+ *)
- if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
- dnl do not add -L/usr/lib because compiler does it anyway
- if test "z$dir" = "z/usr/lib" ; then
-@@ -757,6 +800,8 @@
- NSS_LIBS_FOUND="yes"
- break
- fi
-+ ;;
-+ esac
- done
- fi
-
-@@ -927,7 +972,7 @@
- dnl cannot detect __stdcall functions
- dnl AC_CHECK_LIB(crypt32, CertOpenStore, ....
- LIBS_SAVE="$LIBS"
-- LIBS="$LIBS -lcrypt32"
-+ LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
- AC_MSG_CHECKING(for mscrypto libraries)
- AC_LINK_IFELSE([
- #include <windows.h>
-@@ -944,15 +989,7 @@
- XMLSEC_NO_MSCRYPTO="0"
-
- MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
-- case $host in
-- *-*-mingw*)
-- dnl since mingw crypt32 library is limited
-- dnl we use own def-file
-- MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
-- *)
-- MSCRYPTO_LIBS="-lcrypt32";;
-- esac
--
-+ MSCRYPTO_LIBS="${PSDK_HOME}/lib/crypt32.lib"
- dnl first crypto library is default one
- if test "z$XMLSEC_CRYPTO" = "z" ; then
- XMLSEC_CRYPTO="mscrypto"
---- misc/xmlsec1-1.2.14/ltmain.sh 2009-06-25 22:53:19.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/ltmain.sh 2009-09-29 15:49:39.628349554 +0200
-@@ -4868,6 +4868,11 @@
- fi
- ;;
-
-+ *.lib)
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
- *.$libext)
- # An archive.
- deplibs="$deplibs $arg"
-@@ -5213,6 +5218,10 @@
- continue
- ;;
- *.la) lib="$deplib" ;;
-+ *.lib)
-+ deplibs="$deplib $deplibs"
-+ continue
-+ ;;
- *.$libext)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
---- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-29 15:55:33.430875248 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-29 15:49:39.749963247 +0200
-@@ -1126,6 +1126,7 @@
- NULL, /* void* reserved1; */
- };
-
-+#ifndef __MINGW32__
- /**
- * xmlSecNssTransformKWAes128GetKlass:
- *
-@@ -1160,6 +1161,7 @@
- xmlSecNssTransformKWAes256GetKlass(void) {
- return(&xmlSecNssKWAes256Klass);
- }
-+#endif /* __MINGW32__ */
-
- #endif /* XMLSEC_NO_AES */
-
-@@ -1197,6 +1199,7 @@
- NULL, /* void* reserved1; */
- };
-
-+#ifndef __MINGW32__
- /**
- * xmlSecNssTransformKWDes3GetKlass:
- *
-@@ -1208,6 +1211,7 @@
- xmlSecNssTransformKWDes3GetKlass(void) {
- return(&xmlSecNssKWDes3Klass);
- }
-+#endif /* __MINGW32__ */
-
- #endif /* XMLSEC_NO_DES */
-
More information about the Libreoffice-commits
mailing list