aboutsummaryrefslogtreecommitdiffstats
path: root/community/prosody
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-09-23 14:26:48 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-09-23 14:29:32 +0000
commit28cc75aceca7209586cb60853f85f3a6a17c4613 (patch)
tree3b2cac79ff4e0be5ee83dc930f3b44ce2807b2c1 /community/prosody
parent334aa82ab748b59f8afa8947262d3290535ee93f (diff)
downloadaports-28cc75aceca7209586cb60853f85f3a6a17c4613.tar.bz2
aports-28cc75aceca7209586cb60853f85f3a6a17c4613.tar.xz
community/prosody: fix luasec 0.6 compatibility
ref #5262
Diffstat (limited to 'community/prosody')
-rw-r--r--community/prosody/APKBUILD6
-rw-r--r--community/prosody/luasec-0.6-fix.patch14
2 files changed, 19 insertions, 1 deletions
diff --git a/community/prosody/APKBUILD b/community/prosody/APKBUILD
index df2328550e..c50e95daff 100644
--- a/community/prosody/APKBUILD
+++ b/community/prosody/APKBUILD
@@ -3,7 +3,7 @@
_luaver=5.1
pkgname=prosody
pkgver=0.9.10
-pkgrel=4
+pkgrel=5
pkgdesc="Lua based Jabber/XMPP server"
url="http://prosody.im/"
arch="all"
@@ -16,6 +16,7 @@ subpackages="$pkgname-doc"
pkgusers="prosody"
pkggroups="prosody"
source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz
+ luasec-0.6-fix.patch
$pkgname.cfg.lua.patch
${pkgname}ctl.patch
$pkgname.initd
@@ -55,14 +56,17 @@ package() {
}
md5sums="ef6d4a9e6dcae577eb52f7277d7beac5 prosody-0.9.10.tar.gz
+9adae18009acbecf1287196d4a0e32ff luasec-0.6-fix.patch
b839353efd51b724723f0f4293f76bfb prosody.cfg.lua.patch
ce986894862bab749ca4b46afacf72d2 prosodyctl.patch
413897e00f00c58bb8cbe59736291ef8 prosody.initd"
sha256sums="4836eefed4d9bbb632cba24ac5bd8e9bc7c029a79d06084b00ffc70858d1662f prosody-0.9.10.tar.gz
+7e780e1c24324aefc15343ed4af35e4a4b50b169e652d72d7a35a98c3a3cce2c luasec-0.6-fix.patch
8653ccb14a0a5e27fee95b5baf412158543f619f6ca54fd7630c8d333ddddadd prosody.cfg.lua.patch
33bb4fd12ecd1376bba5602d8db8bbdfb2913e6ddc348b58e0e4877125b8b433 prosodyctl.patch
aaad1d10168e27e10ced38963d5bbeb0c7988bf58a2e74f02a103a3318047e1d prosody.initd"
sha512sums="4453fb596704b6a248a52dedc00cfc77edbee1fad502f1197b04c2148092389a294c152c3ba36203f51831d51ee2b915c15382ac86fcff4f35696ecacf926574 prosody-0.9.10.tar.gz
+2283a5077b909aedee0df5d6c1c342158b48d8d4bdc275cd70417d84da3d12106d288d63e583d3591a12d7c2ff6b8f44dd902e00915b845b11de05463dcdea8c luasec-0.6-fix.patch
950d9b53887d859b7d64986ba3817f92fb45ed1b653998759458156197b9623f1cc240559da071e20992f7aa497ef37d422da2168aa5b3c4ea3946482d160f41 prosody.cfg.lua.patch
96657034ad754ea974222639c45770a1d10f13fe91ed493ab3329382666e2de14807d203105c7a200236875f0d430f7356a0ac8bd624d4859e80eabfbeefc205 prosodyctl.patch
11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd"
diff --git a/community/prosody/luasec-0.6-fix.patch b/community/prosody/luasec-0.6-fix.patch
new file mode 100644
index 0000000000..c8e37d0915
--- /dev/null
+++ b/community/prosody/luasec-0.6-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/util/dependencies.lua b/util/dependencies.lua
+index 4d50cf6..9ea211d 100644
+--- a/util/dependencies.lua
++++ b/util/dependencies.lua
+@@ -99,6 +99,9 @@ function check_dependencies()
+ ["luarocks"] = "luarocks install luasec";
+ ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
+ }, "SSL/TLS support will not be available");
++ elseif not _G.ssl then
++ _G.ssl = ssl;
++ _G.ssl.context = require "ssl.context";
+ end
+
+ local encodings, err = softreq "util.encodings"