Verified Commit 85031e91 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 40854: Upgrade to OpenSSL 3

parent 69317005

projects/openssl/build

+4 −3
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ export CC='gcc -m32' 
  export CC=cc

[% END -%]

export SOURCE_DATE_EPOCH='[% c("timestamp") %]'

./Configure [% c('var/configure_opts') %]

# OpenSSL 3 uses lib64 on 64-bit systems, but tor looks for lib

./Configure --prefix="$distdir" --libdir=lib [% c('var/configure_opts') %]

make -j[% c("num_procs") %]

# https://github.com/openssl/openssl/issues/8170

make -j[% c("num_procs") %] DESTDIR="$distdir" install

make -j[% c("num_procs") %] install

cd /var/tmp/dist

ln -s '[% c("var/openssldir") %]' openssl/openssl



[% c('tar', {

        tar_src => [ project ],

        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),

projects/openssl/config

+2 −3
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 1.1.1u

version: 3.0.8

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

container:

  use_container: 1
@@ -21,7 +21,6 @@ targets: 
    var:

      flag_mwindows: ''

      configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"'

      openssldir: 'Program Files[% IF c("var/windows-i686") %] (x86)[% END %]/OpenSSL'

  macos:

    var:

      configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128'
@@ -34,4 +33,4 @@ input_files: 
  - name: '[% c("var/compiler") %]'

    project: '[% c("var/compiler") %]'

  - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'

    sha256sum: e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6
 
    sha256sum: 6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e

projects/tor/build

+3 −3
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] 
tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %]

tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

libeventdir=/var/tmp/dist/libevent

openssldir=/var/tmp/dist/openssl/openssl

openssldir=/var/tmp/dist/openssl



[% IF c("var/linux") %]

  TORDEBUGDIR="$distdir/debug"

  mkdir "$TORDEBUGDIR"



  cp $openssldir/lib/libssl.so.1.1 "$TORBINDIR"

  cp $openssldir/lib/libcrypto.so.1.1 "$TORBINDIR"

  cp $openssldir/lib/libssl.so.3 "$TORBINDIR"

  cp $openssldir/lib/libcrypto.so.3 "$TORBINDIR"

  cp $libeventdir/lib/libevent-2.1.so.7 "$TORBINDIR"

  # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros.

  # Copying it into /Browser, which feels more natural, and amending