From 3a3e2915646f2eefc4d2039feb3feec74d1a52f8 Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" Date: Sun, 5 Feb 2017 18:17:28 +0900 Subject: [PATCH 1/3] Update openssl to 1.0.2l. Change openssl.rb to strip binary and libraries and prepare to install man correctly. Also add check method to check the correctness. --- packages/openssl.rb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/openssl.rb b/packages/openssl.rb index a595836c3d..342080e897 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -3,13 +3,13 @@ require 'package' class Openssl < Package description 'OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols.' homepage 'https://www.openssl.org/' - version '1.0.2k' + version '1.0.2l' - source_url 'ftp://openssl.org/source/openssl-1.0.2k.tar.gz' - source_sha1 '5f26a624479c51847ebd2f22bb9f84b3b44dcb44' + source_url 'https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz' + source_sha1 '5bea0957b371627e8ebbee5bef221519e94d547c' - depends_on 'perl' - depends_on 'zlibpkg' + depends_on 'perl' => :build + depends_on 'zlibpkg' => :build def self.build options="shared zlib-dynamic" @@ -18,14 +18,23 @@ class Openssl < Package end system "./config --prefix=/usr/local --openssldir=/etc/ssl #{options}" system "make" + system "find . -name '*.so' -print | xargs strip -S" + system "find . -name '*.so.*' -print | xargs strip -S" end def self.install - # installing using multi cores may cause empty libssl.so.1.0.0 or libcrypto.so.1.0.0 problem - system "make", "-j1", "INSTALL_PREFIX=#{CREW_DEST_DIR}", "install" + system "make", "INSTALL_PREFIX=#{CREW_DEST_DIR}", "install" + system "strip", "#{CREW_DEST_DIR}/usr/local/bin/openssl" + system "find #{CREW_DEST_DIR}/usr/local -name 'lib*.a' -print | xargs rm" + + # move man to /usr/local/man + system "mv", "#{CREW_DEST_DIR}/etc/ssl/man", "#{CREW_DEST_DIR}/usr/local/man" # remove all files pretended to install /etc/ssl (use system's /etc/ssl as is) system "rm", "-rf", "#{CREW_DEST_DIR}/etc" end + def self.check + system "make", "test" + end end From 0712fb8e6e516a759108c6a2f3fdf39a6e1c1966 Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" Date: Tue, 6 Jun 2017 07:33:07 +0900 Subject: [PATCH 2/3] Change openssl.rb to use pre-built binary package for aarch64 and armv7l --- packages/openssl.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/openssl.rb b/packages/openssl.rb index 342080e897..d9eadad822 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -7,6 +7,14 @@ class Openssl < Package source_url 'https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz' source_sha1 '5bea0957b371627e8ebbee5bef221519e94d547c' + binary_url ({ + aarch64: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-1-chromeos-armv7l.tar.xz', + armv7l: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-1-chromeos-armv7l.tar.xz', + }) + binary_sha1 ({ + aarch64: '4c9eb37df898e9495a8f53e3aa7f6058063fa8ce', + armv7l: '4c9eb37df898e9495a8f53e3aa7f6058063fa8ce', + }) depends_on 'perl' => :build depends_on 'zlibpkg' => :build From e8773426975dc3baa73e7eb9d63277fb4463bdfc Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" Date: Tue, 6 Jun 2017 19:40:33 +0900 Subject: [PATCH 3/3] Correct binary filename --- packages/openssl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openssl.rb b/packages/openssl.rb index d9eadad822..e9135a5ef3 100644 --- a/packages/openssl.rb +++ b/packages/openssl.rb @@ -8,8 +8,8 @@ class Openssl < Package source_url 'https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz' source_sha1 '5bea0957b371627e8ebbee5bef221519e94d547c' binary_url ({ - aarch64: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-1-chromeos-armv7l.tar.xz', - armv7l: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-1-chromeos-armv7l.tar.xz', + aarch64: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-chromeos-armv7l.tar.xz', + armv7l: 'https://github.com/jam7/chromebrew/releases/download/binaries/openssl-1.0.2l-chromeos-armv7l.tar.xz', }) binary_sha1 ({ aarch64: '4c9eb37df898e9495a8f53e3aa7f6058063fa8ce',