aboutsummaryrefslogtreecommitdiffstats
path: root/main/lua-ossl
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2015-05-14 18:28:07 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2015-05-14 18:28:20 +0300
commitdf42cb0debf35fe4b7439cb5bb738aafd418a6f4 (patch)
treeb689add444720e5215685b5be2bed9bfa9a11ef3 /main/lua-ossl
parent10116065418a10e252212be554272b0e02b8a14e (diff)
downloadaports-df42cb0debf35fe4b7439cb5bb738aafd418a6f4.tar.bz2
aports-df42cb0debf35fe4b7439cb5bb738aafd418a6f4.tar.xz
main/lua-ossl: upgrade to 20150504
Diffstat (limited to 'main/lua-ossl')
-rw-r--r--main/lua-ossl/APKBUILD24
-rw-r--r--main/lua-ossl/fix-lua5.3.patch22
2 files changed, 10 insertions, 36 deletions
diff --git a/main/lua-ossl/APKBUILD b/main/lua-ossl/APKBUILD
index 7e2947622c..359e214d87 100644
--- a/main/lua-ossl/APKBUILD
+++ b/main/lua-ossl/APKBUILD
@@ -3,9 +3,9 @@
_luaversions="5.1 5.2 5.3"
pkgname=lua-ossl
-pkgver=20141028
+pkgver=20150504
_ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=0
pkgdesc="comprehensive OpenSSL Lua module"
url="http://25thandclement.com/~william/projects/luaossl.html"
arch="all"
@@ -21,12 +21,11 @@ for _v in $_luaversions; do
subpackages="$subpackages lua$_v-ossl:split_${_v/./_}"
done
-source="luaossl-$_ver.tar.gz::https://github.com/wahern/luaossl/archive/deb-$_ver-0.tar.gz
+source="luaossl-$_ver.tar.gz::https://github.com/wahern/luaossl/archive/rel-$_ver.tar.gz
musl-fixes.patch
- fix-lua5.3.patch
"
-_builddir="$srcdir"/luaossl-deb-$_ver-0
+_builddir="$srcdir"/luaossl-rel-$_ver
prepare() {
local i
cd "$_builddir"
@@ -71,12 +70,9 @@ for _v in $_luaversions; do
eval "split_${_v/./_}() { _split $_v; }"
done
-md5sums="0f90d964b9a058b1ee7d56be545d54ab luaossl-20141028.tar.gz
-7d03f360ebc62b60279ff0f2066ed6f6 musl-fixes.patch
-b8633e15b72e4e3b7ded22b1d7ca25a0 fix-lua5.3.patch"
-sha256sums="f4b64936a8ba1792fed14331cf7856646700833e5276a096ef5c6410cd9393c2 luaossl-20141028.tar.gz
-49694f9ab7f7a90074471d8e55580f13ff8fc6f7a158a5793f8d55df11147c0e musl-fixes.patch
-f525bd6983418d68b2f9edf1b4653d0003c99f58240e601dfa5fd9bd086f43ed fix-lua5.3.patch"
-sha512sums="8edcb77becb4994c8d2ef0144a45eafcfccf7dca0d78940cf35a4bdbb2daec4be5c4a3a758e2a8ead2e6c395795a44f5b5061f05d1e2149600d48fec09bdf3fc luaossl-20141028.tar.gz
-370467081c87c0e4b0c96a72ff81918d3d492dfa90578b34f51004461d9a983ffd486accb44471a34d092b1a08743ad60462c6937096f80f72a39a335ccd81be musl-fixes.patch
-29424d2d1cd50f5a0d9dc087583a976cccec738aaaef1d96cc9555ea59193c3affad3fb331c3acb35577a7df453ca85f36b9537d15b778aade67a6f80d8b73af fix-lua5.3.patch"
+md5sums="b35a44550bc25569d7f35a49f19f320c luaossl-20150504.tar.gz
+7d03f360ebc62b60279ff0f2066ed6f6 musl-fixes.patch"
+sha256sums="1c6b7c3dd81438431fa0a6c4be18683ccfcb23c1d6c26643863fc9fcaedd982f luaossl-20150504.tar.gz
+49694f9ab7f7a90074471d8e55580f13ff8fc6f7a158a5793f8d55df11147c0e musl-fixes.patch"
+sha512sums="97bd085059c0e4773dbf25c1f9c9c282034c900b65d59c6457c0da2b653315fd521e1f52913e580199d322d9ffb2d273badc9761c5104deed6ea5970c1cdda76 luaossl-20150504.tar.gz
+370467081c87c0e4b0c96a72ff81918d3d492dfa90578b34f51004461d9a983ffd486accb44471a34d092b1a08743ad60462c6937096f80f72a39a335ccd81be musl-fixes.patch"
diff --git a/main/lua-ossl/fix-lua5.3.patch b/main/lua-ossl/fix-lua5.3.patch
deleted file mode 100644
index 79e3376e47..0000000000
--- a/main/lua-ossl/fix-lua5.3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ec65507f2ac00a1ad017363a3567ab3e39a6f5cb Mon Sep 17 00:00:00 2001
-From: william <william@25thandclement.com>
-Date: Wed, 25 Feb 2015 12:45:41 -0800
-Subject: [PATCH] add des to build and fix Lua 5.3 build
-
----
- src/GNUmakefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/GNUmakefile b/src/GNUmakefile
-index 1b77d43..74a19fe 100644
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -20,7 +20,7 @@ OS_$(d) = $(shell $(d)/../mk/vendor.os)
- CC_$(d) = $(shell env CC="$(CC) "$(d)/../mk/vendor.cc)
- LUAPATH_$(d) = $(shell env CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(<D)/../mk/lua.path -krxm3 -I$(DESTDIR)$(includedir) -I/usr/include -I/usr/local/include -P$(DESTDIR)$(bindir) -P$(bindir) -L$(DESTDIR)$(libdir) -L$(libdir) -v$(1) $(2))
-
--CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..)) -DLUA_COMPAT_APIUNSIGNED
-+CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..)) -DLUA_COMPAT_APIINTCASTS
- CFLAGS_$(d) = $(CFLAGS_$(abspath $(@D)/../..))
- LDFLAGS_$(d) = $(LDFLAGS_$(abspath $(@D)/../..))
- SOFLAGS_$(d) = $(SOFLAGS_$(abspath $(@D)/../..))