community/lua-lunix: upgrade to 20190403

2 files changed, 5 insertions, 76 deletions

diff --git a/community/lua-lunix/APKBUILD b/community/lua-lunix/APKBUILD
index 83fd01aa0f..2933ea53c6 100644
--- a/community/lua-lunix/APKBUILD
+++ b/community/lua-lunix/APKBUILD
@@ -3,8 +3,8 @@
 _luaversions="5.1 5.2 5.3"
 pkgname=lua-lunix
 _pkgname=lunix
-pkgver=20150923
-pkgrel=1
+pkgver=20190403
+pkgrel=0
 pkgdesc="Comprehensive Unix API Module for Lua"
 url="https://github.com/wahern/lunix"
 arch="all"
@@ -16,9 +16,8 @@ for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:_package"
 done
-source="$pkgname-$pkgver.tar.gz::https://github.com/wahern/lunix/archive/tag-$pkgver.tar.gz
-	fix-musl-siglist.patch"
-builddir="$srcdir/$_pkgname-tag-$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/wahern/lunix/archive/rel-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-rel-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -46,9 +45,4 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-md5sums="b7341c5f4a5cf5bb0ac1b9fdc3eb174a  lua-lunix-20150923.tar.gz
-479fd7d993059e6ea657c0ac4ed5c510  fix-musl-siglist.patch"
-sha256sums="1c395d1fb46813effd9348708ddd240bd7c39dc68d73216fae184f60fd6d8517  lua-lunix-20150923.tar.gz
-39151eefb5003b8919bb6c78d905019fe2ace51b5b4c40587dcf15f2ab3532c5  fix-musl-siglist.patch"
-sha512sums="cf9fb83ebf99387b79de7afb741f6b8a496911c981be1fd5d51842f2e42c5accc9415e9a026bc17e05b1cade14782f123f6508f8024a8b146e726d26ea8cbdec  lua-lunix-20150923.tar.gz
-4e797cb6a6dc353f0082315b3141862ac8c640bc4b21e856c66e23b24322984b1864dd5df1972fd676c47038080d5122c76a76af1dbc1c1f71c068a3a32535b9  fix-musl-siglist.patch"
+sha512sums="f432284896f00c787993bbe79da871b3a903518641adba2d36e7ebdbdadcf2fa18acda0b7c0823d994a9e012436955f8feed6901bc03aed1f090a67ffd555772  lua-lunix-20190403.tar.gz"
diff --git a/community/lua-lunix/fix-musl-siglist.patch b/community/lua-lunix/fix-musl-siglist.patch
deleted file mode 100644
index 4db73425da..0000000000
--- a/community/lua-lunix/fix-musl-siglist.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From dc5a24c459da3f169fb289e5f72149c63e3b26d0 Mon Sep 17 00:00:00 2001
-From: William Ahern <william+alpine@25thandClement.com>
-Date: Thu, 14 Apr 2016 20:10:15 +0000
-Subject: [PATCH] musl libc has mt-safe strsignal
-
----
- src/unix.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/unix.c b/src/unix.c
-index 516be9e..46ca166 100644
---- a/src/unix.c
-+++ b/src/unix.c
-@@ -82,6 +82,9 @@
- 
- #define UCLIBC_PREREQ(M, m, p) (defined __UCLIBC__ && (__UCLIBC_MAJOR__ > M || (__UCLIBC_MAJOR__ == M && __UCLIBC_MINOR__ > m) || (__UCLIBC_MAJOR__ == M && __UCLIBC_MINOR__ == m && __UCLIBC_SUBLEVEL__ >= p)))
- 
-+/* NB: uClibc defines __GLIBC__ */
-+#define MUSL_MAYBE (__linux && !__BIONIC__ && !__GLIBC__ && !__UCLIBC__)
-+
- #define NETBSD_PREREQ(M, m) __NetBSD_Prereq__(M, m, 0)
- 
- #define FREEBSD_PREREQ(M, m) (defined __FreeBSD_version && __FreeBSD_version >= ((M) * 100000) + ((m) * 1000))
-@@ -318,11 +321,11 @@
- #endif
- 
- #ifndef HAVE_SYS_SIGLIST
--#define HAVE_SYS_SIGLIST 1
-+#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX)
- #endif
- 
- #ifndef HAVE_DECL_SYS_SIGLIST
--#define HAVE_DECL_SYS_SIGLIST 1
-+#define HAVE_DECL_SYS_SIGLIST HAVE_SYS_SIGLIST
- #endif
- 
- #ifndef STRERROR_R_CHAR_P
-@@ -2607,6 +2610,7 @@ static void unixL_random_buf(lua_State *L, void *buf, size_t bufsiz, const unsig
-  * 	              returns NULL on bad signo
-  * 	Linux/glibc : safe'ish since 1998; TLS buffer for bad signo;
-  * 	              gettext for good signo (is gettext thread-safe?)
-+ * 	 Linux/musl : safe; localized; locale structures never deallocated
-  * 	    FreeBSD : safe since 8.1; TLS buffer
-  * 	     NetBSD : not safe as of 6.1; static buffer
-  * 	    OpenBSD : not safe as of 5.6; static buffer
-@@ -2621,11 +2625,18 @@ static void unixL_random_buf(lua_State *L, void *buf, size_t bufsiz, const unsig
-  * has _sys_siglistp instead of sys_siglist. But we use strsignal on those
-  * platforms.
-  */
-+#ifndef HAVE_MTSAFE_STRSIGNAL
-+#define HAVE_MTSAFE_STRSIGNAL_ \
-+	(__sun || GLIBC_PREREQ(0,0) || MUSL_MAYBE || \
-+	 FREEBSD_PREREQ(8,1) || defined __APPLE__ || defined _AIX)
-+#define HAVE_MTSAFE_STRSIGNAL (HAVE_STRSIGNAL && HAVE_MTSAFE_STRSIGNAL_)
-+#endif
-+
- static const char *unixL_strsignal(lua_State *L, int signo) {
- 	const char *info;
- 	unixL_State *U;
- 
--#if HAVE_STRSIGNAL && (USE_STRSIGNAL || __sun || GLIBC_PREREQ(0,0) || FREEBSD_PREREQ(8,1) || defined __APPLE__ || defined _AIX)
-+#if HAVE_MTSAFE_STRSIGNAL
- 	/* AIX strsignal(3) cannot handle bad signo */
- 	if (signo >= 0 && signo < NSIG && (info = strsignal(signo)))
- 		return info;