diff options
Diffstat (limited to 'user/prosody')
| -rw-r--r-- | user/prosody/APKBUILD | 18 | ||||
| -rw-r--r-- | user/prosody/luasec-0.6-fix.patch | 14 | ||||
| -rw-r--r-- | user/prosody/mallinfo.patch | 13 | ||||
| -rw-r--r-- | user/prosody/prosody.initd | 2 | ||||
| -rw-r--r-- | user/prosody/prosodyctl.patch | 11 |
5 files changed, 12 insertions, 46 deletions
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 95b728b76..636c3037d 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=prosody -pkgver=0.11.3 +pkgver=0.11.13 pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" @@ -20,8 +20,14 @@ source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz $pkgname.initd " +# secfixes: +# 0.11.13-r0: +# - CVE-2021-32917 +# - CVE-2021-32919 +# - CVE-2021-32920 +# - CVE-2021-37601 + build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc/prosody \ @@ -37,12 +43,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -d -o prosody -g prosody "$pkgdir/var/log/prosody" @@ -52,6 +56,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb prosody-0.11.3.tar.gz +sha512sums="7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch -24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd" +11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd" diff --git a/user/prosody/luasec-0.6-fix.patch b/user/prosody/luasec-0.6-fix.patch deleted file mode 100644 index c8e37d091..000000000 --- a/user/prosody/luasec-0.6-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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" diff --git a/user/prosody/mallinfo.patch b/user/prosody/mallinfo.patch deleted file mode 100644 index 4f9247c9b..000000000 --- a/user/prosody/mallinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util-src/pposix.c b/util-src/pposix.c -index e70a9d7..b9729ab 100644 ---- a/util-src/pposix.c -+++ b/util-src/pposix.c -@@ -52,7 +52,7 @@ - #include <linux/falloc.h> - #endif - --#if !defined(WITHOUT_MALLINFO) && defined(__linux__) -+#ifdef __GLIBC__ - #include <malloc.h> - #define WITH_MALLINFO - #endif diff --git a/user/prosody/prosody.initd b/user/prosody/prosody.initd index 1d835daca..c0557bd81 100644 --- a/user/prosody/prosody.initd +++ b/user/prosody/prosody.initd @@ -19,7 +19,7 @@ checkconfig() { eerror "You need a /etc/prosody/prosody.cfg.lua file to run prosody" return 1 fi - luac5.2 -p /etc/prosody/prosody.cfg.lua + luac -p /etc/prosody/prosody.cfg.lua return $? } diff --git a/user/prosody/prosodyctl.patch b/user/prosody/prosodyctl.patch deleted file mode 100644 index 18333dd52..000000000 --- a/user/prosody/prosodyctl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prosody-0.9.10.q/prosodyctl -+++ prosody-0.9.10/prosodyctl -@@ -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 |