Mail archive
alpine-aports

[alpine-aports] [PATCH] testing/prosody: fix nil socket error on startup

From: Brad Fritz <brad_at_fewerhassles.com>
Date: Fri, 8 Jul 2016 21:02:56 -0400

Fixes error:

    attempt to index global 'socket' (a nil value)

with same change as applied to Arch Linux release 0.9.8-2 :
https://bugs.archlinux.org/task/46527
---
 testing/prosody/APKBUILD         |  6 +++++-
 testing/prosody/prosodyctl.patch | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 testing/prosody/prosodyctl.patch
diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD
index f770f34..2470041 100644
--- a/testing/prosody/APKBUILD
+++ b/testing/prosody/APKBUILD
_at_@ -3,7 +3,7 @@
 _luaver=5.1
 pkgname=prosody
 pkgver=0.9.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Lua based Jabber/XMPP server"
 url="http://prosody.im/"
 arch="all"
_at_@ -17,6 +17,7 @@ pkgusers="prosody"
 pkggroups="prosody"
 source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz
 	$pkgname.cfg.lua.patch
+	${pkgname}ctl.patch
 	$pkgname.initd
 	"
 
_at_@ -54,10 +55,13 @@ package() {
 
 md5sums="ef6d4a9e6dcae577eb52f7277d7beac5  prosody-0.9.10.tar.gz
 b839353efd51b724723f0f4293f76bfb  prosody.cfg.lua.patch
+ce986894862bab749ca4b46afacf72d2  prosodyctl.patch
 413897e00f00c58bb8cbe59736291ef8  prosody.initd"
 sha256sums="4836eefed4d9bbb632cba24ac5bd8e9bc7c029a79d06084b00ffc70858d1662f  prosody-0.9.10.tar.gz
 8653ccb14a0a5e27fee95b5baf412158543f619f6ca54fd7630c8d333ddddadd  prosody.cfg.lua.patch
+33bb4fd12ecd1376bba5602d8db8bbdfb2913e6ddc348b58e0e4877125b8b433  prosodyctl.patch
 aaad1d10168e27e10ced38963d5bbeb0c7988bf58a2e74f02a103a3318047e1d  prosody.initd"
 sha512sums="4453fb596704b6a248a52dedc00cfc77edbee1fad502f1197b04c2148092389a294c152c3ba36203f51831d51ee2b915c15382ac86fcff4f35696ecacf926574  prosody-0.9.10.tar.gz
 950d9b53887d859b7d64986ba3817f92fb45ed1b653998759458156197b9623f1cc240559da071e20992f7aa497ef37d422da2168aa5b3c4ea3946482d160f41  prosody.cfg.lua.patch
+96657034ad754ea974222639c45770a1d10f13fe91ed493ab3329382666e2de14807d203105c7a200236875f0d430f7356a0ac8bd624d4859e80eabfbeefc205  prosodyctl.patch
 11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347  prosody.initd"
diff --git a/testing/prosody/prosodyctl.patch b/testing/prosody/prosodyctl.patch
new file mode 100644
index 0000000..18333dd
--- /dev/null
+++ b/testing/prosody/prosodyctl.patch
_at_@ -0,0 +1,11 @@
+--- prosody-0.9.10.q/prosodyctl
++++ prosody-0.9.10/prosodyctl
+_at_@ -244,7 +244,7 @@
+ local modulemanager = require "core.modulemanager"
+ 
+ local prosodyctl = require "util.prosodyctl"
+-require "socket"
++local socket = require "socket"
+ -----------------------
+ 
+  -- FIXME: Duplicate code waiting for util.startup
-- 
2.8.3




---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Fri Jul 08 2016 - 21:02:56 GMT