diff options
author | Francesco Colista <fcolista@alpinelinux.org> | 2017-10-03 12:48:29 +0000 |
---|---|---|
committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-10-03 13:50:26 +0000 |
commit | 562be586ef966a3d1e68b38da29ea112ddafdd35 (patch) | |
tree | f89c00da58b9f08fb437cd56ccd7a6fb373ed2d4 /community/prosody | |
parent | 9e08668427c9328b6c63c842927bf68af79ac066 (diff) | |
download | aports-562be586ef966a3d1e68b38da29ea112ddafdd35.tar.bz2 aports-562be586ef966a3d1e68b38da29ea112ddafdd35.tar.xz |
community/prosody: upgrade to 0.10.0
Diffstat (limited to 'community/prosody')
-rw-r--r-- | community/prosody/APKBUILD | 47 | ||||
-rw-r--r-- | community/prosody/mallinfo.patch | 13 | ||||
-rw-r--r-- | community/prosody/prosody.cfg.lua.patch | 34 |
3 files changed, 51 insertions, 43 deletions
diff --git a/community/prosody/APKBUILD b/community/prosody/APKBUILD index 6bf99224ee..4ff655f1ec 100644 --- a/community/prosody/APKBUILD +++ b/community/prosody/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> -_luaver=5.1 +_luaver=5.2 pkgname=prosody -pkgver=0.9.12 -pkgrel=1 +pkgver=0.10.0 +pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" arch="all" @@ -16,8 +16,8 @@ subpackages="$pkgname-doc" pkgusers="prosody" pkggroups="prosody" source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz - $pkgname.cfg.lua.patch - ${pkgname}ctl.patch + prosody.cfg.lua.patch + mallinfo.patch $pkgname.initd " @@ -29,40 +29,33 @@ build() { --prefix=/usr \ --sysconfdir=/etc/prosody \ --ostype=linux \ - --with-lua=/usr/bin \ --with-lua-lib=/usr/lib \ --with-lua-include=/usr/include \ - --runwith=lua${_luaver} \ - --no-example-certs \ - || return 1 - + --lua-version=${_luaver} \ + --no-example-certs # Don't generate certs rm -f "$builddir"/certs/Makefile - make || return 1 + make +} + +check() { + cd "$builddir" + make test } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install - install -d -o prosody -g prosody "$pkgdir/var/log/prosody" || return 1 - install -d -o prosody -g prosody "$pkgdir/var/run/prosody" || return 1 - install -d -m750 -o prosody -g prosody "$pkgdir/var/lib/prosody" \ - || return 1 + install -d -o prosody -g prosody "$pkgdir/var/log/prosody" + install -d -o prosody -g prosody "$pkgdir/var/run/prosody" + install -d -m750 -o prosody -g prosody "$pkgdir/var/lib/prosody" install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -md5sums="d743adea6cfbaacc3a24cc0c3928bb1b prosody-0.9.12.tar.gz -b839353efd51b724723f0f4293f76bfb prosody.cfg.lua.patch -ce986894862bab749ca4b46afacf72d2 prosodyctl.patch -413897e00f00c58bb8cbe59736291ef8 prosody.initd" -sha256sums="1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d prosody-0.9.12.tar.gz -8653ccb14a0a5e27fee95b5baf412158543f619f6ca54fd7630c8d333ddddadd prosody.cfg.lua.patch -33bb4fd12ecd1376bba5602d8db8bbdfb2913e6ddc348b58e0e4877125b8b433 prosodyctl.patch -aaad1d10168e27e10ced38963d5bbeb0c7988bf58a2e74f02a103a3318047e1d prosody.initd" -sha512sums="e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 prosody-0.9.12.tar.gz -950d9b53887d859b7d64986ba3817f92fb45ed1b653998759458156197b9623f1cc240559da071e20992f7aa497ef37d422da2168aa5b3c4ea3946482d160f41 prosody.cfg.lua.patch -96657034ad754ea974222639c45770a1d10f13fe91ed493ab3329382666e2de14807d203105c7a200236875f0d430f7356a0ac8bd624d4859e80eabfbeefc205 prosodyctl.patch +sha512sums="ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 prosody-0.10.0.tar.gz +a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch +b07498cd42677d09f1a3fd4a5d91a085e90dd10cee7d6ee7c5e41438cfc2f4049ab9948c0fd0f7e148dd81f6a25c64c6ae832ea4864cee2329d3c6735216b78b mallinfo.patch 11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd" diff --git a/community/prosody/mallinfo.patch b/community/prosody/mallinfo.patch new file mode 100644 index 0000000000..4f9247c9bc --- /dev/null +++ b/community/prosody/mallinfo.patch @@ -0,0 +1,13 @@ +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/community/prosody/prosody.cfg.lua.patch b/community/prosody/prosody.cfg.lua.patch index 444eeb6f82..ff74c51724 100644 --- a/community/prosody/prosody.cfg.lua.patch +++ b/community/prosody/prosody.cfg.lua.patch @@ -1,27 +1,29 @@ -diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.dist ---- prosody-0.9.0.q/prosody.cfg.lua.dist 2013-08-19 23:37:36.000000000 +0400 -+++ prosody-0.9.0/prosody.cfg.lua.dist 2013-08-21 16:17:49.175521891 +0400 -@@ -11,6 +11,8 @@ - -- The only thing left to do is rename this file to remove the .dist ending, and fill in the +diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist +index a0fc6c9..23a36ac 100644 +--- a/prosody.cfg.lua.dist ++++ b/prosody.cfg.lua.dist +@@ -13,6 +13,9 @@ -- blanks. Good luck, and happy Jabbering! + +daemonize = true +pidfile = "/var/run/prosody/prosody.pid" - ++ ---------- Server-wide settings ---------- -- Settings in this section apply to the whole server and are the default settings -@@ -63,7 +65,7 @@ - --"http_files"; -- Serve static files from a directory over HTTP + -- for any virtual hosts +@@ -86,7 +89,7 @@ modules_disabled = { + -- "offline"; -- Store offline messages + -- "c2s"; -- Handle client connections + -- "s2s"; -- Handle server-to-server connections +- -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + } - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -139,9 +141,9 @@ + -- Disable account creation by default, for security +@@ -161,9 +164,9 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging + -- For advanced logging see https://prosody.im/doc/logging log = { - info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - error = "prosody.err"; |