Update to prosody-0.11.4

Diff from new maintainer lucas at sexy dot is
thank you very much for your work

some help from sthen@ and semarie@ regarding @sample in PLIST
This commit is contained in:
solene 2020-03-15 19:04:25 +00:00
parent ee736f7534
commit 6795446c45
6 changed files with 43 additions and 31 deletions

View File

@ -1,21 +1,21 @@
# $OpenBSD: Makefile,v 1.55 2019/07/12 20:48:44 sthen Exp $
# $OpenBSD: Makefile,v 1.56 2020/03/15 19:04:25 solene Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
DISTNAME= prosody-0.11.2
DISTNAME= prosody-0.11.4
CATEGORIES= net
MASTER_SITES= https://prosody.im/downloads/source/
REVISION= 1
HOMEPAGE= https://prosody.im/
MAINTAINER= Lucas <lucas@sexy.is>
# MIT
PERMIT_PACKAGE= Yes
MAKE_FILE= makefile
MODULES= lang/lua
LIB_DEPENDS= devel/libidn
MODLUA_RUN_DEPENDS+= archivers/luazlib \
databases/luadbi \
MODLUA_RUN_DEPENDS+= databases/luadbi \
devel/lua-bitop \
devel/luafs \
security/luasec \
@ -23,8 +23,6 @@ MODLUA_RUN_DEPENDS+= archivers/luazlib \
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
WANTLIB+= crypto idn
SUBST_VARS+= FLAVOR
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--sysconfdir="${SYSCONFDIR}/prosody" \
@ -33,7 +31,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
--c-compiler="${CC}" \
--linker="${CC}" \
--ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib -L${LOCALBASE}/lib -shared" \
--ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
--cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99"
FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
@ -50,6 +48,5 @@ post-install:
${PREFIX}/share/examples/prosody/certs/Makefile
${INSTALL_DATA} ${WRKSRC}/certs/openssl.cnf \
${PREFIX}/share/examples/prosody/certs
touch ${PREFIX}/share/examples/prosody/prosody.log
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (prosody-0.11.2.tar.gz) = iRH23Cm54MTt+eYdwj+iLXe8QsTK8ouAmrhDsvCOSDE=
SIZE (prosody-0.11.2.tar.gz) = 420689
SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0=
SIZE (prosody-0.11.4.tar.gz) = 423518

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-util-src_pposix_c,v 1.1 2020/03/15 19:04:25 solene Exp $
Define _BSD_SOURCE to make initgroups(3) visible
Index: util-src/pposix.c
--- util-src/pposix.c.orig
+++ util-src/pposix.c
@@ -33,6 +33,11 @@
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
+#if defined(__OpenBSD__)
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE
+#endif
+#endif
#include <stdlib.h>
#include <math.h>

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-util-src_table_c,v 1.1 2017/11/24 12:47:34 jca Exp $
$OpenBSD: patch-util-src_table_c,v 1.2 2020/03/15 19:04:25 solene Exp $
Index: util-src/table.c
--- util-src/table.c.orig
@ -13,7 +13,7 @@ Index: util-src/table.c
lua_insert(L, 1);
- for(int arg = n_args; arg >= 1; arg--) {
+ for(n_args; arg >= 1; arg--) {
+ for(arg = n_args; arg >= 1; arg--) {
lua_rawseti(L, 1, arg);
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2019/02/07 19:23:39 danj Exp $
@comment $OpenBSD: PLIST,v 1.15 2020/03/15 19:04:25 solene Exp $
@newgroup _prosody:638
@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/prosody
@ -149,18 +149,18 @@ lib/prosody/util/array.lua
lib/prosody/util/async.lua
lib/prosody/util/cache.lua
lib/prosody/util/caps.lua
lib/prosody/util/compat.so
@so lib/prosody/util/compat.so
lib/prosody/util/dataforms.lua
lib/prosody/util/datamanager.lua
lib/prosody/util/datetime.lua
lib/prosody/util/debug.lua
lib/prosody/util/dependencies.lua
lib/prosody/util/encodings.so
@so lib/prosody/util/encodings.so
lib/prosody/util/envload.lua
lib/prosody/util/events.lua
lib/prosody/util/filters.lua
lib/prosody/util/format.lua
lib/prosody/util/hashes.so
@so lib/prosody/util/hashes.so
lib/prosody/util/helpers.lua
lib/prosody/util/hex.lua
lib/prosody/util/hmac.lua
@ -176,12 +176,12 @@ lib/prosody/util/json.lua
lib/prosody/util/logger.lua
lib/prosody/util/mercurial.lua
lib/prosody/util/multitable.lua
lib/prosody/util/net.so
@so lib/prosody/util/net.so
lib/prosody/util/openssl.lua
lib/prosody/util/paths.lua
lib/prosody/util/pluginloader.lua
lib/prosody/util/poll.so
lib/prosody/util/pposix.so
@so lib/prosody/util/poll.so
@so lib/prosody/util/pposix.so
lib/prosody/util/presence.lua
lib/prosody/util/promise.lua
lib/prosody/util/prosodyctl.lua
@ -189,7 +189,7 @@ lib/prosody/util/pubsub.lua
lib/prosody/util/queue.lua
lib/prosody/util/random.lua
lib/prosody/util/rfc6724.lua
lib/prosody/util/ringbuffer.so
@so lib/prosody/util/ringbuffer.so
lib/prosody/util/rsm.lua
lib/prosody/util/sasl/
lib/prosody/util/sasl.lua
@ -202,18 +202,18 @@ lib/prosody/util/sasl_cyrus.lua
lib/prosody/util/serialization.lua
lib/prosody/util/session.lua
lib/prosody/util/set.lua
lib/prosody/util/signal.so
@so lib/prosody/util/signal.so
lib/prosody/util/sql.lua
lib/prosody/util/sslconfig.lua
lib/prosody/util/stanza.lua
lib/prosody/util/startup.lua
lib/prosody/util/statistics.lua
lib/prosody/util/statsd.lua
lib/prosody/util/table.so
@so lib/prosody/util/table.so
lib/prosody/util/template.lua
lib/prosody/util/termcolours.lua
lib/prosody/util/throttle.lua
lib/prosody/util/time.so
@so lib/prosody/util/time.so
lib/prosody/util/timer.lua
lib/prosody/util/uuid.lua
lib/prosody/util/vcard.lua
@ -251,8 +251,4 @@ share/examples/prosody/prosody.cfg.lua
@mode 770
@owner _prosody
@group _prosody
share/examples/prosody/prosody.log
@mode 660
@sample /var/prosody/prosody.log
@mode 770
@sample /var/prosody/

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.10 2018/09/04 12:46:18 espie Exp $
$OpenBSD: README,v 1.11 2020/03/15 19:04:25 solene Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
@ -40,8 +40,8 @@ Using Prosody in an OpenBSD environment
5) In case you decide to enable 'mod_storage_sql', the default SQLite3
driver has already been installed. If you like to use MySQL/MariaDB or
PostgreSQL for the database, please install luadbi-mysql,${FLAVOR}
or luadbi-pgsql,${FLAVOR} respectively.
PostgreSQL for the database, please install luadbi-mysql or luadbi-pgsql
respectively.
For MySQL/MariaDB, also add the following to /etc/login.conf: