From ee486386ade0144fef7050935f32bd90f77e561e Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 23 Feb 2019 17:03:27 -0800
Subject: [PATCH] Grasping at straws

---
 scripts/build.sh | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index f5a4c13..5fd1ead 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,13 +16,8 @@ echo ""
 # Common paths.
 NGINX_SRC_DIR="$OG_DIR/src/nginx"
 export NGINX_SRC_DIR
-mkdir -p "$NGINX_SRC_DIR"
-
-NGINX_SRC_ARCHIVE="$OG_DIR/src/nginx-src.tar.gz"
-export NGINX_SRC_ARCHIVE
 
-NGINX_SRC_ARCHIVE_SIGNATURE="$OG_DIR/src/nginx-src.tar.gz.asc"
-export NGINX_SRC_ARCHIVE_SIGNATURE
+mkdir -p "$NGINX_SRC_DIR"
 
 OPENSSL_DIR="$OG_DIR/src/openssl"
 export OPENSSL_DIR
@@ -34,12 +29,9 @@ NGINX_CT_DIR="$OG_DIR/src/nginx_ct"
 export NGINX_CT_DIR
 
 # Dependency: OpenSSL
-echo "DEPENDENCY: OpenSSL"
+echo ""
+echo "DEPENDENCY: OpenSSL AT $OPENSSL_TAG"
 git clone -q --recursive --depth 1 https://github.com/openssl/openssl.git -b "$OPENSSL_TAG" "$OPENSSL_DIR"
-cd "$OPENSSL_DIR" || exit
-./config --prefix=/usr
-make -j"$(nproc)"
-make install
 
 # Dependency: ngx_brotli (no tagged releases)
 echo ""
@@ -48,23 +40,19 @@ git clone -q --recursive --depth 1 https://github.com/google/ngx_brotli.git "$NG
 
 # Dependency: nginx-ct
 echo ""
-echo "DEPENDENCY: nginx-ct"
+echo "DEPENDENCY: nginx-ct AT $NGINX_CT_TAG"
 git clone -q --recursive --depth 1 https://github.com/grahamedgecombe/nginx-ct.git -b "$NGINX_CT_TAG" "$NGINX_CT_DIR"
 
-# Configure nginx
+# nginx from git mirror
 echo ""
-echo "DOWNLOADING & VERIFYING NGINX RELEASE"
-cd "$OG_DIR" || exit
-
-curl -o "$NGINX_SRC_ARCHIVE" "$NGINX_SRC"
-curl -o "$NGINX_SRC_ARCHIVE_SIGNATURE" "$NGINX_SIGNING"
+echo "CLONING nginx FROM GIT MIRROR AT $NGINX_TAG"
+git clone -q --recursive --depth 1 https://github.com/nginx/nginx.git -b "$NGINX_TAG" "$NGINX_SRC_DIR"
 
-# Disabled as nginx is signing with individuals' keys.
-#gpg --import <(curl https://nginx.org/keys/nginx_signing.key)
-#gpg --verify "$NGINX_SRC_ARCHIVE_SIGNATURE" "$NGINX_SRC_ARCHIVE"
+# Configure nginx
+echo ""
+echo "CONFIGURE NGINX"
+cd "$NGINX_SRC_DIR/auto" || exit
 
-tar -zxvf "$NGINX_SRC_ARCHIVE" -C "$NGINX_SRC_DIR" --strip 1
-cd "$NGINX_SRC_DIR" || exit
 ./configure \
     --prefix=/etc/nginx \
     --sbin-path=/usr/sbin/nginx \
-- 
GitLab