Hey, attached patch updates prosody to 0.11.1.
Quite a bit of changes in this one, most noticeably: - prosody now ships with BSD Makefiles, so we can drop gmake. - The patch for util-src/makefile is required until the next release, as a fix was committed upstream[2]. - Lua 5.1 is still supported for now, at some point 5.2 will be mandatory. - I have disabled the tests for now, as they now require busted and luacheck, of which busted has not been ported yet. Also, they were broken before. Though it'd obviously be great to have them back at some point. [1]: https://prosody.im/doc/packagers#section011 [2]: https://issues.prosody.im/1251 Feedback? OK? Best regards Henrik
Index: Makefile =================================================================== RCS file: /cvs/ports/net/prosody/Makefile,v retrieving revision 1.51 diff -u -p -r1.51 Makefile --- Makefile 4 Sep 2018 12:46:18 -0000 1.51 +++ Makefile 22 Dec 2018 22:05:04 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.51 2018/09/04 12:46:18 espie Exp $ COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.10.2 -REVISION= 1 +DISTNAME= prosody-0.11.1 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ @@ -13,7 +12,7 @@ MAINTAINER= Henrik Friedrichsen <henrik@ # 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> Index: distinfo =================================================================== RCS file: /cvs/ports/net/prosody/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 4 Jun 2018 19:53:58 -0000 1.15 +++ distinfo 22 Dec 2018 22:05:04 -0000 @@ -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.1.tar.gz) = kb7EPweYcp4KKyB2E6dFWY6jyn3Lf9hd9EzPBPpcZao= +SIZE (prosody-0.11.1.tar.gz) = 418780 Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 3 Apr 2015 15:23:57 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$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 -@@ -1,12 +1,12 @@ - - include config.unix - --BIN = $(DESTDIR)$(PREFIX)/bin -+BIN = $(DESTDIR)$(PREFIX)/sbin - CONFIG = $(DESTDIR)$(SYSCONFDIR) - MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules - SOURCE = $(DESTDIR)$(LIBDIR)/prosody - DATA = $(DESTDIR)$(DATADIR) --MAN = $(DESTDIR)$(PREFIX)/share/man -+MAN = $(DESTDIR)$(PREFIX)/man - - INSTALLEDSOURCE = $(LIBDIR)/prosody - INSTALLEDCONFIG = $(SYSCONFDIR) Index: patches/patch-certs_Makefile =================================================================== RCS file: patches/patch-certs_Makefile diff -N patches/patch-certs_Makefile --- patches/patch-certs_Makefile 5 Nov 2017 16:52:07 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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: Index: patches/patch-certs_makefile =================================================================== RCS file: patches/patch-certs_makefile diff -N patches/patch-certs_makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-certs_makefile 22 Dec 2018 22:05:04 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +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 Index: patches/patch-core_certmanager_lua =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-core_certmanager_lua,v retrieving revision 1.2 diff -u -p -r1.2 patch-core_certmanager_lua --- patches/patch-core_certmanager_lua 4 Jun 2018 19:53:58 -0000 1.2 +++ patches/patch-core_certmanager_lua 22 Dec 2018 22:05:04 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-core_certmanager_lua,v 1 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 = { Index: patches/patch-makefile =================================================================== RCS file: patches/patch-makefile diff -N patches/patch-makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-makefile 22 Dec 2018 22:05:04 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ + +Index: makefile +--- makefile.orig ++++ makefile +@@ -1,12 +1,12 @@ + + include config.unix + +-BIN = $(DESTDIR)$(PREFIX)/bin ++BIN = $(DESTDIR)$(PREFIX)/sbin + CONFIG = $(DESTDIR)$(SYSCONFDIR) + MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules + SOURCE = $(DESTDIR)$(LIBDIR)/prosody + DATA = $(DESTDIR)$(DATADIR) +-MAN = $(DESTDIR)$(PREFIX)/share/man ++MAN = $(DESTDIR)$(PREFIX)/man + + INSTALLEDSOURCE = $(LIBDIR)/prosody + INSTALLEDCONFIG = $(SYSCONFDIR) Index: patches/patch-prosody_cfg_lua_dist =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v retrieving revision 1.7 diff -u -p -r1.7 patch-prosody_cfg_lua_dist --- patches/patch-prosody_cfg_lua_dist 5 Nov 2017 16:52:07 -0000 1.7 +++ patches/patch-prosody_cfg_lua_dist 22 Dec 2018 22:05:04 -0000 @@ -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 = { Index: patches/patch-tests_run_tests_sh =================================================================== RCS file: patches/patch-tests_run_tests_sh diff -N patches/patch-tests_run_tests_sh --- patches/patch-tests_run_tests_sh 5 Nov 2017 16:52:07 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 $* Index: patches/patch-util-src_makefile =================================================================== RCS file: patches/patch-util-src_makefile diff -N patches/patch-util-src_makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-util-src_makefile 22 Dec 2018 22:05:04 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: util-src/makefile +--- util-src/makefile.orig ++++ util-src/makefile +@@ -5,7 +5,8 @@ CFLAGS+=-I$(LUA_INCDIR) + INSTALL_DATA=install -m644 + TARGET?=../util/ + +-ALL=encodings.so hashes.so net.so pposix.so signal.so table.so ringbuffer.so time.so ++ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \ ++ ringbuffer.so time.so poll.so compat.so + + .ifdef $(RANDOM) + ALL+=crand.so Index: patches/patch-util_prosodyctl_lua =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-util_prosodyctl_lua,v retrieving revision 1.4 diff -u -p -r1.4 patch-util_prosodyctl_lua --- patches/patch-util_prosodyctl_lua 5 Nov 2017 16:52:07 -0000 1.4 +++ patches/patch-util_prosodyctl_lua 22 Dec 2018 22:05:04 -0000 @@ -1,13 +1,14 @@ -$OpenBSD: patch-util_prosodyctl_lua,v 1.4 2017/11/05 16:52:07 landry Exp $ +$OpenBSD$ + 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 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/prosody/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 4 Sep 2018 12:46:18 -0000 1.13 +++ pkg/PLIST 22 Dec 2018 22:05:04 -0000 @@ -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
