diff options
| -rw-r--r-- | main/libuv/APKBUILD | 27 | ||||
| -rw-r--r-- | main/libuv/unsetenv.patch | 28 |
2 files changed, 12 insertions, 43 deletions
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD index b3097ee033..c0e7db964e 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.13.1 +pkgver=1.14.0 pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" @@ -12,15 +12,14 @@ makedepends="automake autoconf libtool linux-headers" subpackages="$pkgname-dev $pkgname-dbg" source="http://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz disable-setuid-test.patch - unsetenv.patch " builddir="$srcdir/$pkgname-v$pkgver" prepare() { - default_prepare || return 1 + default_prepare cd "$builddir" - sh autogen.sh || return 1 + sh autogen.sh } build() { @@ -31,9 +30,13 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var \ - || return 1 - make CFLAGS="$CFLAGS -D__USE_MISC" BUILDTYPE=Release || return 1 + --localstatedir=/var + make CFLAGS="$CFLAGS -D__USE_MISC" BUILDTYPE=Release +} + +check() { + cd "$builddir" + make check } package() { @@ -43,11 +46,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -check() { - cd "$builddir" - make check || return 1 -} - -sha512sums="1b6e0c24d17c3beb61558fb66f8c6d082758a4fd41c7638c5512c2d31a34d5df1c47ee4afeccae4265879d25ae6b1f351379976e326ffb93cecfec1d30387af3 libuv-v1.13.1.tar.gz -478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch -f5c4d2c20a609c33b0341dbc74c78e4b946842f5099a0c3fa22cfe4946724a9f12271185984ec53c06d487a468921eca8ce2bce91c49ce7123b587515bdec14e unsetenv.patch" +sha512sums="a84c62021d50bf5a6024d05580243b21850f09123ff1865fc43fb7f2aabf1f65e5a7d9b33e446ca9a75c1b82d5cdad11b35f18cdc26e7323d0f957ac9af4623f libuv-v1.14.0.tar.gz +478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch" diff --git a/main/libuv/unsetenv.patch b/main/libuv/unsetenv.patch deleted file mode 100644 index 67d9f725ae..0000000000 --- a/main/libuv/unsetenv.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4cffd5aaa32d364cec6dcbfa7ee54816e8ef6fc9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com> -Date: Fri, 7 Jul 2017 22:41:12 +0200 -Subject: [PATCH] Check for NULL in uv_os_unsetenv for parameter name - -* Fixes segfault of unit test on musl (AlpineLinux) -* Add a check for parameter like uv_os_setenv do ---- - src/unix/core.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/unix/core.c b/src/unix/core.c -index 4c744925..a0513451 100644 ---- a/src/unix/core.c -+++ b/src/unix/core.c -@@ -1292,6 +1292,9 @@ int uv_os_setenv(const char* name, const char* value) { - - - int uv_os_unsetenv(const char* name) { -+ if (name == NULL) -+ return -EINVAL; -+ - if (unsetenv(name) != 0) - return -errno; - --- -2.13.2 - |