[Libreoffice-commits] core.git: 2 commits - download.lst openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslwnt.patch openssl/UnpackedTarball_openssl.mk sal/Library_sal.mk sal/osl

Tue Sep 3 07:39:42 PDT 2013

download.lst                       |    2 -
 openssl/UnpackedTarball_openssl.mk |    3 -
 openssl/openssl-asm-fix.patch      |   11 ------
 openssl/opensslios.patch           |    6 +--
 openssl/openssllnx.patch           |   59 ++++---------------------------------
 openssl/opensslwnt.patch           |   31 ++++++-------------
 sal/Library_sal.mk                 |   14 +++++++-
 sal/osl/unx/file.cxx               |    2 -
 sal/osl/unx/uunxapi.cxx            |    2 -
 sal/osl/unx/uunxapi.mm             |    1 
 10 files changed, 37 insertions(+), 94 deletions(-)

New commits:
commit d81da41c9d121f5ec452545b686a71c51a117eed
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Sep 3 16:50:50 2013 +0300

    Don't compile all of the sal library as Objective-C++ on OS X after all
    
    I doubt it affects ABI, but let's not take the risk.
    
    Instead, just compile the uunxapi.cxx file (which has no public API)
    as Objective-C++, as that is now the only one where Objective-C API is
    used.
    
    This reverts part of d22c94dbf16d18bce39f060aa21f3083169426ca
    
    Change-Id: I240dbb36529c419b81b062f6fe860a9e621c2400

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 093546f..8024e3f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
-ifneq (,$(filter IOS MACOSX,$(OS)))
+ifeq ($(OS),IOS)
 $(eval $(call gb_Library_add_cxxflags,sal,\
     $(gb_OBJCXXFLAGS) \
 ))
@@ -162,7 +162,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
         $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
-	sal/osl/unx/uunxapi \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/unx/mutex \
@@ -183,6 +182,17 @@ $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
 		-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
+# Note that the uunxapi.mm file just includes the uunxapi.cxx one
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sal,\
+	sal/osl/unx/uunxapi \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/unx/uunxapi \
+))
+endif
+
 ifneq ($(filter $(OS),MACOSX IOS),)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/osxlocale \
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 4ae6ef6..571a79c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 316f75a..d411645 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.mm b/sal/osl/unx/uunxapi.mm
new file mode 100644
index 0000000..5a7e17f
--- /dev/null
+++ b/sal/osl/unx/uunxapi.mm
@@ -0,0 +1 @@
+#include "uunxapi.cxx"
commit dd3293b83aa7bdb5688005d3906a0de536631487
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 30 19:56:52 2013 +0300

    Upgrade the bundled OpenSSL to 1.0.1e
    
    Change-Id: I5bc15cd2a6e35a7e4dd203ceffb3b49e5949855c

diff --git a/download.lst b/download.lst
index b5a6efc..11fe899 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export ODFGEN_TARBALL := 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
+export OPENSSL_TARBALL := 66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
diff --git a/openssl/UnpackedTarball_openssl.mk b/openssl/UnpackedTarball_openssl.mk
index 92ce3da..cd59f7d 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/openssl/UnpackedTarball_openssl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 	include/openssl/pem2.h \
 	include/openssl/pkcs12.h \
 	include/openssl/pkcs7.h \
-	include/openssl/pq_compat.h \
 	include/openssl/pqueue.h \
 	include/openssl/rand.h \
 	include/openssl/ripemd.h \
@@ -58,7 +57,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 	include/openssl/ssl23.h \
 	include/openssl/ssl3.h \
 	include/openssl/stack.h \
-	include/openssl/store.h \
 	include/openssl/symhacks.h \
 	include/openssl/tls1.h \
 	include/openssl/ui.h \
@@ -69,7 +67,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-	openssl/openssl-asm-fix.patch \
 	$(if $(filter LINUX FREEBSD ANDROID,$(OS)),openssl/openssllnx.patch) \
 	$(if $(filter WNTGCC,$(OS)$(COM)),openssl/opensslmingw.patch) \
 	$(if $(filter MSC,$(COM)),openssl/opensslwnt.patch) \
diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch
deleted file mode 100644
index dd6fa78..0000000
--- a/openssl/openssl-asm-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/openssl-0.9.8v/crypto/md32_common.h.sav	2010-03-29 13:23:11.000000000 +0200
-+++ build/openssl-0.9.8v/crypto/md32_common.h	2012-03-16 12:39:14.986941958 +0100
-@@ -165,7 +165,7 @@
- 				asm (			\
- 				"roll %1,%0"		\
- 				: "=r"(ret)		\
--				: "I"(n), "0"(a)	\
-+				: "I"(n), "0"((unsigned int)(a))	\
- 				: "cc");		\
- 			   ret;				\
- 			})
diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch
index 3f00839..e3e1c21 100644
--- a/openssl/opensslios.patch
+++ b/openssl/opensslios.patch
@@ -1,10 +1,10 @@
 --- misc/openssl-0.9.8v/Configure
 +++ build/openssl-0.9.8v/Configure
 @@ -530,6 +530,9 @@
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ # iPhoneOS/iOS
+ "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  
-+##### iOS
++##### iOS in the LibreOffice case
 +"ios-armv7","gcc:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::",
 +
  ##### A/UX
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index b3c99c9..23a7d9e 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -14,55 +14,10 @@
 +++ build/openssl-0.9.8v/Makefile.org	2010-09-20 09:24:00.000000000 +0100
 @@ -199,7 +199,7 @@
  
- BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
- 		CC='${CC}' CFLAG='${CFLAG}' 			\
--		AS='${CC}' ASFLAG='${CFLAG} -c'			\
-+		AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack'	\
- 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
- 		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
- 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
---- misc/openssl-0.9.8v/config	2009-02-16 09:43:41.000000000 +0100
-+++ build/openssl-0.9.8v/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...
--  # Hopefully, this will work for any future prefixes as well.
--  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
--  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
--  # does give us what we want though, so we use that.  We just just the
--  # 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 [ "$GCCVER" != "" ]; then
--    CC=gcc
--  else
--    CC=cc
--  fi
-+if [ -z "$CC" ];then
-+   GCCVER=`(gcc -dumpversion) 2>/dev/null`
-+   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]*\-//'`
-+     # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-+     # does give us what we want though, so we use that.  We just just the
-+     # 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
- fi
- GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
+ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+ 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
+-		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
++		AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack'	\
+ 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
+ 		CROSS_COMPILE='$(CROSS_COMPILE)'	\
+ 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
diff --git a/openssl/opensslwnt.patch b/openssl/opensslwnt.patch
index a28a24f..b68e037 100644
--- a/openssl/opensslwnt.patch
+++ b/openssl/opensslwnt.patch
@@ -81,9 +81,9 @@
  LFLAGS=$lflags
 -RSC=$rsc
 +RSC=$rsc \$(SOLARINC)
- FIPSLINK=\$(PERL) util${o}fipslink.pl
  
- AES_ASM_OBJ=$aes_asm_obj
+ # The output directory for everything intersting
+ OUT_D=$out_dir
 @@ -730,7 +735,7 @@
  printf OUT <<EOF;
  #ifdef $platform_cpp_symbol
@@ -108,21 +108,21 @@
      }
  
      $cc='$(CC)';
--    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
-+    $base_cflags=' -W3 -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
+-    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
++    $base_cflags=' -W3 -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
      $base_cflags.=" $wcecdefs";
+     $base_cflags.=' -I$(WCECOMPAT)/include'		if (defined($ENV{'WCECOMPAT'}));
+     $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include'	if (defined($ENV{'PORTSDK_LIBPATH'}));
 -    $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...
--    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
+-    $dbg_cflags=' /MC /Od -DDEBUG -D_DEBUG';
 +    $opt_cflags=' -MC -O1i';	# optimize for space, but with intrinsics...
-+    $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG';
++    $dbg_cflags=' -MC -Od -DDEBUG -D_DEBUG';
      $lflags="/nologo /opt:ref $wcelflag";
      }
  else	# Win32
      {
--    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-+    $base_cflags=' -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-     $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
-     $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8
+-    $base_cflags= " $mf_cflag";
++    $base_cflags= " $mf_cflag";
 -    my $f = $shlib || $fips ?' /MD':' /MT';
 -    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
 -    $opt_cflags=$f.' /Ox /O2 /Ob2';
@@ -135,23 +135,14 @@
      }
  $mlflags='';
 @@ -138,7 +138,7 @@
- 	}
  
  $obj='.obj';
+ $asm_suffix='.asm';
 -$ofile="/Fo";
 +$ofile="-Fo.\\";
  
  # EXE linking stuff
  $link="link";
-@@ -298,7 +298,7 @@
- 	$tmp_def='tmp32dll_$(TARGETCPU)';
- 	}
- 
--$cflags.=" /Fd$out_def";
-+$cflags.=" -Fd$out_def";
- 
- sub do_lib_rule
- 	{
 --- build/openssl-0.9.8v/ms/uplink.c
 +++ build/openssl-0.9.8v/ms/uplink.c
 @@ -1,5 +1,6 @@
