[arch-commits] Commit in crystal/trunk (PKGBUILD remove_failing_socket_test.patch)

[Anatol Pomozov]

    Date: Sunday, April 23, 2017 @ 01:46:16
  Author: anatolik
Revision: 224433

upgpkg: crystal 0.22.0-1

Modified:
  crystal/trunk/PKGBUILD
  crystal/trunk/remove_failing_socket_test.patch

----------------------------------+
 PKGBUILD                         |   25 ++++++-------------------
 remove_failing_socket_test.patch |   22 ++++++++++++++--------
 2 files changed, 20 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-22 23:52:29 UTC (rev 224432)
+++ PKGBUILD	2017-04-23 01:46:16 UTC (rev 224433)
@@ -3,7 +3,7 @@
 # Contributor: Jonne Haß <me at jhass.eu>
 
 pkgname=crystal
-pkgver=0.21.1
+pkgver=0.22.0
 pkgrel=1
 _binary_rel=1
 pkgdesc='The Crystal Programming Language'
@@ -19,33 +19,20 @@
             'libxml2: For XML support')
 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=('eb93de3b388641fd2a09a2d10ab9fe40a58148d888fc48e4583a86ee1ddb1085'
-            'e258c64886b678cfc6bde6a7e1eb04cd79a4a0d4057b318404d3d5f495fa3a7d'
-            '77e9b34c9e4ccb9c168344396cb249d8b91f9e0c5428c67918f40641654d0240'
-            '7c6458aeeb663674ccf642a2223c2e4ba73b6a6f2c30d3c56810af34456e2273'
-            'c7118f72e5179b3c2a95576966e17c520fab6023479a5e61e59ea250ee4f9273'
-            'c0f5ee92aac8acbee85fc0d3124112262538f2dfe30019e80823b0e6ba78f52c')
-sha256sums_i686=('8ab875309aa71d4501995e834850d40538fb66dd9890024ed812777f83085f48')
-sha256sums_x86_64=('e8a7489aba888cc0deec61e9bda5dd27ab600edb102afc17fa11582b90960875')
+sha256sums=('5b9f11d9710ca9bd971a5afb94d369fd8dfaee103d7edf1c9fbebb2f21898547'
+            '96672187a8a522af3c214e7cb3252dc69aed0bae47ba2e1faf87aad8a67bfe35')
+sha256sums_i686=('c084846d3f9e0c3cfcba6a79fe4e0cf6c6cb6801826a969460ecf2a47abd0fe9')
+sha256sums_x86_64=('789d7b844886133428248605113ede9174c6ea4ba47d96a13f0efd1565b5810d')
 
 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
 
+  # https://github.com/crystal-lang/crystal/issues/4130
   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() {

Modified: remove_failing_socket_test.patch
===================================================================
--- remove_failing_socket_test.patch	2017-04-22 23:52:29 UTC (rev 224432)
+++ remove_failing_socket_test.patch	2017-04-23 01:46:16 UTC (rev 224433)
@@ -1,23 +1,29 @@
-commit 6ca6bfeedbc4d8c304298949c61ffaeefdd4ac9d
-Author: Jonne Haß <me at jhass.eu>
-Date:   Tue Mar 28 21:47:12 2017 +0200
+commit 73103a21fa8b09f4a2d0ee1886204e3bb9e17252
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Sat Apr 22 06:54:02 2017 -0700
 
-    Remove failing host tests
+    Remove tests that fail because of #4130
 
 diff --git a/spec/std/socket_spec.cr b/spec/std/socket_spec.cr
-index 3bf7bd11a..f5554893b 100644
+index 56e565f86..f5554893b 100644
 --- a/spec/std/socket_spec.cr
 +++ b/spec/std/socket_spec.cr
-@@ -536,12 +536,6 @@ describe TCPSocket do
+@@ -536,18 +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)
+-    expect_raises(Socket::Error, /No address found for doesnotexist.example.org.:12345/) do
+-      TCPSocket.new("doesnotexist.example.org.", 12345)
 -    end
 -  end
+-
+-  it "fails (rather than segfault on darwin) when host doesn't exist and port is 0" do
+-    expect_raises(Socket::Error, /No address found for doesnotexist.example.org.:0/) do
+-      TCPSocket.new("doesnotexist.example.org.", 0)
+-    end
+-  end
  end
  
  describe UDPSocket do