Merge pull request #119 from brave/update-deps

Update all deps except for libevent

.gitignore

@@ -1,3 +1,4 @@
+/build/
 /gpg-keys/*.gpg~
 /gnupg-*/
 /gnupg-*.tar.bz2

README.md

@@ -46,6 +46,7 @@ $ gpg --keyserver hkps://keyserver.ubuntu.com --no-default-keyring --keyring gpg
 $ gpg --keyserver hkps://keyserver.ubuntu.com --no-default-keyring --keyring gpg-keys/openssl.gpg --recv-key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
 $ gpg --keyserver hkps://keyserver.ubuntu.com --no-default-keyring --keyring gpg-keys/openssl.gpg --recv-key E5E52560DD91C556DDBDA5D02064C53641C25E5D
 $ gpg --keyserver hkps://keyserver.ubuntu.com --no-default-keyring --keyring gpg-keys/openssl.gpg --recv-key DC7032662AF885E2F47F243F527466A21CA79E6D
+$ gpg --keyserver hkps://keys.openpgp.org --no-default-keyring --keyring gpg-keys/openssl.gpg --recv-key EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
 ```
 
 The keys are listed on https://www.openssl.org/community/omc.html.
@@ -73,7 +74,7 @@ In case of updates for `tor` | `libevent` | `zlib` | `openssl`
 6. Update the hash in env.sh.
 7. Attempt a build.  It should pass.
 8. Prepare a PR for your branch.
-9. To test building on other platforms, build the *brave-tor-client-build* project in Jenkins using your branch instead of `master`. The build output will give you URLs on S3 of all of the generated binaries (one per platform).
+9. To test building on other platforms, build the *brave-tor-client-build* project in Jenkins using your branch instead of `master` (the "Upload" build option must be ON). The build output will give you URLs on S3 of all of the generated binaries (one per platform).
 10. Download each binary and run `sha512sum` on them. Make sure you use the **post-signing** Windows binary since both signed and unsigned will be in the output.
 11. Merge your `brave/tor_build_scripts` PR once it's been reviewed.
 12. Prepare a PR for the `brave/brave-core-crx-packager` repo bumping the version numbers and hashes (e.g. brave/brave-core-crx-packager#390).

build_darwin.sh

@@ -3,23 +3,23 @@
 # Download and verify dependencies
 curl --proto '=https' --tlsv1.2 -fsSL "https://zlib.net/zlib-$ZLIB_VERSION.tar.gz" -o "zlib-$ZLIB_VERSION.tar.gz"
 curl --proto '=https' --tlsv1.2 -fsSL "https://zlib.net/zlib-$ZLIB_VERSION.tar.gz.asc" -o "zlib-$ZLIB_VERSION.tar.gz.asc"
-gpg --keyring gpg-keys/zlib.gpg --verify "zlib-$ZLIB_VERSION.tar.gz.asc" "zlib-$ZLIB_VERSION.tar.gz"
+GNUPGHOME="$PWD" gpg --keyring gpg-keys/zlib.gpg --verify "zlib-$ZLIB_VERSION.tar.gz.asc" "zlib-$ZLIB_VERSION.tar.gz"
 echo "$ZLIB_HASH  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c -
 
 curl --proto '=https' --tlsv1.2 -fsSL "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" -o "openssl-$OPENSSL_VERSION.tar.gz"
 curl --proto '=https' --tlsv1.2 -fsSL "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz.asc" -o "openssl-$OPENSSL_VERSION.tar.gz.asc"
-gpg --keyring gpg-keys/openssl.gpg --verify "openssl-$OPENSSL_VERSION.tar.gz.asc" "openssl-$OPENSSL_VERSION.tar.gz"
+GNUPGHOME="$PWD" gpg --keyring gpg-keys/openssl.gpg --verify "openssl-$OPENSSL_VERSION.tar.gz.asc" "openssl-$OPENSSL_VERSION.tar.gz"
 echo "$OPENSSL_HASH  openssl-$OPENSSL_VERSION.tar.gz" | shasum -a 256 -c -
 
 curl --proto '=https' --tlsv1.2 -fsSL "https://github.com/libevent/libevent/releases/download/release-$LIBEVENT_VERSION/libevent-$LIBEVENT_VERSION.tar.gz" -o "libevent-$LIBEVENT_VERSION.tar.gz"
 curl --proto '=https' --tlsv1.2 -fsSL "https://github.com/libevent/libevent/releases/download/release-$LIBEVENT_VERSION/libevent-$LIBEVENT_VERSION.tar.gz.asc" -o "libevent-$LIBEVENT_VERSION.tar.gz.asc"
-gpg --keyring gpg-keys/libevent.gpg --verify "libevent-$LIBEVENT_VERSION.tar.gz.asc" "libevent-$LIBEVENT_VERSION.tar.gz"
+GNUPGHOME="$PWD" gpg --keyring gpg-keys/libevent.gpg --verify "libevent-$LIBEVENT_VERSION.tar.gz.asc" "libevent-$LIBEVENT_VERSION.tar.gz"
 echo "$LIBEVENT_HASH  libevent-$LIBEVENT_VERSION.tar.gz" | shasum -a 256 -c -
 
 curl --proto '=https' --tlsv1.2 -fsSL "https://dist.torproject.org/tor-$TOR_VERSION.tar.gz" -o "tor-$TOR_VERSION.tar.gz"
 curl --proto '=https' --tlsv1.2 -fsSL "https://dist.torproject.org/tor-$TOR_VERSION.tar.gz.sha256sum.asc" -o "tor-$TOR_VERSION.tar.gz.sha256sum.asc"
 echo "$TOR_HASH  tor-$TOR_VERSION.tar.gz" > "tor-$TOR_VERSION.tar.gz.sha256sum"
-gpg --keyring gpg-keys/tor.gpg --verify "tor-$TOR_VERSION.tar.gz.sha256sum.asc" "tor-$TOR_VERSION.tar.gz.sha256sum"
+GNUPGHOME="$PWD" gpg --keyring gpg-keys/tor.gpg --verify "tor-$TOR_VERSION.tar.gz.sha256sum.asc" "tor-$TOR_VERSION.tar.gz.sha256sum"
 shasum -a 256 -c "tor-$TOR_VERSION.tar.gz.sha256sum"
 
 if [ "$(uname)" = 'Linux' ]

build_darwin_arm64.sh

@@ -41,6 +41,7 @@ patch -p0 < ../../patch/libevent/regress.c.patch
 	    LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib --target=arm64-apple-macos11" \
 	    CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include --target=arm64-apple-macos11" \
 	    --prefix="$PWD/install" \
+	    --disable-openssl \
 	    --disable-shared \
 	    --enable-static \
             --host=arm-apple-darwin \

build_darwin_x86_64.sh

@@ -41,6 +41,7 @@ patch -p0 < ../../patch/libevent/regress.c.patch
             LDFLAGS="-L$PWD/../openssl-$OPENSSL_VERSION/root/lib" \
             CPPFLAGS="-I$PWD/../openssl-$OPENSSL_VERSION/include" \
             --prefix="$PWD/install" \
+            --disable-openssl \
             --disable-shared \
             --enable-static \
             --disable-clock-gettime \

env.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
 
-export MACOSX_DEPLOYMENT_TARGET=10.10
+export MACOSX_DEPLOYMENT_TARGET=10.15
 
 # Reset version number to zero everytime TOR_VERSION changes.
-export BRAVE_TOR_VERSION="1"
+export BRAVE_TOR_VERSION="0"
 
-export TOR_VERSION="0.4.7.13"
+export TOR_VERSION="0.4.8.5"
 
-export ZLIB_VERSION="1.2.13"
+export ZLIB_VERSION="1.3"
 export LIBEVENT_VERSION="2.1.12-stable"
-export OPENSSL_VERSION="1.1.1t"
+export OPENSSL_VERSION="1.1.1w"
 
-export ZLIB_HASH=b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+export ZLIB_HASH=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 export LIBEVENT_HASH=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
-export OPENSSL_HASH=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
-export TOR_HASH=2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d
+export OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
+export TOR_HASH=6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119