From c46a8e531741e0b9890f582f11cc317886a0ee13 Mon Sep 17 00:00:00 2001 From: fhajny Date: Mon, 10 Mar 2014 13:01:17 +0000 Subject: Update prosody to 0.9.3. Changes in 0.9.3: - A config file passed as command line argument is no longer forgotten when config is reloaded - MUC: Allow admins to always bypass restrict_room_creation - Strip trailing '.' when normalizing hostnames - HTTP: Prevent silent connection failures - Components: Allow easier overriding of component authentication by plugins - Components: Enable TCP keepalives - Migrator: Better error reporting and improved robustness - S2S: Include IP in log messages, if hostname is unavailable - TLS: Log error when initialization fails Changes in 0.9.2: - Debian/Ubuntu packages fixed to always generate per-system certs - TLS: Improved cipher string, and use Prosody's preferred ciphers - MUC: Fix for Spark clients not displaying room lists --- chat/prosody/Makefile | 9 ++++++--- chat/prosody/PLIST | 6 +++++- chat/prosody/distinfo | 16 ++++++++-------- chat/prosody/patches/patch-aa | 8 ++++---- chat/prosody/patches/patch-ab | 4 ++-- chat/prosody/patches/patch-ad | 4 ++-- chat/prosody/patches/patch-prosodyctl | 4 ++-- 7 files changed, 29 insertions(+), 22 deletions(-) (limited to 'chat') diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile index 130d32b9f9f..60db641c78a 100644 --- a/chat/prosody/Makefile +++ b/chat/prosody/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2014/02/12 23:17:37 tron Exp $ +# $NetBSD: Makefile,v 1.13 2014/03/10 13:01:17 fhajny Exp $ # -DISTNAME= prosody-0.9.1 -PKGREVISION= 2 +DISTNAME= prosody-0.9.3 CATEGORIES= chat MASTER_SITES= http://prosody.im/downloads/source/ @@ -47,6 +46,10 @@ PKG_SHELL.${PROSODY_USER}= ${NOLOGIN} PKG_SYSCONFSUBDIR= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua +CONF_FILES+= ${EGDIR}/certs/example.com.cnf ${PKG_SYSCONFDIR}/certs/example.com.cnf +CONF_FILES+= ${EGDIR}/certs/example.com.crt ${PKG_SYSCONFDIR}/certs/example.com.crt +CONF_FILES+= ${EGDIR}/certs/example.com.key ${PKG_SYSCONFDIR}/certs/example.com.key +CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf CONF_FILES+= ${EGDIR}/certs/localhost.crt ${PKG_SYSCONFDIR}/certs/localhost.crt CONF_FILES+= ${EGDIR}/certs/localhost.key ${PKG_SYSCONFDIR}/certs/localhost.key diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST index 344059e4bab..19b1888d7df 100644 --- a/chat/prosody/PLIST +++ b/chat/prosody/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/09/13 14:37:49 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/03/10 13:01:17 fhajny Exp $ bin/prosody bin/prosodyctl lib/prosody/core/certmanager.lua @@ -133,6 +133,10 @@ lib/prosody/util/xml.lua lib/prosody/util/xmppstream.lua man/man1/prosodyctl.1 share/examples/prosody/certs/Makefile +share/examples/prosody/certs/example.com.cnf +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 share/examples/prosody/certs/localhost.key share/examples/prosody/certs/openssl.cnf diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo index 81c037915cc..2dae834c0a6 100644 --- a/chat/prosody/distinfo +++ b/chat/prosody/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2013/09/13 14:37:49 fhajny Exp $ +$NetBSD: distinfo,v 1.6 2014/03/10 13:01:17 fhajny Exp $ -SHA1 (prosody-0.9.1.tar.gz) = 2e500932857e865557977f6c1b52ac362b6eb020 -RMD160 (prosody-0.9.1.tar.gz) = 95d5e12c4ca2a2e292a2baa7271f949f1743c02b -Size (prosody-0.9.1.tar.gz) = 265755 bytes -SHA1 (patch-aa) = 70398b3ce10b7adc06ccf56e60cbf8f1da8fb2c4 -SHA1 (patch-ab) = 5a8497693644ecd4d0bd809470f900423ea675e2 -SHA1 (patch-ad) = 5cd22cb93895b6f60b4f910d6aab09e6f1f22712 -SHA1 (patch-prosodyctl) = f181c10cae64f09b87fda3015e4e940597cbe723 +SHA1 (prosody-0.9.3.tar.gz) = c201c0cd82dfb6b209d8dc176033e5a7ba9559c3 +RMD160 (prosody-0.9.3.tar.gz) = 1abe851bea1e0db52c38fa8056dc479a5abf3c8c +Size (prosody-0.9.3.tar.gz) = 264318 bytes +SHA1 (patch-aa) = 3b4084a887b373bfdbef28028a4630bf9e26c17d +SHA1 (patch-ab) = 755dd6d77689ef56ea4468f943f149933be72378 +SHA1 (patch-ad) = abcae34982fee846c00252be1c0b033a44ad65d0 +SHA1 (patch-prosodyctl) = e3e3a8f03c6d7c74b9026cf7ada765ee86c8397e diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa index f644f34a3a4..096a0ff2386 100644 --- a/chat/prosody/patches/patch-aa +++ b/chat/prosody/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2013/09/13 14:37:49 fhajny Exp $ +$NetBSD: patch-aa,v 1.4 2014/03/10 13:01:17 fhajny Exp $ Fix installation directories and scripts ---- Makefile.orig 2013-09-09 10:32:23.000000000 +0000 +--- Makefile.orig 2014-01-12 11:41:40.000000000 +0000 +++ Makefile @@ -3,10 +3,11 @@ include config.unix @@ -16,8 +16,8 @@ Fix installation directories and scripts INSTALLEDSOURCE = $(PREFIX)/lib/prosody INSTALLEDCONFIG = $(SYSCONFDIR) -@@ -19,26 +20,39 @@ all: prosody.install prosodyctl.install - $(MAKE) -C util-src install +@@ -22,26 +23,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) diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-ab index 0e3a62de99c..866467bb014 100644 --- a/chat/prosody/patches/patch-ab +++ b/chat/prosody/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.4 2013/09/13 14:37:49 fhajny Exp $ +$NetBSD: patch-ab,v 1.5 2014/03/10 13:01:17 fhajny Exp $ enable POSIX functionality by default set the logging paths set up the pid files ---- prosody.cfg.lua.dist.orig 2013-09-09 10:32:23.000000000 +0000 +--- prosody.cfg.lua.dist.orig 2014-01-12 11:41:40.000000000 +0000 +++ prosody.cfg.lua.dist @@ -63,7 +63,7 @@ modules_enabled = { --"http_files"; -- Serve static files from a directory over HTTP diff --git a/chat/prosody/patches/patch-ad b/chat/prosody/patches/patch-ad index 1e53f1699ba..abb5b6bcd58 100644 --- a/chat/prosody/patches/patch-ad +++ b/chat/prosody/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2011/06/06 14:41:48 schnoebe Exp $ +$NetBSD: patch-ad,v 1.3 2014/03/10 13:01:17 fhajny Exp $ Include when on UNIX ---- util-src/signal.c.orig 2011-06-03 15:31:34.000000000 +0000 +--- util-src/signal.c.orig 2014-01-12 11:41:40.000000000 +0000 +++ util-src/signal.c @@ -29,6 +29,10 @@ #include diff --git a/chat/prosody/patches/patch-prosodyctl b/chat/prosody/patches/patch-prosodyctl index 430f4e4f50a..0c86ecbd6bc 100644 --- a/chat/prosody/patches/patch-prosodyctl +++ b/chat/prosody/patches/patch-prosodyctl @@ -1,7 +1,7 @@ -$NetBSD: patch-prosodyctl,v 1.1 2013/09/13 14:37:49 fhajny Exp $ +$NetBSD: patch-prosodyctl,v 1.2 2014/03/10 13:01:17 fhajny Exp $ Fix Lua code. ---- prosodyctl.orig 2013-09-09 10:32:23.000000000 +0000 +--- prosodyctl.orig 2014-01-12 11:41:40.000000000 +0000 +++ prosodyctl @@ -243,7 +243,7 @@ end local modulemanager = require "core.modulemanager" -- cgit v1.2.3