diff options
author | Tobias Krause <tkr@openoffice.org> | 2007-10-02 08:03:13 +0000 |
---|---|---|
committer | Tobias Krause <tkr@openoffice.org> | 2007-10-02 08:03:13 +0000 |
commit | 5c811d17334474945b173550564d89ed1be5d6dd (patch) | |
tree | 365d674a7c84afcaa9ac3eb3e9d4155e7afcbf4f /openssl | |
parent | 1489095f3e1374a1da82460b442e8358cfd44f2a (diff) |
#31053# https webdav support
Diffstat (limited to 'openssl')
-rw-r--r-- | openssl/makefile.mk | 108 | ||||
-rw-r--r-- | openssl/openssl.patch | 31 | ||||
-rw-r--r-- | openssl/prj/build.lst | 3 | ||||
-rw-r--r-- | openssl/prj/d.lst | 18 | ||||
-rw-r--r-- | openssl/version.mk | 41 |
5 files changed, 201 insertions, 0 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk new file mode 100644 index 000000000000..51f738bb5c2a --- /dev/null +++ b/openssl/makefile.mk @@ -0,0 +1,108 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.10 $ +# +# last change: $Author: tkr $ $Date: 2007-10-02 09:00:10 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +PRJ=. + +PRJNAME=so_openssl +TARGET=so_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.8a + +TARFILE_NAME=$(OPENSSL_NAME) + +CONFIGURE_DIR=. +CONFIGURE_ACTION=config +CONFIGURE_FLAGS=shared + +BUILD_DIR=. +BUILD_ACTION=make + +.IF "$(OS)" == "SOLARIS" +CONFIGURE_DIR=. +CONFIGURE_ACTION=Configure solaris-sparcv9-gcc +.IF "$(PROCTYPE)" == "x86" +CONFIGURE_ACTION=Configure solaris-x86-gcc +.ENDIF +.IF "$(PROCTYPE)" == "x86_64" +CONFIGURE_ACTION=Configure solaris-x86_64-gcc +.ENDIF +CONFIGURE_FLAGS=shared + +BUILD_DIR=. +BUILD_ACTION=make + +.ENDIF + +.IF "$(OS)" == "WNT" +OPENSSL_NAME=openssl-0.9.8e + +PATCH_FILE_NAME=openssl.patch + +CONFIGURE_DIR=. +CONFIGURE_ACTION=$(PERL) configure +CONFIGURE_FLAGS=VC-WIN32 + +#.IMPORT .IGNORE : SOLARINC +#INCLUDE := $(SOLARINC:s/-I/;) +#.EXPORT : INCLUDE + +BUILD_DIR=. +BUILD_ACTION=cmd /c "ms\do_ms $(PERL)" && nmake -f ms/ntdll.mak +.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 + diff --git a/openssl/openssl.patch b/openssl/openssl.patch new file mode 100644 index 000000000000..20172aeac273 --- /dev/null +++ b/openssl/openssl.patch @@ -0,0 +1,31 @@ +--- misc/build/openssl-0.9.8e/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200 ++++ misc/build/openssl-0.9.8e/ms/do_ms.bat 2007-08-23 15:04:58.218750000 +0200 +@@ -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 + +-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 +-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak +-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak +- +-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/build/openssl-0.9.8e/util/mk1mf.pl 2006-11-30 14:04:43.000000000 +0100 ++++ misc/build/openssl-0.9.8e/util/mk1mf.pl 2007-10-02 09:12:46.343750000 +0200 +@@ -115,7 +115,7 @@ + $inc_def="outinc"; + $tmp_def="tmp"; + +-$perl="perl" unless defined $perl; ++$perl="$ENV{PERL}" unless defined $perl; + $mkdir="-mkdir" unless defined $mkdir; + + ($ssl,$crypto)=("ssl","crypto"); + diff --git a/openssl/prj/build.lst b/openssl/prj/build.lst new file mode 100644 index 000000000000..1adcd146c3bf --- /dev/null +++ b/openssl/prj/build.lst @@ -0,0 +1,3 @@ +xh openssl : soltools external EXPAT:expatNULL +xh openssl usr1 - all xh_mkout NULL +xh openssl nmake - all xh_openssl NULL
\ No newline at end of file diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst new file mode 100644 index 000000000000..90a50a5136b4 --- /dev/null +++ b/openssl/prj/d.lst @@ -0,0 +1,18 @@ +mkdir: %_DEST%\inc%_EXT%\external +mkdir: %_DEST%\inc%_EXT%\external\openssl +..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk +..\%__SRC%\misc\build\openssl-0.9.8e\inc32\openssl\* %_DEST%\inc%_EXT%\external\openssl\* +..\%__SRC%\misc\build\openssl-0.9.8a\include\openssl\* %_DEST%\inc%_EXT%\external\openssl\* +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.exp +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\libeay32.lib %_DEST%\lib%_EXT%\libeay32.exp +..\%__SRC%\misc\build\openssl-0.9.8e\out32dll\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll +..\%__SRC%\misc\build\openssl-0.9.8a\out32dll\ssleay32.so %_DEST%\bin%_EXT%\ssleay32.so +..\%__SRC%\misc\build\openssl-0.9.8a\out32dll\libeay32.so %_DEST%\bin%_EXT%\libeay32.so +..\%__SRC%\misc\build\openssl-0.9.8a\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a +..\%__SRC%\misc\build\openssl-0.9.8a\libcrypto.so.0.9.8 %_DEST%\lib%_EXT%\libcrypto.so +..\%__SRC%\misc\build\openssl-0.9.8a\libssl.a %_DEST%\lib%_EXT%\libssl.a +..\%__SRC%\misc\build\openssl-0.9.8a\libssl.so.0.9.8 %_DEST%\lib%_EXT%\libssl.so + diff --git a/openssl/version.mk b/openssl/version.mk new file mode 100644 index 000000000000..65b32a60b9b1 --- /dev/null +++ b/openssl/version.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: version.mk,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: tkr $ $Date: 2007-10-02 09:00:50 $ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + + +OPENSSL_VERSION=0.9.8a + +.IF "$(OS)" == "WNT" +OPENSSL_NAME=openssl-0.9.8e +.ENDIF
\ No newline at end of file |