From 91404d2b7f4a62e21ea85374bf8cfcf977cf255c Mon Sep 17 00:00:00 2001
From: Ed Reel <edreel@gmail.com>
Date: Thu, 29 Oct 2020 20:33:46 -0500
Subject: [PATCH] Add missing libpsl and zstd dependencies (#4541)

Update constants in const.rb and crew

Install order matters

Add zstd to core_packages.txt

Update buildessential package

Update git sha256 hash
---
 crew                       |  2 ++
 install.sh                 | 34 +++++++++++++++++++++++++---------
 lib/const.rb               |  8 ++++----
 packages/buildessential.rb |  4 ++--
 packages/git.rb            |  2 +-
 tools/core_packages.txt    |  1 +
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/crew b/crew
index 984f75e78..c49212e6e 100755
--- a/crew
+++ b/crew
@@ -313,6 +313,7 @@ def const (var)
       'CHROMEOS_RELEASE',
       'CREW_BREW_DIR',
       'CREW_BUILD',
+      'CREW_CMAKE_LIBSUFFIX_OPTIONS',
       'CREW_CMAKE_OPTIONS',
       'CREW_CONFIG_PATH',
       'CREW_DEST_DIR',
@@ -322,6 +323,7 @@ def const (var)
       'CREW_DEST_PREFIX',
       'CREW_LIB_PATH',
       'CREW_LIB_PREFIX',
+      'CREW_LIB_SUFFIX',
       'CREW_MAN_PREFIX',
       'CREW_MESON_OPTIONS',
       'CREW_NOT_COMPRESS',
diff --git a/install.sh b/install.sh
index f6f1aca52..9df049a35 100755
--- a/install.sh
+++ b/install.sh
@@ -66,6 +66,8 @@ case "${ARCH}" in
   sha256s+=('25b93f3304ee1cf1a06c582de5c053436322b08fb27a576d132130bf73ef436b')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libnghttp2-1.38.0-chromeos-armv7l.tar.xz')
   sha256s+=('7375e44ec6c77c7afc760eaa4310d9974e0640cb46053c330b32c0e87bee73f4')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/libpsl-0.20.2-chromeos-armv7l.tar.xz')
+  sha256s+=('f6dab3749e5e195e417775c03870738aef36454f5124e59708c70a006b417b9c')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-armv7l.tar.xz')
   sha256s+=('497e146e4d769aa85b0d547889784d7552e2aadbbaa448df5bbe9515cd94c182')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libtirpc-1.0.2-0-chromeos-armv7l.tar.xz')
@@ -76,14 +78,16 @@ case "${ARCH}" in
   sha256s+=('0267ada9d7a13d09de9ca7503f1fe6623262de74dd364cb3998e6ae30d583808')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58f-chromeos-armv7l.tar.xz')
   sha256s+=('9e8f50f34f570d8bd6fb161fd96dc4c3384259e07eeebf03cc975b4eb9d21306')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/zstd-1.4.5-chromeos-armv7l.tar.xz')
+  sha256s+=('5cf9b496bf10ca56ab900bc0b2b82ed3e30493a1bbdc170a456ff73454531bfc')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-2.7.2-chromeos-armv7l.tar.xz')
   sha256s+=('a435e6bf7965e1a82e8842e5ea66bdd670ec9b627d785bd720d3d2652fc89f6d')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.1-chromeos-armv7l.tar.xz')
   sha256s+=('34d1b4b333195d6aaf5856665dbd9a8b56152603e93fd85f36a1b9c69de8852a')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-armv7l.tar.xz')
-  sha256s+=('0f75d8a211f66cf27c0f9bfe35b10761f21c6f6d71665d10d5511c1c72017c58')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.2-chromeos-armv7l.tar.xz')
   sha256s+=('36a493288d8d24cdb4c52866d37fcc47530417158717819443b4a087fd035d08')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-armv7l.tar.xz')
+  sha256s+=('0f75d8a211f66cf27c0f9bfe35b10761f21c6f6d71665d10d5511c1c72017c58')
   ;;
 "armv7l")
   if ! type "xz" > /dev/null; then
@@ -108,6 +112,8 @@ case "${ARCH}" in
   sha256s+=('25b93f3304ee1cf1a06c582de5c053436322b08fb27a576d132130bf73ef436b')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libnghttp2-1.38.0-chromeos-armv7l.tar.xz')
   sha256s+=('7375e44ec6c77c7afc760eaa4310d9974e0640cb46053c330b32c0e87bee73f4')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/libpsl-0.20.2-chromeos-armv7l.tar.xz')
+  sha256s+=('f6dab3749e5e195e417775c03870738aef36454f5124e59708c70a006b417b9c')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-armv7l.tar.xz')
   sha256s+=('497e146e4d769aa85b0d547889784d7552e2aadbbaa448df5bbe9515cd94c182')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libtirpc-1.0.2-0-chromeos-armv7l.tar.xz')
@@ -118,14 +124,16 @@ case "${ARCH}" in
   sha256s+=('0267ada9d7a13d09de9ca7503f1fe6623262de74dd364cb3998e6ae30d583808')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58f-chromeos-armv7l.tar.xz')
   sha256s+=('9e8f50f34f570d8bd6fb161fd96dc4c3384259e07eeebf03cc975b4eb9d21306')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/zstd-1.4.5-chromeos-armv7l.tar.xz')
+  sha256s+=('5cf9b496bf10ca56ab900bc0b2b82ed3e30493a1bbdc170a456ff73454531bfc')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-2.7.2-chromeos-armv7l.tar.xz')
   sha256s+=('a435e6bf7965e1a82e8842e5ea66bdd670ec9b627d785bd720d3d2652fc89f6d')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.1-chromeos-armv7l.tar.xz')
   sha256s+=('34d1b4b333195d6aaf5856665dbd9a8b56152603e93fd85f36a1b9c69de8852a')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-armv7l.tar.xz')
-  sha256s+=('0f75d8a211f66cf27c0f9bfe35b10761f21c6f6d71665d10d5511c1c72017c58')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.2-chromeos-armv7l.tar.xz')
   sha256s+=('36a493288d8d24cdb4c52866d37fcc47530417158717819443b4a087fd035d08')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-armv7l.tar.xz')
+  sha256s+=('0f75d8a211f66cf27c0f9bfe35b10761f21c6f6d71665d10d5511c1c72017c58')
   ;;
 "i686")
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.0-chromeos-i686.tar.xz')
@@ -146,6 +154,8 @@ case "${ARCH}" in
   sha256s+=('d10d7a95750b93be70f457d6c5db8935e30f85a726bf154d2953d075bd28d216')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libnghttp2-1.38.0-chromeos-i686.tar.xz')
   sha256s+=('cc5a56e8d3731aab1f8ff2a983e42d147e5a7234206d961e39b69d24d7cc3ffd')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/libpsl-0.20.2-chromeos-i686.tar.xz')
+  sha256s+=('51e81940423ac5bf3de3a931f697d1b0962a74be326f7cf0685f0328d97b7dab')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-i686.tar.xz')
   sha256s+=('dd2172bf82e3ffc1cfd06463108a36de55ba5e4bc2eb283852b54a737e087fe4')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libtirpc-1.0.2-0-chromeos-i686.tar.xz')
@@ -156,14 +166,16 @@ case "${ARCH}" in
   sha256s+=('71df836d0590e3ab3c27b7bc0debac785b112615f2138a5e13e4d901b2b40413')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58f-chromeos-i686.tar.xz')
   sha256s+=('3f28349cce85d7cc73208f7bd921543baea29dd1994e068ecf3597119b761a18')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/zstd-1.4.5-chromeos-i686.tar.xz')
+  sha256s+=('184413b92f95c5fad0ca8724f4fb231018c46f8b24b42d39a2f892f034548dc1')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-2.7.2-chromeos-i686.tar.xz')
   sha256s+=('81865864d3ba93b6cbd5dc8e1b6cb51bd2ebe854f6c01e282c1b73f379fb7caf')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.1-chromeos-i686.tar.xz')
   sha256s+=('0246035512a9cd81206672ccb996b97a1252050e9473340278c324988ca90b6d')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-i686.tar.xz')
-  sha256s+=('3109622744ec710f5f7d37678f108f382f481a7297fbecc01902fb5933a0cfa1')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.2-chromeos-i686.tar.xz')
   sha256s+=('f900f8674e63a71e2206f8458d94c039e375af3be7027047818fd680fb78aa78')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-i686.tar.xz')
+  sha256s+=('3109622744ec710f5f7d37678f108f382f481a7297fbecc01902fb5933a0cfa1')
   ;;
 "x86_64")
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.0-chromeos-x86_64.tar.xz')
@@ -184,6 +196,8 @@ case "${ARCH}" in
   sha256s+=('6e1e4b07e44e4b8cf1c436a6594f333bf339803c4c04a6c5a4f1762e00409479')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libnghttp2-1.38.0-chromeos-x86_64.tar.xz')
   sha256s+=('32428353d0b390ca68f1737ebaead7e5cd5ade1676c7d62896de0553bd58fa39')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/libpsl-0.20.2-chromeos-x86_64.tar.xz')
+  sha256s+=('f7f422c26f3d5b3cf690a6f9db6245f32ec7700d1db8e2b33eac212ca00c422e')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-x86_64.tar.xz')
   sha256s+=('d02623da747ecc95acdba69a056220ef579b01dae82a0cbfec2aa96c2ea8e914')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libtirpc-1.0.2-0-chromeos-x86_64.tar.xz')
@@ -194,14 +208,16 @@ case "${ARCH}" in
   sha256s+=('1c71f56cdecc230eaa5a5188b4141d71e84e61c77033b7c9f7aa5a0c60799049')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58f-chromeos-x86_64.tar.xz')
   sha256s+=('015f35c6556f9fa4100093e0cb44581ad0725a25391b301ce8972e5a090c8cec')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/zstd-1.4.5-chromeos-x86_64.tar.xz')
+  sha256s+=('a0fef2e2ed65835399ff8435bb806e74fe8b9e4e3019889a284bdd422fd1979a')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-2.7.2-chromeos-x86_64.tar.xz')
   sha256s+=('658808516b7a2e58f8102fd131e765aaa79f2a7c906d0330b7e883fbdc12d1a9')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.1-chromeos-x86_64.tar.xz')
-  sha256s+=('b850298e9dbbbcc9777d8fff1c95bcf701f26124780fa9976c6dd4381bcc204a')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-x86_64.tar.xz')
-  sha256s+=('ab8fc3bdc5f2495067b979105b21fc684952beb463a356051fb5736d70f5e1da')
+  sha256s+=('c86f8bfe92978f4b757dd78d02d8e29c65b54ffd00698f0227ce8793b1bc23c8')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.2-chromeos-x86_64.tar.xz')
   sha256s+=('2995523debedf84f763b79fb73b7958656c6d8e1a20628220e4b3d45b3dfa25a')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.73.0-chromeos-x86_64.tar.xz')
+  sha256s+=('ab8fc3bdc5f2495067b979105b21fc684952beb463a356051fb5736d70f5e1da')
   ;;
 esac
 
diff --git a/lib/const.rb b/lib/const.rb
index 30ac816df..7b0a89544 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -1,6 +1,6 @@
 # Defines common constants used in different parts of crew
 
-CREW_VERSION = '1.4.8'
+CREW_VERSION = '1.5.0'
 
 ARCH_ACTUAL = `uname -m`.strip
 # This helps with virtualized builds on aarch64 machines
@@ -68,6 +68,6 @@ CREW_MESON_OPTIONS = "-Dprefix=#{CREW_PREFIX} -Dlibdir=#{CREW_LIB_PREFIX} -Dmand
 # This is often considered deprecated. See discussio at https://gitlab.kitware.com/cmake/cmake/-/issues/18640 
 # and also https://bugzilla.redhat.com/show_bug.cgi?id=1425064
 # Let's have two CREW_CMAKE_OPTIONS since this avoids the logic in the recipe file.
-CREW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX}  -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
-CMAKELIBSUFFIX = if ARCH == 'x86_64' then '64' else '' end
-CREW_CMAKE_LIBSUFFIX_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX}  -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX}  -DLIB_SUFFIX=#{CMAKELIBSUFFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
+CREW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
+CREW_LIB_SUFFIX = if ARCH == 'x86_64' then '64' else '' end
+CREW_CMAKE_LIBSUFFIX_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DLIB_SUFFIX=#{CREW_LIB_SUFFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
diff --git a/packages/buildessential.rb b/packages/buildessential.rb
index 837673468..2a9a4c678 100644
--- a/packages/buildessential.rb
+++ b/packages/buildessential.rb
@@ -3,12 +3,12 @@ require 'package'
 class Buildessential < Package
   description 'A collection of tools essential to compile and build software.'
   homepage ''
-  version '1.6'
+  version '1.7'
   compatibility 'all'
 
   is_fake
 
-  depends_on 'gcc8'
+  depends_on 'gcc10'
   depends_on 'gcc_tools'
   depends_on 'linuxheaders'
   depends_on 'make'
diff --git a/packages/git.rb b/packages/git.rb
index 740ea6afe..478b17312 100644
--- a/packages/git.rb
+++ b/packages/git.rb
@@ -18,7 +18,7 @@ class Git < Package
     aarch64: '34d1b4b333195d6aaf5856665dbd9a8b56152603e93fd85f36a1b9c69de8852a',
      armv7l: '34d1b4b333195d6aaf5856665dbd9a8b56152603e93fd85f36a1b9c69de8852a',
        i686: '0246035512a9cd81206672ccb996b97a1252050e9473340278c324988ca90b6d',
-     x86_64: 'b850298e9dbbbcc9777d8fff1c95bcf701f26124780fa9976c6dd4381bcc204a',
+     x86_64: 'c86f8bfe92978f4b757dd78d02d8e29c65b54ffd00698f0227ce8793b1bc23c8',
   })
 
   depends_on 'curl' => :build
diff --git a/tools/core_packages.txt b/tools/core_packages.txt
index bcb2f703d..916637dd0 100644
--- a/tools/core_packages.txt
+++ b/tools/core_packages.txt
@@ -92,3 +92,4 @@ wget
 xzutils
 zip
 zlibpkg
+zstd