convert openssl to gbuild and add to tail_build

Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3
Reviewed-on: https://gerrit.libreoffice.org/1495Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>

Module_tail_build.mk

@@ -70,7 +70,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	embedserv \
 	$(call gb_Helper_optional,EPM,epm) \
 	eventattacher \
+	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
+	external \
 	extras \
 	fileaccess \
 	filter \
@@ -130,11 +132,13 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	oovbaapi \
 	oox \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
+	$(call gb_Helper_optional,OPENSSL,openssl) \
 	package \
 	padmin \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	psprint_config \
 	$(call gb_Helper_optional,PYUNO,pyuno) \
+	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	readlicense_oo \
 	$(call gb_Helper_optional,REDLAND,redland) \

RepositoryExternal.mk

@@ -1021,6 +1021,9 @@ endif # SYSTEM_ICU
 
 ifeq ($(SYSTEM_OPENSSL),YES)
 
+gb_LinkTarget__use_openssl_headers:=
+gb_ExternalProject__use_openssl:=
+
 define gb_LinkTarget__use_openssl
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
@@ -1044,7 +1047,21 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 endif
 
+define gb_ExternalProject__use_openssl
+$(call gb_ExternalProject_use_package,$(1),openssl)
+
+endef
+
+define gb_LinkTarget__use_openssl_headers
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
+	$$(INCLUDE) \
+)
+
+endef
+
 define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_use_package,$(1),openssl)
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_libraries,$(1),\
 	crypto \

RepositoryModule_ooo.mk

@@ -138,6 +138,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	oovbaapi \
 	oox \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
+	$(call gb_Helper_optional,OPENSSL,openssl) \
 	package \
 	padmin \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \

neon/Library_neon.mk

@@ -14,6 +14,7 @@ $(eval $(call gb_Library_use_unpacked,neon,neon))
 $(eval $(call gb_Library_use_externals,neon,\
 	libxml2 \
 	openssl \
+	openssl_headers \
 	zlib \
 ))
 

oox/Library_oox.mk

@@ -81,7 +81,10 @@ $(eval $(call gb_Library_use_libraries,oox,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_external,oox,openssl))
+$(eval $(call gb_Library_use_externals,oox,\
+	openssl \
+	openssl_headers \
+))
 
 $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
 

openssl/ExternalPackage_openssl.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
+
+$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_files,openssl,lib,\
+	out32dll/ssleay32.lib \
+	out32dll/libeay32.lib \
+))
+$(eval $(call gb_ExternalPackage_add_files,openssl,bin,\
+	out32dll/ssleay32.dll \
+	out32dll/libeay32.dll \
+))
+else
+$(eval $(call gb_ExternalPackage_add_files,openssl,lib,\
+	libcrypto.a \
+	libssl.a \
+))
+endif
+# vim: set noet sw=4 ts=4:

openssl/ExternalProject_openssl.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,openssl))
+
+$(eval $(call gb_ExternalProject_use_unpacked,openssl,openssl))
+
+$(eval $(call gb_ExternalProject_register_targets,openssl,\
+	build \
+))
+
+OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
+	$(if $(filter I,$(CPU)),\
+	$(if $(filter GNU/kFreeBSD,$(shell uname)),\
+	debian-kfreebsd-i386,linux-elf),\
+	linux-generic32),\
+	$(if $(filter SOLARIS,$(OS)),\
+	$(if $(filter INTEL,$(CPUNAME)),\
+	$(if $(filter X,$(CPU)),\
+	solaris64-x86_64-cc,solaris-x86-cc),\
+	solaris-sparcv9-cc),\
+	$(if $(filter IOS,$(OS)),\
+	ios-armv7,\
+	$(if $(filter WNT,$(OS)),\
+	$(if $(filter GCC,$(COM)),\
+	mingw,\
+	$(if $(filter I,$(CPU)),\
+	VC-WIN32,VC_WIN64A))))))
+
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,openssl,build):
+	cd $(EXTERNAL_WORKDIR) \
+	&& export CC="$(shell cygpath -w $(CC))" \
+	&& export PERL="$(shell cygpath -w $(PERL))" \
+	&& export LIB="$(ILIB)" \
+	&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \
+	&& cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \
+	&& unset MAKEFLAGS \
+	&& nmake -f "ms\ntdll.mak" \
+	&& touch $@
+else
+$(call gb_ExternalProject_get_state_target,openssl,build):
+	cd $(EXTERNAL_WORKDIR) \
+	&& MAKE="$(MAKE) -j1" \
+	$(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\
+	$(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
+	$(OPENSSL_PLATFORM) \
+	$(if $(filter ANDROID,$(OS)),\
+	shared no-idea,\
+	$(if $(filter IOS,$(OS)),no-shared no-idea,\
+	$(if $(filter WNT,$(OS)),shared,\
+	shared no-idea \
+	$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \
+	$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+	&& export MAKEFLAGS="$(MAKEFLAGS:r=)" \
+	&& $(MAKE) -j1 build_libs \
+	CC="$(CC) $(if $(filter-out WNT,$(OS)),\
+	$(if $(filter TRUE,$(HAVE_GCC_VISIBILTIY_FEATURE)),\
+	-fvisibility=hidden))" \
+	&& touch $@
+endif
+# vim: set noet sw=4 ts=4:

openssl/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

openssl/Module_openssl.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,openssl))
+
+ifeq ($(SYSTEM_OPENSSL),NO)
+$(eval $(call gb_Module_add_targets,openssl,\
+	UnpackedTarball_openssl \
+	ExternalPackage_openssl \
+	ExternalProject_openssl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

openssl/UnpackedTarball_openssl.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL)))
+
+# hack to fix symlinks with MSVC
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
+	include/openssl/asn1.h \
+	include/openssl/bio.h \
+	include/openssl/bn.h \
+	include/openssl/buffer.h \
+	include/openssl/comp.h \
+	include/openssl/conf.h \
+	include/openssl/crypto.h \
+	include/openssl/des.h \
+	include/openssl/des_old.h \
+	include/openssl/dh.h \
+	include/openssl/dsa.h \
+	include/openssl/dtls1.h \
+	include/openssl/e_os2.h \
+	include/openssl/ec.h \
+	include/openssl/ecdh.h \
+	include/openssl/ecdsa.h \
+	include/openssl/err.h \
+	include/openssl/evp.h \
+	include/openssl/hmac.h \
+	include/openssl/kssl.h \
+	include/openssl/lhash.h \
+	include/openssl/md4.h \
+	include/openssl/md5.h \
+	include/openssl/obj_mac.h \
+	include/openssl/objects.h \
+	include/openssl/opensslconf.h \
+	include/openssl/opensslv.h \
+	include/openssl/ossl_typ.h \
+	include/openssl/pem.h \
+	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 \
+	include/openssl/rsa.h \
+	include/openssl/safestack.h \
+	include/openssl/sha.h \
+	include/openssl/ssl.h \
+	include/openssl/ssl2.h \
+	include/openssl/ssl23.h \
+	include/openssl/ssl3.h \
+	include/openssl/stack.h \
+	include/openssl/symhacks.h \
+	include/openssl/tls1.h \
+	include/openssl/ui.h \
+	include/openssl/ui_compat.h \
+	include/openssl/x509.h \
+	include/openssl/x509_vfy.h \
+	include/openssl/x509v3.h \
+))
+
+$(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) \
+	$(if $(filter SOLARIS,$(OS)),openssl/opensslsol.patch) \
+	$(if $(filter IOS,$(OS)),openssl/opensslios.patch) \
+))
+
+# vim: set noet sw=4 ts=4:

openssl/makefile.mk

-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=openssl
-TARGET=openssl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-@all:
-    @echo "Using system openssl...."
-.ENDIF
-
-.IF "$(DISABLE_OPENSSL)" == "TRUE"
-@all:
-    @echo "openssl disabled...."
-.ENDIF
-
-OPENSSL_NAME=openssl-0.9.8v
-
-TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
-PATCH_FILES=openssl-asm-fix.patch
-
-CONFIGURE_DIR=.
-CONFIGURE_ACTION=config
-.IF "$(OS)" == "ANDROID"
-CONFIGURE_FLAGS=shared no-idea
-.ELSE
-# explicitly including /usr/include seems hyper-broken anyway but ...
-CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
-    --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-
-BUILD_DIR=.
-
-COMPILER_AND_FLAGS=$(CC)
-#See fdo#35404 If we're only interested in getting a .a (i.e. not windows) then
-#force everything, when possible, as hidden symbols
-.IF "$(OS)" != "WNT" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-COMPILER_AND_FLAGS+=-fvisibility=hidden
-.ENDIF
-
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1
-
-OUT2LIB = libssl.*
-OUT2LIB += libcrypto.*
-OUT2INC += include/openssl/*
-
-UNAME=$(shell uname)
-
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
-    PATCH_FILES+=openssllnx.patch
-    ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8v.map \
-        libssl_OOo_0_9_8v.map
-    .IF "$(CPU)" == "I"
-        .IF "$(UNAME)" == "GNU/kFreeBSD"
-            CONFIGURE_ACTION=Configure debian-kfreebsd-i386
-        .ELSE
-            CONFIGURE_ACTION=Configure linux-elf
-        .ENDIF
-    .ELIF "$(BUILD64)" == "1"
-        .IF "$(UNAME)" == "GNU/kFreeBSD"
-            CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
-        .ELSE
-            CONFIGURE_ACTION=Configure linux-generic64
-        .ENDIF
-    .ELSE
-        CONFIGURE_ACTION=Configure linux-generic32
-    .ENDIF
-    # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
-    #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map'
-.ENDIF
-
-.IF "$(OS)" == "SOLARIS"
-    PATCH_FILES+=opensslsol.patch
-    ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8v.map \
-        libssl_OOo_0_9_8v.map
-    #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8v.map'
-
-    # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
-
-    .IF "$(CPUNAME)" == "INTEL" # Solaris INTEL
-        .IF "$(CPU)" == "X"
-           CONFIGURE_ACTION=Configure solaris64-x86_64-cc
-        .ELSE
-           CONFIGURE_ACTION=Configure solaris-x86-cc
-        .ENDIF
-    .ELIF "$(CPU)" == "U" # Solaris SPARC
-       CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
-    .ELSE
-       CONFIGURE_ACTION=Configure solaris-sparcv9-cc
-    .ENDIF
-.ENDIF
-
-.IF "$(OS)" == "IOS"
-    PATCH_FILES+=opensslios.patch
-    CONFIGURE_ACTION=Configure ios-armv7
-    CONFIGURE_FLAGS=no-shared no-idea
-.ENDIF
-
-.IF "$(OS)" == "WNT"
-
-.IF "$(COM)"=="GCC"
-PATCH_FILES+=opensslmingw.patch
-CONFIGURE_ACTION=$(PERL) Configure
-CONFIGURE_FLAGS=mingw shared 
-INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
-OUT2LIB = libcrypto_static.*
-OUT2LIB += libssl_static.*
-OUT2LIB += libcrypto.*
-OUT2LIB += libssl.*
-OUT2BIN = ssleay32.dll
-OUT2BIN += libeay32.dll
-.ELSE
-
-        PATCH_FILES+=openssl.patch
-        .IF "$(MAKETARGETS)" == ""
-            # 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)"==""
-                CC!:=$(subst,/,\ $(normpath,1 $(CC:1)))
-				CC!:=$(CC:s/ccache/ccache cl.exe/)
-                .EXPORT : CC
-            .ENDIF
-            PERL_bak:=$(PERL)
-            PERL!:=$(subst,/,\ $(normpath,1 $(PERL)))
-            .EXPORT : PERL
-            PERL!:=$(PERL_bak)
-        .ENDIF
-
-        #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
-        CONFIGURE_ACTION=$(PERL) configure
-.IF "$(CPU)" == "I"
-        OPENSSL_PLATFORM=VC-WIN32
-.ELSE
-        OPENSSL_PLATFORM=VC-WIN64A
-.ENDIF
-        CONFIGURE_FLAGS=$(OPENSSL_PLATFORM) no-idea
-        BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) $(OPENSSL_PLATFORM)" && nmake -f ms/ntdll.mak
-
-        OUT2LIB = out32dll$/ssleay32.lib
-        OUT2LIB += out32dll$/libeay32.lib
-        OUT2BIN = out32dll$/ssleay32.dll
-        OUT2BIN += out32dll$/libeay32.dll
-        OUT2INC = inc32$/openssl$/*
-    .ENDIF
-.ENDIF
-
-#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-

openssl/openssl-asm-fix.patch

---- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav	2010-03-29 13:23:11.000000000 +0200
-+++ misc/build/openssl-0.9.8v/crypto/md32_common.h	2012-03-16 12:39:14.986941958 +0100
+--- 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"		\

openssl/opensslios.patch

 --- misc/openssl-0.9.8v/Configure
-+++ misc/build/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",

openssl/openssl.patch → openssl/opensslwnt.patch

 --- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c	2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c	2010-03-26 12:04:20.961547300 +0100
++++ build/openssl-0.9.8v/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)
@@ -10,7 +10,7 @@
   * All rights reserved.
   *
 --- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c	2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c	2010-03-26 12:04:20.961547300 +0100
++++ build/openssl-0.9.8v/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)
@@ -21,7 +21,7 @@
   * All rights reserved.
   *
 --- misc/openssl-0.9.8v/ms/do_ms.bat	2009-07-28 14:51:19.000000000 +0200
-+++ misc/build/openssl-0.9.8v/ms/do_ms.bat	2010-03-26 12:19:19.399047300 +0100
++++ build/openssl-0.9.8v/ms/do_ms.bat	2010-03-26 12:19:19.399047300 +0100
 @@ -1,11 +1,11 @@
  
 -perl util\mkfiles.pl >MINFO
@@ -44,7 +44,7 @@
 +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
 +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
 --- misc/openssl-0.9.8v/util/mk1mf.pl	2009-09-20 14:46:42.000000000 +0200
-+++ misc/build/openssl-0.9.8v/util/mk1mf.pl	2010-03-26 12:04:20.977172300 +0100
++++ build/openssl-0.9.8v/util/mk1mf.pl	2010-03-26 12:04:20.977172300 +0100
 @@ -128,7 +128,7 @@
  $inc_def="outinc";
  $tmp_def="tmp";
@@ -66,6 +66,24 @@
  	if ($key eq "RELATIVE_DIRECTORY")
  		{
  		if ($lib ne "")
+@@ -529,7 +529,7 @@
+ # Set your compiler options
+ PLATFORM=$platform
+ CC=$bin_dir${cc}
+-CFLAG=$cflags
++CFLAG=$cflags \$(SOLARINC)
+ APP_CFLAG=$app_cflag
+ LIB_CFLAG=$lib_cflag
+ SHLIB_CFLAG=$shl_cflag
+@@ -544,7 +544,7 @@
+ 
+ LINK=$link
+ LFLAGS=$lflags
+-RSC=$rsc
++RSC=$rsc \$(SOLARINC)
+ FIPSLINK=\$(PERL) util${o}fipslink.pl
+ 
+ AES_ASM_OBJ=$aes_asm_obj
 @@ -730,7 +735,7 @@
  printf OUT <<EOF;
  #ifdef $platform_cpp_symbol
@@ -76,7 +94,7 @@
  EOF
  printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
 --- misc/openssl-0.9.8v/util/pl/VC-32.pl	2010-02-04 02:10:24.000000000 +0100
-+++ misc/build/openssl-0.9.8v/util/pl/VC-32.pl	2010-03-26 12:04:20.977172300 +0100
++++ build/openssl-0.9.8v/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;
  
@@ -134,8 +152,8 @@
  
  sub do_lib_rule
  	{
---- misc/build/openssl-0.9.8v/ms/uplink.c
-+++ misc/build/openssl-0.9.8v/ms/uplink.c
+--- build/openssl-0.9.8v/ms/uplink.c
++++ build/openssl-0.9.8v/ms/uplink.c
 @@ -1,5 +1,6 @@
  #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
  #define UNICODE

openssl/prj/build.lst

 ssl      openssl  :  soltools external EXPAT:expat NULL
-ssl      openssl     usr1           -       all     ssl_mkout NULL
 ssl      openssl     nmake          -       all     ssl_openssl NULL 

openssl/prj/d.lst

-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\openssl
-..\version.mk %_DEST%\inc\external\openssl\version.mk
-..\%__SRC%\inc\*.h %_DEST%\inc\external\openssl
-..\%__SRC%\lib\ssleay32.lib %_DEST%\lib\ssleay32.lib
-..\%__SRC%\bin\ssleay32.dll %_DEST%\bin\ssleay32.dll
-..\%__SRC%\lib\libeay32.lib %_DEST%\lib\libeay32.lib
-..\%__SRC%\bin\libeay32.dll %_DEST%\bin\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib\libssl.a
- 

openssl/version.mk

-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-OPENSSL_VERSION=0.9.8v
-
-.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8v
-.ENDIF
\ No newline at end of file

postgresql/ExternalProject_postgresql.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql))
 
 $(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
 
+$(eval $(call gb_ExternalProject_use_external,postgresql,openssl))
+
 $(eval $(call gb_ExternalProject_register_targets,postgresql,\
 	build \
 ))
@@ -33,8 +35,11 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		$(if $(filter YES,$(WITH_KRB5)),--with-krb5) \
 		$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \
+		CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\
+		-I$(call gb_UnpackedTarball_get_dir,openldap/include)) \
+		$(if $(filter NO,$(SYSTEM_OPENSSL)),\
+		-I$(call gb_UnpackedTarball_get_dir,openssl/include))" \
 		$(if $(filter NO,$(SYSTEM_OPENLDAP)), \
-			CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,openldap/include)" \
 			LDFLAGS="-L$(OUTDIR)/lib" \
 			EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
 		) \

python3/ExternalProject_python3.mk

@@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,python3))
 
 $(eval $(call gb_ExternalProject_use_unpacked,python3,python3))
 
-$(eval $(call gb_ExternalProject_use_external,python3,expat))
+$(eval $(call gb_ExternalProject_use_externals,python3,\
+	expat \
+	openssl \
+))
 
 $(eval $(call gb_ExternalProject_register_targets,python3,\
 	build \
@@ -75,8 +78,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			--enable-shared \
 		) \
 		CC="$(strip $(CC) \
-			$(if $(filter YES,$(SYSTEM_OPENSSL)),, -I$(OUTDIR)/inc/external) \
-			$(if $(filter YES,$(SYSTEM_EXPAT)),, -I$(OUTDIR)/inc/external/expat) \
+			$(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \
+			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \
 			$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \

python3/python-3.3.0-ssl.patch.1

@@ -47,7 +47,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -65,7 +65,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -83,7 +83,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -101,7 +101,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -119,7 +119,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -137,7 +137,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -155,7 +155,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -173,7 +173,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
  			<Tool
  				Name="VCCLCompilerTool"
 -				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
++				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
@@ -206,7 +206,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -223,7 +223,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
      </Midl>
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -237,7 +237,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -254,7 +254,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
      </Midl>
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -268,7 +268,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -285,7 +285,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
      </Midl>
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -300,7 +300,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -317,7 +317,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
      </Midl>
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
      <PreLinkEvent>
        <Command>
@@ -343,14 +343,12 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
 diff -ru python3.old_/setup.py python3/setup.py
 --- python3.old_/setup.py	2012-09-29 10:00:50.000000000 +0200
 +++ python3/setup.py	2012-11-13 14:18:23.484158149 +0100
-@@ -757,7 +757,12 @@
+@@ -757,7 +757,10 @@
          exts.append( Extension('_socket', ['socketmodule.c'],
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
-+        ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
-+            os.environ.get('INPATH') + '/' + \
-+            'inc'
-+        ooosslinc = ooosslinc + '/external/'
++        ooosslinc = os.environ.get('WORKDIR') + '/' + \
++            '/UnpackedTarball/openssl/include/'
          search_for_ssl_incs_in = [
 +                              ooosslinc,
                                '/usr/local/ssl/include',

redland/Library_rdf.mk

@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,rdf,\
 
 $(eval $(call gb_Library_use_externals,rdf,\
 	openssl \
+	openssl_headers \
 	raptor_headers \
 	rasqal_headers \
 ))

tail_build/prj/build.lst

-tb      tail_build : EXPAT:expat FONTCONFIG:fontconfig LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL
+tb      tail_build : FONTCONFIG:fontconfig LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss XPDF:xpdf solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL