diff options
| -rw-r--r-- | main/libuv/APKBUILD | 16 | ||||
| -rw-r--r-- | main/libuv/disable-setuid-test.patch | 44 |
2 files changed, 11 insertions, 49 deletions
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD index 75b68443bd..842397f323 100644 --- a/main/libuv/APKBUILD +++ b/main/libuv/APKBUILD @@ -11,9 +11,7 @@ license="MIT BSD ISC" makedepends_build="automake autoconf libtool" makedepends_host="linux-headers" subpackages="$pkgname-static $pkgname-dev $pkgname-dbg" -source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz - disable-setuid-test.patch - " +source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz" builddir="$srcdir/$pkgname-v$pkgver" prepare() { @@ -36,6 +34,15 @@ build() { check() { cd "$builddir" + # see https://github.com/libuv/libuv/issues/2307 + case $CARCH in + x86*) + if test $DRONE; then + sed -i "s/TEST_.*(ipc_closed_handle)//g" test/test-list.h + fi + ;; + esac + make check } @@ -46,5 +53,4 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="0813a57d7da28c1665824be69321f133050656171d294bb0cb5a83bab7b7c8eef2d6690bdcff2f44727a6f6d6b9b977a66586efb5d59ed280f78be72c71110d3 libuv-v1.29.1.tar.gz -ba85b0be3905be6d5ff2bf825f99420d979eb2db9c665d2de1cea8366470de718670f71addb9611e468befe1f1e9fcdcf8886ae1d4784485abf0beae2ccc8ee3 disable-setuid-test.patch" +sha512sums="0813a57d7da28c1665824be69321f133050656171d294bb0cb5a83bab7b7c8eef2d6690bdcff2f44727a6f6d6b9b977a66586efb5d59ed280f78be72c71110d3 libuv-v1.29.1.tar.gz" diff --git a/main/libuv/disable-setuid-test.patch b/main/libuv/disable-setuid-test.patch deleted file mode 100644 index 7977883bc4..0000000000 --- a/main/libuv/disable-setuid-test.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/test/test-list.h -+++ b/test/test-list.h -@@ -266,8 +266,10 @@ - TEST_DECLARE (spawn_and_kill_with_std) - TEST_DECLARE (spawn_and_ping) - TEST_DECLARE (spawn_preserve_env) -+#if 0 - TEST_DECLARE (spawn_setuid_fails) - TEST_DECLARE (spawn_setgid_fails) -+#endif - TEST_DECLARE (spawn_stdout_to_file) - TEST_DECLARE (spawn_stdout_and_stderr_to_file) - TEST_DECLARE (spawn_stdout_and_stderr_to_file2) -@@ -412,7 +414,9 @@ - TEST_DECLARE (emfile) - TEST_DECLARE (close_fd) - TEST_DECLARE (spawn_fs_open) -+#if 0 - TEST_DECLARE (spawn_setuid_setgid) -+#endif - TEST_DECLARE (we_get_signal) - TEST_DECLARE (we_get_signals) - TEST_DECLARE (we_get_signal_one_shot) -@@ -803,8 +807,10 @@ - TEST_ENTRY (spawn_and_kill_with_std) - TEST_ENTRY (spawn_and_ping) - TEST_ENTRY (spawn_preserve_env) -+#if 0 - TEST_ENTRY (spawn_setuid_fails) - TEST_ENTRY (spawn_setgid_fails) -+#endif - TEST_ENTRY (spawn_stdout_to_file) - TEST_ENTRY (spawn_stdout_and_stderr_to_file) - TEST_ENTRY (spawn_stdout_and_stderr_to_file2) -@@ -838,7 +844,9 @@ - TEST_ENTRY (emfile) - TEST_ENTRY (close_fd) - TEST_ENTRY (spawn_fs_open) -+#if 0 - TEST_ENTRY (spawn_setuid_setgid) -+#endif - TEST_ENTRY (we_get_signal) - TEST_ENTRY (we_get_signals) - TEST_ENTRY (we_get_signal_one_shot) |