sb126: merged in DEV300_m87

17 files changed, 200 insertions, 211 deletions

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f50f4aadc164..9441e9219483 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
@@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
diff --git a/external/StAX/README_jsr173_1.0_api.jar b/external/StAX/README_jsr173_1.0_api.jar
deleted file mode 100644
index 7df7eb0f37f8..000000000000
--- a/external/StAX/README_jsr173_1.0_api.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-The JSR173 is the XML pull API used at build time for the saxon9 XSLT processor, it has become part of OpenJDK 6.

-When using an older JDK, get the API from <https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/lib/jars/jsr173_1.0_api.jar> 

-located at the StAS Java site <https://sjsxp.dev.java.net/> and put it into external/StAX.    
\ No newline at end of file
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index 9803bc619e47..bea4a2b7e4f5 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -11,7 +11,7 @@
              case COUNT :
                  buf.append(' ').append(Token.T_COUNT).append('(');
 -                break;
-+                return buf.toString();
++                if ( "(*)".equals(left))buf.append('*');else   buf.append(left);   buf.append(')');   return buf.toString();
  
              case SUM :
                  buf.append(' ').append(Token.T_SUM).append('(');
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index f1aa3806a17c..b733398c3c8d 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic
 @all:
     echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 OUT2INC += hyphen.h 
 .ENDIF
 
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index 030140513af5..e1dae4abcaa2 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,4 +63,7 @@ SHL1LIBS=       $(SLB)$/eggtray.lib
 
 # --- Targets ----------------------------------
 .ENDIF 		# L10N_framework
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(LIBRARY_PATH)
+.ENDIF # "$(OS)$(CPU)" == "LINUXX"
 .INCLUDE : target.mk
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 01a2a6eadc36..f14a69bd5113 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -30,6 +30,12 @@ PRJ=.
 PRJNAME=libtextcat
 TARGET=libtextcat
 
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+all:
+        @echo "An already available installation of libtextcat should exist on your system."
+        @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 9a0e92acf91f..f721db3148a4 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
 TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 
 #xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
 #xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
 #xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
 #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
 PATCH_FILES=\
    xmlsec1-configure.patch \
+   xmlsec1-configure-libxml-libxslt.patch \
    xmlsec1-olderlibxml2.patch \
    xmlsec1-nssdisablecallbacks.patch \
    xmlsec1-customkeymanage.patch \
@@ -102,7 +104,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ELSE
 CONFIGURE_DIR=win32
@@ -162,7 +164,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
new file mode 100644
index 000000000000..fdf39ad19554
--- /dev/null
+++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
@@ -0,0 +1,40 @@
+--- misc/xmlsec1-1.2.14/configure	Wed Jun 30 11:55:36 2010
++++ misc/build/xmlsec1-1.2.14/configure	Wed Jun 30 11:57:28 2010
+@@ -12077,7 +12077,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxml/bin:$PATH"
++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+@@ -12258,7 +12258,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxslt/bin:$PATH"
++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+--- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
++++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
+@@ -231,7 +231,7 @@
+ if test "z$LIBXML_FOUND" = "zno" ; then
+     if test "z$with_libxml" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+-		     [$with_libxml/bin:$PATH])
++		     [$with_libxml${with_libxml:+/bin:}$PATH])
+     fi
+     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+@@ -296,7 +296,7 @@
+ if test "z$LIBXSLT_FOUND" = "zno" ; then
+     if test "z$with_libxslt" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+-		     [$with_libxslt/bin:$PATH])
++		     [$with_libxslt${with_libxslt:+/bin:}:$PATH])
+     fi
+     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
+     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 943ac98bf687..f2f5f4e8f642 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -590,6 +590,15 @@
          	    		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
                  else
+@@ -13166,7 +13284,7 @@
+ 
+     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"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
 @@ -15036,7 +15154,7 @@
  # values after options handling.
  ac_log="
@@ -734,6 +743,15 @@
          	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"
+@@ -738,7 +761,7 @@
+ 
+     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
 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
 @@ -376,7 +376,7 @@
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 77d88bc4ca5f..f373a5d16262 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,8 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
 
+.IF "$(SYSTEM_MYTHES)" != "YES"
+
 .IF "$(SYSTEM_HUNSPELL)" != "YES"
 HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
 HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
@@ -74,21 +76,18 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
 .ENDIF
 
-.IF "$(SYSTEM_MYTHES)" == "YES"
-@all:
-    echo "Nothing to do here."
-.ELSE
 BUILD_ACTION=make
 OUT2INC += mythes.hxx
 .ENDIF
-
 .ENDIF # "$(GUI)"=="UNX"
 
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS= --disable-shared --with-pic \
+    HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
+    HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.2"
 
 BUILD_ACTION=make
 
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 081680781a2c..6fabd1ce6f03 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -46,10 +46,10 @@ TARGET=openssl
     @echo "openssl disabled...."
 .ENDIF
 
-OPENSSL_NAME=openssl-0.9.8l
+OPENSSL_NAME=openssl-0.9.8o
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=05a0ece1372392a2cf310ebb96333025
+TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
@@ -67,8 +67,8 @@ UNAME=$(shell uname)
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
     PATCH_FILES=openssllnx.patch
     ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8l.map \
-        libssl_OOo_0_9_8l.map
+        libcrypto_OOo_0_9_8o.map \
+        libssl_OOo_0_9_8o.map
     .IF "$(CPU)" == "I"
         .IF "$(UNAME)" == "GNU/kFreeBSD"
             CONFIGURE_ACTION=Configure debian-kfreebsd-i386
@@ -91,8 +91,8 @@ UNAME=$(shell uname)
 .IF "$(OS)" == "SOLARIS"
     PATCH_FILES=opensslsol.patch
     ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8l.map \
-        libssl_OOo_0_9_8l.map
+        libcrypto_OOo_0_9_8o.map \
+        libssl_OOo_0_9_8o.map
     #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
 
     # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
@@ -141,11 +141,7 @@ OUT2BIN += out/libeay32.dll
             # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
             # If WRAPCMD is set it is prepended before the compiler, don't touch that.
             .IF "$(WRAPCMD)"==""
-                # relace / with \ first word only
-                cc_first_repl = $(subst,/,\ $(normpath,1 $(CC:1)))
-                cc_first = $(normpath,1 $(CC:1))
-                CC!:=$(subst,$(cc_first),$(cc_first_repl) $(normpath,1 $(CC)))
-#				CC!:=$(subst,/,\ $(normpath,1 $(CC)))
+                CC!:=$(subst,/,\ $(normpath,1 $(CC)))
                 .EXPORT : CC
             .ENDIF
             PERL_bak:=$(PERL)
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4b976ae832c4..5d245f450642 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pci.c	2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pci.c	2008-03-20 13:30:16.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c	2007-03-05 01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c	2010-03-26 12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
  /* Contributed to the OpenSSL Project 2004
   * by Richard Levitte (richard@levitte.org)
@@ -9,8 +9,8 @@
   * (Royal Institute of Technology, Stockholm, Sweden).
   * All rights reserved.
   *
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pcia.c	2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pcia.c	2008-03-20 13:30:47.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c	2004-12-28 01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c	2010-03-26 12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
  /* Contributed to the OpenSSL Project 2004
   * by Richard Levitte (richard@levitte.org)
@@ -20,28 +20,30 @@
   * (Royal Institute of Technology, Stockholm, Sweden).
   * All rights reserved.
   *
---- misc/openssl-0.9.8l/ms/do_ms.bat	2005-05-17 02:07:13.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/do_ms.bat	2008-03-20 13:27:06.000000000 +0100
-@@ -1,9 +1,8 @@
-+%1 util\mkfiles.pl >MINFO
-+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
-+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+--- misc/openssl-0.9.8o/ms/do_ms.bat	2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/do_ms.bat	2010-03-26 12:19:19.399047300 +0100
+@@ -1,11 +1,11 @@
  
 -perl util\mkfiles.pl >MINFO
 -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
 -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
++%1 util\mkfiles.pl >MINFO
++%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
++%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
+ if x%OSVERSION% == x goto skipce
 -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
 -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
--
++%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
++%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+ :skipce
+ 
 -perl util\mkdef.pl 32 libeay > ms\libeay32.def
 -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
 +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
 +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
---- misc/openssl-0.9.8l/util/mk1mf.pl	2007-08-13 00:31:14.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/mk1mf.pl	2008-03-20 13:27:06.000000000 +0100
-@@ -115,7 +115,7 @@
+--- misc/openssl-0.9.8o/util/mk1mf.pl	2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/mk1mf.pl	2010-03-26 12:04:20.977172300 +0100
+@@ -128,7 +128,7 @@
  $inc_def="outinc";
  $tmp_def="tmp";
  
@@ -50,19 +52,19 @@
  $mkdir="-mkdir" unless defined $mkdir;
  
  ($ssl,$crypto)=("ssl","crypto");
-@@ -277,6 +277,11 @@
-	chop;
-
-	($key,$val)=/^([^=]+)=(.*)/;
+@@ -290,6 +290,11 @@
+ 	chop;
+ 
+ 	($key,$val)=/^([^=]+)=(.*)/;
 +
 +	# On some Windows machines, $val has linefeeds at the end, which confuses
 +	# subsequent code in this file. So we strip all whitespace at the end.
 +	$val =~ s/\s+$//;
 +
-	if ($key eq "RELATIVE_DIRECTORY")
-		{
-		if ($lib ne "")
-@@ -570,7 +575,7 @@
+ 	if ($key eq "RELATIVE_DIRECTORY")
+ 		{
+ 		if ($lib ne "")
+@@ -730,7 +735,7 @@
  printf OUT <<EOF;
  #ifdef $platform_cpp_symbol
    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
@@ -71,10 +73,10 @@
    #define PLATFORM "$platform"
  EOF
  printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8l/util/pl/VC-32.pl	2007-07-19 19:39:07.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/VC-32.pl	2008-03-20 13:27:06.000000000 +0100
-@@ -28,7 +28,7 @@
- $zlib_lib="zlib1.lib";
+--- misc/openssl-0.9.8o/util/pl/VC-32.pl	2010-02-04 02:10:24.000000000 +0100
++++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl	2010-03-26 12:04:20.977172300 +0100
+@@ -32,7 +32,7 @@
+ $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
  
  # C compiler stuff
 -$cc='cl';
@@ -82,7 +84,7 @@
  if ($FLAVOR =~ /WIN64/)
      {
      # Note that we currently don't have /WX on Win64! There is a lot of
-@@ -99,21 +99,21 @@
+@@ -103,21 +103,21 @@
      }
  
      $cc='$(CC)';
@@ -102,17 +104,17 @@
      $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
      $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8
 -    my $f = $shlib || $fips ?' /MD':' /MT';
-+    my $f = $shlib || $fips ?' -MD':' -MT';
 -    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
-+    $lib_cflag='-Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
 -    $opt_cflags=$f.' /Ox /O2 /Ob2';
 -    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
++    my $f = $shlib || $fips ?' -MD':' -MT';
++    $lib_cflag='-Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
 +    $opt_cflags=$f.' -Ox -O2 -Ob2';
 +    $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
      $lflags="/nologo /subsystem:console /opt:ref";
      }
  $mlflags='';
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
  	}
  
  $obj='.obj';
@@ -121,7 +123,7 @@
  
  # EXE linking stuff
  $link="link";
-@@ -281,7 +281,7 @@
+@@ -298,7 +298,7 @@
  	$tmp_def='tmp32dll_$(TARGETCPU)';
  	}
  
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 5d8f8231e45a..7fc92f6972b3 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,6 +1,6 @@
---- misc/build/openssl-0.9.8l/Configure-old	2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Configure	2010-04-17 13:52:03.000000000 +0200
-@@ -382,6 +382,9 @@
+--- misc/build/openssl-0.9.8o/Configure-old	2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/Configure	2010-04-17 13:52:03.000000000 +0200
+@@ -388,6 +388,9 @@
  
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
@@ -21,43 +21,12 @@
  		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
  		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
  		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
---- misc/openssl-0.9.8l/test/Makefile	2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile	2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- 		LIBRARIES="$(LIBCRYPTO)"; \
- 	fi; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- 	fi; \
- 	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
-  
---- misc/openssl-0.9.8l/apps/Makefile	2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile	2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- 	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- 	[ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
- 	-(cd ..; \
---- misc/openssl-0.9.8l/config	2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config	2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8o/config	2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8o/config	2009-03-30 08:59:09.588448000 +0200
 @@ -399,27 +399,21 @@
  # this is where the translation occurs into SSLeay terms
  # ---------------------------------------------------------------------------
-
+ 
 -GCCVER=`(gcc -dumpversion) 2>/dev/null`
 -if [ "$GCCVER" != "" ]; then
 -  # then strip off whatever prefix egcs prepends the number with...
@@ -96,12 +65,12 @@
 +   fi
  fi
  GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then 
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+ if [ "$SYSTEM" = "HP-UX" ];then
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2010-03-26 15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2010-03-26 15:31:38.019501422 +0100
+@@ -1 +1,3295 @@
 -dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
 +	global:
 +ACCESS_DESCRIPTION_free;
 +ACCESS_DESCRIPTION_it;
@@ -1420,7 +1389,7 @@
 +KRB5_TKTBODY_free;
 +KRB5_TKTBODY_it;
 +KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
 +LONG_it;
 +MD2;
 +MD2_Final;
@@ -3396,11 +3365,11 @@
 +	local:
 +		*;
 +};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map	Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map	Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2010-03-26 15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2010-03-26 15:31:58.552966503 +0100
+@@ -1 +1,445 @@
 -dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
 +	global:
 +BIO_f_ssl;
 +BIO_new_buffer_ssl_connect;
@@ -3413,7 +3382,7 @@
 +DTLSv1_method;
 +DTLSv1_server_method;
 +ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
 +SSL_CIPHER_description;
 +SSL_CIPHER_get_bits;
 +SSL_CIPHER_get_name;
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
index fb6bf48dd91d..4c998533fa2a 100644
--- a/openssl/opensslmacosx.patch
+++ b/openssl/opensslmacosx.patch
@@ -1,7 +1,7 @@
---- misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	2007-10-16 15:44:13.000000000 +0200
-@@ -0,0 +1,3303 @@
-+LIBCRYPTO_OOO_0_9_8l{
+--- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2007-10-16 15:44:13.000000000 +0200
+@@ -0,1 +1,3304 @@
++LIBCRYPTO_OOO_0_9_8o{
 +	global:
 +ACCESS_DESCRIPTION_free;
 +ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
 +	local:
 +		*;
 +};
---- misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map	1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map	2007-10-16 15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2007-10-16 15:44:13.000000000 +0200
 @@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8l{
++LIBSSL_OOO_0_9_8o{
 +	global:
 +BIO_f_ssl;
 +BIO_new_buffer_ssl_connect;
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 144376388c59..10b48531190d 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/Makefile.shared	2008-09-17 17:56:40.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Makefile.shared	2009-03-30 11:52:53.684538000 +0200
+--- misc/openssl-0.9.8o/Makefile.shared	2008-09-17 17:56:40.000000000 +0200
++++ misc/build/openssl-0.9.8o/Makefile.shared	2009-03-30 11:52:53.684538000 +0200
 @@ -254,13 +254,17 @@
  	base=-Wl,--enable-auto-image-base; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -21,25 +21,8 @@
  	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
  	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
  	$(LINK_SO_A) || exit 1; \
---- misc/openssl-0.9.8l/apps/Makefile	2008-11-20 01:03:48.000000000 +0900
-+++ misc/build/openssl-0.9.8l/apps/Makefile	2009-04-10 19:49:37.006875000 +0900
-@@ -153,12 +153,12 @@
- 	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- 		shlib_target="$(SHLIB_TARGET)"; \
- 	elif [ -n "$(FIPSCANLIB)" ]; then \
--	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+	  FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- 	fi; \
- 	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- 	[ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
- 	-(cd ..; \
---- misc/openssl-0.9.8l/e_os2.h	2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8l/e_os2.h	2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8o/e_os2.h	2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8o/e_os2.h	2009-04-04 23:07:15.324250000 +0900
 @@ -264,7 +264,7 @@
  # define OPENSSL_IMPLEMENT_GLOBAL(type,name)			     \
  	extern type _hide_##name;				     \
@@ -49,8 +32,8 @@
  # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
  # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
  #else
---- misc/openssl-0.9.8l/ms/mingw32.bat	2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/mingw32.bat	2009-03-30 11:54:10.000000000 +0200
+--- misc/openssl-0.9.8o/ms/mingw32.bat	2006-05-05 15:19:32.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/mingw32.bat	2009-03-30 11:54:10.000000000 +0200
 @@ -79,15 +79,41 @@
  rem copy ms\tlhelp32.h outinc
  
@@ -96,40 +79,8 @@
  echo Done compiling OpenSSL
  
  :end
---- misc/openssl-0.9.8l/test/Makefile	2009-03-25 19:59:22.000000000 +0900
-+++ misc/build/openssl-0.9.8l/test/Makefile	2009-04-10 20:07:21.522500000 +0900
-@@ -402,13 +402,13 @@
- 	if [ "$(FIPSCANLIB)" = "libfips" ]; then \
- 		LIBRARIES="-L$(TOP) -lfips"; \
- 	elif [ -n "$(FIPSCANLIB)" ]; then \
--		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+		FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- 		LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
- 	else \
- 		LIBRARIES="$(LIBCRYPTO)"; \
- 	fi; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
- 
-@@ -417,11 +417,11 @@
- 	fi; \
- 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
- 	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
--		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+		FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- 	fi; \
- 	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- 	$(MAKE) -f $(TOP)/Makefile.shared -e \
--		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- 		link_app.$${shlib_target}
- 
---- misc/openssl-0.9.8l/util/pl/Mingw32.pl	2006-05-05 15:19:34.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/Mingw32.pl	2009-03-30 11:55:04.000000000 +0200
+--- misc/openssl-0.9.8o/util/pl/Mingw32.pl	2006-05-05 15:19:34.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl	2009-03-30 11:55:04.000000000 +0200
 @@ -6,11 +6,11 @@
  $o='/';
  $cp='cp';
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
index 5ca83a1d6aae..cd2d93a12f53 100644
--- a/openssl/opensslsol.patch
+++ b/openssl/opensslsol.patch
@@ -1,18 +1,18 @@
---- misc/openssl-0.9.8l/Configure	Mon Feb 16 09:44:22 2009
-+++ misc/build/openssl-0.9.8l/Configure	Mon Mar 30 08:17:56 2009
-@@ -206,8 +206,8 @@
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
+--- misc/openssl-0.9.8o/Configure	Mon Nov  9 15:14:26 2009
++++ misc/build/openssl-0.9.8o/Configure	Fri Mar 26 16:01:32 2010
+@@ -212,8 +212,8 @@
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+  
  #### Solaris x86 with Sun C setups
 -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"solaris-x86-cc","cc:-O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
+ 
  #### SPARC Solaris with GNU C setups
  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
----- misc/openssl-0.9.8l/Makefile.shared	Wed Sep 17 17:56:40 2008
-+++ misc/build/openssl-0.9.8l/Makefile.shared	Mon Mar 30 08:19:42 2009
+--- misc/openssl-0.9.8o/Makefile.shared	Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8o/Makefile.shared	Fri Mar 26 16:04:41 2010
 @@ -93,7 +93,7 @@
      LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
@@ -20,7 +20,7 @@
 -    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
 +    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
      $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
-
+ 
  LINK_SO=	\
 @@ -103,7 +103,7 @@
      SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
@@ -31,12 +31,12 @@
      $${SHAREDCMD} $${SHAREDFLAGS} \
  	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
  	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
----- misc/openssl-0.9.8l/config	Mon Feb 16 09:43:41 2009
-+++ misc/build/openssl-0.9.8l/config	Mon Mar 30 08:22:05 2009
+--- misc/openssl-0.9.8o/config	Tue Mar  9 18:08:24 2010
++++ misc/build/openssl-0.9.8o/config	Fri Mar 26 16:07:55 2010
 @@ -399,28 +399,25 @@
  # this is where the translation occurs into SSLeay terms
  # ---------------------------------------------------------------------------
-
+ 
 -GCCVER=`(gcc -dumpversion) 2>/dev/null`
 -if [ "$GCCVER" != "" ]; then
 -  # then strip off whatever prefix egcs prepends the number with...
@@ -47,16 +47,10 @@
 -  # major and minor version numbers.
 -  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
 -  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
--fi
--
--# Only set CC if not supplied already
--if [ -z "$CC" ]; then
--# figure out if gcc is available and if so we use it otherwise
--# we fallback to whatever cc does on the system
 +if [ -z "$CC" ];then
 +  GCCVER=`(gcc -dumpversion) 2>/dev/null`
-   if [ "$GCCVER" != "" ]; then
-     CC=gcc
++ if [ "$GCCVER" != "" ]; then
++   CC=gcc
 +    # then strip off whatever prefix egcs prepends the number with...
 +    # Hopefully, this will work for any future prefixes as well.
 +    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
@@ -65,21 +59,31 @@
 +    # major and minor version numbers.
 +    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
 +    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-   else
-     CC=cc
-   fi
++ else
++   CC=cc
++ fi
 +else
 +    CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
  fi
-+
+ 
+-# Only set CC if not supplied already
+-if [ -z "$CC" ]; then
+-# figure out if gcc is available and if so we use it otherwise
+-# we fallback to whatever cc does on the system
+-  if [ "$GCCVER" != "" ]; then
+-    CC=gcc
+-  else
+-    CC=cc
+-  fi
+-fi
  GCCVER=${GCCVER:-0}
  if [ "$SYSTEM" = "HP-UX" ];then
-   # By default gcc is a ILP32 compiler (with long long == 64). 
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map	Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+   # By default gcc is a ILP32 compiler (with long long == 64).
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	Fri Mar 26 16:10:09 2010
+@@ -1,1 +1,3296 @@
 -dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
 +	global:
 +ACCESS_DESCRIPTION_free;
 +ACCESS_DESCRIPTION_it;
@@ -1398,7 +1402,7 @@
 +KRB5_TKTBODY_free;
 +KRB5_TKTBODY_it;
 +KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
 +LONG_it;
 +MD2;
 +MD2_Final;
@@ -3374,11 +3378,12 @@
 +	local:
 +		*;
 +};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map	Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map	Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
++
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map	Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	Fri Mar 26 16:11:27 2010
+@@ -1,1 +1,446 @@
 -dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
 +	global:
 +BIO_f_ssl;
 +BIO_new_buffer_ssl_connect;
@@ -3391,7 +3396,7 @@
 +DTLSv1_method;
 +DTLSv1_server_method;
 +ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
 +SSL_CIPHER_description;
 +SSL_CIPHER_get_bits;
 +SSL_CIPHER_get_name;
@@ -3823,3 +3828,4 @@
 +		*;
 +};
 +
++
diff --git a/openssl/version.mk b/openssl/version.mk
index 6eb8862cd883..613f65a3d59a 100644
--- a/openssl/version.mk
+++ b/openssl/version.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -26,8 +26,8 @@
 #*************************************************************************
 
 
-OPENSSL_VERSION=0.9.8g
+OPENSSL_VERSION=0.9.8o
 
 .IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8l
+OPENSSL_NAME=openssl-0.9.8o
 .ENDIF
\ No newline at end of file