This patch updates the XMPP server prosody to version 0.9.3.
In combination with the luasec update posted before, this allows to use perfect-forward-secrecy.
diff -Naur ../_prosody/Makefile ./Makefile --- ../_prosody/Makefile Thu Feb 27 19:54:22 2014 +++ ./Makefile Thu Feb 27 20:00:33 2014 @@ -3,10 +3,9 @@ SHARED_ONLY= Yes COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.8.2 +DISTNAME= prosody-0.9.3 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ -REVISION= 9 HOMEPAGE= http://prosody.im/ diff -Naur ../_prosody/distinfo ./distinfo --- ../_prosody/distinfo Thu Feb 27 19:54:22 2014 +++ ./distinfo Thu Feb 27 20:00:38 2014 @@ -1,2 +1,2 @@ -SHA256 (prosody-0.8.2.tar.gz) = 0DFRUPhIf8lgrfVs4FeYVChnmXX5xvP89CSDLSTqrmA= -SIZE (prosody-0.8.2.tar.gz) = 212170 +SHA256 (prosody-0.9.3.tar.gz) = ItJCf65IWNFbT2lTSPt3geTGXASiQXGDeYUCTnZ5nqA= +SIZE (prosody-0.9.3.tar.gz) = 264318 diff -Naur ../_prosody/patches/patch-Makefile ./patches/patch-Makefile --- ../_prosody/patches/patch-Makefile Thu Feb 27 19:54:22 2014 +++ ./patches/patch-Makefile Thu Feb 27 20:07:09 2014 @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2009/09/06 18:40:57 jolan Exp $ ---- Makefile.orig Wed Jul 29 12:54:54 2009 -+++ Makefile Sun Sep 6 12:06:00 2009 +$OpenBSD$ +--- Makefile.orig Thu Feb 27 20:03:28 2014 ++++ Makefile Thu Feb 27 20:03:41 2014 @@ -1,12 +1,12 @@ include config.unix diff -Naur ../_prosody/patches/patch-certs_Makefile ./patches/patch-certs_Makefile --- ../_prosody/patches/patch-certs_Makefile Thu Feb 27 19:54:22 2014 +++ ./patches/patch-certs_Makefile Thu Feb 27 20:07:07 2014 @@ -1,14 +1,7 @@ -$OpenBSD: patch-certs_Makefile,v 1.2 2012/10/08 09:11:35 jasper Exp $ - -- use '.crt' as the certificate extension -- set correct Make program for this GNU Makefile -- make sure the permissions are restricted for the .key files - ---- certs/Makefile.orig Sun Jun 12 23:21:39 2011 -+++ certs/Makefile Fri Oct 5 17:08:16 2012 -@@ -1,14 +1,14 @@ --.DEFAULT: localhost.cert -+.DEFAULT: localhost.crt +$OpenBSD$ +--- certs/Makefile.orig Thu Feb 27 20:04:09 2014 ++++ certs/Makefile Thu Feb 27 20:05:11 2014 +@@ -2,13 +2,13 @@ keysize=2048 # How to: @@ -20,21 +13,12 @@ +# 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.cert` +-# 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 -@@ -18,7 +18,7 @@ keysize=2048 - openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^) - - # Self signed --%.cert: %.cnf %.key -+%.crt: %.cnf %.key - openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \ - -sha1 -out $@ -utf8 -config $(firstword $^) - @@ -28,3 +28,4 @@ keysize=2048 %.key: openssl genrsa $(keysize) > $@ diff -Naur ../_prosody/patches/patch-prosody_cfg_lua_dist ./patches/patch-prosody_cfg_lua_dist --- ../_prosody/patches/patch-prosody_cfg_lua_dist Thu Feb 27 19:54:22 2014 +++ ./patches/patch-prosody_cfg_lua_dist Thu Feb 27 20:07:10 2014 @@ -1,6 +1,6 @@ -$OpenBSD: patch-prosody_cfg_lua_dist,v 1.4 2012/10/05 14:38:09 jasper Exp $ ---- prosody.cfg.lua.dist.orig Sun Jun 12 23:21:40 2011 -+++ prosody.cfg.lua.dist Fri Oct 5 16:17:16 2012 +$OpenBSD$ +--- prosody.cfg.lua.dist.orig Thu Feb 27 20:05:53 2014 ++++ prosody.cfg.lua.dist Thu Feb 27 20:06:51 2014 @@ -22,6 +22,14 @@ -- Example: admins = { "[email protected]", "[email protected]" } admins = { } @@ -16,25 +16,7 @@ -- Enable use of libevent for better performance under high load -- For more information see: http://prosody.im/doc/libevent --use_libevent = true; -@@ -59,7 +67,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. - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP - --"groups"; -- Shared roster support -@@ -87,7 +95,7 @@ allow_registration = false; - -- to use SSL/TLS, you may comment or remove this - ssl = { - key = "certs/localhost.key"; -- certificate = "certs/localhost.cert"; -+ certificate = "certs/localhost.crt"; - } - - -- Only allow encrypted streams? Encryption is already used when -@@ -123,8 +131,8 @@ authentication = "internal_plain" +@@ -139,8 +147,8 @@ authentication = "internal_plain" -- Logging configuration -- For advanced logging see http://prosody.im/doc/logging log = { diff -Naur ../_prosody/pkg/PLIST ./pkg/PLIST --- ../_prosody/pkg/PLIST Thu Feb 27 19:54:22 2014 +++ ./pkg/PLIST Thu Feb 27 20:09:39 2014 @@ -8,7 +8,9 @@ lib/prosody/core/configmanager.lua lib/prosody/core/hostmanager.lua lib/prosody/core/loggingmanager.lua +lib/prosody/core/moduleapi.lua lib/prosody/core/modulemanager.lua +lib/prosody/core/portmanager.lua lib/prosody/core/rostermanager.lua lib/prosody/core/s2smanager.lua lib/prosody/core/sessionmanager.lua @@ -27,17 +29,21 @@ 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_c2s.lua lib/prosody/modules/mod_component.lua lib/prosody/modules/mod_compression.lua lib/prosody/modules/mod_dialback.lua lib/prosody/modules/mod_disco.lua lib/prosody/modules/mod_groups.lua -lib/prosody/modules/mod_httpserver.lua +lib/prosody/modules/mod_http.lua +lib/prosody/modules/mod_http_errors.lua +lib/prosody/modules/mod_http_files.lua 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_net_multiplex.lua lib/prosody/modules/mod_offline.lua lib/prosody/modules/mod_pep.lua lib/prosody/modules/mod_ping.lua @@ -46,10 +52,15 @@ 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/ +lib/prosody/modules/mod_s2s/mod_s2s.lua +lib/prosody/modules/mod_s2s/s2sout.lib.lua lib/prosody/modules/mod_saslauth.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_time.lua lib/prosody/modules/mod_tls.lua @@ -61,43 +72,53 @@ lib/prosody/modules/muc/ lib/prosody/modules/muc/mod_muc.lua lib/prosody/modules/muc/muc.lib.lua +lib/prosody/modules/sql.lib.lua +lib/prosody/modules/storage/ +lib/prosody/modules/storage/mod_xep0227.lua +lib/prosody/modules/storage/sqlbasic.lib.lua +lib/prosody/modules/storage/xep227store.lib.lua lib/prosody/net/ lib/prosody/net/adns.lua lib/prosody/net/connlisteners.lua lib/prosody/net/dns.lua +lib/prosody/net/http/ lib/prosody/net/http.lua -lib/prosody/net/httpclient_listener.lua +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/httpserver_listener.lua -lib/prosody/net/multiplex_listener.lua lib/prosody/net/server.lua lib/prosody/net/server_event.lua lib/prosody/net/server_select.lua -lib/prosody/net/xmppclient_listener.lua -lib/prosody/net/xmppcomponent_listener.lua -lib/prosody/net/xmppserver_listener.lua lib/prosody/prosody.version lib/prosody/util/ +lib/prosody/util/adhoc.lua 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/debug.lua lib/prosody/util/dependencies.lua +lib/prosody/util/envload.lua lib/prosody/util/events.lua lib/prosody/util/filters.lua lib/prosody/util/helpers.lua lib/prosody/util/hmac.lua -lib/prosody/util/httpstream.lua +lib/prosody/util/http.lua lib/prosody/util/import.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/multitable.lua +lib/prosody/util/net.so +lib/prosody/util/openssl.lua lib/prosody/util/pluginloader.lua lib/prosody/util/prosodyctl.lua +lib/prosody/util/pubsub.lua +lib/prosody/util/rfc6724.lua lib/prosody/util/sasl/ lib/prosody/util/sasl.lua lib/prosody/util/sasl/anonymous.lua @@ -107,12 +128,16 @@ lib/prosody/util/sasl_cyrus.lua lib/prosody/util/serialization.lua lib/prosody/util/set.lua +lib/prosody/util/sql.lua lib/prosody/util/stanza.lua lib/prosody/util/template.lua lib/prosody/util/termcolours.lua +lib/prosody/util/throttle.lua lib/prosody/util/timer.lua lib/prosody/util/uuid.lua -lib/prosody/util/xmlrpc.lua +lib/prosody/util/watchdog.lua +lib/prosody/util/x509.lua +lib/prosody/util/xml.lua lib/prosody/util/xmppstream.lua @man man/man1/prosodyctl.1 sbin/prosody @@ -126,8 +151,13 @@ @sample ${SYSCONFDIR}/prosody/certs/ share/examples/prosody/certs/Makefile @sample ${SYSCONFDIR}/prosody/certs/Makefile -share/examples/prosody/certs/localhost.cert -@sample ${SYSCONFDIR}/prosody/certs/localhost.crt +share/examples/prosody/certs/Makefile.beforesubst +share/examples/prosody/certs/Makefile.orig +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 @sample ${SYSCONFDIR}/prosody/certs/localhost.key share/examples/prosody/certs/openssl.cnf diff -Naur ../_prosody/pkg/PLIST.orig ./pkg/PLIST.orig --- ../_prosody/pkg/PLIST.orig Thu Jan 1 01:00:00 1970 +++ ./pkg/PLIST.orig Fri Oct 5 16:38:09 2012 @@ -0,0 +1,147 @@ +@comment $OpenBSD: PLIST,v 1.7 2012/10/05 14:38:09 jasper Exp $ +@newgroup _prosody:638 +@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin +%%SHARED%% +lib/prosody/ +lib/prosody/core/ +lib/prosody/core/certmanager.lua +lib/prosody/core/configmanager.lua +lib/prosody/core/hostmanager.lua +lib/prosody/core/loggingmanager.lua +lib/prosody/core/modulemanager.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/modules/ +lib/prosody/modules/adhoc/ +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_dialback.lua +lib/prosody/modules/mod_disco.lua +lib/prosody/modules/mod_groups.lua +lib/prosody/modules/mod_httpserver.lua +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 +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_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 +lib/prosody/modules/mod_vcard.lua +lib/prosody/modules/mod_version.lua +lib/prosody/modules/mod_watchregistrations.lua +lib/prosody/modules/mod_welcome.lua +lib/prosody/modules/muc/ +lib/prosody/modules/muc/mod_muc.lua +lib/prosody/modules/muc/muc.lib.lua +lib/prosody/net/ +lib/prosody/net/adns.lua +lib/prosody/net/connlisteners.lua +lib/prosody/net/dns.lua +lib/prosody/net/http.lua +lib/prosody/net/httpclient_listener.lua +lib/prosody/net/httpserver.lua +lib/prosody/net/httpserver_listener.lua +lib/prosody/net/multiplex_listener.lua +lib/prosody/net/server.lua +lib/prosody/net/server_event.lua +lib/prosody/net/server_select.lua +lib/prosody/net/xmppclient_listener.lua +lib/prosody/net/xmppcomponent_listener.lua +lib/prosody/net/xmppserver_listener.lua +lib/prosody/prosody.version +lib/prosody/util/ +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/events.lua +lib/prosody/util/filters.lua +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 +lib/prosody/util/prosodyctl.lua +lib/prosody/util/sasl/ +lib/prosody/util/sasl.lua +lib/prosody/util/sasl/anonymous.lua +lib/prosody/util/sasl/digest-md5.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/set.lua +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/xmppstream.lua +@man man/man1/prosodyctl.1 +sbin/prosody +sbin/prosodyctl +share/doc/pkg-readmes/${FULLPKGNAME} +share/doc/prosody/ +share/doc/prosody/README +share/examples/prosody/ +@sample ${SYSCONFDIR}/prosody/ +share/examples/prosody/certs/ +@sample ${SYSCONFDIR}/prosody/certs/ +share/examples/prosody/certs/Makefile +@sample ${SYSCONFDIR}/prosody/certs/Makefile +share/examples/prosody/certs/localhost.cert +@sample ${SYSCONFDIR}/prosody/certs/localhost.crt +share/examples/prosody/certs/localhost.key +@sample ${SYSCONFDIR}/prosody/certs/localhost.key +share/examples/prosody/certs/openssl.cnf +@sample ${SYSCONFDIR}/prosody/certs/openssl.cnf +share/examples/prosody/prosody.cfg.lua +@sample ${SYSCONFDIR}/prosody/prosody.cfg.lua +@mode 770 +@owner _prosody +@group _prosody +@sample /var/prosody/ +share/examples/prosody/prosody.log +@mode 660 +@sample /var/prosody/prosody.log +@owner +@group +@mode +@rcscript ${RCDIR}/prosody
