cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to prosody-0.11.2

Browse Source 
"""Quite a bit of changes in this one, most noticeably:
- prosody now ships with BSD Makefiles, so we can drop gmake.
- I have disabled the tests for now, as they now require busted and
  luacheck, of which busted has not been ported yet."""

From Henrik Friedrichsen (Maintainer)
This commit is contained in:
danj 2019-02-07 19:23:39 +00:00
parent 0c403c84da
commit fea1d0af5d
10 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/prosody/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.51 2018/09/04 12:46:18 espie Exp $
# $OpenBSD: Makefile,v 1.52 2019/02/07 19:23:39 danj Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
DISTNAME= prosody-0.10.2
REVISION= 1
DISTNAME= prosody-0.11.2
CATEGORIES= net
MASTER_SITES= http://prosody.im/downloads/source/
@ -13,7 +12,7 @@ MAINTAINER= Henrik Friedrichsen <henrik@diff.cc>
# MIT
PERMIT_PACKAGE_CDROM= Yes
USE_GMAKE= Yes
MAKE_FILE= makefile
MODULES= lang/lua
LIB_DEPENDS= devel/libidn
MODLUA_RUN_DEPENDS+= archivers/luazlib \
@ -25,7 +24,7 @@ MODLUA_RUN_DEPENDS+= archivers/luazlib \
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
WANTLIB+= crypto idn
SUBST_VARS+= FLAVOR MAKE_PROGRAM
SUBST_VARS+= FLAVOR
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
@ -41,18 +40,17 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
pre-configure:
${SUBST_CMD} ${WRKSRC}/certs/Makefile
cd ${WRKSRC}; sed -i -e 's,^#!/usr/bin/env lua,#!${MODLUA_BIN},' -e \
's,^lua ,${MODLUA_BIN} ,' prosody prosodyctl tests/run_tests.sh
's,^lua ,${MODLUA_BIN} ,' prosody prosodyctl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody
${INSTALL_DATA} ${WRKSRC}/README \
${PREFIX}/share/doc/prosody
${INSTALL_DATA} ${WRKSRC}/certs/makefile \
${PREFIX}/share/examples/prosody/certs/Makefile
${INSTALL_DATA} ${WRKSRC}/certs/openssl.cnf \
${PREFIX}/share/examples/prosody/certs
touch ${PREFIX}/share/examples/prosody/prosody.log
rm -f ${PREFIX}/share/examples/prosody/certs/Makefile.*
do-test:
cd ${WRKSRC}/tests && sh run_tests.sh 0
.include <bsd.port.mk>

4
net/prosody/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (prosody-0.10.2.tar.gz) = dbXwNeenTV8gju6vhBm5SoXQm0AlLURM/4Az/ePJdo4=
SIZE (prosody-0.10.2.tar.gz) = 331874
SHA256 (prosody-0.11.2.tar.gz) = iRH23Cm54MTt+eYdwj+iLXe8QsTK8ouAmrhDsvCOSDE=
SIZE (prosody-0.11.2.tar.gz) = 420689

31
net/prosody/patches/patch-certs_Makefile
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-certs_Makefile,v 1.7 2017/11/05 16:52:07 landry Exp $
Index: certs/Makefile
--- certs/Makefile.orig
+++ certs/Makefile
@@ -2,13 +2,13 @@
keysize=2048
# How to:
-# First, `make yourhost.cnf` which creates a openssl config file.
+# First, `${MAKE_PROGRAM} yourhost.cnf` which creates a openssl config file.
# Then edit this file and fill in the details you want it to have,
# and add or change hosts and components it should cover.
-# Then `make yourhost.key` to create your private key, you can
+# Then `${MAKE_PROGRAM} yourhost.key` to create your private key, you can
# include keysize=number to change the size of the key.
-# Then you can either `make yourhost.csr` to generate a certificate
-# signing request that you can submit to a CA, or `make yourhost.crt`
+# Then you can either `${MAKE_PROGRAM} yourhost.csr` to generate a certificate
+# signing request that you can submit to a CA, or `${MAKE_PROGRAM} yourhost.crt`
# to generate a self signed certificate.
.PRECIOUS: %.cnf %.key
@@ -60,6 +60,8 @@ keysize=2048
%.key:
umask 0077 && openssl genrsa -out $@ $(keysize)
@chmod 400 $@
+ @chown _prosody $@ || \
+ echo "***WARNING***: You will need to 'chown _prosody $@'"
# Generate Diffie-Hellman parameters
dh-%.pem:

13
net/prosody/patches/patch-certs_makefile Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-certs_makefile,v 1.1 2019/02/07 19:23:39 danj Exp $
Index: certs/makefile
--- certs/makefile.orig
+++ certs/makefile
@@ -14,5 +14,7 @@ keysize=2048
${.TARGETS:M*.crt}:
openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout ${.TARGET:R}.key \
-days 365 -sha256 -out $@ -utf8 -subj /CN=${.TARGET:R}
+ @chown _prosody $@ || \
+ echo "***WARNING***: You will need to 'chown _prosody $@'"
.SUFFIXES: .key .crt

4
net/prosody/patches/patch-core_certmanager_lua
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-core_certmanager_lua,v 1.2 2018/06/04 19:53:58 landry Exp $
$OpenBSD: patch-core_certmanager_lua,v 1.3 2019/02/07 19:23:39 danj Exp $
Index: core/certmanager.lua
--- core/certmanager.lua.orig
+++ core/certmanager.lua
@@ -102,7 +102,7 @@ end
@@ -103,7 +103,7 @@ end
-- Built-in defaults
local core_defaults = {

8
net/prosody/patches/patch-Makefile → net/prosody/patches/patch-makefile
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-Makefile,v 1.3 2015/04/03 15:23:57 edd Exp $
--- Makefile.orig Tue Mar 24 20:18:04 2015
+++ Makefile Wed Apr 1 21:06:56 2015
$OpenBSD: patch-makefile,v 1.1 2019/02/07 19:23:39 danj Exp $
Index: makefile
--- makefile.orig
+++ makefile
@@ -1,12 +1,12 @@
include config.unix

4
net/prosody/patches/patch-prosody_cfg_lua_dist
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-prosody_cfg_lua_dist,v 1.7 2017/11/05 16:52:07 landry Exp $
$OpenBSD: patch-prosody_cfg_lua_dist,v 1.8 2019/02/07 19:23:39 danj Exp $
Index: prosody.cfg.lua.dist
--- prosody.cfg.lua.dist.orig
+++ prosody.cfg.lua.dist
@ -17,7 +17,7 @@ Index: prosody.cfg.lua.dist
-- Enable use of libevent for better performance under high load
-- For more information see: https://prosody.im/doc/libevent
--use_libevent = true
@@ -161,8 +169,8 @@ archive_expires_after = "1w" -- Remove archived messag
@@ -153,8 +161,8 @@ archive_expires_after = "1w" -- Remove archived messag
-- Logging configuration
-- For advanced logging see https://prosody.im/doc/logging
log = {

11
net/prosody/patches/patch-tests_run_tests_sh
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-tests_run_tests_sh,v 1.4 2017/11/05 16:52:07 landry Exp $
Index: tests/run_tests.sh
--- tests/run_tests.sh.orig
+++ tests/run_tests.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-rm reports/*.report
-exec lua test.lua "$@"
+rm -f reports/*.report
+/usr/local/bin/lua51 test.lua $*

11
net/prosody/patches/patch-util_prosodyctl_lua
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-util_prosodyctl_lua,v 1.4 2017/11/05 16:52:07 landry Exp $
$OpenBSD: patch-util_prosodyctl_lua,v 1.5 2019/02/07 19:23:39 danj Exp $
Index: util/prosodyctl.lua
--- util/prosodyctl.lua.orig
+++ util/prosodyctl.lua
@@ -239,7 +239,7 @@ local function start()
if not CFG_SOURCEDIR then
@@ -240,7 +240,7 @@ local function start(source_dir)
if not source_dir then
os.execute("./prosody");
else
- os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
+ os.execute(CFG_SOURCEDIR.."/../../sbin/prosody");
- os.execute(source_dir.."/../../bin/prosody");
+ os.execute(source_dir.."/../../sbin/prosody");
end
return true;
end

55
net/prosody/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2018/09/04 12:46:18 espie Exp $
@comment $OpenBSD: PLIST,v 1.14 2019/02/07 19:23:39 danj Exp $
@newgroup _prosody:638
@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/prosody
@ -27,6 +27,7 @@ lib/prosody/modules/mod_admin_telnet.lua
lib/prosody/modules/mod_announce.lua
lib/prosody/modules/mod_auth_anonymous.lua
lib/prosody/modules/mod_auth_cyrus.lua
lib/prosody/modules/mod_auth_insecure.lua
lib/prosody/modules/mod_auth_internal_hashed.lua
lib/prosody/modules/mod_auth_internal_plain.lua
lib/prosody/modules/mod_blocklist.lua
@ -34,7 +35,8 @@ lib/prosody/modules/mod_bosh.lua
lib/prosody/modules/mod_c2s.lua
lib/prosody/modules/mod_carbons.lua
lib/prosody/modules/mod_component.lua
lib/prosody/modules/mod_compression.lua
lib/prosody/modules/mod_csi.lua
lib/prosody/modules/mod_csi_simple.lua
lib/prosody/modules/mod_debug_sql.lua
lib/prosody/modules/mod_dialback.lua
lib/prosody/modules/mod_disco.lua
@ -47,54 +49,81 @@ lib/prosody/modules/mod_lastactivity.lua
lib/prosody/modules/mod_legacyauth.lua
lib/prosody/modules/mod_limits.lua
lib/prosody/modules/mod_mam/
lib/prosody/modules/mod_mam/fallback_archive.lib.lua
lib/prosody/modules/mod_mam/mamprefs.lib.lua
lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
lib/prosody/modules/mod_mam/mod_mam.lua
lib/prosody/modules/mod_message.lua
lib/prosody/modules/mod_motd.lua
lib/prosody/modules/mod_muc_mam.lua
lib/prosody/modules/mod_muc_unique.lua
lib/prosody/modules/mod_net_multiplex.lua
lib/prosody/modules/mod_offline.lua
lib/prosody/modules/mod_pep.lua
lib/prosody/modules/mod_pep_plus.lua
lib/prosody/modules/mod_pep_simple.lua
lib/prosody/modules/mod_ping.lua
lib/prosody/modules/mod_posix.lua
lib/prosody/modules/mod_presence.lua
lib/prosody/modules/mod_privacy.lua
lib/prosody/modules/mod_private.lua
lib/prosody/modules/mod_proxy65.lua
lib/prosody/modules/mod_pubsub/
lib/prosody/modules/mod_pubsub/mod_pubsub.lua
lib/prosody/modules/mod_pubsub/pubsub.lib.lua
lib/prosody/modules/mod_register.lua
lib/prosody/modules/mod_register_ibr.lua
lib/prosody/modules/mod_register_limits.lua
lib/prosody/modules/mod_roster.lua
lib/prosody/modules/mod_s2s/
lib/prosody/modules/mod_s2s/mod_s2s.lua
lib/prosody/modules/mod_s2s/s2sout.lib.lua
lib/prosody/modules/mod_s2s_auth_certs.lua
lib/prosody/modules/mod_saslauth.lua
lib/prosody/modules/mod_scansion_record.lua
lib/prosody/modules/mod_server_contact_info.lua
lib/prosody/modules/mod_stanza_debug.lua
lib/prosody/modules/mod_storage_internal.lua
lib/prosody/modules/mod_storage_memory.lua
lib/prosody/modules/mod_storage_none.lua
lib/prosody/modules/mod_storage_sql.lua
lib/prosody/modules/mod_storage_sql1.lua
lib/prosody/modules/mod_storage_xep0227.lua
lib/prosody/modules/mod_time.lua
lib/prosody/modules/mod_tls.lua
lib/prosody/modules/mod_unknown.lua
lib/prosody/modules/mod_uptime.lua
lib/prosody/modules/mod_user_account_management.lua
lib/prosody/modules/mod_vcard.lua
lib/prosody/modules/mod_vcard4.lua
lib/prosody/modules/mod_vcard_legacy.lua
lib/prosody/modules/mod_version.lua
lib/prosody/modules/mod_watchregistrations.lua
lib/prosody/modules/mod_websocket.lua
lib/prosody/modules/mod_welcome.lua
lib/prosody/modules/mod_windows.lua
lib/prosody/modules/muc/
lib/prosody/modules/muc/config_form_sections.lib.lua
lib/prosody/modules/muc/description.lib.lua
lib/prosody/modules/muc/hidden.lib.lua
lib/prosody/modules/muc/history.lib.lua
lib/prosody/modules/muc/language.lib.lua
lib/prosody/modules/muc/lock.lib.lua
lib/prosody/modules/muc/members_only.lib.lua
lib/prosody/modules/muc/mod_muc.lua
lib/prosody/modules/muc/moderated.lib.lua
lib/prosody/modules/muc/muc.lib.lua
lib/prosody/modules/muc/name.lib.lua
lib/prosody/modules/muc/occupant.lib.lua
lib/prosody/modules/muc/password.lib.lua
lib/prosody/modules/muc/persistent.lib.lua
lib/prosody/modules/muc/register.lib.lua
lib/prosody/modules/muc/request.lib.lua
lib/prosody/modules/muc/subject.lib.lua
lib/prosody/modules/muc/util.lib.lua
lib/prosody/modules/muc/whois.lib.lua
lib/prosody/net/
lib/prosody/net/adns.lua
lib/prosody/net/connect.lua
lib/prosody/net/connlisteners.lua
lib/prosody/net/cqueues.lua
lib/prosody/net/dns.lua
lib/prosody/net/http/
lib/prosody/net/http.lua
@ -102,7 +131,12 @@ lib/prosody/net/http/codes.lua
lib/prosody/net/http/parser.lua
lib/prosody/net/http/server.lua
lib/prosody/net/httpserver.lua
lib/prosody/net/resolvers/
lib/prosody/net/resolvers/basic.lua
lib/prosody/net/resolvers/manual.lua
lib/prosody/net/resolvers/service.lua
lib/prosody/net/server.lua
lib/prosody/net/server_epoll.lua
lib/prosody/net/server_event.lua
lib/prosody/net/server_select.lua
lib/prosody/net/websocket/
@ -112,8 +146,10 @@ lib/prosody/prosody.version
lib/prosody/util/
lib/prosody/util/adhoc.lua
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
lib/prosody/util/dataforms.lua
lib/prosody/util/datamanager.lua
lib/prosody/util/datetime.lua
@ -131,6 +167,7 @@ lib/prosody/util/hmac.lua
lib/prosody/util/http.lua
lib/prosody/util/id.lua
lib/prosody/util/import.lua
lib/prosody/util/indexedbheap.lua
lib/prosody/util/interpolation.lua
lib/prosody/util/ip.lua
lib/prosody/util/iterators.lua
@ -143,8 +180,10 @@ 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
lib/prosody/util/presence.lua
lib/prosody/util/promise.lua
lib/prosody/util/prosodyctl.lua
lib/prosody/util/pubsub.lua
lib/prosody/util/queue.lua
@ -167,19 +206,22 @@ 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
lib/prosody/util/template.lua
lib/prosody/util/termcolours.lua
lib/prosody/util/throttle.lua
lib/prosody/util/time.lua
lib/prosody/util/time.so
lib/prosody/util/timer.lua
lib/prosody/util/uuid.lua
lib/prosody/util/vcard.lua
lib/prosody/util/watchdog.lua
lib/prosody/util/x509.lua
lib/prosody/util/xml.lua
lib/prosody/util/xmppstream.lua
lib/prosody/util/xpcall.lua
@man man/man1/prosodyctl.1
sbin/prosody
sbin/prosodyctl
@ -194,7 +236,6 @@ share/examples/prosody/certs/Makefile
@sample ${SYSCONFDIR}/prosody/certs/Makefile
share/examples/prosody/certs/example.com.crt
share/examples/prosody/certs/example.com.key
share/examples/prosody/certs/localhost.cnf
share/examples/prosody/certs/localhost.crt
@sample ${SYSCONFDIR}/prosody/certs/localhost.crt
@mode 400