[tor-commits] [tor-browser-build/master] Bug 31499: Update libevent to 2.1.11-stable

[boklm at torproject.org]

commit bb2d411f379c7b866dadc3d0ef18ce827c8d5260
Author: sisbell <shane.isbell at gmail.com>
Date:   Sun Mar 1 15:58:00 2020 -0800

    Bug 31499:  Update libevent to 2.1.11-stable
---
 projects/libevent/autotools-openssl-mac.patch | 26 --------------------------
 projects/libevent/build                       |  1 -
 projects/libevent/config                      |  4 +---
 projects/tor/build                            |  2 +-
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch
deleted file mode 100644
index 1ee2964..0000000
--- a/projects/libevent/autotools-openssl-mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas at 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
-
diff --git a/projects/libevent/build b/projects/libevent/build
index de9ba80..1d620d9 100644
--- a/projects/libevent/build
+++ b/projects/libevent/build
@@ -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") %]
diff --git a/projects/libevent/config b/projects/libevent/config
index 386f746..fa01c1c 100644
--- a/projects/libevent/config
+++ b/projects/libevent/config
@@ -1,5 +1,5 @@
 # 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") %]'
diff --git a/projects/tor/build b/projects/tor/build
index 2d10fb3..0235da7 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -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