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

Merge remote-tracking branch 'sisbell/bug-31499d'

parents 15575100 bb2d411f

projects/libevent/autotools-openssl-mac.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>

Date: Tue, 29 Aug 2017 00:44:57 -0700

Subject: [PATCH] autotools: confirm openssl is working before using



latest versions of macOS provide pkg-config and libraries for an ancient

version of openssl as part of the system, but no headers



diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4

index c2040595..7b458134 100644

--- a/m4/libevent_openssl.m4

+++ b/m4/libevent_openssl.m4

@@ -39,6 +39,10 @@ case "$enable_openssl" in

 	done

 	;;

     esac

+    CPPFLAGS_SAVE=$CPPFLAGS

+    CPPFLAGS+=$OPENSSL_INCS

+    AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no])

+    CPPFLAGS=$CPPFLAGS_SAVE

     AC_SUBST(OPENSSL_INCS)

     AC_SUBST(OPENSSL_LIBS)

     case "$have_openssl" in

-- 

2.17.0

projects/libevent/build

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ mkdir -p /var/tmp/build 
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

cd /var/tmp/build/[% project %]-[% c('version') %]

[% IF c("var/osx") -%]

  patch -p1 < $rootdir/autotools-openssl-mac.patch

  # Setting this after `configure` but before `make` might be enough, but let's

  # not bet on that and just set it here.

  export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %]

projects/libevent/config

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

version: 2.1.8

version: 2.1.11

git_url: https://github.com/libevent/libevent.git

git_hash: 'release-[% c("version") %]-stable'

tag_gpg_id: 1
@@ -20,5 +20,3 @@ input_files: 
  - project: container-image

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

    project: '[% c("var/compiler") %]'
 
  - filename: autotools-openssl-mac.patch

    enable: '[% c("var/osx") %]'

projects/tor/build

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ openssldir=/var/tmp/dist/openssl/openssl 
  mkdir -p "$distdir/Debug/Tor"

  cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/"

  cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/"

  cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/"

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

  # 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

  # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old