main/lua-turbo: upgrade to 2.0.0

2 files changed, 11 insertions, 52 deletions

diff --git a/main/lua-turbo/APKBUILD b/main/lua-turbo/APKBUILD
index 1461d56d5e..4dd9ca0a61 100644
--- a/main/lua-turbo/APKBUILD
+++ b/main/lua-turbo/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lua-turbo
 _jitver=2.0.4
-pkgver=1.1.6
+pkgver=2.0.0
 pkgrel=0
 pkgdesc="a framework built for LuaJIT 2 and Linux"
 url="http://www.turbolua.org/"
@@ -15,8 +15,7 @@ makedepends="$depends_dev openssl-dev"
 install=""
 subpackages=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/kernelsauce/turbo/archive/v$pkgver.tar.gz
-	fix-bindir.patch
-	case-sensitive-url-matching.patch"
+	fix-bindir.patch"
 
 _builddir="$srcdir/turbo-$pkgver"
 
@@ -42,11 +41,11 @@ prepare() {
 	# we need to fix the loading of libssl.
 	# so we replace symlink with real filename
 	sed -i -e \
-		"s|ffi.load\"ssl\"|ffi.load\"$(readlink /usr/lib/libssl.so)\"|" \
+		"s|os.getenv(\"TURBO_LIBSSL\") or \"ssl\"|\"$(readlink /usr/lib/libssl.so)\"|" \
 		turbo/hash.lua || return 1
 	sed -i -e \
-		"s|ffi.load(\"ssl\")|ffi.load(\"$(readlink /usr/lib/libssl.so)\")|" \
-		turbo/crypto.lua || return 1
+		"s|os.getenv(\"TURBO_LIBSSL\") or \"ssl\"|\"$(readlink /usr/lib/libssl.so)\"|" \
+		turbo/crypto_linux.lua || return 1
 }
 
 build() {
@@ -59,12 +58,9 @@ package() {
 	make PREFIX="$pkgdir"/usr install || return 1
 }
 
-md5sums="3fe7d896dc6e6abcd65763abe7cada51  lua-turbo-1.1.6.tar.gz
-5fbc1fcf73ef48998a90b06df782162c  fix-bindir.patch
-87944005b334730fe2536cd2897c3fba  case-sensitive-url-matching.patch"
-sha256sums="e221ae568f3b1b8fbb59a490c0401da9eda7514c5fcceeaf38788623cd31a3b5  lua-turbo-1.1.6.tar.gz
-d676d0cd520759f293afdb59e59024a4ad30a8c419ab348e6acc1e72a1bb90a4  fix-bindir.patch
-de865aa2c1a0c32088f7eac03521ca71d79a5ea89adedac8cecd99ee5fe67a7e  case-sensitive-url-matching.patch"
-sha512sums="f1bbda85a7d05d4f9a336478fa146523737f16564a4f8ba5d2c00cc346b6ad5e3c8deba53bfeef4033463da207f9b85da11ac6fefe3fd9b6df287504bcc8a6ce  lua-turbo-1.1.6.tar.gz
-e8ce4427bcf7040fdf3f711a533a0857d9dcf3678334fd4b32917642cb1a5c540ade3d3c8e26bc6b8a7ce0ff6c6f64c92eda70edec3874e7aa3507acb82c2211  fix-bindir.patch
-b6154799a70c59b7bddffc1afa296afe1e3ac3c3c6bcdd29a4bfbac61bba1f9f12500ed5d9ee326788033213e749adfb63c1c03625b3c3f0081079a76ab3c9eb  case-sensitive-url-matching.patch"
+md5sums="387f768f3c0d617cba882b002aeb289d  lua-turbo-2.0.0.tar.gz
+5fbc1fcf73ef48998a90b06df782162c  fix-bindir.patch"
+sha256sums="1c538e7d3190ac17898d61e83654404859a30c37eaaef8be1b9e78c55d2b3999  lua-turbo-2.0.0.tar.gz
+d676d0cd520759f293afdb59e59024a4ad30a8c419ab348e6acc1e72a1bb90a4  fix-bindir.patch"
+sha512sums="9261dd4a080f5c1b2474d4bb5d46232dcec782687587df6458a19761419ffbbeb8c8c90de1b09f5c9de2da9099d950d4cd6ac86da0d25150df54c77fff090577  lua-turbo-2.0.0.tar.gz
+e8ce4427bcf7040fdf3f711a533a0857d9dcf3678334fd4b32917642cb1a5c540ade3d3c8e26bc6b8a7ce0ff6c6f64c92eda70edec3874e7aa3507acb82c2211  fix-bindir.patch"
diff --git a/main/lua-turbo/case-sensitive-url-matching.patch b/main/lua-turbo/case-sensitive-url-matching.patch
deleted file mode 100644
index 4de2a17c9b..0000000000
--- a/main/lua-turbo/case-sensitive-url-matching.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 525910f1caaa12669d51b86c9f154586ff1c1815 Mon Sep 17 00:00:00 2001
-From: John Abrahamsen <jhnabrhmsn@gmail.com>
-Date: Fri, 24 Apr 2015 18:19:53 +0200
-Subject: [PATCH] Case sensitive URL matching as requested in issue #142.
-
----
- turbo/web.lua | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/turbo/web.lua b/turbo/web.lua
-index 80cc40a..01224da 100644
---- a/turbo/web.lua
-+++ b/turbo/web.lua
-@@ -730,7 +730,13 @@ function web.RequestHandler:_execute()
-     end
-     self:prepare()
-     if not self._finished then
--        self[self.request.method:lower()](self, unpack(self._url_args))
-+        -- If there is no URL args then do not unpack as this has a significant
-+        -- cost.
-+        if self._url_args and #self._url_args > 0 then
-+            self[self.request.method:lower()](self, unpack(self._url_args))
-+        else
-+            self[self.request.method:lower()](self)
-+        end
-         if self._auto_finish and not self._finished then
-             self:finish()
-         end
-@@ -1157,7 +1163,7 @@ end
- -- class.
- -- @param request (HTTPRequest instance)
- function web.Application:_get_request_handlers(request)
--    local path = request.path and request.path:lower()
-+    local path = request.path
-     if not path then
-         path = "/"
-     end