Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 64f7cb24d5f9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 27fd944bb73f
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on May 4, 2019

  1. libressl_2_9: 2.9.0 -> 2.9.1 

    This new version does not build as-is, it will need to be patched.
    @ruuda
    ruuda committed May 4, 2019
    Copy the full SHA
    3415872 View commit details
    Browse the repository at this point in the history

  2. libressl: build with cmake 

    LibreSSL 2.9.1 no longer builds with the default autotools configuration.
When I searched for the error, I noticed that Buildroot ran into the
same issue, and they resolved the problem by building with CMake rather
than autotools. [1] I followed the same approach here.

[1]: buildroot/buildroot@e783d60
    @ruuda
    ruuda committed May 4, 2019
    Copy the full SHA
    8c7cde5 View commit details
    Browse the repository at this point in the history

  3. libressl: ensure we can link against libtls 

    Without setting BUILD_SHARED_LIBS, the package would build file, but
when linking it into acme-client or nginx, I got the following error:

    libressl-2.9.1/lib/libtls.a(tls.c.o): undefined reference to symbol 'pthread_once@@GLIBC_2.2.5'
    binutils-2.31.1/bin/ld: glibc-2.27/lib/libpthread.so.0: error adding symbols: DSO missing from command line
    collect2: error: ld returned 1 exit status

After looking at the CMakeLists.txt in libressl/tls, I noticed the
BUILD_SHARED_LIBS option, and setting it resolves the linking error.
    @ruuda
    ruuda committed May 4, 2019
    Copy the full SHA
    5f594be View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Merge pull request #60925 from ruuda/libressl-291 

    libressl: 2.9.0 -> 2.9.1
    @thoughtpolice
    thoughtpolice committed May 7, 2019
    Copy the full SHA
    27fd944 View commit details
    Browse the repository at this point in the history