summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2011-06-06 19:49:00 +0000
committertron <tron>2011-06-06 19:49:00 +0000
commit8e8d720deef080255e0e5d25fd5a12783a29f346 (patch)
tree7e834604665373d26dc82b850ac1f4cce65b6344
parent2c8de2ebaf4d41e1d30cd473d510a2f0ce1400ee (diff)
downloadpkgsrc-8e8d720deef080255e0e5d25fd5a12783a29f346.tar.gz
Pullup ticket #3448 - requested by schnoebe
textproc/lua-expat: security update chat/prosody: security update Revisions pulled up: - chat/prosody/Makefile 1.3 via patch - chat/prosody/PLIST 1.2 - chat/prosody/distinfo 1.2 - chat/prosody/patches/patch-aa 1.2 - chat/prosody/patches/patch-ab 1.2 - chat/prosody/patches/patch-ac deleted - chat/prosody/patches/patch-ad 1.2 - textproc/lua-expat/Makefile 1.16 - textproc/lua-expat/distinfo 1.5 --- Module Name: pkgsrc Committed By: schnoebe Date: Sat Jun 4 23:13:40 UTC 2011 Modified Files: pkgsrc/textproc/lua-expat: Makefile distinfo Log Message: Update textproc/lua-expat to 1.2.0. Required for updating chat/prosody to 0.8.1, which helps handle the "billion laughs" exploits on XML parsers and XMPP servers. Change log as recorded in the README: Version 1.2.0 [02/Jun/2011] * support for the StartDoctypeDecl handler * add parser:stop() to abort parsing inside a callback --- Module Name: pkgsrc Committed By: schnoebe Date: Mon Jun 6 14:41:48 UTC 2011 Modified Files: pkgsrc/chat/prosody: Makefile PLIST distinfo pkgsrc/chat/prosody/patches: patch-aa patch-ab patch-ad Removed Files: pkgsrc/chat/prosody/patches: patch-ac Log Message: Update to prosody 0.8.1. A security and bug fix release. The security aspect is to mitigate the "billion laughs" denial-of-service attack against XML parsers and XMPP servers. Other changes: - Reject XML DTDs, comments and processing instructions, preventing the "billion laughs" attack - Switch to MEDIUMTEXT in the schema for MySQL to avoid truncating large data (such as large avatars) Prosody automatically upgrades the table in-place if possible, see: http://prosody.im/doc/mysql - Fix for endless loop when parsing certain invalid JSON - Fix PostgreSQL compatibility in prosody-migrator - Fix timestamp parsing for DST (affecting MUC scrollback retrieval) - mod_legacyauth now correctly disabled for unencrypted connections by default - Components properly inherit SSL settings and certificates from their 'parent' hosts - Prevent startup with no VirtualHost entries in the config file
Diffstat
-rw-r--r--chat/prosody/Makefile6
-rw-r--r--chat/prosody/PLIST29
-rw-r--r--chat/prosody/distinfo15
-rw-r--r--chat/prosody/patches/patch-aa17
-rw-r--r--chat/prosody/patches/patch-ab31
-rw-r--r--chat/prosody/patches/patch-ac14
-rw-r--r--chat/prosody/patches/patch-ad25
-rw-r--r--textproc/lua-expat/Makefile10
-rw-r--r--textproc/lua-expat/distinfo8
9 files changed, 74 insertions, 81 deletions
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 92edbcc41b1..902491f2b0c 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+# $NetBSD: Makefile,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
#
-DISTNAME= prosody-0.7.0
+DISTNAME= prosody-0.8.1
CATEGORIES= chat
MASTER_SITES= http://prosody.im/downloads/source/
@@ -13,7 +13,7 @@ LICENSE= mit
PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= lua-filesystem>=1.0:../../devel/lua-filesystem
-DEPENDS+= lua-expat>=1.1:../../textproc/lua-expat
+DEPENDS+= lua-expat>=1.2:../../textproc/lua-expat
DEPENDS+= lua-sec>=0.3.3:../../security/lua-sec
DEPENDS+= lua-socket>=2.0:../../net/lua-socket
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index 9b57f7303c1..23d3eac33ea 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,25 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
bin/prosody
bin/prosodyctl
lib/prosody/core/certmanager.lua
-lib/prosody/core/componentmanager.lua
lib/prosody/core/configmanager.lua
-lib/prosody/core/eventmanager.lua
lib/prosody/core/hostmanager.lua
lib/prosody/core/loggingmanager.lua
lib/prosody/core/modulemanager.lua
-lib/prosody/core/offlinemanager.lua
lib/prosody/core/rostermanager.lua
lib/prosody/core/s2smanager.lua
lib/prosody/core/sessionmanager.lua
lib/prosody/core/stanza_router.lua
+lib/prosody/core/storagemanager.lua
lib/prosody/core/usermanager.lua
-lib/prosody/core/xmlhandlers.lua
+lib/prosody/modules/adhoc/adhoc.lib.lua
+lib/prosody/modules/adhoc/mod_adhoc.lua
+lib/prosody/modules/mod_admin_adhoc.lua
+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_internal_hashed.lua
+lib/prosody/modules/mod_auth_internal_plain.lua
lib/prosody/modules/mod_bosh.lua
lib/prosody/modules/mod_component.lua
lib/prosody/modules/mod_compression.lua
-lib/prosody/modules/mod_console.lua
lib/prosody/modules/mod_dialback.lua
lib/prosody/modules/mod_disco.lua
lib/prosody/modules/mod_groups.lua
@@ -28,6 +32,8 @@ lib/prosody/modules/mod_iq.lua
lib/prosody/modules/mod_lastactivity.lua
lib/prosody/modules/mod_legacyauth.lua
lib/prosody/modules/mod_message.lua
+lib/prosody/modules/mod_motd.lua
+lib/prosody/modules/mod_offline.lua
lib/prosody/modules/mod_pep.lua
lib/prosody/modules/mod_ping.lua
lib/prosody/modules/mod_posix.lua
@@ -38,6 +44,8 @@ lib/prosody/modules/mod_proxy65.lua
lib/prosody/modules/mod_register.lua
lib/prosody/modules/mod_roster.lua
lib/prosody/modules/mod_saslauth.lua
+lib/prosody/modules/mod_storage_internal.lua
+lib/prosody/modules/mod_storage_sql.lua
lib/prosody/modules/mod_time.lua
lib/prosody/modules/mod_tls.lua
lib/prosody/modules/mod_uptime.lua
@@ -64,18 +72,22 @@ lib/prosody/net/xmppserver_listener.lua
lib/prosody/prosody.version
lib/prosody/util/array.lua
lib/prosody/util/broadcast.lua
+lib/prosody/util/caps.lua
lib/prosody/util/dataforms.lua
lib/prosody/util/datamanager.lua
lib/prosody/util/datetime.lua
lib/prosody/util/dependencies.lua
lib/prosody/util/encodings.so
lib/prosody/util/events.lua
+lib/prosody/util/filters.lua
lib/prosody/util/hashes.so
lib/prosody/util/helpers.lua
lib/prosody/util/hmac.lua
+lib/prosody/util/httpstream.lua
lib/prosody/util/import.lua
lib/prosody/util/iterators.lua
lib/prosody/util/jid.lua
+lib/prosody/util/json.lua
lib/prosody/util/logger.lua
lib/prosody/util/multitable.lua
lib/prosody/util/pluginloader.lua
@@ -91,12 +103,15 @@ lib/prosody/util/serialization.lua
lib/prosody/util/set.lua
lib/prosody/util/signal.so
lib/prosody/util/stanza.lua
+lib/prosody/util/template.lua
lib/prosody/util/termcolours.lua
lib/prosody/util/timer.lua
lib/prosody/util/uuid.lua
lib/prosody/util/xmlrpc.lua
-lib/prosody/util/ztact.lua
+lib/prosody/util/xmppstream.lua
man/man1/prosodyctl.1
+share/examples/prosody/certs/Makefile
share/examples/prosody/certs/localhost.cert
share/examples/prosody/certs/localhost.key
+share/examples/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index 9f5333240b0..80885d29625 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+$NetBSD: distinfo,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
-SHA1 (prosody-0.7.0.tar.gz) = 3f3a6c4f262a062a9c027cc843cd6827104fb8ba
-RMD160 (prosody-0.7.0.tar.gz) = 2e40b4f807b6120971c611f52d4df3264a82cbb9
-Size (prosody-0.7.0.tar.gz) = 177412 bytes
-SHA1 (patch-aa) = 5bb7fb62cc367e075b4213b7cc85661fece0cf23
-SHA1 (patch-ab) = 687ee0ad43074c36c0f1a7fa7bb3cd4575fcae54
-SHA1 (patch-ac) = 3463fffe6884326a8f39f22216f9c94f35ad5cd7
-SHA1 (patch-ad) = d0fc4133bc2027c5f5b3a690bfca4c76a70f48fc
+SHA1 (prosody-0.8.1.tar.gz) = 7de714c019eca35346300c61d609ad2ce999b692
+RMD160 (prosody-0.8.1.tar.gz) = d0b357fb0a9e8ba77b0f45f6342172e262ec018b
+Size (prosody-0.8.1.tar.gz) = 211970 bytes
+SHA1 (patch-aa) = 241c01dbd8de2821c0988032db50b01cc61c548c
+SHA1 (patch-ab) = e8816af363cc452d43dd860f161f1735e6d2e301
+SHA1 (patch-ad) = 5cd22cb93895b6f60b4f910d6aab09e6f1f22712
diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa
index 652d5a178a3..bbde879ac84 100644
--- a/chat/prosody/patches/patch-aa
+++ b/chat/prosody/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+$NetBSD: patch-aa,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
Fix installation directories and scripts
---- Makefile.orig 2010-06-13 00:23:01.000000000 +0000
+--- Makefile.orig 2011-06-03 15:31:32.000000000 +0000
+++ Makefile
@@ -3,10 +3,11 @@ include config.unix
@@ -16,7 +16,7 @@ Fix installation directories and scripts
INSTALLEDSOURCE = $(PREFIX)/lib/prosody
INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -17,27 +18,31 @@ all: prosody.install prosodyctl.install
+@@ -17,28 +18,33 @@ all: prosody.install prosodyctl.install
$(MAKE) -C util-src install
install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
@@ -37,17 +37,18 @@ Fix installation directories and scripts
- install -d $(MODULES)/muc
- install -m644 plugins/muc/* $(MODULES)/muc
- install -m644 certs/* $(CONFIG)/certs
-- install -m644 plugins/*.lua $(MODULES)
+- install -d $(MODULES)/adhoc
+- install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
- 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 prosody.version $(SOURCE)/prosody.version || true
-+ $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
++ $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)
+ $(BSD_INSTALL_DATA_DIR) $(MODULES)
+ $(BSD_INSTALL_DATA_DIR) $(SOURCE)
+ $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
+ $(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
++ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
+ $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
@@ -59,10 +60,12 @@ Fix installation directories and scripts
+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
+ $(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
+ $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
-+ $(BSD_INSTALL_DATA_DIR) $(MODULES)/muc
++ $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
+ $(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
+ $(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
++ $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
++ $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
+ $(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+ $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
+ $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-ab
index dc72c8f1cb5..a2eef00f207 100644
--- a/chat/prosody/patches/patch-ab
+++ b/chat/prosody/patches/patch-ab
@@ -1,24 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+$NetBSD: patch-ab,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
-Enable POSIX functionality by default
---- prosody.cfg.lua.dist.orig 2010-06-13 00:23:02.000000000 +0000
+enable POSIX functionality by default
+set the logging paths
+set up the pid files
+
+--- prosody.cfg.lua.dist.orig 2011-06-03 15:31:34.000000000 +0000
+++ prosody.cfg.lua.dist
-@@ -54,7 +54,7 @@ modules_enabled = {
- "register"; -- Allow users to register on this server using a client and change passwords
+@@ -59,7 +59,7 @@ modules_enabled = {
+ --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-- Other specific functionality
- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- --"console"; -- Opens admin telnet interface on localhost port 5582
++ posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"httpserver"; -- Serve static files from a directory over HTTP
-@@ -90,9 +90,12 @@ ssl = {
-
+ --"groups"; -- Shared roster support
+@@ -123,12 +123,15 @@ authentication = "internal_plain"
-- Logging configuration
-- For advanced logging see http://prosody.im/doc/logging
--log = "prosody.log";
-+log = "@PROSODY_LOG@/prosody.log";
- debug = false; -- Log debug messages?
+ log = {
+- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+- error = "prosody.err";
++ info = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++ error = "@PROSODY_LOG@/prosody.err";
+ -- "*syslog"; -- Uncomment this for logging to syslog
+ -- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
+-- Enable PID file by default
+pidfile = "@PROSODY_RUN@/prosody.pid";
diff --git a/chat/prosody/patches/patch-ac b/chat/prosody/patches/patch-ac
deleted file mode 100644
index 418e293bb97..00000000000
--- a/chat/prosody/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
-
-Add runtime search path to linking phase
---- util-src/Makefile.orig 2010-06-13 00:23:02.000000000 +0000
-+++ util-src/Makefile
-@@ -16,7 +16,7 @@ LD?=gcc
-
- .o.so:
- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
-- $(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto
-+ $(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -R$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto
-
- all: encodings.so hashes.so pposix.so signal.so
-
diff --git a/chat/prosody/patches/patch-ad b/chat/prosody/patches/patch-ad
index 6edb799d362..82aad640d27 100644
--- a/chat/prosody/patches/patch-ad
+++ b/chat/prosody/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+$NetBSD: patch-ad,v 1.1.1.1.6.1 2011/06/06 19:49:00 tron Exp $
-Fix POSIX logic for BSD systems
---- util-src/signal.c.orig 2010-06-13 00:23:02.000000000 +0000
+Include <sys/param.h> when on UNIX
+
+--- util-src/signal.c.orig 2011-06-03 15:31:34.000000000 +0000
+++ util-src/signal.c
@@ -29,6 +29,10 @@
#include <signal.h>
@@ -14,21 +15,3 @@ Fix POSIX logic for BSD systems
#include "lua.h"
#include "lauxlib.h"
-@@ -326,7 +330,7 @@ static int l_raise(lua_State *L)
- return 1;
- }
-
--#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
-+#ifdef __unix__
-
- /* define some posix only functions */
-
-@@ -373,7 +377,7 @@ static int l_kill(lua_State *L)
- static const struct luaL_Reg lsignal_lib[] = {
- {"signal", l_signal},
- {"raise", l_raise},
--#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
-+#ifdef __unix__
- {"kill", l_kill},
- #endif
- {NULL, NULL}
diff --git a/textproc/lua-expat/Makefile b/textproc/lua-expat/Makefile
index d93658de14d..39bb75c6dc3 100644
--- a/textproc/lua-expat/Makefile
+++ b/textproc/lua-expat/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2010/07/06 10:17:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.15.6.1 2011/06/06 19:49:00 tron Exp $
#
-DISTNAME= luaexpat-1.1
-PKGNAME= ${DISTNAME:S/lua/lua-/}.0
+DISTNAME= luaexpat-1.2.0
+PKGNAME= ${DISTNAME:S/lua/lua-/}
CATEGORIES= textproc
-MASTER_SITES= http://luaforge.net/frs/download.php/2469/
+MASTER_SITES= http://matthewwild.co.uk/projects/luaexpat/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.keplerproject.org/luaexpat/
+HOMEPAGE= http://matthewwild.co.uk/projects/projects
COMMENT= XML parser for LUA based on expat
LICENSE= mit
diff --git a/textproc/lua-expat/distinfo b/textproc/lua-expat/distinfo
index a41ae0d0244..adfd7f95396 100644
--- a/textproc/lua-expat/distinfo
+++ b/textproc/lua-expat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/12/15 12:43:04 fhajny Exp $
+$NetBSD: distinfo,v 1.4.12.1 2011/06/06 19:49:00 tron Exp $
-SHA1 (luaexpat-1.1.tar.gz) = ea359bdbd346ee378c47179a17ac3ee410be5c9d
-RMD160 (luaexpat-1.1.tar.gz) = f661c0e7f22363f51862187e96306498addea9d9
-Size (luaexpat-1.1.tar.gz) = 27907 bytes
+SHA1 (luaexpat-1.2.0.tar.gz) = 76f036e6fb928a3e5f3c3ba1b854e5fef8e1b28f
+RMD160 (luaexpat-1.2.0.tar.gz) = e92fb3447b3cd17bdd03ebfdaf000a1f001c59f2
+Size (luaexpat-1.2.0.tar.gz) = 28621 bytes
SHA1 (patch-aa) = dd908d36c310b3a17a7e2319dc4f969a903f9402
SHA1 (patch-ac) = 61d9bb455ef189d6ceb5dd71b06f7218da29e2f9
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 18:38:13 +0000