From 19a98755b9a9d90091c413cfa5f285ea4a06097e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 17 Mar 2016 21:03:47 +0100 Subject: Upgrade libxmlsec to 1.2.16 No instant drop of any of our patches this time, but a considerable amount of xmlsec1-customkeymanage.patch.1 is now redundant, as part of the key wrapper code is available in this upstream release for both mscrypto and nss. But that can be cleaned up in a separate follow-up commit. Change-Id: I197eaffe3a52f2f9c02af982872185e017965006 Reviewed-on: https://gerrit.libreoffice.org/23344 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 | 4 +- .../libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 | 4 +- external/libxmlsec/xmlsec1-android.patch.1 | 6 +- .../xmlsec1-configure-libxml-libxslt.patch.1 | 4 +- external/libxmlsec/xmlsec1-configure.patch.1 | 60 ++--- external/libxmlsec/xmlsec1-customkeymanage.patch.1 | 26 +-- .../xmlsec1-mingw-keymgr-mscrypto.patch.1 | 30 +-- external/libxmlsec/xmlsec1-noverify.patch.1 | 6 +- .../libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 | 2 +- .../libxmlsec/xmlsec1-nssmangleciphers.patch.1 | 2 +- external/libxmlsec/xmlsec1-oldlibtool.patch.1 | 2 +- external/libxmlsec/xmlsec1-ooxml.patch.1 | 2 +- .../libxmlsec/xmlsec1-update-config.guess.patch.1 | 253 ++++++--------------- external/libxmlsec/xmlsec1-vc.patch.1 | 10 +- 14 files changed, 154 insertions(+), 257 deletions(-) (limited to 'external') diff --git a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 index a004295369ef..3b23758565a4 100644 --- a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 +++ b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 @@ -1,4 +1,4 @@ -From 7aaf2be1bb36db78450ea7f06dd571d98f57c06f Mon Sep 17 00:00:00 2001 +From cbe91fb9ff4d17dc4d7d1ea075718374b0c9591c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:15:25 +0100 Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch @@ -8,7 +8,7 @@ Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch 1 file changed, 4 deletions(-) diff --git a/configure.in b/configure.in -index cbf6e4a..403ec63 100644 +index 0721cfa..cf196e2 100644 --- a/configure.in +++ b/configure.in @@ -46,10 +46,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar) diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 index 120462f788e9..bc23158e83fc 100644 --- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 +++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 @@ -1,4 +1,4 @@ -From 4acfcb9acf87b4e6e6ee4d68875255b198b0fa0c Mon Sep 17 00:00:00 2001 +From c0ee9f2e99da3d6900427b4a1ac58e9d48e5f746 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:12:48 +0100 Subject: [PATCH 09/14] xmlsec1-1.2.14_fix_extern_c.patch @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h -index 9ab4cea..a6c09f2 100644 +index ad44918..b72aa62 100644 --- a/include/xmlsec/xmlsec.h +++ b/include/xmlsec/xmlsec.h @@ -11,16 +11,16 @@ diff --git a/external/libxmlsec/xmlsec1-android.patch.1 b/external/libxmlsec/xmlsec1-android.patch.1 index d2dc1b4fe4e8..a2ae0901d7df 100644 --- a/external/libxmlsec/xmlsec1-android.patch.1 +++ b/external/libxmlsec/xmlsec1-android.patch.1 @@ -1,4 +1,4 @@ -From f78fe748f06042492147e4ca57621acd3da2c605 Mon Sep 17 00:00:00 2001 +From 69969d29e78b5443dd013ee977bdd5481f561369 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:13:10 +0100 Subject: [PATCH 10/14] xmlsec1-android.patch @@ -8,7 +8,7 @@ Subject: [PATCH 10/14] xmlsec1-android.patch 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.sub b/config.sub -index a39437d..45bad78 100755 +index eb0389a..f0c82d4 100755 --- a/config.sub +++ b/config.sub @@ -120,7 +120,7 @@ esac @@ -20,7 +20,7 @@ index a39437d..45bad78 100755 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1275,7 +1275,7 @@ case $os in +@@ -1282,7 +1282,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ diff --git a/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 index 72d08f80108e..cb7d4bd018b4 100644 --- a/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 +++ b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 @@ -1,4 +1,4 @@ -From 9d5883f326e74e846fa9ce987d45516454d6ba0e Mon Sep 17 00:00:00 2001 +From 40dfb0d39abb949b9fc3f9919e8d0d92b0c0baa0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:06:58 +0100 Subject: [PATCH 02/14] xmlsec1-configure-libxml-libxslt.patch @@ -8,7 +8,7 @@ Subject: [PATCH 02/14] xmlsec1-configure-libxml-libxslt.patch 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index 14cb432..cbf6e4a 100644 +index 1fa401e..0721cfa 100644 --- a/configure.in +++ b/configure.in @@ -220,7 +220,7 @@ fi 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 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 #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 diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 index 1c512f6437f4..82e6b4366d1a 100644 --- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 +++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 @@ -1,7 +1,7 @@ -From 249eb9792617b159bff3ea7fbc7ee1ef7716f7e4 Mon Sep 17 00:00:00 2001 +From 20e5f77bd3139482e9348fcb9f814b294af373aa Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:19:12 +0100 -Subject: [PATCH] xmlsec1-customkeymanage.patch +Subject: [PATCH 12/14] xmlsec1-customkeymanage.patch Conflicts: include/xmlsec/nss/app.h @@ -59,10 +59,10 @@ index 18dff94..44837b6 100644 certkeys.h \ crypto.h \ diff --git a/include/xmlsec/mscrypto/Makefile.in b/include/xmlsec/mscrypto/Makefile.in -index 4bc1320..689971b 100644 +index 4a5a4f9..147b4f8 100644 --- a/include/xmlsec/mscrypto/Makefile.in +++ b/include/xmlsec/mscrypto/Makefile.in -@@ -281,6 +281,7 @@ top_srcdir = @top_srcdir@ +@@ -288,6 +288,7 @@ top_srcdir = @top_srcdir@ NULL = xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto xmlsecmscryptoinc_HEADERS = \ @@ -162,10 +162,10 @@ index e352162..997ca7f 100644 install-exec-hook: diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/nss/Makefile.in -index 4b70b00..815d1da 100644 +index 64865e5..8e97e1a 100644 --- a/include/xmlsec/nss/Makefile.in +++ b/include/xmlsec/nss/Makefile.in -@@ -288,6 +288,9 @@ bignum.h \ +@@ -295,6 +295,9 @@ bignum.h \ keysstore.h \ pkikeys.h \ x509.h \ @@ -768,7 +768,7 @@ index 8cd8586..48a6bf9 100644 if SHAREDLIB_HACK diff --git a/src/nss/Makefile.in b/src/nss/Makefile.in -index d10f05f..7275b4a 100644 +index 0003297..3b53588 100644 --- a/src/nss/Makefile.in +++ b/src/nss/Makefile.in @@ -72,7 +72,8 @@ am__DEPENDENCIES_1 = @@ -790,7 +790,7 @@ index d10f05f..7275b4a 100644 $(am__objects_1) $(am__objects_2) libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS) libxmlsec1_nss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -333,6 +336,7 @@ libxmlsec1_nss_la_CPPFLAGS = \ +@@ -340,6 +343,7 @@ libxmlsec1_nss_la_CPPFLAGS = \ libxmlsec1_nss_la_SOURCES = app.c bignum.c ciphers.c crypto.c \ digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \ x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \ @@ -798,7 +798,7 @@ index d10f05f..7275b4a 100644 $(NULL) $(am__append_1) libxmlsec1_nss_la_LIBADD = \ $(NSS_LIBS) \ -@@ -439,6 +443,9 @@ distclean-compile: +@@ -446,6 +450,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@ @@ -808,7 +808,7 @@ index d10f05f..7275b4a 100644 .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -468,6 +475,27 @@ libxmlsec1_nss_la-app.lo: app.c +@@ -475,6 +482,27 @@ libxmlsec1_nss_la-app.lo: app.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c @@ -6107,10 +6107,10 @@ index 8a6e97a..d1b2850 100644 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc -index 2f4c3e7..601d379 100644 +index 9309c3a..3fd562e 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc -@@ -224,6 +224,9 @@ XMLSEC_OPENSSL_OBJS_A = \ +@@ -226,6 +226,9 @@ XMLSEC_OPENSSL_OBJS_A = \ $(XMLSEC_OPENSSL_INTDIR_A)\x509vfy.obj XMLSEC_NSS_OBJS = \ @@ -6120,7 +6120,7 @@ index 2f4c3e7..601d379 100644 $(XMLSEC_NSS_INTDIR)\app.obj\ $(XMLSEC_NSS_INTDIR)\bignum.obj\ $(XMLSEC_NSS_INTDIR)\ciphers.obj \ -@@ -259,6 +262,7 @@ XMLSEC_NSS_OBJS_A = \ +@@ -261,6 +264,7 @@ XMLSEC_NSS_OBJS_A = \ $(XMLSEC_NSS_INTDIR_A)\strings.obj XMLSEC_MSCRYPTO_OBJS = \ diff --git a/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 index 72ba2693f7b7..1323a5baef0d 100644 --- a/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 +++ b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 @@ -1,4 +1,4 @@ -From 26f650d3eb4b0c633d1dc44c7180aff836ee13b5 Mon Sep 17 00:00:00 2001 +From bb769e0ff1ca9018005ce833c17cc2061c550001 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:11:52 +0100 Subject: [PATCH 07/14] xmlsec1-mingw-keymgr-mscrypto.patch @@ -11,10 +11,10 @@ Conflicts: 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mscrypto/Makefile.am b/src/mscrypto/Makefile.am -index 1099e3f..ccb9715 100644 +index 5cea654..3dc6452 100644 --- a/src/mscrypto/Makefile.am +++ b/src/mscrypto/Makefile.am -@@ -37,6 +37,7 @@ libxmlsec1_mscrypto_la_SOURCES =\ +@@ -39,6 +39,7 @@ libxmlsec1_mscrypto_la_SOURCES =\ csp_calg.h \ csp_oid.h \ xmlsec-mingw.h \ @@ -23,20 +23,20 @@ index 1099e3f..ccb9715 100644 if SHAREDLIB_HACK diff --git a/src/mscrypto/Makefile.in b/src/mscrypto/Makefile.in -index e3d1607..4336fe0 100644 +index 594760d..0a79e76 100644 --- a/src/mscrypto/Makefile.in +++ b/src/mscrypto/Makefile.in @@ -72,7 +72,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 \ - kt_rsa.c signatures.c symkeys.c x509.c x509vfy.c csp_calg.h \ -- csp_oid.h xmlsec-mingw.h ../strings.c -+ csp_oid.h xmlsec-mingw.h ../strings.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 = @SHAREDLIB_HACK_TRUE@am__objects_2 = \ @SHAREDLIB_HACK_TRUE@ libxmlsec1_mscrypto_la-strings.lo -@@ -87,7 +88,8 @@ am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \ +@@ -89,7 +90,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 \ @@ -46,15 +46,15 @@ index e3d1607..4336fe0 100644 $(am__objects_2) libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS) libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -339,6 +341,7 @@ libxmlsec1_mscrypto_la_CPPFLAGS = \ +@@ -348,6 +350,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 kt_rsa.c \ - signatures.c symkeys.c x509.c x509vfy.c csp_calg.h csp_oid.h \ + 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 \ - xmlsec-mingw.h $(NULL) $(am__append_1) + csp_calg.h csp_oid.h xmlsec-mingw.h $(NULL) $(am__append_1) libxmlsec1_mscrypto_la_LIBADD = \ - ../libxmlsec1.la \ -@@ -443,6 +446,7 @@ distclean-compile: + $(MSCRYPTO_LIBS) \ +@@ -454,6 +457,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@ @@ -62,7 +62,7 @@ index e3d1607..4336fe0 100644 .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -472,6 +476,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c +@@ -483,6 +487,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @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-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c diff --git a/external/libxmlsec/xmlsec1-noverify.patch.1 b/external/libxmlsec/xmlsec1-noverify.patch.1 index ddb405e32376..7e90b54e91f5 100644 --- a/external/libxmlsec/xmlsec1-noverify.patch.1 +++ b/external/libxmlsec/xmlsec1-noverify.patch.1 @@ -1,4 +1,4 @@ -From 9a28fa3b996be34b72548456c9877a9e0e0460ab Mon Sep 17 00:00:00 2001 +From 90dc858561bdb830a8dcc9ada71a67839feb41e0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:10:16 +0100 Subject: [PATCH 06/14] xmlsec1-noverify.patch @@ -11,10 +11,10 @@ Conflicts: 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/mscrypto/x509vfy.c b/src/mscrypto/x509vfy.c -index ab6fe0f..5a91bdf 100644 +index cf31787..80de2c9 100644 --- a/src/mscrypto/x509vfy.c +++ b/src/mscrypto/x509vfy.c -@@ -564,9 +564,16 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs, +@@ -560,9 +560,16 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs, CertFreeCertificateContext(nextCert); } diff --git a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 index f13030474b61..aa815115b369 100644 --- a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 +++ b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 @@ -1,4 +1,4 @@ -From 8b86c6ee388008ab5ab9afd8807e869db0e420e4 Mon Sep 17 00:00:00 2001 +From 1a39e144b32a51e00e8102d38bc1c8781fe7eb8c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:09:10 +0100 Subject: [PATCH 04/14] xmlsec1-nssdisablecallbacks.patch diff --git a/external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 b/external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 index a0527c00abf3..e7a4dce6d88c 100644 --- a/external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 +++ b/external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 @@ -1,4 +1,4 @@ -From 1b6be1b87bd39af0aacca5be048134715fb5c8e1 Mon Sep 17 00:00:00 2001 +From 0cba783a88f6ea54717c2c732c43a6ee18d51aff Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:09:39 +0100 Subject: [PATCH 05/14] xmlsec1-nssmangleciphers.patch diff --git a/external/libxmlsec/xmlsec1-oldlibtool.patch.1 b/external/libxmlsec/xmlsec1-oldlibtool.patch.1 index c487ac616160..17c3e218fd64 100644 --- a/external/libxmlsec/xmlsec1-oldlibtool.patch.1 +++ b/external/libxmlsec/xmlsec1-oldlibtool.patch.1 @@ -1,4 +1,4 @@ -From 68c5e703a5db9b58eb7b90c0e6a42323cd7c3d47 Mon Sep 17 00:00:00 2001 +From f8e7406cafa94afffd04a7a6d68464bbe65e5c8b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:08:09 +0100 Subject: [PATCH 03/14] xmlsec1-oldlibtool.patch diff --git a/external/libxmlsec/xmlsec1-ooxml.patch.1 b/external/libxmlsec/xmlsec1-ooxml.patch.1 index c2967d7ef99b..616b194ed96a 100644 --- a/external/libxmlsec/xmlsec1-ooxml.patch.1 +++ b/external/libxmlsec/xmlsec1-ooxml.patch.1 @@ -1,4 +1,4 @@ -From 236d595dec5e4df1036ba797ebebcd2bb3b29234 Mon Sep 17 00:00:00 2001 +From 26638413b86a4a690baf96547a52f2fc762bc5bb Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 25 Jan 2016 09:50:03 +0100 Subject: [PATCH 14/14] OOXML Relationship Transform diff --git a/external/libxmlsec/xmlsec1-update-config.guess.patch.1 b/external/libxmlsec/xmlsec1-update-config.guess.patch.1 index b59045f6bead..91f15aac45a7 100644 --- a/external/libxmlsec/xmlsec1-update-config.guess.patch.1 +++ b/external/libxmlsec/xmlsec1-update-config.guess.patch.1 @@ -1,26 +1,29 @@ -From 23a37fb61ca6eaa5b5cdb98b5ed559896012dc7c Mon Sep 17 00:00:00 2001 +From e557de8d785f87426fdc62bc387640904832f00a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 13 May 2014 16:35:04 +0200 Subject: [PATCH 13/14] update config.* to support ppc64le +Conflicts: + config.guess + config.sub --- - config.guess | 541 +++++++++++++++++++++++++++++------------------------------ - config.sub | 301 ++++++++++++++++++++++----------- - 2 files changed, 472 insertions(+), 370 deletions(-) + config.guess | 489 +++++++++++++++++++++++++++++++---------------------------- + config.sub | 294 +++++++++++++++++++++++------------ + 2 files changed, 453 insertions(+), 330 deletions(-) diff --git a/config.guess b/config.guess -index da83314..b79252d 100755 +index e3a2116..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. --timestamp='2009-04-27' +-timestamp='2009-06-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it @@ -30,7 +33,7 @@ index da83314..b79252d 100755 # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but -@@ -17,26 +15,22 @@ timestamp='2009-04-27' +@@ -17,26 +15,22 @@ timestamp='2009-06-10' # General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -51,17 +54,17 @@ index da83314..b79252d 100755 +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -+# -+# Originally written by Per Bothner. # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# Originally written by Per Bothner. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + @@ -112,15 +115,6 @@ index da83314..b79252d 100755 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward -@@ -170,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; @@ -341,15 +335,6 @@ index da83314..b79252d 100755 EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -656,7 +680,7 @@ EOF - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else @@ -727,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) @@ -449,17 +434,7 @@ index da83314..b79252d 100755 echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) -@@ -822,6 +851,9 @@ EOF - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -842,210 +874,157 @@ EOF +@@ -845,45 +874,81 @@ EOF exit ;; *:GNU:*:*) # the GNU system @@ -550,47 +525,9 @@ index da83314..b79252d 100755 - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= +@@ -901,123 +966,65 @@ EOF #endif #endif EOF @@ -608,12 +545,12 @@ index da83314..b79252d 100755 - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; @@ -624,7 +561,7 @@ index da83314..b79252d 100755 - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + or32:Linux:*:*) @@ -708,14 +645,6 @@ index da83314..b79252d 100755 - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build @@ -756,7 +685,7 @@ index da83314..b79252d 100755 i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both -@@ -1053,11 +1032,11 @@ EOF +@@ -1025,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) @@ -772,16 +701,7 @@ index da83314..b79252d 100755 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) -@@ -1074,7 +1053,7 @@ EOF - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1089,7 +1068,7 @@ EOF +@@ -1061,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) @@ -790,7 +710,7 @@ index da83314..b79252d 100755 case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; -@@ -1117,13 +1096,13 @@ EOF +@@ -1089,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: @@ -807,7 +727,7 @@ index da83314..b79252d 100755 Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; -@@ -1158,8 +1137,8 @@ EOF +@@ -1130,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) @@ -818,16 +738,7 @@ index da83314..b79252d 100755 NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ -@@ -1182,7 +1161,7 @@ EOF - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1202,10 +1181,10 @@ EOF +@@ -1174,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; @@ -842,7 +753,7 @@ index da83314..b79252d 100755 *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm -@@ -1231,11 +1210,11 @@ EOF +@@ -1203,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then @@ -857,7 +768,7 @@ index da83314..b79252d 100755 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; -@@ -1248,6 +1227,9 @@ EOF +@@ -1220,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; @@ -867,7 +778,7 @@ index da83314..b79252d 100755 SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; -@@ -1274,9 +1256,21 @@ EOF +@@ -1246,9 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown @@ -892,7 +803,7 @@ index da83314..b79252d 100755 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1290,7 +1284,10 @@ EOF +@@ -1262,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; @@ -904,7 +815,7 @@ index da83314..b79252d 100755 echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) -@@ -1335,13 +1332,13 @@ EOF +@@ -1307,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) @@ -920,7 +831,7 @@ index da83314..b79252d 100755 case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; -@@ -1359,11 +1356,11 @@ EOF +@@ -1331,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; @@ -935,7 +846,7 @@ index da83314..b79252d 100755 eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 @@ -951,18 +862,18 @@ index da83314..b79252d 100755 #endif diff --git a/config.sub b/config.sub -index 45bad78..d2a9613 100755 +index f0c82d4..d2a9613 100755 --- a/config.sub +++ b/config.sub @@ -1,44 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. --timestamp='2009-04-17' +-timestamp='2009-06-11' +timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software. @@ -1047,7 +958,7 @@ index 45bad78..d2a9613 100755 *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] -@@ -149,10 +149,13 @@ case $os in +@@ -149,12 +149,12 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ @@ -1056,13 +967,14 @@ index 45bad78..d2a9613 100755 os= basic_machine=$1 ;; +- -bluegene*) +- os=-cnk + -bluegene*) + os=-cnk -+ ;; + ;; -sim | -cisco | -oki | -wec | -winbond) os= - basic_machine=$1 -@@ -167,10 +170,10 @@ case $os in +@@ -170,10 +170,10 @@ case $os in os=-chorusos basic_machine=$1 ;; @@ -1076,7 +988,7 @@ index 45bad78..d2a9613 100755 -hiux*) os=-hiuxwe2 ;; -@@ -215,6 +218,12 @@ case $os in +@@ -218,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -1089,7 +1001,7 @@ index 45bad78..d2a9613 100755 -lynx*) os=-lynxos ;; -@@ -239,20 +248,27 @@ case $basic_machine in +@@ -242,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ @@ -1120,7 +1032,7 @@ index 45bad78..d2a9613 100755 | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ -@@ -270,32 +286,45 @@ case $basic_machine in +@@ -273,32 +286,45 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ @@ -1175,7 +1087,7 @@ index 45bad78..d2a9613 100755 basic_machine=$basic_machine-unknown os=-none ;; -@@ -305,6 +334,21 @@ case $basic_machine in +@@ -308,6 +334,21 @@ case $basic_machine in basic_machine=mt-unknown ;; @@ -1197,7 +1109,7 @@ index 45bad78..d2a9613 100755 # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. -@@ -319,25 +363,30 @@ case $basic_machine in +@@ -322,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -1231,7 +1143,7 @@ index 45bad78..d2a9613 100755 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ -@@ -355,28 +404,34 @@ case $basic_machine in +@@ -358,28 +404,34 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ @@ -1274,7 +1186,7 @@ index 45bad78..d2a9613 100755 | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) -@@ -401,7 +456,7 @@ case $basic_machine in +@@ -404,7 +456,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; @@ -1283,14 +1195,10 @@ index 45bad78..d2a9613 100755 basic_machine=abacus-unknown ;; adobe68k) -@@ -467,11 +522,24 @@ case $basic_machine in - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux +@@ -474,11 +526,20 @@ case $basic_machine in + basic_machine=powerpc-ibm + os=-cnk ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; @@ -1309,7 +1217,7 @@ index 45bad78..d2a9613 100755 basic_machine=arm-unknown os=-cegcc ;; -@@ -503,7 +571,7 @@ case $basic_machine in +@@ -510,7 +571,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; @@ -1318,7 +1226,7 @@ index 45bad78..d2a9613 100755 basic_machine=cr16-unknown os=-elf ;; -@@ -661,7 +729,6 @@ case $basic_machine in +@@ -668,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; @@ -1326,7 +1234,7 @@ index 45bad78..d2a9613 100755 i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 -@@ -719,8 +786,15 @@ case $basic_machine in +@@ -726,8 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; @@ -1343,7 +1251,7 @@ index 45bad78..d2a9613 100755 os=-mingw32 ;; mingw32ce) -@@ -755,10 +829,18 @@ case $basic_machine in +@@ -762,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; @@ -1362,7 +1270,7 @@ index 45bad78..d2a9613 100755 ncr3000) basic_machine=i486-ncr os=-sysv4 -@@ -823,6 +905,12 @@ case $basic_machine in +@@ -830,6 +905,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; @@ -1375,7 +1283,7 @@ index 45bad78..d2a9613 100755 nsr-tandem) basic_machine=nsr-tandem ;; -@@ -905,9 +993,10 @@ case $basic_machine in +@@ -912,9 +993,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; @@ -1388,7 +1296,7 @@ index 45bad78..d2a9613 100755 ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown -@@ -917,7 +1006,7 @@ case $basic_machine in +@@ -924,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; @@ -1397,7 +1305,7 @@ index 45bad78..d2a9613 100755 ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown -@@ -932,7 +1021,11 @@ case $basic_machine in +@@ -939,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; @@ -1410,7 +1318,7 @@ index 45bad78..d2a9613 100755 basic_machine=i386-pc os=-rdos ;; -@@ -1001,6 +1094,9 @@ case $basic_machine in +@@ -1008,6 +1094,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; @@ -1420,7 +1328,7 @@ index 45bad78..d2a9613 100755 sun2) basic_machine=m68000-sun ;; -@@ -1057,20 +1153,8 @@ case $basic_machine in +@@ -1064,20 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; @@ -1442,7 +1350,7 @@ index 45bad78..d2a9613 100755 os=-linux-gnu ;; tx39) -@@ -1140,6 +1224,9 @@ case $basic_machine in +@@ -1147,6 +1224,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; @@ -1452,7 +1360,7 @@ index 45bad78..d2a9613 100755 ymp) basic_machine=ymp-cray os=-unicos -@@ -1237,9 +1324,12 @@ esac +@@ -1244,9 +1324,12 @@ esac if [ x"$os" != x"" ] then case $os in @@ -1467,14 +1375,12 @@ index 45bad78..d2a9613 100755 -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -@@ -1260,22 +1350,23 @@ case $os in - # Each alternative MUST END IN A *, to match a version number. +@@ -1268,21 +1351,22 @@ case $os in # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1497,7 +1403,7 @@ index 45bad78..d2a9613 100755 | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1283,7 +1374,7 @@ case $os in +@@ -1290,7 +1374,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ @@ -1506,7 +1412,7 @@ index 45bad78..d2a9613 100755 # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) -@@ -1322,7 +1413,7 @@ case $os in +@@ -1329,7 +1413,7 @@ case $os in -opened*) os=-openedition ;; @@ -1515,7 +1421,7 @@ index 45bad78..d2a9613 100755 os=-os400 ;; -wince*) -@@ -1371,7 +1462,7 @@ case $os in +@@ -1378,7 +1462,7 @@ case $os in -sinix*) os=-sysv4 ;; @@ -1524,7 +1430,7 @@ index 45bad78..d2a9613 100755 os=-tpf ;; -triton*) -@@ -1407,15 +1498,14 @@ case $os in +@@ -1414,15 +1498,14 @@ case $os in -aros*) os=-aros ;; @@ -1542,7 +1448,7 @@ index 45bad78..d2a9613 100755 -none) ;; *) -@@ -1438,10 +1528,10 @@ else +@@ -1445,10 +1528,10 @@ else # system, and we'll never get to this point. case $basic_machine in @@ -1555,7 +1461,7 @@ index 45bad78..d2a9613 100755 os=-elf ;; *-acorn) -@@ -1453,8 +1543,23 @@ case $basic_machine in +@@ -1460,8 +1543,23 @@ case $basic_machine in arm*-semi) os=-aout ;; @@ -1581,7 +1487,7 @@ index 45bad78..d2a9613 100755 ;; # This must come before the *-dec entry. pdp10-*) -@@ -1474,14 +1579,11 @@ case $basic_machine in +@@ -1481,14 +1579,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 @@ -1597,7 +1503,7 @@ index 45bad78..d2a9613 100755 os=-elf ;; mips*-cisco) -@@ -1490,6 +1592,9 @@ case $basic_machine in +@@ -1497,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; @@ -1607,7 +1513,7 @@ index 45bad78..d2a9613 100755 or32-*) os=-coff ;; -@@ -1508,7 +1613,7 @@ case $basic_machine in +@@ -1515,7 +1613,7 @@ case $basic_machine in *-ibm) os=-aix ;; @@ -1616,15 +1522,6 @@ index 45bad78..d2a9613 100755 os=-mmixware ;; *-wec) -@@ -1613,7 +1718,7 @@ case $basic_machine in - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -- 2.6.2 diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1 index 36e93cae7fec..cf0d46cc9eaa 100644 --- a/external/libxmlsec/xmlsec1-vc.patch.1 +++ b/external/libxmlsec/xmlsec1-vc.patch.1 @@ -1,4 +1,4 @@ -From de1c40ec9621c4100bc4153a947f2e67be0c42e5 Mon Sep 17 00:00:00 2001 +From 3f9ccaa6ac3113c45a6e021e35b2c81cf541fc1b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:12:29 +0100 Subject: [PATCH 08/14] xmlsec1-vc.patch @@ -37,7 +37,7 @@ index 49dd127..f46eeee 100644 #endif diff --git a/apps/xmlsec.c b/apps/xmlsec.c -index 72d68fa..364ed5e 100644 +index 3aa6ebd..548cdf9 100644 --- a/apps/xmlsec.c +++ b/apps/xmlsec.c @@ -9,7 +9,7 @@ @@ -50,10 +50,10 @@ index 72d68fa..364ed5e 100644 #endif diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc -index cfa0a46..2f4c3e7 100644 +index 5269202..9309c3a 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc -@@ -305,6 +305,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\" +@@ -311,6 +311,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\" CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H" CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H" @@ -64,7 +64,7 @@ index cfa0a46..2f4c3e7 100644 !if "$(UNICODE)" == "1" CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" -@@ -359,7 +363,11 @@ LIBS = +@@ -365,7 +369,11 @@ LIBS = !if "$(DEBUG)" == "1" LDFLAGS = $(LDFLAGS) /DEBUG !else -- cgit