Unverified Commit fba3b060 authored by boklm's avatar boklm
Browse files

Install hardening-wrapper and use /bin/bash in openssl and libevent 

Install hardening-wrapper, since the compiler setup on Linux requires
it.

Use #!/bin/bash rather than #!/bin/sh in the build scripts since the
compiler setup use bash specific commands.
parent 360a3ac3

projects/libevent/build

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

#!/bin/bash

set -e

rootdir=$(pwd)

[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

projects/libevent/config

+5 −0
Original line number Diff line number Diff line
@@ -13,10 +13,15 @@ var: 
    - libtool



targets:

  linux-x86_64:

    var:

      arch_deps:

        - hardening-wrapper

  linux-i686:

    var:

      arch_deps:

        - libc6-dev-i386

        - hardening-wrapper



input_files:

  - project: docker-image

projects/openssl/build

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

#!/bin/bash

set -e

rootdir=$(pwd)

[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

projects/openssl/config

+3 −0
Original line number Diff line number Diff line
@@ -10,11 +10,14 @@ targets: 
  linux-x86_64:

    var:

      configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-generic64

      arch_deps:

        - hardening-wrapper

  linux-i686:

    var:

      configure_opts: -shared linux-generic32

      arch_deps:

        - libc6-dev-i386

        - hardening-wrapper

  windows-i686:

    var:

      configure_opts: '-shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"'