bootver set to 0.27.0
deleted patches for tests which now pass testing
add patches to skip tests which fails and depends on libc type
use _llvmver variable instead of hardcoded ones
---
community/crystal/APKBUILD | 22 +++++++++----------
community/crystal/fix-spec-http-server.patch | 20 -----------------
.../fix-spec-socket-tcp_server.cr.patch | 11 ----------
.../fix-spec-socket-tcp_socket.cr.patch | 11 ----------
.../crystal/fix-spec-std-kernel-spec.cr.patch | 11 ++++++++++
...x-spec-std-socket-tcp_server_spec.cr.patch | 11 ++++++++++
6 files changed, 32 insertions(+), 54 deletions(-)
delete mode 100644 community/crystal/fix-spec-http-server.patch
delete mode 100644 community/crystal/fix-spec-socket-tcp_server.cr.patch
delete mode 100644 community/crystal/fix-spec-socket-tcp_socket.cr.patch
create mode 100644 community/crystal/fix-spec-std-kernel-spec.cr.patch
create mode 100644 community/crystal/fix-spec-std-socket-tcp_server_spec.cr.patch
diff --git a/community/crystal/APKBUILD b/community/crystal/APKBUILD
index af919a6c59..0b4746dd57 100644
--- a/community/crystal/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=crystal
-pkgver=0.27.0
+pkgver=0.27.2
pkgrel=0
-_bootver=0.26.0
+_bootver=0.27.0
_llvmver=5
pkgdesc="The Crystal Programming Language"
url="https://crystal-lang.org/"
@@ -11,7 +11,7 @@ arch="x86_64 aarch64"
license="Apache-2.0"
depends="gc-dev libatomic_ops libevent-dev gcc gmp-dev pcre-dev"
checkdepends="openssl-dev libxml2-dev readline-dev tzdata yaml-dev zlib-dev"
-makedepends="llvm5-dev llvm5-static"
+makedepends="llvm$_llvmver-dev llvm$_llvmver-static"
subpackages="$pkgname-doc
$pkgname-bash-completion:bashcomp:noarch
$pkgname-zsh-completion:zshcomp:noarch
@@ -20,9 +20,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/crystal-lang/$pkgname/archiv
https://dev.alpinelinux.org/archive/crystal/crystal-$_bootver-x86_64-alpine-linux-musl.tar.gz
https://dev.alpinelinux.org/archive/crystal/crystal-$_bootver-aarch64-alpine-linux-musl.tar.gz
disable-specs-using-GB2312-encoding.patch
- fix-spec-http-server.patch
- fix-spec-socket-tcp_server.cr.patch
- fix-spec-socket-tcp_socket.cr.patch
+ fix-spec-std-kernel-spec.cr.patch
+ fix-spec-std-socket-tcp_server_spec.cr.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -119,10 +118,9 @@ zshcomp() {
"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
}
-sha512sums="02b0e1d43d699d1dd91f4b979c8ab8909264e5f1fcc344f6110bebb808c0ee764a943368cce9d33a258adb9631ed4f445e1f771d5a9e50fcd337fc8b319616cf crystal-0.27.0.tar.gz
-c3f2a27189214af8b7882e3356053beddd21b7ec9f6d3b9e083c0b1a15125f4986141798f26086fe27221ec4be88faf920d60fac44d291a5f8510a404498dd7a crystal-0.26.0-x86_64-alpine-linux-musl.tar.gz
-2aafaaae0f8a1563b3cb27b351c0de49b6e9f5928e15c2af6f2a57d040369da92afa64ab120265d54dc40604c6a84c0d62188fbc2fbb2582534278fad8afddcb crystal-0.26.0-aarch64-alpine-linux-musl.tar.gz
+sha512sums="dcb5948f373d4a7b17e6bdd45697a43e86ec7eb38bdafaade982df9adacbc5a24f2b08f327e41b853bb8f6ec8272411d14defee4e510c430c5dd1370afca42ae crystal-0.27.2.tar.gz
+0519f6c68de8087a618ff05b88f4dcc3190e63997d810d9eaaa8d6d14fca523a158e3bb4d36a56862178643bae46016ae93e6b6041deeb547efe1163e9dd03f5 crystal-0.27.0-x86_64-alpine-linux-musl.tar.gz
+e5614293ac4d8fe35f0e8b9c4bce363380504b9afb7d2a015bf057d39a9bdc4c4b0c403808ccb840f7588054ab8cf4148a701e66780a202853715462a1c06732 crystal-0.27.0-aarch64-alpine-linux-musl.tar.gz
269976fbc990dde075769e651c9fac6e7e0b39681e55cbd067c6d2a790c58a096bdc9981f62ae69b5217623025ba768daa63bc5316bd8ddd18192d88839aedcb disable-specs-using-GB2312-encoding.patch
-1c58cfd03b89d55ab38d0073161a4fbe9b5dd71c6ccb01a5b2085c6f737a999b75c44b0485f372403c97fc77bcdcc50808adede901ab0e20705f70221b3f97ee fix-spec-http-server.patch
-c628c02e7b827b80dd530e4885205dc08ebfc1b037cda441b1f15000a3756efd5b965d6a86e993c4c557a1f9bf70002a9f37ffad1676704b8995564c83b58af5 fix-spec-socket-tcp_server.cr.patch
-058a9ae98c89953ad4154b4fed04318378da8b3a0f69df17c7eb3c2f004f347400d3a77ac9836d99089059e5bd964bd24cb04176bf8ab542509706a362f21f6d fix-spec-socket-tcp_socket.cr.patch"
+ee1d81b40a9b15b2abfecbc61a1ef830700cc5613f9d2626722e8393633ed5d40329ac1fc2813b08b66c689876d3bd8a9f949a22beeda572ea3d4753f58417a8 fix-spec-std-kernel-spec.cr.patch
+560da65be712983e036fcc614cb191647a4dbd76bacae97e0c2d5cdc3016de23daa44bd63f4fb509c5bd9e58419e63db7403faa8cd9d0b7af4ac2477efb9ff3b fix-spec-std-socket-tcp_server_spec.cr.patch"
diff --git a/community/crystal/fix-spec-http-server.patch b/community/crystal/fix-spec-http-server.patch
deleted file mode 100644
index 9ab3a511e9..0000000000
--- a/community/crystal/fix-spec-http-server.patch
@@ -1,20 +0,0 @@
---- a/spec/std/http/server/server_spec.cr
-+++ b/spec/std/http/server/server_spec.cr
-@@ -491,7 +491,7 @@
- end
- {% end %}
-
-- it "handles exception during SSL handshake (#6577)" do
-+ pending "handles exception during SSL handshake (#6577)" do
- server = SilentErrorHTTPServer.new do |context|
- context.response.print "ok"
- context.response.close
-@@ -524,7 +524,7 @@
- end
-
- describe "#close" do
-- it "closes gracefully" do
-+ pending "closes gracefully" do
- server = Server.new do |context|
- context.response.flush
- context.response.puts "foo"
diff --git a/community/crystal/fix-spec-socket-tcp_server.cr.patch b/community/crystal/fix-spec-socket-tcp_server.cr.patch
deleted file mode 100644
index 077aebe79b..0000000000
--- a/community/crystal/fix-spec-socket-tcp_server.cr.patch
@@ -1,11 +0,0 @@
---- a/spec/std/socket/tcp_server_spec.cr
-+++ b/spec/std/socket/tcp_server_spec.cr
-@@ -32,7 +32,7 @@
- server.local_address.port.should be > 0
- end
-
-- it "raises when port is negative" do
-+ pending "raises when port is negative" do
- expect_raises(Socket::Error, linux? ? "getaddrinfo: Servname not supported for ai_socktype" : "No address found for #{address}:-12 over TCP") do
- TCPServer.new(address, -12)
- end
diff --git a/community/crystal/fix-spec-socket-tcp_socket.cr.patch b/community/crystal/fix-spec-socket-tcp_socket.cr.patch
deleted file mode 100644
index 21c0645323..0000000000
--- a/community/crystal/fix-spec-socket-tcp_socket.cr.patch
@@ -1,11 +0,0 @@
---- a/spec/std/socket/tcp_socket_spec.cr
-+++ b/spec/std/socket/tcp_socket_spec.cr
-@@ -32,7 +32,7 @@
- end
- end
-
-- it "raises when port is negative" do
-+ pending "raises when port is negative" do
- expect_raises(Socket::Error, linux? ? "getaddrinfo: Servname not supported for ai_socktype" : "No address found for #{address}:-12 over TCP") do
- TCPSocket.new(address, -12)
- end
diff --git a/community/crystal/fix-spec-std-kernel-spec.cr.patch b/community/crystal/fix-spec-std-kernel-spec.cr.patch
new file mode 100644
index 0000000000..08100900b4
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/spec/std/kernel_spec.cr 2019-02-05 14:51:38.000000000 +0000
++++ b/spec/std/kernel_spec.cr 2019-02-19 19:11:02.129045734 +0000
+@@ -232,7 +232,7 @@
+ error.should_not contain("Stack overflow")
+ end
+
+- it "detects stack overflow on the main stack" do
++ pending "detects stack overflow on the main stack" do
+ # This spec can take some time under FreeBSD where
+ # the default stack size is 0.5G. Setting a
+ # smaller stack size with `ulimit -s 8192`
diff --git a/community/crystal/fix-spec-std-socket-tcp_server_spec.cr.patch b/community/crystal/fix-spec-std-socket-tcp_server_spec.cr.patch
new file mode 100644
index 0000000000..ff0920020d
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/spec/std/socket/tcp_server_spec.cr 2019-02-05 14:51:38.000000000 +0000
++++ b/spec/std/socket/tcp_server_spec.cr 2019-02-19 19:15:23.202756036 +0000
+@@ -48,7 +48,7 @@
+ end
+ end
+
+- it "raises when not binding with reuse_port" do
++ pending "raises when not binding with reuse_port" do
+ TCPServer.open(address, 0, reuse_port: true) do |server|
+ expect_raises_errno(Errno::EADDRINUSE, {% if flag?(:linux) %}"listen: "{% else %}"bind: "{% end %}) do
+ TCPServer.open(address, server.local_address.port) { }
--
2.20.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---