pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/prosody Update chat/prosody to 0.10.0

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07f67d83d92f
branches:  trunk
changeset: 371876:07f67d83d92f
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Thu Nov 23 22:06:15 2017 +0000

description:
Update chat/prosody to 0.10.0

- Rewritten SQL storage module with archive support
- SCRAM-SHA-1-PLUS
- prosodyctl check
- Statistics
- Improved TLS configuration
- Lua 5.2 support
- mod_blocklist (XEP-0191)
- mod_carbons (XEP-0280)
- Pluggable connection timeout handling
- mod_websocket (RFC 7395)
- mod_mam (XEP-0313)

See release notes on upgrading:

  https://prosody.im/doc/release/0.10.0#upgrade_notes

diffstat:

 chat/prosody/Makefile                        |  17 ++++---
 chat/prosody/PLIST                           |  40 ++++++++++++++++--
 chat/prosody/distinfo                        |  21 ++++-----
 chat/prosody/patches/patch-aa                |  59 ++++++++++++++++-----------
 chat/prosody/patches/patch-ab                |  26 +++++------
 chat/prosody/patches/patch-ad                |   6 +-
 chat/prosody/patches/patch-prosodyctl        |  14 ------
 chat/prosody/patches/patch-util-src_Makefile |  27 ++++--------
 chat/prosody/patches/patch-util-src_hashes.c |  27 ++++++------
 9 files changed, 126 insertions(+), 111 deletions(-)

diffs (truncated from 487 to 300 lines):

diff -r d166db25ba4b -r 07f67d83d92f chat/prosody/Makefile
--- a/chat/prosody/Makefile     Thu Nov 23 20:44:56 2017 +0000
+++ b/chat/prosody/Makefile     Thu Nov 23 22:06:15 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2017/03/01 16:38:31 fhajny Exp $
+# $NetBSD: Makefile,v 1.28 2017/11/23 22:06:15 fhajny Exp $
 #
 
-DISTNAME=              prosody-0.9.12
+DISTNAME=              prosody-0.10.0
 CATEGORIES=            chat
 MASTER_SITES=          http://prosody.im/downloads/source/
 
@@ -16,10 +16,11 @@
 DEPENDS+=              ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
 
 HAS_CONFIGURE=         yes
+USE_LANGUAGES+=                c c99
 USE_TOOLS+=            gmake
 BUILD_DEFS+=           VARBASE
 
-LUA_VERSIONS_ACCEPTED= 51
+LUA_VERSIONS_ACCEPTED= 52 51
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -34,10 +35,10 @@
 OWN_DIRS_PERMS+=       ${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/certs
 
-PKG_USERS_VARS=                PROSODY_USER
-PKG_GROUPS_VARS=       PROSODY_GROUP
-PKG_GROUPS=            ${PROSODY_GROUP}
-PKG_USERS=             ${PROSODY_USER}:${PROSODY_GROUP}
+PKG_USERS_VARS=                        PROSODY_USER
+PKG_GROUPS_VARS=               PROSODY_GROUP
+PKG_GROUPS=                    ${PROSODY_GROUP}
+PKG_USERS=                     ${PROSODY_USER}:${PROSODY_GROUP}
 PKG_GECOS.${PROSODY_USER}=     Prosody daemon user
 PKG_HOME.${PROSODY_USER}=      ${PROSODY_DATA}
 PKG_SHELL.${PROSODY_USER}=     ${NOLOGIN}
@@ -69,6 +70,8 @@
 
 RCD_SCRIPTS=           prosody
 
+TEST_TARGET=           test
+
 .include "../../lang/lua/application.mk"
 .include "../../lang/lua/tool.mk"
 .include "../../devel/libidn/buildlink3.mk"
diff -r d166db25ba4b -r 07f67d83d92f chat/prosody/PLIST
--- a/chat/prosody/PLIST        Thu Nov 23 20:44:56 2017 +0000
+++ b/chat/prosody/PLIST        Thu Nov 23 22:06:15 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/02/26 10:52:01 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/11/23 22:06:15 fhajny Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -12,6 +12,7 @@
 lib/prosody/core/s2smanager.lua
 lib/prosody/core/sessionmanager.lua
 lib/prosody/core/stanza_router.lua
+lib/prosody/core/statsmanager.lua
 lib/prosody/core/storagemanager.lua
 lib/prosody/core/usermanager.lua
 lib/prosody/modules/adhoc/adhoc.lib.lua
@@ -23,10 +24,13 @@
 lib/prosody/modules/mod_auth_cyrus.lua
 lib/prosody/modules/mod_auth_internal_hashed.lua
 lib/prosody/modules/mod_auth_internal_plain.lua
+lib/prosody/modules/mod_blocklist.lua
 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_debug_sql.lua
 lib/prosody/modules/mod_dialback.lua
 lib/prosody/modules/mod_disco.lua
 lib/prosody/modules/mod_groups.lua
@@ -36,6 +40,7 @@
 lib/prosody/modules/mod_iq.lua
 lib/prosody/modules/mod_lastactivity.lua
 lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_limits.lua
 lib/prosody/modules/mod_message.lua
 lib/prosody/modules/mod_motd.lua
 lib/prosody/modules/mod_net_multiplex.lua
@@ -47,28 +52,30 @@
 lib/prosody/modules/mod_privacy.lua
 lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_proxy65.lua
-lib/prosody/modules/mod_pubsub.lua
 lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_roster.lua
 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_server_contact_info.lua
 lib/prosody/modules/mod_storage_internal.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_vcard.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/mod_muc.lua
 lib/prosody/modules/muc/muc.lib.lua
-lib/prosody/modules/sql.lib.lua
-lib/prosody/modules/storage/mod_xep0227.lua
-lib/prosody/modules/storage/sqlbasic.lib.lua
-lib/prosody/modules/storage/xep227store.lib.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connlisteners.lua
 lib/prosody/net/dns.lua
@@ -80,9 +87,11 @@
 lib/prosody/net/server.lua
 lib/prosody/net/server_event.lua
 lib/prosody/net/server_select.lua
+lib/prosody/net/websocket.lua
 lib/prosody/prosody.version
 lib/prosody/util/adhoc.lua
 lib/prosody/util/array.lua
+lib/prosody/util/cache.lua
 lib/prosody/util/caps.lua
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
@@ -93,38 +102,56 @@
 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
 lib/prosody/util/helpers.lua
+lib/prosody/util/hex.lua
 lib/prosody/util/hmac.lua
 lib/prosody/util/http.lua
+lib/prosody/util/id.lua
 lib/prosody/util/import.lua
+lib/prosody/util/interpolation.lua
 lib/prosody/util/ip.lua
 lib/prosody/util/iterators.lua
 lib/prosody/util/jid.lua
 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
 lib/prosody/util/openssl.lua
+lib/prosody/util/paths.lua
 lib/prosody/util/pluginloader.lua
 lib/prosody/util/pposix.so
+lib/prosody/util/presence.lua
 lib/prosody/util/prosodyctl.lua
 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
+lib/prosody/util/rsm.lua
 lib/prosody/util/sasl.lua
 lib/prosody/util/sasl/anonymous.lua
 lib/prosody/util/sasl/digest-md5.lua
+lib/prosody/util/sasl/external.lua
 lib/prosody/util/sasl/plain.lua
 lib/prosody/util/sasl/scram.lua
 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
 lib/prosody/util/sql.lua
+lib/prosody/util/sslconfig.lua
 lib/prosody/util/stanza.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/timer.lua
 lib/prosody/util/uuid.lua
 lib/prosody/util/watchdog.lua
@@ -136,3 +163,4 @@
 share/examples/prosody/certs/localhost.cnf
 share/examples/prosody/certs/openssl.cnf
 share/examples/prosody/prosody.cfg.lua
+@pkgdir lib/prosody/modules/storage
diff -r d166db25ba4b -r 07f67d83d92f chat/prosody/distinfo
--- a/chat/prosody/distinfo     Thu Nov 23 20:44:56 2017 +0000
+++ b/chat/prosody/distinfo     Thu Nov 23 22:06:15 2017 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.14 2017/03/01 16:38:31 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2017/11/23 22:06:15 fhajny Exp $
 
-SHA1 (prosody-0.9.12.tar.gz) = 1ee224263a5b3d67960e12edbbe6b2f16b95d147
-RMD160 (prosody-0.9.12.tar.gz) = 5d5d16d839936d4577228e7b7de06e9bb95d001a
-SHA512 (prosody-0.9.12.tar.gz) = e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76
-Size (prosody-0.9.12.tar.gz) = 267869 bytes
-SHA1 (patch-aa) = a51829983e9b4b28ee769a101df3dec00daf677d
-SHA1 (patch-ab) = 755dd6d77689ef56ea4468f943f149933be72378
-SHA1 (patch-ad) = abcae34982fee846c00252be1c0b033a44ad65d0
-SHA1 (patch-prosodyctl) = e3e3a8f03c6d7c74b9026cf7ada765ee86c8397e
-SHA1 (patch-util-src_Makefile) = be6d7dd7224a56687238a85827756c109d068a96
-SHA1 (patch-util-src_hashes.c) = ddd8a623209def4e7ff923d71a20e0c143f6ebaf
+SHA1 (prosody-0.10.0.tar.gz) = 57c1c5a665e6453bdde06727ef398cd69accd9d7
+RMD160 (prosody-0.10.0.tar.gz) = dad7a9329fb94bffbaf3177a86aa2740360f74c8
+SHA512 (prosody-0.10.0.tar.gz) = ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9
+Size (prosody-0.10.0.tar.gz) = 330461 bytes
+SHA1 (patch-aa) = 5725cddbb77358d3bf75c55f122fe91051efbae3
+SHA1 (patch-ab) = 15acaf1320eec02c6d4a0b005350dc49dbd20af5
+SHA1 (patch-ad) = 3683833ef1c45e521542f04df4e6df698e727671
+SHA1 (patch-util-src_Makefile) = 0405f68a3b4c7f4f7a98d67230470a2a11078869
+SHA1 (patch-util-src_hashes.c) = 9c5b02f3ad652a9cb12ee4cbf4a6b7d235668932
diff -r d166db25ba4b -r 07f67d83d92f chat/prosody/patches/patch-aa
--- a/chat/prosody/patches/patch-aa     Thu Nov 23 20:44:56 2017 +0000
+++ b/chat/prosody/patches/patch-aa     Thu Nov 23 22:06:15 2017 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2016/01/25 13:01:39 fhajny Exp $
+$NetBSD: patch-aa,v 1.7 2017/11/23 22:06:15 fhajny Exp $
 
 Fix installation directories and scripts
---- Makefile.orig      2016-01-08 13:07:07.000000000 +0000
+
+--- Makefile.orig      2017-11-17 20:57:32.803849000 +0000
 +++ Makefile
 @@ -3,10 +3,11 @@ include config.unix
  
@@ -16,30 +17,37 @@
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -22,26 +23,39 @@ ifeq ($(EXCERTS),yes)
+@@ -28,35 +29,39 @@ ifeq ($(EXCERTS),yes)
  endif
  
  install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
--      install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
--      install -m750 -d $(DATA)
--      install -d $(MAN)/man1
--      install -d $(CONFIG)/certs
--      install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
--      install -m755 ./prosody.install $(BIN)/prosody
--      install -m755 ./prosodyctl.install $(BIN)/prosodyctl
--      install -m644 core/*.lua $(SOURCE)/core
--      install -m644 net/*.lua $(SOURCE)/net
--      install -d $(SOURCE)/net/http
--      install -m644 net/http/*.lua $(SOURCE)/net/http
--      install -m644 util/*.lua $(SOURCE)/util
--      install -m644 util/*.so $(SOURCE)/util
--      install -d $(SOURCE)/util/sasl
--      install -m644 util/sasl/* $(SOURCE)/util/sasl
--      umask 0022 && cp -r plugins/* $(MODULES)
--      install -m644 certs/* $(CONFIG)/certs
--      install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
--      test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
--      test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
+-      $(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+-      $(MKDIR_PRIVATE) $(DATA)
+-      $(MKDIR) $(MAN)/man1
+-      $(MKDIR) $(CONFIG)/certs
+-      $(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
+-      $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
+-      $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
+-      $(INSTALL_DATA) core/*.lua $(SOURCE)/core
+-      $(INSTALL_DATA) net/*.lua $(SOURCE)/net
+-      $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/websocket
+-      $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
+-      $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
+-      $(INSTALL_DATA) util/*.lua $(SOURCE)/util
+-      $(INSTALL_DATA) util/*.so $(SOURCE)/util
+-      $(MKDIR) $(SOURCE)/util/sasl
+-      $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
+-      $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
+-      $(INSTALL_DATA) plugins/*.lua $(MODULES)
+-      $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
+-      $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
+-      $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
+-      $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
+-      $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
+-      $(INSTALL_DATA) certs/* $(CONFIG)/certs
+-      $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+-      test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+-      -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
 +      $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
 +      $(BSD_INSTALL_DATA_DIR) $(EGDIR)
 +      $(BSD_INSTALL_DATA_DIR) $(MODULES)
@@ -69,10 +77,11 @@
 +      $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
Home | Main Index | Thread Index | Old Index