diff --git a/packages/musl_openssl.rb b/packages/musl_openssl.rb index 30a19982f..e3d63b07b 100644 --- a/packages/musl_openssl.rb +++ b/packages/musl_openssl.rb @@ -3,24 +3,24 @@ require 'package' class Musl_openssl < Package description 'The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' homepage 'https://www.openssl.org' - @_ver = '3.0.7' + @_ver = '3.0.8' version @_ver license 'openssl' compatibility 'all' source_url "https://www.openssl.org/source/openssl-#{@_ver}.tar.gz" - source_sha256 '83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e' + source_sha256 '6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.7_armv7l/musl_openssl-3.0.7-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.7_armv7l/musl_openssl-3.0.7-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.7_i686/musl_openssl-3.0.7-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.7_x86_64/musl_openssl-3.0.7-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.8_armv7l/musl_openssl-3.0.8-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.8_armv7l/musl_openssl-3.0.8-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.8_i686/musl_openssl-3.0.8-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/musl_openssl/3.0.8_x86_64/musl_openssl-3.0.8-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '3d9aa6f889b0b804025ce70eed32894e1c07b7762ae94374a29137bf1b564e90', - armv7l: '3d9aa6f889b0b804025ce70eed32894e1c07b7762ae94374a29137bf1b564e90', - i686: '3ac71992c6298f746d4bb497b1091acf1a18d09c4337ee733ae0b38a842cc18f', - x86_64: '1601e49a3221acab4897b99e4de3c975b6128f304eb7a99b89de72381ed1203e' + aarch64: '714297a8186e44a61d27618d8a0ef3cd81659149bd379927b6ea9ff2fcb828d4', + armv7l: '714297a8186e44a61d27618d8a0ef3cd81659149bd379927b6ea9ff2fcb828d4', + i686: '79660b0ae4c4ca70e2de38f937f15aa345fab9488a0a52c2780942c1980ebd40', + x86_64: '37f4eb675bf536e7155635b680c80b05d11e2872022292768fe471a383e404ed' }) depends_on 'musl_native_toolchain' => :build diff --git a/packages/openssl.rb b/packages/openssl.rb index 70dd218e9..898fd0638 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -3,23 +3,23 @@ require 'package' class Openssl < Package description 'The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' homepage 'https://www.openssl.org' - version '1.1.1s' # Do not use @_ver here, it will break the installer. + version '1.1.1t' # Do not use @_ver here, it will break the installer. license 'openssl' compatibility 'all' - source_url 'https://www.openssl.org/source/openssl-1.1.1s.tar.gz' - source_sha256 'c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa' + source_url 'https://www.openssl.org/source/openssl-1.1.1t.tar.gz' + source_sha256 '8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1s_armv7l/openssl-1.1.1s-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1s_armv7l/openssl-1.1.1s-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1s_i686/openssl-1.1.1s-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1s_x86_64/openssl-1.1.1s-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1t_armv7l/openssl-1.1.1t-chromeos-armv7l.tar.xz', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1t_armv7l/openssl-1.1.1t-chromeos-armv7l.tar.xz', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1t_i686/openssl-1.1.1t-chromeos-i686.tar.xz', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/openssl/1.1.1t_x86_64/openssl-1.1.1t-chromeos-x86_64.tar.xz' }) binary_sha256({ - aarch64: '6befd72e7eac1d745316502b52ad14f72b24cee3bc810920886fe4ae85f1ec41', - armv7l: '6befd72e7eac1d745316502b52ad14f72b24cee3bc810920886fe4ae85f1ec41', - i686: '690f62d599ec878d59e237aead76631407a48e1b070729a44f00d4e8a6a59193', - x86_64: '69e980b70b331ca265ff22c5e649fc31195586fbb61a59f274320610e68a6263' + aarch64: '88a36d1539c7c01af1f5e469b64c2760f43126bb75c0e63b53d3d61c2a6fbe7f', + armv7l: '88a36d1539c7c01af1f5e469b64c2760f43126bb75c0e63b53d3d61c2a6fbe7f', + i686: 'ce98c1898e57df1cbcceab08912e219fb5f27b0e4585315f7babdf524fa844dc', + x86_64: 'd6583dc2c7566da33402cb8d7f9025189d65b8ba6300e752edcb0d74ebcb1f68' }) # depends_on 'ccache' => :build @@ -43,8 +43,8 @@ class Openssl < Package @openssl_configure_target = 'linux-x86_64' end @ARCH_LDFLAGS = '-flto' - @ARCH_C_LTO_FLAGS = "#{@arch_c_flags} -flto" - @ARCH_CXX_LTO_FLAGS = "#{@arch_cxx_flags} -flto" + @ARCH_C_LTO_FLAGS = "#{@arch_c_flags} -flto=auto" + @ARCH_CXX_LTO_FLAGS = "#{@arch_cxx_flags} -flto=auto" def self.build # This gives you the list of OpenSSL configure targets @@ -60,6 +60,10 @@ class Openssl < Package end def self.check + # ecdsatest fails on i686 + # collect2: fatal error: ld terminated with signal 11 [Segmentation fault], core dumped + return if ARCH == 'i686' + # Don't run tests if we are just rebuilding the same version of openssl. system 'make test' unless `openssl version | awk '{print $2}'`.chomp == '1.1.1s' end