[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: fe2a2471c237640b00095779a694b21b0d336027
Author: Conrad Kostecki gentoo org>
AuthorDate: Mon Mar 1 19:43:12 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Mar 1 19:43:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2a2471
net-im/prosody: drop old version
Bug: https://bugs.gentoo.org/771144
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/Manifest | 1 -
net-im/prosody/files/prosody-0.11.7-bit32.patch | 20 -
net-im/prosody/prosody-0.11.7-r101.ebuild | 106
3 files changed, 127 deletions(-)
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index f6531f73dd6..b4a12128e74 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1 @@
-DIST prosody-0.11.7.tar.gz 429369 BLAKE2B
8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6
SHA512
923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
DIST prosody-0.11.8.tar.gz 429762 BLAKE2B
e7c945d0f99ed02cd54175f989241ee4731677600db39475365d3a4227afe2fa2b6f2075e3820fa9b7840d65014f43f786fa218a60765f7be319ddd7d30b67d4
SHA512
b0b7e1d3e41f47f0f88ad5b76444e4959b20f4c7a937f3cc605ba6ed5d92e713a3054dcb61ee6629063883a8f9ff1a03952893de4a0d840dcec4e5e42079eb57
diff --git a/net-im/prosody/files/prosody-0.11.7-bit32.patch
b/net-im/prosody/files/prosody-0.11.7-bit32.patch
deleted file mode 100644
index fb7b55f6bbe..000
--- a/net-im/prosody/files/prosody-0.11.7-bit32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Kim Alvefur
-# Date 1601928749 -7200
-# Node ID e17b98feb0b7cad6539ee25c5cc7728911349a6d
-# Parent c3eefb517b7b934dbf4f78244c18f7e91b852846
-util.dependencies: Check for bitop library same way as net.websocket.frames
(fixes #1594)
-
-diff -r c3eefb517b7b -r e17b98feb0b7 util/dependencies.lua
a/util/dependencies.lua
-+++ b/util/dependencies.lua
-@@ -90,7 +90,7 @@
- }, "SSL/TLS support will not be available");
- end
-
-- local bit = _G.bit32 or softreq"bit";
-+ local bit = softreq"bit" or softreq"bit32";
-
- if not bit then
- missingdep("lua-bitops", {
-
diff --git a/net-im/prosody/prosody-0.11.7-r101.ebuild
b/net-im/prosody/prosody-0.11.7-r101.ebuild
deleted file mode 100644
index aee5c34cf35..000
--- a/net-im/prosody/prosody-0.11.7-r101.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/;
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test
+zlib"
-REQUIRED_USE="
- ^^ ( icu idn )
- ${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
- net-im/jabber-base
- icu? ( dev-libs/icu:= )
- idn? ( net-dns/libidn:= )
- libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- lua_single_target_lua5-1? ( $(lua_gen_cond_dep
'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
- mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
- postgres? ( $(lua_gen_cond_dep
'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
- sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
- ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
- zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
- ${LUA_DEPS}
-"
-
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-jabber )
-"
-
-BDEPEND="
- virtual/pkgconfig
- test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.11.7-bit32.patch"
- "${FILESDIR}/${PN}-0.11.7-gentoo.patch"
-)
-
-src_prepare() {
- default
-
- # Set correct plugin path for optional net-im/prosody-modules package
- sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
- local myeconfargs=(
- --add-cflags="${CFLAGS}"
- --add-ldflags="${LDFLAGS}"
- --c-compiler="$(tc-getCC)"
- --datadir="${EPREFIX}/var/spool/jabber"
-
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: 0627ace426453e33e7c25cee06997274a002a127
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Jan 26 17:46:33 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Jan 26 17:48:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0627ace4
net-im/prosody: fix checkconfig on slotted lua
Closes: https://bugs.gentoo.org/767202
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/files/prosody.initd-r5 | 44 +
net-im/prosody/prosody-0.11.7-r101.ebuild | 103 ++
2 files changed, 147 insertions(+)
diff --git a/net-im/prosody/files/prosody.initd-r5
b/net-im/prosody/files/prosody.initd-r5
new file mode 100644
index 000..54e37be5bd8
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r5
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Prosody XMPP server"
+extra_started_commands="reload"
+jabber_pid="/run/jabber"
+jabber_logs="/var/log/jabber"
+pidfile="${jabber_pid}/prosody.pid"
+prosody_config="/etc/jabber/prosody.cfg.lua"
+
+command="/usr/bin/prosody"
+commandctl="/usr/bin/prosodyctl"
+command_group="jabber"
+command_user="jabber"
+
+checkconfig() {
+ if [ ! -f "${prosody_config}" ]; then
+ eerror "Please create ${prosody_config} before starting
Prosody!"
+ return 1
+ fi
+
+ ${commandctl} check config
+ return $?
+}
+
+depend() {
+ need net
+ provide jabber-server
+ use dns postgresql
+}
+
+reload() {
+ ebegin "Reloading configuration"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ checkpath -d -m 0750 -o "${command_user}:${command_group}" -q
"${jabber_logs}"
+ checkpath -d -m 0750 -o "${command_user}:${command_group}" -q
"${jabber_pid}"
+}
diff --git a/net-im/prosody/prosody-0.11.7-r101.ebuild
b/net-im/prosody/prosody-0.11.7-r101.ebuild
new file mode 100644
index 000..28fe617959e
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.7-r101.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/;
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib"
+REQUIRED_USE="
+ ^^ ( icu idn )
+ ${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+ $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+ $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+ net-im/jabber-base
+ icu? ( dev-libs/icu:= )
+ idn? ( net-dns/libidn:= )
+ libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+ libressl? ( dev-libs/libressl:= )
+ !libressl? ( dev-libs/openssl:0= )
+ lua_single_target_lua5-1? ( $(lua_gen_cond_dep
'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+ mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+ postgres? ( $(lua_gen_cond_dep
'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+ sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+ ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+ zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+ ${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.11.7-bit32.patch"
+ "${FILESDIR}/${PN}-0.11.7-gentoo.patch"
+)
+
+src_prepare() {
+ default
+
+ # Set correct plugin path for optional net-im/prosody-modules package
+ sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --add-cflags="${CFLAGS}"
+ --add-ldflags="${LDFLAGS}"
+ --c-compiler="$(tc-getCC)"
+ --datadir="${EPREFIX}/var/spool/jabber"
+ --idn-library="$(usex idn 'idn' 'icu')"
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --linker="$(tc-getCC)"
+ --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut
1-2 $(lua_get_version)))"
+ --no-example-certs
+ --ostype="linux"
+ --prefix="${EPREFIX}/usr"
+ --runwith="${ELUA}"
+ --sysconfdir="${EPREFIX}/etc/jabber"
+
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: ea533bd044e37a3b3cdac4117f39a9e3d7c03e56
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Jan 26 17:48:17 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Jan 26 17:48:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea533bd0
net-im/prosody: drop old version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/files/prosody.initd-r4 | 43 -
net-im/prosody/prosody-0.11.7-r100.ebuild | 103 --
net-im/prosody/prosody-0.11.7-r2.ebuild | 94 ---
3 files changed, 240 deletions(-)
diff --git a/net-im/prosody/files/prosody.initd-r4
b/net-im/prosody/files/prosody.initd-r4
deleted file mode 100644
index 1282e9dc456..000
--- a/net-im/prosody/files/prosody.initd-r4
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="Prosody XMPP server"
-extra_started_commands="reload"
-jabber_pid="/run/jabber"
-jabber_logs="/var/log/jabber"
-pidfile="${jabber_pid}/prosody.pid"
-prosody_config="/etc/jabber/prosody.cfg.lua"
-
-command="/usr/bin/prosody"
-command_group="jabber"
-command_user="jabber"
-
-checkconfig() {
- if [ ! -f "${prosody_config}" ]; then
- eerror "Please create ${prosody_config} before starting
Prosody!"
- return 1
- fi
-
- luac -p "${prosody_config}"
- return $?
-}
-
-depend() {
- need net
- provide jabber-server
- use dns postgresql
-}
-
-reload() {
- ebegin "Reloading configuration"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
-
-start_pre() {
- checkconfig || return 1
-
- checkpath -d -m 0750 -o "${command_user}:${command_group}" -q
"${jabber_logs}"
- checkpath -d -m 0750 -o "${command_user}:${command_group}" -q
"${jabber_pid}"
-}
diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild
b/net-im/prosody/prosody-0.11.7-r100.ebuild
deleted file mode 100644
index 9d4dfaa9cdb..000
--- a/net-im/prosody/prosody-0.11.7-r100.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/;
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib"
-REQUIRED_USE="
- ^^ ( icu idn )
- ${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
- net-im/jabber-base
- icu? ( dev-libs/icu:= )
- idn? ( net-dns/libidn:= )
- libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- lua_single_target_lua5-1? ( $(lua_gen_cond_dep
'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
- mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
- postgres? ( $(lua_gen_cond_dep
'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
- sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
- ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
- zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
- ${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.11.7-bit32.patch"
- "${FILESDIR}/${PN}-0.11.7-gentoo.patch"
-)
-
-src_prepare() {
- default
-
- # Set correct plugin path for optional net-im/prosody-modules package
- sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
- local myeconfargs=(
- --add-cflags="${CFLAGS}"
- --add-ldflags="${LDFLAGS}"
- --c-compiler="$(tc-getCC)"
- --datadir="${EPREFIX}/var/spool/jabber"
- --idn-library="$(usex idn 'idn' 'icu')"
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --linker="$(tc-getCC)"
- --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut
1-2 $(lua_get_version)))"
- --no-example-certs
- --ostype="linux"
- --prefix="${EPREFIX}/usr"
- --runwith="${ELUA}"
- --sysconfdir="${EPREFIX}/etc/jabber"
-
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: 363e5885780c380ea78a23f714f8ee9f37067c44
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Jan 3 23:52:39 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Jan 4 00:24:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363e5885
net-im/prosody: drop old version
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/Manifest| 1 -
.../prosody/files/prosody-0.11.2-r1-gentoo.patch | 16 -
net-im/prosody/files/prosody.initd-r2 | 46 -
net-im/prosody/files/prosody.service | 13
net-im/prosody/files/prosody.tmpfilesd | 1 -
net-im/prosody/metadata.xml| 1 -
net-im/prosody/prosody-0.11.5-r1.ebuild| 78 --
7 files changed, 156 deletions(-)
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index ded27dd5ec2..6db7e0ac624 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1 @@
-DIST prosody-0.11.5.tar.gz 425122 BLAKE2B
d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29
SHA512
43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
DIST prosody-0.11.7.tar.gz 429369 BLAKE2B
8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6
SHA512
923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
diff --git a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
deleted file mode 100644
index 94423a834ae..000
--- a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/prosody.cfg.lua.dist 2019-03-19 15:11:16.355743969 +0100
-+++ b/prosody.cfg.lua.dist 2019-03-19 15:14:42.810995725 +0100
-@@ -32,6 +32,13 @@
- -- will look for modules first. For community modules, see
https://modules.prosody.im/
- --plugin_paths = {}
-
-+-- Gentoo uses the jabber:jabber uid/gid for all Jabber-related services
-+prosody_user = "jabber"
-+prosody_group = "jabber"
-+
-+-- Make sure prosodyctl checks in the right spot for the PID file
-+pidfile = "/run/jabber/prosody.pid"
-+
- -- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that
exists too.
- -- Documentation for bundled modules can be found at:
https://prosody.im/doc/modules
diff --git a/net-im/prosody/files/prosody.initd-r2
b/net-im/prosody/files/prosody.initd-r2
deleted file mode 100644
index a6b623dd622..000
--- a/net-im/prosody/files/prosody.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prosody is a server for Jabber/XMPP written in Lua."
-description_reload="Reload configuration and reopen log files."
-extra_started_commands="reload"
-pidfile="/var/run/jabber/prosody.pid"
-
-depend() {
- use dns
- need net
- provide jabber-server
-}
-
-checkconfig() {
- if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
- eerror "You need a /etc/jabber/prosody.cfg.lua file to run
prosody"
- return 1
- fi
- luac -p /etc/jabber/prosody.cfg.lua
- return $?
-}
-
-start() {
- checkconfig || return 1
- checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
- checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
- checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
- ebegin "Starting Prosody XMPP Server"
- prosodyctl start
- eend $?
-}
-
-stop() {
- ebegin "Stopping Prosody XMPP Server"
- prosodyctl stop
- eend $?
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading configuration of Prosody XMPP Server"
- prosodyctl reload
- eend $?
-}
diff --git a/net-im/prosody/files/prosody.service
b/net-im/prosody/files/prosody.service
deleted file mode 100644
index 5c5ea87bd54..000
--- a/net-im/prosody/files/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP (Jabber) server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecReload=/usr/bin/prosodyctl reload
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd
b/net-im/prosody/files/prosody.tmpfilesd
deleted file mode 100644
index 924ba434659..000
--- a/net-im/prosody/files/prosody.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/jabber 710 jabber jabber
diff
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: a7c01843ba339d47ec244309c2d343ebf6b65b28
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Oct 23 15:44:11 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Oct 23 15:44:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c01843
net-im/prosody: fix systemd unit
Closes: https://bugs.gentoo.org/750539
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/files/prosody.service-r2 | 13 +
net-im/prosody/prosody-0.11.7-r2.ebuild | 96 +
2 files changed, 109 insertions(+)
diff --git a/net-im/prosody/files/prosody.service-r2
b/net-im/prosody/files/prosody.service-r2
new file mode 100644
index 000..81408beefe5
--- /dev/null
+++ b/net-im/prosody/files/prosody.service-r2
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prosody XMPP server
+After=network.target
+
+[Service]
+Group=jabber
+PIDFile=/run/jabber/prosody.pid
+ExecStart=/usr/bin/prosody
+ExecReload=/bin/kill -HUP $MAINPID
+User=jabber
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild
b/net-im/prosody/prosody-0.11.7-r2.ebuild
new file mode 100644
index 000..4495eed2ee3
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.7-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/;
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ || (
+ >=dev-lang/lua-5.2:*
+ dev-lua/lua-bit32
+ )
+ net-dns/libidn
+ net-im/jabber-base
+ libressl? ( dev-libs/libressl:= )
+ !libressl? ( dev-libs/openssl:0= )
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( dev-lang/lua:0 )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-lua/busted )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-lua/luaexpat
+ dev-lua/luafilesystem
+ dev-lua/luasocket
+ libevent? ( dev-lua/luaevent )
+ mysql? ( dev-lua/luadbi[mysql] )
+ postgres? ( dev-lua/luadbi[postgres] )
+ sqlite? ( dev-lua/luadbi[sqlite] )
+ ssl? ( dev-lua/luasec )
+ zlib? ( dev-lua/lua-zlib )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.11.7-bit32.patch"
+ "${FILESDIR}/${PN}-0.11.7-gentoo.patch"
+)
+
+src_prepare() {
+ default
+
+ # Set correct plugin path for optional net-im/prosody-modules package
+ sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --c-compiler="$(tc-getCC)"
+ --datadir="${EPREFIX}/var/spool/jabber"
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --linker="$(tc-getCC)"
+ --ostype="linux"
+ --prefix="${EPREFIX}/usr"
+ --runwith="$(usex luajit luajit lua)"
+ --sysconfdir="${EPREFIX}/etc/jabber"
+ --with-lua-include="${EPREFIX}/usr/include"
+ --with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
+ )
+
+ # Since the configure script is handcrafted,
+ # and yells at unknown options, do not use 'econf'.
+ ./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC"
--ldflags="${LDFLAGS} -shared" || die
+
+ rm makefile || die
+ mv GNUmakefile Makefile || die
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/prosody.initd-r4 prosody
+ systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
+
+ newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
+
+ keepdir /var/spool/jabber
+}
+
+pkg_postinst() {
+ tmpfiles_process prosody.conf
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: 363d4260585fe701da73df093bec4dd8a2fc4d72
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Oct 23 15:45:11 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Oct 23 15:45:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363d4260
net-im/prosody: drop old version
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/files/prosody.service-r1 | 13 -
net-im/prosody/prosody-0.11.7-r1.ebuild | 96 -
2 files changed, 109 deletions(-)
diff --git a/net-im/prosody/files/prosody.service-r1
b/net-im/prosody/files/prosody.service-r1
deleted file mode 100644
index 608423869fd..000
--- a/net-im/prosody/files/prosody.service-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP server
-After=network.target
-
-[Service]
-Group=jabber
-PIDFile=/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosody
-ExecReload=/usr/bin/kill -HUP $MAINPID
-User=jabber
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/prosody/prosody-0.11.7-r1.ebuild
b/net-im/prosody/prosody-0.11.7-r1.ebuild
deleted file mode 100644
index bdfb5f9d6c3..000
--- a/net-im/prosody/prosody-0.11.7-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/;
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- || (
- >=dev-lang/lua-5.2:*
- dev-lua/lua-bit32
- )
- net-dns/libidn
- net-im/jabber-base
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( dev-lang/lua:0 )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- test? ( dev-lua/busted )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- dev-lua/luaexpat
- dev-lua/luafilesystem
- dev-lua/luasocket
- libevent? ( dev-lua/luaevent )
- mysql? ( dev-lua/luadbi[mysql] )
- postgres? ( dev-lua/luadbi[postgres] )
- sqlite? ( dev-lua/luadbi[sqlite] )
- ssl? ( dev-lua/luasec )
- zlib? ( dev-lua/lua-zlib )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.11.7-bit32.patch"
- "${FILESDIR}/${PN}-0.11.7-gentoo.patch"
-)
-
-src_prepare() {
- default
-
- # Set correct plugin path for optional net-im/prosody-modules package
- sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
- local myeconfargs=(
- --c-compiler="$(tc-getCC)"
- --datadir="${EPREFIX}/var/spool/jabber"
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --linker="$(tc-getCC)"
- --ostype="linux"
- --prefix="${EPREFIX}/usr"
- --runwith="$(usex luajit luajit lua)"
- --sysconfdir="${EPREFIX}/etc/jabber"
- --with-lua-include="${EPREFIX}/usr/include"
- --with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
- )
-
- # Since the configure script is handcrafted,
- # and yells at unknown options, do not use 'econf'.
- ./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC"
--ldflags="${LDFLAGS} -shared" || die
-
- rm makefile || die
- mv GNUmakefile Makefile || die
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/prosody.initd-r4 prosody
- systemd_newunit "${FILESDIR}"/prosody.service-r1 prosody.service
-
- newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-
- keepdir /var/spool/jabber
-}
-
-pkg_postinst() {
- tmpfiles_process prosody.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: 21185d1a53f9597691eff67f05f7ac4fa0a3c769
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Oct 10 15:53:20 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Oct 10 15:57:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21185d1a
net-im/prosody: switch to bit32, update init scripts
Since dev-lua/LuaBitOp is not supported on >=lua-5.2, switching to
dev-lua/lua-bit32 as an alternative, since it's supported by upstream.
Also updated the init scripts, since starting with prosodyctl is not
recomended and current init scripts warns about not using it.
Closes: https://bugs.gentoo.org/407079
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki gentoo.org>
net-im/prosody/files/prosody-0.11.7-bit32.patch | 20 +
net-im/prosody/files/prosody-0.11.7-gentoo.patch | 29 +++
net-im/prosody/files/prosody.initd-r4| 43 +++
net-im/prosody/files/prosody.service-r1 | 13
net-im/prosody/files/prosody.tmpfilesd-r1| 1 +
net-im/prosody/prosody-0.11.7-r1.ebuild | 96
6 files changed, 202 insertions(+)
diff --git a/net-im/prosody/files/prosody-0.11.7-bit32.patch
b/net-im/prosody/files/prosody-0.11.7-bit32.patch
new file mode 100644
index 000..fb7b55f6bbe
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-bit32.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Kim Alvefur
+# Date 1601928749 -7200
+# Node ID e17b98feb0b7cad6539ee25c5cc7728911349a6d
+# Parent c3eefb517b7b934dbf4f78244c18f7e91b852846
+util.dependencies: Check for bitop library same way as net.websocket.frames
(fixes #1594)
+
+diff -r c3eefb517b7b -r e17b98feb0b7 util/dependencies.lua
+--- a/util/dependencies.lua
b/util/dependencies.lua
+@@ -90,7 +90,7 @@
+ }, "SSL/TLS support will not be available");
+ end
+
+- local bit = _G.bit32 or softreq"bit";
++ local bit = softreq"bit" or softreq"bit32";
+
+ if not bit then
+ missingdep("lua-bitops", {
+
diff --git a/net-im/prosody/files/prosody-0.11.7-gentoo.patch
b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
new file mode 100644
index 000..e571066874b
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/prosody.cfg.lua.dist
b/prosody.cfg.lua.dist
+@@ -17,6 +17,15 @@
+ -- Settings in this section apply to the whole server and are the default
settings
+ -- for any virtual hosts
+
++-- Prosody will use this user and group for launching the service.
++-- Gentoo uses by default jabber:jabber (uid:gid) for all Jabber related
services.
++prosody_user = "jabber"
++prosody_group = "jabber"
++
++-- Prosody will create this pid file after it has been successfully started.
++-- Please don't change that path, as it's being used by the Gentoo init
scripts.
++pidfile = "/run/jabber/prosody.pid"
++
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see https://prosody.im/doc/creating_accounts for info)
+@@ -30,7 +39,9 @@
+ -- Prosody will always look in its source directory for modules, but
+ -- this option allows you to specify additional locations where Prosody
+ -- will look for modules first. For community modules, see
https://modules.prosody.im/
+---plugin_paths = {}
++-- The default included path is for the optional net-im/prosody-modules
package,
++-- which provides additional community maintained modules.
++plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/community-modules" };
+
+ -- This is the list of modules Prosody will load on startup.
+ -- It looks for mod_modulename.lua in the plugins folder, so make sure that
exists too.
diff --git a/net-im/prosody/files/prosody.initd-r4
b/net-im/prosody/files/prosody.initd-r4
new file mode 100644
index 000..1282e9dc456
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r4
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Prosody XMPP server"
+extra_started_commands="reload"
+jabber_pid="/run/jabber"
+jabber_logs="/var/log/jabber"
+pidfile="${jabber_pid}/prosody.pid"
+prosody_config="/etc/jabber/prosody.cfg.lua"
+
+command="/usr/bin/prosody"
+command_group="jabber"
+command_user="jabber"
+
+checkconfig() {
+ if [ ! -f "${prosody_config}" ]; then
+ eerror "Please create ${prosody_config} before starting
Prosody!"
+ return 1
+ fi
+
+ luac -p "${prosody_config}"
+ return $?
+}
+
+depend() {
+ need net
+ provide jabber-server
+ use dns postgresql
+}
+
+reload() {
+ ebegin "Reloading configuration"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ checkpath -d -m 0750 -o
[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/
commit: 99e97c008d71ac2e9ac736aee02aad42af01fc44
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Oct 3 13:31:28 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Oct 3 13:43:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e97c00
net-im/prosody: use proper patch name
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki gentoo.org>
.../{prosody_cfg-0.11.2-r1.patch => prosody-0.11.2-r1-gentoo.patch} | 0
net-im/prosody/prosody-0.11.5.ebuild| 2 +-
net-im/prosody/prosody-0.11.7.ebuild| 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/prosody/files/prosody_cfg-0.11.2-r1.patch
b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
similarity index 100%
rename from net-im/prosody/files/prosody_cfg-0.11.2-r1.patch
rename to net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
diff --git a/net-im/prosody/prosody-0.11.5.ebuild
b/net-im/prosody/prosody-0.11.5.ebuild
index 77ea1552347..bf394ef3fa2 100644
--- a/net-im/prosody/prosody-0.11.5.ebuild
+++ b/net-im/prosody/prosody-0.11.5.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${BASE_DEPEND}
ssl? ( dev-lua/luasec )
zlib? ( dev-lua/lua-zlib )"
-PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch")
+PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
JABBER_ETC="/etc/jabber"
JABBER_SPOOL="/var/spool/jabber"
diff --git a/net-im/prosody/prosody-0.11.7.ebuild
b/net-im/prosody/prosody-0.11.7.ebuild
index 7d39dc0434f..82f95665764 100644
--- a/net-im/prosody/prosody-0.11.7.ebuild
+++ b/net-im/prosody/prosody-0.11.7.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
zlib? ( dev-lua/lua-zlib )
"
-PATCHES=( "${FILESDIR}/prosody_cfg-0.11.2-r1.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
src_configure() {
local myconfargs=(
