From dc420fd3eab4bfb4f2d49f0d640dfae33fcd00c0 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 10 Sep 2009 22:33:17 +0000
Subject: CWS-TOOLING: integrate CWS mh232 2009-08-26 03:52:57 +0200 mh 
 r275385 : #i102182# FreeBSD patch 2009-08-26 03:43:20 +0200 mh  r275384 :
 #i101333# patch for FreeBSD 2009-08-26 03:11:20 +0200 mh  r275383 : #i39230
 2009-08-26 03:07:51 +0200 mh  r275382 : #i39230# more space for initials
 field 2009-08-26 02:41:19 +0200 mh  r275380 : #i39230# use vos::osecurity for
 reading the user name 2009-08-18 22:06:00 +0200 mh  r275130 : #i104243#, line
 ending problem with newer perl 2009-08-18 21:53:21 +0200 mh  r275129 :
 #i39230# read initials via getpwnam 2009-08-18 21:34:05 +0200 mh  r275128 :
 enable CAIROCANVAS for Linux and Mac, #i88613# 2009-08-17 18:02:59 +0200 mh 
 r275067 : #i95498# make compile with gcc3

---
 openssl/makefile.mk   |  2 +-
 openssl/openssl.patch | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'openssl')

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 22920c296b98..10f720662e38 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -65,7 +65,7 @@ OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
 OUT2INC += include/openssl/*
 
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
     PATCH_FILES=openssllnx.patch
     ADDITIONAL_FILES:= \
         libcrypto_OOo_0_9_8k.map \
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index ed475400e2e0..90e9db0e2526 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -50,7 +50,19 @@
  $mkdir="-mkdir" unless defined $mkdir;
  
  ($ssl,$crypto)=("ssl","crypto");
-@@ -570,7 +570,7 @@
+@@ -277,6 +277,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 @@
  printf OUT <<EOF;
  #ifdef $platform_cpp_symbol
    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
-- 
cgit