diff --git a/install.sh b/install.sh index 4cc6b441b..7d721e9d4 100755 --- a/install.sh +++ b/install.sh @@ -99,14 +99,18 @@ case "${ARCH}" in sha256s+=('780763658f32364cdc24bef4fb8efcb14d2beba989c7c0a894bf73f3e4fccc9b') urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-armv7l.tar.xz') sha256s+=('81509c5d3585f1a0c3c7d616d9f9a0d0192c6e3276c3ddea23c3905e78e56bfc') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-armv7l.tar.xz') - sha256s+=('59a8e3c3cf6bd97210f04882c2b0ce94566311f360536d1174d7e04e8f9884ab') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-armv7l.tar.xz') - sha256s+=('c3033ec7b37b5d451f528df4361a348a3dde750d71a131551039bed8880b5bb0') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz') - sha256s+=('f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz') - sha256s+=('530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libffi-3.3-chromeos-armv7l.tar.xz') + sha256s+=('22a2ec5efcbcf5b587f34f35489ee0976f5a1ed256f47a4ac87a240f804c0d02') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-armv7l.tar.xz') + sha256s+=('6b4db90acb22c772dcb70d5688033b26230d3e10f2037ee56422f38b8fbd0029') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-armv7l.tar.xz') + sha256s+=('48caa978643acd326ffdf3e3f4bc502d48c8aafc73b1e39e47d710174fad2145') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-armv7l.tar.xz') + sha256s+=('4386bc951eaa7311b8c828fb76b030410f63686c9c86f6288b2a1025594166f1') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-armv7l.tar.xz') + sha256s+=('35dfc0e95c0d6c09a323fd6ec393dc48e33940fc7815a4f51adff5a63f99416a') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libedit-3.1-0-chromeos-armv7l.tar.xz') + sha256s+=('90f9db2636bdcae5cb4c8d6a0d020398b13c6290164c27776507689bc5fc85be') ;; "i686") urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.1-0f64-chromeos-i686.tar.xz') @@ -145,14 +149,18 @@ case "${ARCH}" in sha256s+=('3119323613fefd0c8c4d6f0ec6d55d2ae3ec6390aeb19eb01ca47bff4903322f') urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-i686.tar.xz') sha256s+=('6a624ec30b5b6f32a842ec9f686278ce239d729f9736bf1b5d74ac08a716e0ef') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-i686.tar.xz') - sha256s+=('d6962728e73894df3382ad17035b838f213f246edb6dc4aa54522c3bc5c59dd8') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-i686.tar.xz') - sha256s+=('a1435f3a49db9dd3f07f3558cfffdbb0f724b15b1dba430ce3ad028b5d861366') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-i686.tar.xz') - sha256s+=('ba7b7abeda8592135d2ea851f906636716b1f1d577fdcc75ad68bd6f0b67e5e0') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-i686.tar.xz') - sha256s+=('fa19e5276870d4347259daf6b8c4c001eafdaabb0c02b7846014558cf6ca90a5') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libffi-3.3-chromeos-i686.tar.xz') + sha256s+=('8041e3401d2b9721a2dd87d31aff2b1b5380f7946c092d9a3c18f573ca6422f8') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-i686.tar.xz') + sha256s+=('22aae2e468cab25f6258c07cce8afe586b906297d2af602762516c5fd1cd93b5') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-i686.tar.xz') + sha256s+=('fed721a267a16a27df602b6116d0be04423bb58194d567dbf42727e6d61afdf2') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-i686.tar.xz') + sha256s+=('6dd0fc056dd3cdca76596603c1a161724e8f81d68c50bf18f25877e4df8dc9e4') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-i686.tar.xz') + sha256s+=('1c45fb6c19db175fba61dd9925b648955c5081ad7dea31feb7b613b5ca0a97c9') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libedit-3.1-0-chromeos-i686.tar.xz') + sha256s+=('0590ee8aa7923a29332aa436ff42b909cf968c7ab50121df43539d968e3c496f') ;; "x86_64") urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.1-0f64-chromeos-x86_64.tar.xz') @@ -191,14 +199,18 @@ case "${ARCH}" in sha256s+=('d342c29d70e7bb4405555954ee376ff72782b419025b673ee750fe7d0c9efa1f') urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-x86_64.tar.xz') sha256s+=('64ab9f4df6ab0185f7f74a0deb6a809d5ba910128f730522f21079062985108f') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-x86_64.tar.xz') - sha256s+=('be499bd46626d26ed6c333dc1a74df423537053e6afbf2a14e542c5ceec796ef') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-x86_64.tar.xz') - sha256s+=('52a43bc84d243218a2bf98c8895b1e366887a7e5308e711a3145ffe7879fe9e0') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-x86_64.tar.xz') - sha256s+=('7696a5014d09eaff0864ee36fe4a7f8032c99e7eeb56baf0e04a87427e0114c6') - urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-x86_64.tar.xz') - sha256s+=('70adb89d9f1e1a250cc84f0e1b3e98d7ed5c82ceb413f4ae451ef9cd748b9398') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libffi-3.3-chromeos-x86_64.tar.xz') + sha256s+=('aecc094eb0e5b961106ee3d4086f120a30555cb82b3b8263107d9cab4e6c278f') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-x86_64.tar.xz') + sha256s+=('c5d19a3cab5f38898f4875ca2be57c3a8fb23c73726dd14e29f7bed02d252eb0') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-x86_64.tar.xz') + sha256s+=('e8a8120132ce90acda8cc2b9f87c609dd4eca1851a8ef990b2d99eebf84372b1') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-x86_64.tar.xz') + sha256s+=('ae2a5001e272fdf4a1f212ed31f38b62e2fd20205f8ab0c77ab7226b8a94b6ac') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-x86_64.tar.xz') + sha256s+=('290087e9c03a94eaf5d33a82b76dc3b5bb11be1dff5a6e57aa190ec5439bcfb2') + urls+=('https://dl.bintray.com/chromebrew/chromebrew/libedit-3.1-0-chromeos-x86_64.tar.xz') + sha256s+=('6f6ed8dd83aad5895b5e3927c673d66c5d676a345f3bc6913e94392a74db929a') ;; esac diff --git a/packages/curl.rb b/packages/curl.rb index bcb454eec..896a6163c 100644 --- a/packages/curl.rb +++ b/packages/curl.rb @@ -4,24 +4,25 @@ class Curl < Package description 'Command line tool and library for transferring data with URLs.' homepage 'https://curl.se/' @_ver = "7.74.0" - version @_ver + '-1' + version @_ver + '-2' compatibility 'all' source_url "https://curl.se/download/curl-#{@_ver}.tar.xz" source_sha256 '999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-2-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201', - armv7l: 'f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201', - i686: 'ba7b7abeda8592135d2ea851f906636716b1f1d577fdcc75ad68bd6f0b67e5e0', - x86_64: '7696a5014d09eaff0864ee36fe4a7f8032c99e7eeb56baf0e04a87427e0114c6', + aarch64: '48caa978643acd326ffdf3e3f4bc502d48c8aafc73b1e39e47d710174fad2145', + armv7l: '48caa978643acd326ffdf3e3f4bc502d48c8aafc73b1e39e47d710174fad2145', + i686: 'fed721a267a16a27df602b6116d0be04423bb58194d567dbf42727e6d61afdf2', + x86_64: 'e8a8120132ce90acda8cc2b9f87c609dd4eca1851a8ef990b2d99eebf84372b1', }) + depends_on 'groff' => :build depends_on 'brotli' depends_on 'c_ares' diff --git a/packages/git.rb b/packages/git.rb index 7896b1f7b..190d666ff 100644 --- a/packages/git.rb +++ b/packages/git.rb @@ -4,25 +4,24 @@ class Git < Package description 'Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.' homepage 'https://git-scm.com/' @_ver = '2.30.0' - version @_ver + version @_ver + '-1' compatibility 'all' source_url "https://github.com/git/git/archive/v#{@_ver}.tar.gz" source_sha256 '8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353', - armv7l: '530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353', - i686: 'fa19e5276870d4347259daf6b8c4c001eafdaabb0c02b7846014558cf6ca90a5', - x86_64: '70adb89d9f1e1a250cc84f0e1b3e98d7ed5c82ceb413f4ae451ef9cd748b9398', + aarch64: '4386bc951eaa7311b8c828fb76b030410f63686c9c86f6288b2a1025594166f1', + armv7l: '4386bc951eaa7311b8c828fb76b030410f63686c9c86f6288b2a1025594166f1', + i686: '6dd0fc056dd3cdca76596603c1a161724e8f81d68c50bf18f25877e4df8dc9e4', + x86_64: 'ae2a5001e272fdf4a1f212ed31f38b62e2fd20205f8ab0c77ab7226b8a94b6ac', }) - depends_on 'curl' => :build depends_on 'python3' => :build diff --git a/packages/gnutls.rb b/packages/gnutls.rb index 38ed30867..26b100bae 100644 --- a/packages/gnutls.rb +++ b/packages/gnutls.rb @@ -3,22 +3,22 @@ require 'package' class Gnutls < Package description 'GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them.' homepage 'http://gnutls.org/' - version '3.7.0' + version '3.7.0-1' compatibility 'all' source_url 'https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.0.tar.xz' source_sha256 '49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '4e7f7e7314732e4716817f541e408a76489a53a9bb3b98e0c4072bb290c50cf5', - armv7l: '4e7f7e7314732e4716817f541e408a76489a53a9bb3b98e0c4072bb290c50cf5', - i686: 'c3ebd7f90ca13365f208afd7384f6979de959c38fd7cc2ea780b4f951e743b36', - x86_64: '74ede0950a89488bf91cc9e144f7318d8e26b4a522d50db557f182cef66ced39', + aarch64: '7a80e48b97bb721ee3b6805d5863d61800a230c9b598a511a07df3af5d49dfdb', + armv7l: '7a80e48b97bb721ee3b6805d5863d61800a230c9b598a511a07df3af5d49dfdb', + i686: 'b3f8597ad7173e9721bd5bc5dbb6fd6385fac9cc748fc7e5d1871dc7161ccff8', + x86_64: 'd9fb0a59c22d64d629a7fcd868450b0c862a2bbe66c8940d854331da738ba4c3', }) depends_on 'zlibpkg' diff --git a/packages/icu4c.rb b/packages/icu4c.rb index a78ee1498..083b30d3f 100644 --- a/packages/icu4c.rb +++ b/packages/icu4c.rb @@ -3,33 +3,34 @@ require 'package' class Icu4c < Package description 'ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications.' homepage 'http://site.icu-project.org/' - version '68.1' + version '68.2' compatibility 'all' - source_url 'https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz' - source_sha256 'a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d' + source_url 'https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz' + source_sha256 'c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.1-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-68.2-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'b49e0c6c754f3b019d769d9c9eb54aa04f6374e25481b3c01611d886a791caed', - armv7l: 'b49e0c6c754f3b019d769d9c9eb54aa04f6374e25481b3c01611d886a791caed', - i686: 'cd5f09ba3b1b9f12fe553f8b52f8cacec9d5541c4f0d1fad74f6f8137c09ed99', - x86_64: '07ddbfffe6b0790289c741f4da5f2e8d341b5194f069ec5a5026ba85bbcfcee2', + aarch64: '35dfc0e95c0d6c09a323fd6ec393dc48e33940fc7815a4f51adff5a63f99416a', + armv7l: '35dfc0e95c0d6c09a323fd6ec393dc48e33940fc7815a4f51adff5a63f99416a', + i686: '1c45fb6c19db175fba61dd9925b648955c5081ad7dea31feb7b613b5ca0a97c9', + x86_64: '290087e9c03a94eaf5d33a82b76dc3b5bb11be1dff5a6e57aa190ec5439bcfb2', }) def self.build FileUtils.cd('source') do + case ARCH when 'aarch64', 'armv7l' # Armhf requires sane ELF headers rather than other architectures as # discussed in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457 system "sed -e '/LDFLAGSICUDT=/cLDFLAGSICUDT=' -i config/mh-linux" end - system "./configure #{CREW_OPTIONS} --without-samples --without-tests" + system "env CFLAGS='-pipe -flto' CXXFLAGS='-pipe -flto' ./configure #{CREW_OPTIONS} --without-samples --without-tests" system 'make' end end diff --git a/packages/nettle.rb b/packages/nettle.rb index 6afd8fc11..889af1982 100644 --- a/packages/nettle.rb +++ b/packages/nettle.rb @@ -4,22 +4,22 @@ class Nettle < Package description 'Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.' homepage 'http://www.lysator.liu.se/~nisse/nettle/' @_ver = '3.7' - version @_ver + version @_ver + '-1' compatibility 'all' source_url "https://ftpmirror.gnu.org/nettle/nettle-#{@_ver}.tar.gz" source_sha256 'f001f64eb444bf13dd91bceccbc20acbc60c4311d6e2b20878452eb9a9cec75a' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'ac62f7cd94b7047e87d413a8d6e338ebaeadbac613458b0a46290b9332ac647f', - armv7l: 'ac62f7cd94b7047e87d413a8d6e338ebaeadbac613458b0a46290b9332ac647f', - i686: '21eb9162bced72c824cdfa392bcb4b783ca6c7a5a7487134258027c8662c484f', - x86_64: '2ea16fff4808cfa8105c8a7f1f6eab83157979aeb2b0cce06da8f8b6ab3bdd02', + aarch64: '5b39e94078c6b414dbab4bc39d3930cea06cda4fae8ac00ae8070d398cc66427', + armv7l: '5b39e94078c6b414dbab4bc39d3930cea06cda4fae8ac00ae8070d398cc66427', + i686: '22cc6881f5df8c0e0a6d77154156ab74efb3ec9866208cde5c71a5935bad839b', + x86_64: '713dbccd1a267bac1cd71856ab6f68dd897ae32a005d2c9439f9d31d31597481', }) depends_on 'm4' diff --git a/packages/openssh.rb b/packages/openssh.rb index 95c103e5f..df7729a1c 100644 --- a/packages/openssh.rb +++ b/packages/openssh.rb @@ -3,22 +3,22 @@ require 'package' class Openssh < Package description 'OpenSSH is the premier connectivity tool for remote login with the SSH protocol.' homepage 'https://www.openssh.com/' - version '8.4' + version '8.4-1' compatibility 'all' source_url 'https://github.com/openssh/openssh-portable/archive/V_8_4_P1.tar.gz' source_sha256 'b924181983a77cb10e61530960e818ccae075e5c457ea6b9f67e4946009563db' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openssh-8.4-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'c5b8da68a42483a6e5ffc032a7e699be340169fee6abe956c0b865b7ed617286', - armv7l: 'c5b8da68a42483a6e5ffc032a7e699be340169fee6abe956c0b865b7ed617286', - i686: '852034874b0fc63c61eb7db3a770bcf2fbec471153829c61d0f67794d102c5d6', - x86_64: '38aa21b22cde3bb2d52ee6c3826f92f83326985e58ceae9ef9aa9dcacb7de285', + aarch64: '6cc250043f9f5978e65220cc5a499651a292f0d8597eedb97e427ccb80872d29', + armv7l: '6cc250043f9f5978e65220cc5a499651a292f0d8597eedb97e427ccb80872d29', + i686: '80b048feee0b23334ffc90fecba4532139ae3f7ccf7bf8bac525a38709f98436', + x86_64: 'e50c359bf9872cb674f90087654d35d3e2d880d3f869c5ed443b179018de1402', }) depends_on 'autoconf' => :build diff --git a/packages/openssl.rb b/packages/openssl.rb index 5d55c20f0..e7acab859 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -4,22 +4,22 @@ class Openssl < Package description 'The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' homepage 'https://www.openssl.org' @_ver = '1.1.1i' - version @_ver + version @_ver + '-1' compatibility 'all' source_url "https://www.openssl.org/source/openssl-#{@_ver}.tar.gz" source_sha256 'e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'c3033ec7b37b5d451f528df4361a348a3dde750d71a131551039bed8880b5bb0', - armv7l: 'c3033ec7b37b5d451f528df4361a348a3dde750d71a131551039bed8880b5bb0', - i686: 'a1435f3a49db9dd3f07f3558cfffdbb0f724b15b1dba430ce3ad028b5d861366', - x86_64: '52a43bc84d243218a2bf98c8895b1e366887a7e5308e711a3145ffe7879fe9e0', + aarch64: '6b4db90acb22c772dcb70d5688033b26230d3e10f2037ee56422f38b8fbd0029', + armv7l: '6b4db90acb22c772dcb70d5688033b26230d3e10f2037ee56422f38b8fbd0029', + i686: '22aae2e468cab25f6258c07cce8afe586b906297d2af602762516c5fd1cd93b5', + x86_64: 'c5d19a3cab5f38898f4875ca2be57c3a8fb23c73726dd14e29f7bed02d252eb0', }) @@ -27,16 +27,16 @@ class Openssl < Package case ARCH when 'aarch64','armv7l' - @ARCH_C_FLAGS = '-march=armv7-a -mfloat-abi=hard' - @ARCH_CXX_FLAGS = '-march=armv7-a -mfloat-abi=hard' + @ARCH_C_FLAGS = '-fPIC -march=armv7-a -mfloat-abi=hard' + @ARCH_CXX_FLAGS = '-fPIC -march=armv7-a -mfloat-abi=hard' OPENSSL_CONFIGURE_TARGET = 'linux-generic32' when 'i686' - @ARCH_C_FLAGS = '' - @ARCH_CXX_FLAGS = '' + @ARCH_C_FLAGS = '-fPIC' + @ARCH_CXX_FLAGS = '-fPIC' OPENSSL_CONFIGURE_TARGET = 'linux-x86' when 'x86_64' - @ARCH_C_FLAGS = '' - @ARCH_CXX_FLAGS = '' + @ARCH_C_FLAGS = '-fPIC' + @ARCH_CXX_FLAGS = '-fPIC' OPENSSL_CONFIGURE_TARGET = 'linux-x86_64' end @ARCH_C_LTO_FLAGS = "#{@ARCH_C_FLAGS} -flto=auto" @@ -54,11 +54,16 @@ class Openssl < Package system "make" end + def self.check system "make test" end + def self.install system "make DESTDIR=#{CREW_DEST_DIR} install_sw install_ssldirs" + # For Libressl Compatibility + #FileUtils.ln_s "#{CREW_LIB_PREFIX}/libssl.so", "#{CREW_DEST_LIB_PREFIX}/libssl.so.48" + #FileUtils.ln_s "#{CREW_LIB_PREFIX}/libcrypto.so", "#{CREW_DEST_LIB_PREFIX}/libcrypto.so.46" end end diff --git a/packages/xwayland.rb b/packages/xwayland.rb index 357f205f7..3c4c0791c 100644 --- a/packages/xwayland.rb +++ b/packages/xwayland.rb @@ -4,24 +4,25 @@ class Xwayland < Package description 'X server configured to work with weston or sommelier' homepage 'https://x.org' @_ver = '1.20.10' - version @_ver + '-1' + version @_ver + '-2' compatibility 'all' source_url "https://github.com/freedesktop/xorg-xserver/archive/xorg-server-#{@_ver}.tar.gz" source_sha256 '499d2b79fdf78e2e06b0c17a4d735fe25ba9d44f689e06a7e82612c35083c4ad' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-2-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-2-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-2-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-2-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'c0a7dc97b292c4e0b4f656e287662cc42d9f5d9faa153121af2febc6646b685d', - armv7l: 'c0a7dc97b292c4e0b4f656e287662cc42d9f5d9faa153121af2febc6646b685d', - i686: 'ebecd2f9921810166ffac629fb4a38c8157e5b675174ef514e2e386ad8b27f18', - x86_64: '2423bbd76b41e395066641ba7cb889ca70a32a4b002226b6d0fc00bf0604d903', + aarch64: '56870da84a58bd14ac55464f7f0363de30c924fb4853d29d1c5c987ee5164914', + armv7l: '56870da84a58bd14ac55464f7f0363de30c924fb4853d29d1c5c987ee5164914', + i686: '5832302f0eed9f41e3eca584b9c3df401c3c5b551db087d9cc8e6d43d19056cf', + x86_64: 'acaa00da4c1c6200fa3c6ffa3f833e5d13bcd240bc0d6cb5277ee0c01299ba47', }) + depends_on 'libepoxy' depends_on 'xorg_proto' depends_on 'libxtrans' @@ -71,7 +72,7 @@ class Xwayland < Package puts "patch2 archive downloaded".lightgreen system 'base64 --decode patch2_base64 > patch2' system 'patch -p 1 < patch2' - + url_patch3 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-xwayland-sysmacros.patch?format=TEXT" uri_patch3 = URI.parse url_patch3 filename_patch3 = 'patch3_base64' @@ -95,6 +96,11 @@ class Xwayland < Package end def self.build + #case ARCH + #when 'aarch64', 'armv7l', 'x86_64' + # ENV['CFLAGS'] = '-fuse-ld=lld' + # ENV['CXXFLAGS'] = '-fuse-ld=lld' + #end system 'meson setup build' system "meson configure #{CREW_MESON_OPTIONS} \ -Dc_link_args='-fuse-ld=lld' \