diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-07-07 22:47:38 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-10 09:21:20 +0000 |
| commit | 0fd64360bf6d4531c751a86b30feae1b6b58c759 (patch) | |
| tree | 40090b9918677ab7ae36d981ea2d5c4687690f0b /main/libuv | |
| parent | f026174d428074a7238ffd21dbc198d6ffc454cc (diff) | |
| download | aports-0fd64360bf6d4531c751a86b30feae1b6b58c759.tar.bz2 aports-0fd64360bf6d4531c751a86b30feae1b6b58c759.tar.xz | |
main/libuv: upgrade to 1.13.1
Add patch for uv_os_unsetenv
Diffstat (limited to 'main/libuv')
| -rw-r--r-- | main/libuv/APKBUILD | 10 | ||||
| -rw-r--r-- | main/libuv/unsetenv.patch | 28 |
2 files changed, 34 insertions, 4 deletions
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD index 8746991409..b3097ee033 100644 --- a/main/libuv/APKBUILD +++ b/main/libuv/APKBUILD @@ -2,8 +2,8 @@ # Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libuv -pkgver=1.11.0 -pkgrel=1 +pkgver=1.13.1 +pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" arch="all" @@ -12,6 +12,7 @@ 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" @@ -47,5 +48,6 @@ check() { make check || return 1 } -sha512sums="5b56e4c337093c6ddc12f8353b011fba9e57fd84565e279bfc13a7d16d3b6dc01f02fee52a32f38ef630a0f5200fc63f3cc04137af21942422c3dcf535212f02 libuv-v1.11.0.tar.gz -478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch" +sha512sums="1b6e0c24d17c3beb61558fb66f8c6d082758a4fd41c7638c5512c2d31a34d5df1c47ee4afeccae4265879d25ae6b1f351379976e326ffb93cecfec1d30387af3 libuv-v1.13.1.tar.gz +478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch +f5c4d2c20a609c33b0341dbc74c78e4b946842f5099a0c3fa22cfe4946724a9f12271185984ec53c06d487a468921eca8ce2bce91c49ce7123b587515bdec14e unsetenv.patch" diff --git a/main/libuv/unsetenv.patch b/main/libuv/unsetenv.patch new file mode 100644 index 0000000000..67d9f725ae --- /dev/null +++ b/main/libuv/unsetenv.patch @@ -0,0 +1,28 @@ +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 + |