[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/cws-kfreebsdport01v2.diff |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9c9a1582a51cd27469bc31ae49fcd03cc3d2de5e
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 18:30:06 2010 +0200

    "update" cws-kfreebsdport01v2.diff for m77
    
    * patches/dev300/cws-kfreebsdport01v2.diff: revert openssl 0.9.8n -> l
      change, as that''s not in DEV300 yet

diff --git a/patches/dev300/cws-kfreebsdport01v2.diff b/patches/dev300/cws-kfreebsdport01v2.diff
index de602de..b36a505 100644
--- a/patches/dev300/cws-kfreebsdport01v2.diff
+++ b/patches/dev300/cws-kfreebsdport01v2.diff
@@ -8093,8 +8093,8 @@ diff --git a/openssl/makefile.mk b/openssl/makefile.mk
  .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
  	PATCH_FILES=openssllnx.patch
  	ADDITIONAL_FILES:= \
- 		libcrypto_OOo_0_9_8n.map \
- 		libssl_OOo_0_9_8n.map
+ 		libcrypto_OOo_0_9_8l.map \
+ 		libssl_OOo_0_9_8l.map
  	.IF "$(CPU)" == "I"
 -		CONFIGURE_ACTION=Configure linux-elf
 +        .IF "$(UNAME)" == "GNU/kFreeBSD"
@@ -8116,8 +8116,8 @@ diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
 --- openssl/openssllnx.patch
 +++ openssl/openssllnx.patch
 @@ -1,3 +1,15 @@
-+--- misc/build/openssl-0.9.8n/Configure-old	2010-04-17 13:51:42.000000000 +0200
-++++ misc/build/openssl-0.9.8n/Configure	2010-04-17 13:52:03.000000000 +0200
++--- 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 @@
 + 
 + "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)",
@@ -8128,9 +8128,9 @@ diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
 + "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 + "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 + 
- --- misc/openssl-0.9.8n/config	2010-03-09 18:08:24.000000000 +0100
- +++ misc/build/openssl-0.9.8n/config	2010-03-26 15:21:12.049659235 +0100
- @@ -399,27 +399,21 @@
+ --- 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 @@
 diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
 --- sal/osl/unx/file_volume.cxx
 +++ sal/osl/unx/file_volume.cxx