Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Matthias Seidel
Hi Don,

Thanks for that!

Since NASM is now needed for Windows: If I install the 64bit version,
will it produce 32bit code?

Regards,

   Matthias

Am 07.10.19 um 22:52 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> truckman pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
>      new fccc850  Upgrade openssl to version 1.0.2t.  This requires NASM to build on Windows.
> fccc850 is described below
>
> commit fccc850397d17a256bb8797f46d2c77a9cdfd7aa
> Author: Don Lewis <[hidden email]>
> AuthorDate: Mon Oct 7 13:52:21 2019 -0700
>
>     Upgrade openssl to version 1.0.2t.  This requires NASM to build on Windows.
> ---
>  main/configure.ac             |  1 +
>  main/external_deps.lst        |  6 +++---
>  main/openssl/makefile.mk      |  4 ++--
>  main/openssl/openssl.patch    | 36 ++++++++++++++++++------------------
>  main/openssl/openssllnx.patch | 12 ++++++------
>  5 files changed, 30 insertions(+), 29 deletions(-)
>
> diff --git a/main/configure.ac b/main/configure.ac
> index 400f191..ce3e1bf 100644
> --- a/main/configure.ac
> +++ b/main/configure.ac
> @@ -5719,6 +5719,7 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes" -a "$SYSTEM_OPENSSL" = "NO"
>      AC_PATH_PROG(NASM_EXE, nasm.exe)
>      if test -z "$NASM_EXE"; then
>        with_nasm_home="NO_NASM_HOME"
> +      AC_MSG_ERROR([NASM is required to build on Windows, please install or use --with-nasm-home],,)
>      else
>        with_nasm_home="NASM_IN_PATH"
>      fi
> diff --git a/main/external_deps.lst b/main/external_deps.lst
> index 2b0ebe6..2088c80 100644
> --- a/main/external_deps.lst
> +++ b/main/external_deps.lst
> @@ -151,9 +151,9 @@ if (SOLAR_JAVA==TRUE)
>      URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
>  
>  if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
> -    MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df
> -    name = openssl-1.0.2p.tar.gz
> -    URL1 = https://www.openssl.org/source/openssl-1.0.2p.tar.gz
> +    MD5 = ef66581b80f06eae42f5268bc0b50c6d
> +    name = openssl-1.0.2t.tar.gz
> +    URL1 = https://www.openssl.org/source/openssl-1.0.2t.tar.gz
>      URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
>  
>  if ( true )
> diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
> index e66cc0e..7280aa2 100644
> --- a/main/openssl/makefile.mk
> +++ b/main/openssl/makefile.mk
> @@ -42,10 +42,10 @@ TARGET=openssl
>   @echo "openssl disabled...."
>  .ENDIF
>  
> -OPENSSL_NAME=openssl-1.0.2p
> +OPENSSL_NAME=openssl-1.0.2t
>  
>  TARFILE_NAME=$(OPENSSL_NAME)
> -TARFILE_MD5=ac5eb30bf5798aa14b1ae6d0e7da58df
> +TARFILE_MD5=ef66581b80f06eae42f5268bc0b50c6d
>  
>  CONFIGURE_DIR=.
>  CONFIGURE_ACTION=config
> diff --git a/main/openssl/openssl.patch b/main/openssl/openssl.patch
> index 1a6da37..54fae43 100644
> --- a/main/openssl/openssl.patch
> +++ b/main/openssl/openssl.patch
> @@ -1,6 +1,6 @@
> -diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
> ---- misc/openssl-1.0.2p/Configure 2018-08-14 05:49:04.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/Configure 2018-08-26 14:51:25.397910000 -0700
> +diff -ur misc/openssl-1.0.2t/Configure misc/build/openssl-1.0.2t/Configure
> +--- misc/openssl-1.0.2t/Configure 2018-08-14 05:49:04.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/Configure 2018-08-26 14:51:25.397910000 -0700
>  @@ -477,19 +477,20 @@
>   "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
>  
> @@ -56,9 +56,9 @@ diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
>   }
>   if ($depflags ne $default_depflags && !$make_depend) {
>      $warn_make_depend++;
> -diff -ur misc/openssl-1.0.2p/config misc/build/openssl-1.0.2p/config
> ---- misc/openssl-1.0.2p/config 2018-08-14 05:48:56.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/config 2018-08-26 14:49:34.431584000 -0700
> +diff -ur misc/openssl-1.0.2t/config misc/build/openssl-1.0.2t/config
> +--- misc/openssl-1.0.2t/config 2018-08-14 05:48:56.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/config 2018-08-26 14:49:34.431584000 -0700
>  @@ -762,14 +762,8 @@
>     sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
>     ia64-*-*bsd*) OUT="BSD-ia64" ;;
> @@ -76,9 +76,9 @@ diff -ur misc/openssl-1.0.2p/config misc/build/openssl-1.0.2p/config
>   *ELF*) OUT="BSD-x86-elf" ;;
>   *) OUT="BSD-x86"; options="$options no-sse2" ;;
>   esac ;;
> -diff -ur misc/openssl-1.0.2p/ms/do_ms.bat misc/build/openssl-1.0.2p/ms/do_ms.bat
> ---- misc/openssl-1.0.2p/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/ms/do_ms.bat 2018-08-26 14:49:34.432106000 -0700
> +diff -ur misc/openssl-1.0.2t/ms/do_ms.bat misc/build/openssl-1.0.2t/ms/do_ms.bat
> +--- misc/openssl-1.0.2t/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/ms/do_ms.bat 2018-08-26 14:49:34.432106000 -0700
>  @@ -1,11 +1,11 @@
>  
>  -perl util\mkfiles.pl >MINFO
> @@ -98,9 +98,9 @@ diff -ur misc/openssl-1.0.2p/ms/do_ms.bat misc/build/openssl-1.0.2p/ms/do_ms.bat
>  -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
> -diff -ur misc/openssl-1.0.2p/ms/do_win64a.bat misc/build/openssl-1.0.2p/ms/do_win64a.bat
> ---- misc/openssl-1.0.2p/ms/do_win64a.bat 2018-08-14 05:48:59.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/ms/do_win64a.bat 2018-08-26 14:49:34.432647000 -0700
> +diff -ur misc/openssl-1.0.2t/ms/do_win64a.bat misc/build/openssl-1.0.2t/ms/do_win64a.bat
> +--- misc/openssl-1.0.2t/ms/do_win64a.bat 2018-08-14 05:48:59.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/ms/do_win64a.bat 2018-08-26 14:49:34.432647000 -0700
>  @@ -1,19 +1,19 @@
>  -perl util\mkfiles.pl >MINFO
>  +%1 util\mkfiles.pl >MINFO
> @@ -128,9 +128,9 @@ diff -ur misc/openssl-1.0.2p/ms/do_win64a.bat misc/build/openssl-1.0.2p/ms/do_wi
>  -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
> -diff -ur misc/openssl-1.0.2p/util/mk1mf.pl misc/build/openssl-1.0.2p/util/mk1mf.pl
> ---- misc/openssl-1.0.2p/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/util/mk1mf.pl 2018-08-26 14:49:34.433421000 -0700
> +diff -ur misc/openssl-1.0.2t/util/mk1mf.pl misc/build/openssl-1.0.2t/util/mk1mf.pl
> +--- misc/openssl-1.0.2t/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/util/mk1mf.pl 2018-08-26 14:49:34.433421000 -0700
>  @@ -163,7 +163,7 @@
>   $inc_def="outinc";
>   $tmp_def="tmp";
> @@ -152,9 +152,9 @@ diff -ur misc/openssl-1.0.2p/util/mk1mf.pl misc/build/openssl-1.0.2p/util/mk1mf.
>   if ($key eq "RELATIVE_DIRECTORY")
>   {
>   if ($lib ne "")
> -diff -ur misc/openssl-1.0.2p/util/pl/VC-32.pl misc/build/openssl-1.0.2p/util/pl/VC-32.pl
> ---- misc/openssl-1.0.2p/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000 -0700
> +diff -ur misc/openssl-1.0.2t/util/pl/VC-32.pl misc/build/openssl-1.0.2t/util/pl/VC-32.pl
> +--- misc/openssl-1.0.2t/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000 -0700
>  @@ -30,7 +30,7 @@
>   my $ff = "";
>  
> diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
> index c4c09de..b4257ce 100644
> --- a/main/openssl/openssllnx.patch
> +++ b/main/openssl/openssllnx.patch
> @@ -1,6 +1,6 @@
> -diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
> ---- misc/openssl-1.0.2p/Configure 2018-08-14 05:49:04.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/Configure 2018-08-26 13:35:54.485021000 -0700
> +diff -ur misc/openssl-1.0.2t/Configure misc/build/openssl-1.0.2t/Configure
> +--- misc/openssl-1.0.2t/Configure 2018-08-14 05:49:04.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/Configure 2018-08-26 13:35:54.485021000 -0700
>  @@ -493,6 +493,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)",
> @@ -11,9 +11,9 @@ diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
>   "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}:::",
>  
> -diff -ur misc/openssl-1.0.2p/Makefile.org misc/build/openssl-1.0.2p/Makefile.org
> ---- misc/openssl-1.0.2p/Makefile.org 2018-08-14 05:48:56.000000000 -0700
> -+++ misc/build/openssl-1.0.2p/Makefile.org 2018-08-26 13:35:54.485813000 -0700
> +diff -ur misc/openssl-1.0.2t/Makefile.org misc/build/openssl-1.0.2t/Makefile.org
> +--- misc/openssl-1.0.2t/Makefile.org 2018-08-14 05:48:56.000000000 -0700
> ++++ misc/build/openssl-1.0.2t/Makefile.org 2018-08-26 13:35:54.485813000 -0700
>  @@ -208,7 +208,7 @@
>   # same language for uniform treatment.
>   BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Don Lewis-2
On  7 Oct, Matthias Seidel wrote:
> Hi Don,
>
> Thanks for that!
>
> Since NASM is now needed for Windows: If I install the 64bit version,
> will it produce 32bit code?

I wuuld think so, but I don't know for sure and have no way to test it.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Matthias Seidel

I will start a test tomorrow...

With both versions installed I can use --with-nasm-home to switch between them.

Matthias

Am 07.10.19 um 23:08 schrieb Don Lewis:
On  7 Oct, Matthias Seidel wrote:
Hi Don,

Thanks for that!

Since NASM is now needed for Windows: If I install the 64bit version,
will it produce 32bit code?
I wuuld think so, but I don't know for sure and have no way to test it.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Don Lewis-2
On  7 Oct, Matthias Seidel wrote:
> I will start a test tomorrow...
>
> With both versions installed I can use --with-nasm-home to switch
> between them.

According to the NASM docs, it looks like the bitness of NASM doesn't
make a difference.  THe bitness of the assembler is governed by the
output format specified on the command line and an assembler directive.

I think either version should work.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Matthias Seidel
Hi Don,

Am 08.10.19 um 01:16 schrieb Don Lewis:

> On  7 Oct, Matthias Seidel wrote:
>> I will start a test tomorrow...
>>
>> With both versions installed I can use --with-nasm-home to switch
>> between them.
> According to the NASM docs, it looks like the bitness of NASM doesn't
> make a difference.  THe bitness of the assembler is governed by the
> output format specified on the command line and an assembler directive.
>
> I think either version should work.
I just started the Windows build...

NASM 64bit is not found automatically and has to be configured:
--with-nasm-home="C:/Program Files/NASM"
Not a big issue, but maybe we can tweak oowintool to search for it.

Module OpenSSL is already built, so I am quite confident that everything
will work.

Regards,

   Matthias

>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Upgrade openssl to version 1.0.2t. This requires NASM to build on Windows.

Don Lewis-2
On  8 Oct, Matthias Seidel wrote:

> Hi Don,
>
> Am 08.10.19 um 01:16 schrieb Don Lewis:
>> On  7 Oct, Matthias Seidel wrote:
>>> I will start a test tomorrow...
>>>
>>> With both versions installed I can use --with-nasm-home to switch
>>> between them.
>> According to the NASM docs, it looks like the bitness of NASM doesn't
>> make a difference.  THe bitness of the assembler is governed by the
>> output format specified on the command line and an assembler directive.
>>
>> I think either version should work.
>
> I just started the Windows build...
>
> NASM 64bit is not found automatically and has to be configured:
> --with-nasm-home="C:/Program Files/NASM"
> Not a big issue, but maybe we can tweak oowintool to search for it.

Configure only finds it automatically if it is already in $PATH.

> Module OpenSSL is already built, so I am quite confident that everything
> will work.
>
> Regards,
>
>    Matthias
>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]