diff options
author | schnoebe <schnoebe> | 2011-06-06 14:41:48 +0000 |
---|---|---|
committer | schnoebe <schnoebe> | 2011-06-06 14:41:48 +0000 |
commit | 94f5ea1edf08ce7f66b1a231f538b26115aefb56 (patch) | |
tree | a6b53cc20dd49d78dee270531a32de2f6f453831 /chat/prosody/patches | |
parent | 418f7119b7accdfab03376810cbec1481d518062 (diff) | |
download | pkgsrc-94f5ea1edf08ce7f66b1a231f538b26115aefb56.tar.gz |
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 (limited to 'chat/prosody/patches')
-rw-r--r-- | chat/prosody/patches/patch-aa | 17 | ||||
-rw-r--r-- | chat/prosody/patches/patch-ab | 31 | ||||
-rw-r--r-- | chat/prosody/patches/patch-ac | 14 | ||||
-rw-r--r-- | chat/prosody/patches/patch-ad | 25 |
4 files changed, 33 insertions, 54 deletions
diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa index 652d5a178a3..fd50e94ae6d 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.2 2011/06/06 14:41:48 schnoebe 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..fdc465fd2f5 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.2 2011/06/06 14:41:48 schnoebe 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..1e53f1699ba 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.2 2011/06/06 14:41:48 schnoebe 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} |