X-Original-To: alpine-aports@lists.alpinelinux.org Received: from smtp.fewerhassles.com (smtp.fewerhassles.com [67.23.22.179]) by lists.alpinelinux.org (Postfix) with ESMTP id 986705C4185 for ; Sat, 9 Jul 2016 01:02:58 +0000 (GMT) Received: from t440p.swifi (50-90-32-109.res.bhn.net [50.90.32.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by smtp.fewerhassles.com (Postfix) with ESMTPSA id 3A42AAC24C for ; Fri, 8 Jul 2016 21:02:58 -0400 (EDT) Date: Fri, 8 Jul 2016 21:02:56 -0400 From: Brad Fritz To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] testing/prosody: fix nil socket error on startup Message-ID: <20160709010236.GA18529@t440p.swifi> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="O3RTKUHj+75w1tg5" Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) --O3RTKUHj+75w1tg5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 @@ -3,7 +3,7 @@ _luaver=3D5.1 pkgname=3Dprosody pkgver=3D0.9.10 -pkgrel=3D2 +pkgrel=3D3 pkgdesc=3D"Lua based Jabber/XMPP server" url=3D"http://prosody.im/" arch=3D"all" @@ -17,6 +17,7 @@ pkgusers=3D"prosody" pkggroups=3D"prosody" source=3D"http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz $pkgname.cfg.lua.patch + ${pkgname}ctl.patch $pkgname.initd " =20 @@ -54,10 +55,13 @@ package() { =20 md5sums=3D"ef6d4a9e6dcae577eb52f7277d7beac5 prosody-0.9.10.tar.gz b839353efd51b724723f0f4293f76bfb prosody.cfg.lua.patch +ce986894862bab749ca4b46afacf72d2 prosodyctl.patch 413897e00f00c58bb8cbe59736291ef8 prosody.initd" sha256sums=3D"4836eefed4d9bbb632cba24ac5bd8e9bc7c029a79d06084b00ffc70858d1= 662f prosody-0.9.10.tar.gz 8653ccb14a0a5e27fee95b5baf412158543f619f6ca54fd7630c8d333ddddadd prosody.= cfg.lua.patch +33bb4fd12ecd1376bba5602d8db8bbdfb2913e6ddc348b58e0e4877125b8b433 prosodyc= tl.patch aaad1d10168e27e10ced38963d5bbeb0c7988bf58a2e74f02a103a3318047e1d prosody.= initd" sha512sums=3D"4453fb596704b6a248a52dedc00cfc77edbee1fad502f1197b04c2148092= 389a294c152c3ba36203f51831d51ee2b915c15382ac86fcff4f35696ecacf926574 proso= dy-0.9.10.tar.gz 950d9b53887d859b7d64986ba3817f92fb45ed1b653998759458156197b9623f1cc240559d= a071e20992f7aa497ef37d422da2168aa5b3c4ea3946482d160f41 prosody.cfg.lua.pat= ch +96657034ad754ea974222639c45770a1d10f13fe91ed493ab3329382666e2de14807d20310= 5c7a200236875f0d430f7356a0ac8bd624d4859e80eabfbeefc205 prosodyctl.patch 11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d= 54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 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 @@ -0,0 +1,11 @@ +--- prosody-0.9.10.q/prosodyctl ++++ prosody-0.9.10/prosodyctl +@@ -244,7 +244,7 @@ + local modulemanager =3D require "core.modulemanager" +=20 + local prosodyctl =3D require "util.prosodyctl" +-require "socket" ++local socket =3D require "socket" + ----------------------- +=20 + -- FIXME: Duplicate code waiting for util.startup --=20 2.8.3 --O3RTKUHj+75w1tg5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgE1AAAoJENKC9q+q4fmg5RYP/jDj9dfKd0d8KPBESaaHvb7V MMAo3ZxBn/LrpEIDgWhDUMFdNMB34p74klPqQkamWCtPTI3QirM/G80FXAJ0Xwug kQ2H9/48rKDNT3DVhBSP1Z2OYbCeij56mwUjiPzJYhmSYXVFKLXnkakjRMtCUWHX qUnl2ljY/fp71sGl0Sw8Hhq6+5LkC32/k0e9d+AO6eIAFJWnwwRGOS9TbTXNbPmG aWgQOXOsdlgz28JmcnX2z34rvYJLxRO8Lib/ajSyzCP0e+t4A6LDVBLkLZ64gmdC tZw8O/mt23w/+NCl+Q+QcZBFHTD+B6J1QN2DtH6E3/5/EabYdHy9EehrCKpzKWZD zvA2nsI0amnz4PLGLO+KC2lLSFMHUclodT77pgVfiJQw/qq8ebbHNPZC69u095Un jWvLEs2ashEcwTMpFDabLzZi0/hCt7AG3niDEPokwA8Rs77DnCo329SXO2O/IpBq 9KsTUBuZ50JWx31nAuuXAUviPKPevKJxVvzwOJaS8hO0qERPqGZG71Gdh9XdOy9D XmOuOYDRiNxholFeAOYsQVAG7OuiSsDDUUMoIaMpWmGCcWQ+T7anbRbXXubp2vIh DAw1SaURUAVJbELdpOz7J+rySiBGTBSBTq/drBqGg7o4xY8fEzObaWfEYAVFYFBM pQBtP4cSirMn9tvilM/5 =6/Ll -----END PGP SIGNATURE----- --O3RTKUHj+75w1tg5-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---