diff options
| author | TBK <tbk@jjtc.dk> | 2018-04-27 15:52:49 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-04-28 22:44:53 +0200 |
| commit | 6e9346160b4a0d0451e600cf94ee3d178221c1ad (patch) | |
| tree | 83a3f0bba617723012cb11f27acdc0109de32001 /main/libuv | |
| parent | dc7a75d3f3cb957fb4afb19888369f8e9ac45380 (diff) | |
| download | aports-6e9346160b4a0d0451e600cf94ee3d178221c1ad.tar.bz2 aports-6e9346160b4a0d0451e600cf94ee3d178221c1ad.tar.xz | |
main/libuv: upgrade to 1.20.2 and rebuild dependent aports
Diffstat (limited to 'main/libuv')
| -rw-r--r-- | main/libuv/APKBUILD | 8 | ||||
| -rw-r--r-- | main/libuv/disable-setuid-test.patch | 8 | ||||
| -rw-r--r-- | main/libuv/test-connection-unspecified.patch | 24 |
3 files changed, 7 insertions, 33 deletions
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD index af79fa580d..04eea87a18 100644 --- a/main/libuv/APKBUILD +++ b/main/libuv/APKBUILD @@ -2,7 +2,7 @@ # Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libuv -pkgver=1.19.2 +pkgver=1.20.2 pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" @@ -12,7 +12,6 @@ makedepends="automake autoconf libtool linux-headers" subpackages="$pkgname-dev $pkgname-dbg" source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz disable-setuid-test.patch - test-connection-unspecified.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -46,6 +45,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="8f317bb9c173af32d19e8f9f5c64e2cb50178166a109e84218ea630667a5cbd8c6c700c53baf89d2754e615b8526c22d5514bf3c2fe123913b297fbe5727be5e libuv-v1.19.2.tar.gz -7471ec9bd513c50cd38f9c38ece5fe45c3dc02c9e941a6db4b480efc6d0dfc86a7a32608735ca49439d23653369fa8444eb70e41b99d6dcbf32db0375ec92793 disable-setuid-test.patch -e3faf7b148ce2fb4d28de27c8b096282a7d93bdd4ca253c89b33f17bcc2a123698b8ed9aada6aa6ba502d3a261a1ac36fa2faa245df4969c85a60ee5da0f96fa test-connection-unspecified.patch" +sha512sums="e39ba5d2fab83d735a1b3bb3191e1ce970c78d3d8745b9d0aa0d2c32bd82c84ff0899cb5c06a4a8b2734d010a59653807374e38a364835d12d3c1d208c33b754 libuv-v1.20.2.tar.gz +081b98efa33264d326d998f32600635efd5723de1d9836b99039c60168580c7f56a7ea9fdd138f41bb1aede11da70079cce4aa69ea5b954b7f9e4dcad53ba16a disable-setuid-test.patch" diff --git a/main/libuv/disable-setuid-test.patch b/main/libuv/disable-setuid-test.patch index 4d9cb38dc0..410c2660c0 100644 --- a/main/libuv/disable-setuid-test.patch +++ b/main/libuv/disable-setuid-test.patch @@ -1,6 +1,6 @@ --- a/test/test-list.h +++ b/test/test-list.h -@@ -253,8 +253,10 @@ +@@ -254,8 +254,10 @@ TEST_DECLARE (spawn_and_kill_with_std) TEST_DECLARE (spawn_and_ping) TEST_DECLARE (spawn_preserve_env) @@ -11,7 +11,7 @@ TEST_DECLARE (spawn_stdout_to_file) TEST_DECLARE (spawn_stdout_and_stderr_to_file) TEST_DECLARE (spawn_stdout_and_stderr_to_file2) -@@ -384,7 +386,9 @@ +@@ -391,7 +393,9 @@ TEST_DECLARE (emfile) TEST_DECLARE (close_fd) TEST_DECLARE (spawn_fs_open) @@ -21,7 +21,7 @@ TEST_DECLARE (we_get_signal) TEST_DECLARE (we_get_signals) TEST_DECLARE (we_get_signal_one_shot) -@@ -747,8 +751,10 @@ +@@ -755,8 +759,10 @@ TEST_ENTRY (spawn_and_kill_with_std) TEST_ENTRY (spawn_and_ping) TEST_ENTRY (spawn_preserve_env) @@ -32,7 +32,7 @@ TEST_ENTRY (spawn_stdout_to_file) TEST_ENTRY (spawn_stdout_and_stderr_to_file) TEST_ENTRY (spawn_stdout_and_stderr_to_file2) -@@ -782,7 +788,9 @@ +@@ -790,7 +796,9 @@ TEST_ENTRY (emfile) TEST_ENTRY (close_fd) TEST_ENTRY (spawn_fs_open) diff --git a/main/libuv/test-connection-unspecified.patch b/main/libuv/test-connection-unspecified.patch deleted file mode 100644 index 225cfc066c..0000000000 --- a/main/libuv/test-connection-unspecified.patch +++ /dev/null @@ -1,24 +0,0 @@ -# https://github.com/libuv/libuv/issues/1766 ---- a/test/test-connect-unspecified.c -+++ b/test/test-connect-unspecified.c -@@ -48,12 +48,14 @@ - (const struct sockaddr*) &addr4, - connect_4) == 0); - -- ASSERT(uv_tcp_init(loop, &socket6) == 0); -- ASSERT(uv_ip6_addr("::", TEST_PORT, &addr6) == 0); -- ASSERT(uv_tcp_connect(&connect6, -- &socket6, -- (const struct sockaddr*) &addr6, -- connect_6) == 0); -+ if (can_ipv6()) { -+ ASSERT(uv_tcp_init(loop, &socket6) == 0); -+ ASSERT(uv_ip6_addr("::", TEST_PORT, &addr6) == 0); -+ ASSERT(uv_tcp_connect(&connect6, -+ &socket6, -+ (const struct sockaddr*) &addr6, -+ connect_6) == 0); -+ } - - ASSERT(uv_run(loop, UV_RUN_DEFAULT) == 0); - |