Date: Wednesday, April 5, 2017 @ 10:34:21 Author: anatolik Revision: 220574
Add openssl 1.1 compat patches from upstream Added: crystal/trunk/remove_failing_socket_test.patch Modified: crystal/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 29 ++++++++++++++++++++++++----- remove_failing_socket_test.patch | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-05 10:32:12 UTC (rev 220573) +++ PKGBUILD 2017-04-05 10:34:21 UTC (rev 220574) @@ -3,7 +3,7 @@ # Contributor: Jonne Haß <[email protected]> pkgname=crystal -pkgver=0.20.5 +pkgver=0.21.1 pkgrel=1 _binary_rel=1 pkgdesc='The Crystal Programming Language' @@ -17,16 +17,35 @@ 'libyaml: For YAML support' 'gmp: For BigInt support' 'libxml2: For XML support') -source=(crystal-$pkgver.tar.gz::https://github.com/crystal-lang/crystal/archive/$pkgver.tar.gz) +source=(crystal-$pkgver.tar.gz::https://github.com/crystal-lang/crystal/archive/$pkgver.tar.gz + remove_failing_socket_test.patch + openssl11_1.patch::https://github.com/crystal-lang/crystal/commit/1658c312d8b26c559ce5410254f0c75182529abe.patch + openssl11_2.patch::https://github.com/crystal-lang/crystal/commit/b67a118e7a438009e5d44d0701c21d030c92aa94.patch + openssl11_3.patch::https://github.com/crystal-lang/crystal/commit/58b84812ed531acc528086a08ce843baa6188a7a.patch + openssl11_4.patch::https://github.com/crystal-lang/crystal/commit/3119e5989ee0dbdb9b1eff45bf5a0e2fdf665115.patch +) source_i686+=(https://github.com/crystal-lang/crystal/releases/download/$pkgver/$pkgname-$pkgver-$_binary_rel-linux-i686.tar.gz) source_x86_64+=(https://github.com/crystal-lang/crystal/releases/download/$pkgver/$pkgname-$pkgver-$_binary_rel-linux-x86_64.tar.gz) -sha256sums=('ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707') -sha256sums_i686=('e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7') -sha256sums_x86_64=('fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100') +sha256sums=('eb93de3b388641fd2a09a2d10ab9fe40a58148d888fc48e4583a86ee1ddb1085' + 'e258c64886b678cfc6bde6a7e1eb04cd79a4a0d4057b318404d3d5f495fa3a7d' + '77e9b34c9e4ccb9c168344396cb249d8b91f9e0c5428c67918f40641654d0240' + '7c6458aeeb663674ccf642a2223c2e4ba73b6a6f2c30d3c56810af34456e2273' + 'c7118f72e5179b3c2a95576966e17c520fab6023479a5e61e59ea250ee4f9273' + 'c0f5ee92aac8acbee85fc0d3124112262538f2dfe30019e80823b0e6ba78f52c') +sha256sums_i686=('8ab875309aa71d4501995e834850d40538fb66dd9890024ed812777f83085f48') +sha256sums_x86_64=('e8a7489aba888cc0deec61e9bda5dd27ab600edb102afc17fa11582b90960875') prepare() { cd $pkgname-$pkgver sed -i 's|Please install shards: https://github.com/ysbaddaden/shards|Please install shards: pacman -S shards|' src/compiler/crystal/command.cr + + patch -p1 < ../remove_failing_socket_test.patch + + # https://github.com/crystal-lang/crystal/issues/4204 + patch -p1 < ../openssl11_1.patch + patch -p1 < ../openssl11_2.patch + patch -p1 < ../openssl11_3.patch + patch -p1 < ../openssl11_4.patch } build() { Added: remove_failing_socket_test.patch =================================================================== --- remove_failing_socket_test.patch (rev 0) +++ remove_failing_socket_test.patch 2017-04-05 10:34:21 UTC (rev 220574) @@ -0,0 +1,23 @@ +commit 6ca6bfeedbc4d8c304298949c61ffaeefdd4ac9d +Author: Jonne Haß <[email protected]> +Date: Tue Mar 28 21:47:12 2017 +0200 + + Remove failing host tests + +diff --git a/spec/std/socket_spec.cr b/spec/std/socket_spec.cr +index 3bf7bd11a..f5554893b 100644 +--- a/spec/std/socket_spec.cr ++++ b/spec/std/socket_spec.cr +@@ -536,12 +536,6 @@ describe TCPSocket do + TCPSocket.new("localhost", port) + end + end +- +- it "fails when host doesn't exist" do +- expect_raises(Socket::Error, /No address found for localhostttttt:12345/) do +- TCPSocket.new("localhostttttt", 12345) +- end +- end + end + + describe UDPSocket do
