mingwport30: merge with DEV300 m80

1 files changed, 26 insertions, 77 deletions

diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch
index 78a7f8f8ab9f..fd71ddf87c54 100644
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@ -1,57 +1,6 @@
---- misc/xmlsec1-1.2.12/aclocal.m4	2009-06-25 22:53:24.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/aclocal.m4	2009-09-29 15:49:39.550158665 +0200
-@@ -6219,6 +6219,10 @@
- AC_SUBST(LIBADD_DL)
- AC_LANG_PUSH([C])
- 
-+case $host_os in
-+mingw*)
-+;;
-+*)
- AC_CHECK_FUNC([shl_load],
-       [AC_DEFINE([HAVE_SHL_LOAD], [1],
- 		 [Define if you have the shl_load function.])],
-@@ -6254,6 +6258,8 @@
-     ])
-   ])
- ])
-+;;
-+esac
- 
- if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
- then
---- misc/xmlsec1-1.2.12/configure	2009-09-29 15:55:33.269924586 +0200
-+++ misc/build/xmlsec1-1.2.12/configure	2009-09-29 15:55:08.838176411 +0200
-@@ -21883,6 +21883,10 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-+case $host_os in
-+mingw*)
-+;;
-+*)
- echo "$as_me:$LINENO: checking for shl_load" >&5
- echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
- if test "${ac_cv_func_shl_load+set}" = set; then
-@@ -22434,6 +22438,8 @@
- 
- fi
- 
-+;;
-+esac
- 
- if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
- then
-@@ -22614,7 +22620,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 22617 "configure"
-+#line 22623 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -26178,7 +26184,9 @@
+--- misc/xmlsec1-1.2.14/configure	2009-09-29 15:55:33.269924586 +0200
++++ misc/build/xmlsec1-1.2.14/configure	2009-09-29 15:55:08.838176411 +0200
+@@ -13184,7 +13184,9 @@
  	done
  
  	for dir in $ac_nss_lib_dir ; do
@@ -62,7 +11,7 @@
  		        	if test "z$dir" = "z/usr/lib" ; then
              	    NSPR_LIBS="$NSPR_LIBS_LIST"
      		else
-@@ -26191,6 +26199,25 @@
+@@ -13197,6 +13199,25 @@
  		NSPR_LIBS_FOUND="yes"
  		break
  	    fi
@@ -88,7 +37,7 @@
  	done
      fi
  
-@@ -26264,6 +26291,24 @@
+@@ -13266,6 +13287,24 @@
          done
  
          for dir in $ac_nss_lib_dir ; do
@@ -113,7 +62,7 @@
              if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
          	    		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -26277,6 +26322,8 @@
+@@ -13279,6 +13318,8 @@
      		NSS_LIBS_FOUND="yes"
      		break
  	    fi
@@ -122,16 +71,16 @@
  	done
      fi
  
-@@ -26769,7 +26816,7 @@
- echo "${ECHO_T}$MSCRYPTO_ENABLE" >&6
+@@ -13684,7 +13725,7 @@
+ $as_echo "$MSCRYPTO_ENABLE" >&6; }
  else
      LIBS_SAVE="$LIBS"
 -    LIBS="$LIBS -lcrypt32"
 +    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
-     echo "$as_me:$LINENO: checking for mscrypto libraries" >&5
- echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -26819,13 +26866,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
+ $as_echo_n "checking for mscrypto libraries... " >&6; }
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13711,13 +13752,7 @@
      XMLSEC_NO_MSCRYPTO="0"
  
      MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
@@ -146,9 +95,9 @@
          if test "z$XMLSEC_CRYPTO" = "z" ; then
  	XMLSEC_CRYPTO="mscrypto"
      	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
---- misc/xmlsec1-1.2.12/configure.in	2009-09-29 15:55:33.282288142 +0200
-+++ misc/build/xmlsec1-1.2.12/configure.in	2009-09-29 15:49:39.614223428 +0200
-@@ -606,7 +606,9 @@
+--- 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
+@@ -671,7 +671,9 @@
  	done
  	
  	for dir in $ac_nss_lib_dir ; do
@@ -159,7 +108,7 @@
  		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"
-@@ -620,6 +622,26 @@
+@@ -685,6 +687,26 @@
  		NSPR_LIBS_FOUND="yes"
  		break
  	    fi
@@ -186,7 +135,7 @@
  	done
      fi
  
-@@ -677,6 +699,25 @@
+@@ -742,6 +764,25 @@
          done
         
          for dir in $ac_nss_lib_dir ; do
@@ -212,7 +161,7 @@
              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
-@@ -691,6 +732,8 @@
+@@ -756,6 +797,8 @@
      		NSS_LIBS_FOUND="yes"
      		break
  	    fi
@@ -221,7 +170,7 @@
  	done
      fi
  
-@@ -861,7 +904,7 @@
+@@ -926,7 +969,7 @@
  dnl cannot detect __stdcall functions
  dnl    AC_CHECK_LIB(crypt32, CertOpenStore, ....
      LIBS_SAVE="$LIBS"
@@ -230,7 +179,7 @@
      AC_MSG_CHECKING(for mscrypto libraries)
      AC_LINK_IFELSE([
  	#include <windows.h>
-@@ -878,15 +921,7 @@
+@@ -943,15 +986,7 @@
      XMLSEC_NO_MSCRYPTO="0"
  
      MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
@@ -247,9 +196,9 @@
      dnl first crypto library is default one
      if test "z$XMLSEC_CRYPTO" = "z" ; then
  	XMLSEC_CRYPTO="mscrypto"
---- misc/xmlsec1-1.2.12/ltmain.sh	2009-06-25 22:53:19.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/ltmain.sh	2009-09-29 15:49:39.628349554 +0200
-@@ -1661,6 +1661,11 @@
+--- 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
  	;;
  
@@ -261,7 +210,7 @@
        *.$libext)
  	# An archive.
  	deplibs="$deplibs $arg"
-@@ -1974,6 +1979,10 @@
+@@ -5213,6 +5218,10 @@
  	  continue
  	  ;;
  	*.la) lib="$deplib" ;;
@@ -272,8 +221,8 @@
  	*.$libext)
  	  if test "$pass" = conv; then
  	    deplibs="$deplib $deplibs"
---- misc/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
+--- 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; */
  };