commit prosody for openSUSE:Factory

30 Nov 2018

Hello community,

here is the log from the commit of package prosody for openSUSE:Factory checked in at 2018-11-30 16:32:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prosody (Old)
 and      /work/SRC/openSUSE:Factory/.prosody.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "prosody"

Fri Nov 30 16:32:16 2018 rev:13 rq:652595 version:0.11.1

Changes:
--------

--- /work/SRC/openSUSE:Factory/prosody/prosody.changes	2018-11-26 10:28:53.177127909 +0100
+++ /work/SRC/openSUSE:Factory/.prosody.new.19453/prosody.changes	2018-11-30 16:32:17.961369970 +0100
@@ -1,0 +2,13 @@
+Thu Nov 29 10:14:01 UTC 2018 - ecsos@opensuse.org
+
+- Update to 0.11.1:
+  * Fixes and improvements
+    - mod_csi_simple: Don’t set stamps on stanzas (fixes #1248)
+    - mod_csi_simple: Bypass importance event in active mode (fixes #1249)
+  * Minor changes
+    - mod_csi_simple: Use the same event name when firing as when hooking (fixes #1245)
+    - mod_csi: Set session.state to simplify CSI modules
+    - MUC: Fix traceback on muc#admin query with missing child (#1242)
+- Fix build error for Leap 42.3
+
+-------------------------------------------------------------------

Old:
----
  prosody-0.11.0.tar.gz
  prosody-0.11.0.tar.gz.asc

New:
----
  prosody-0.11.1.tar.gz
  prosody-0.11.1.tar.gz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ prosody.spec ++++++
--- /var/tmp/diff_new_pack.jVqH10/_old	2018-11-30 16:32:18.605369126 +0100
+++ /var/tmp/diff_new_pack.jVqH10/_new	2018-11-30 16:32:18.613369115 +0100
@@ -18,7 +18,7 @@
 
 %define _piddir /run
 Name:           prosody
-Version:        0.11.0
+Version:        0.11.1
 Release:        0
 Summary:        Communications server for Jabber/XMPP
 License:        MIT
@@ -73,8 +73,12 @@
 # CFLAGS need to keep -fPIC for shared modules
 ./configure \
     --lua-suffix="5.1" \
+    %if 0%{?suse_version} >= 1500
     --with-lua-include=%{lua_incdir} \
     --cflags="%{optflags} -fPIC" \
+    %else
+    --cflags="%{optflags} -fPIC -std=c99" \
+    %endif
     --c-compiler=gcc \
 	--libdir=%{_libdir}
 

++++++ prosody-0.11.0.tar.gz -> prosody-0.11.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/.hg_archival.txt new/prosody-0.11.1/.hg_archival.txt
--- old/prosody-0.11.0/.hg_archival.txt	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/.hg_archival.txt	2018-11-28 15:12:07.000000000 +0100
@@ -1,4 +1,4 @@
 repo: 3e3171b59028ee70122cfec6ecf98f518f946b59
-node: 83f3a05c1b1bb9b54b3b153077a06eb02e247c8e
+node: 91856829f18bb8ef7056ca02464122fc6de17807
 branch: 0.11
-tag: 0.11.0
+tag: 0.11.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/plugins/mod_csi.lua new/prosody-0.11.1/plugins/mod_csi.lua
--- old/prosody-0.11.0/plugins/mod_csi.lua	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/plugins/mod_csi.lua	2018-11-28 15:12:07.000000000 +0100
@@ -11,6 +11,7 @@
 function refire_event(name)
 	return function (event)
 		if event.origin.username then
+			event.origin.state = event.stanza.name;
 			module:fire_event(name, event);
 			return true;
 		end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/plugins/mod_csi_simple.lua new/prosody-0.11.1/plugins/mod_csi_simple.lua
--- old/prosody-0.11.0/plugins/mod_csi_simple.lua	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/plugins/mod_csi_simple.lua	2018-11-28 15:12:07.000000000 +0100
@@ -81,11 +81,11 @@
 		pump:pause();
 		session.pump = pump;
 		function session.send(stanza)
-			if module:fire_event("csi-stanza-is-important", { stanza = stanza, session = session }) then
+			if session.state == "active" or module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then
 				pump:flush();
 				send(stanza);
 			else
-				if st.is_stanza(stanza) then
+				if st.is_stanza(stanza) and stanza.attr.xmlns == nil and stanza.name ~= "iq" then
 					stanza = st.clone(stanza);
 					stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = bare_jid, stamp = dt.datetime()}));
 				end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/plugins/mod_proxy65.lua new/prosody-0.11.1/plugins/mod_proxy65.lua
--- old/prosody-0.11.0/plugins/mod_proxy65.lua	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/plugins/mod_proxy65.lua	2018-11-28 15:12:07.000000000 +0100
@@ -93,7 +93,6 @@
 	local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service");
 
 	local proxy_address = module:get_option_string("proxy65_address", host);
-	local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
 	local proxy_acl = module:get_option_array("proxy65_acl");
 
 	-- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config
@@ -123,6 +122,13 @@
 			return true;
 		end
 
+		local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
+		if not proxy_port then
+			module:log("warn", "Not listening on any port");
+			origin.send(st.error_reply(stanza, "wait", "item-not-found", "Not listening on any port"));
+			return true;
+		end
+
 		local sid = stanza.tags[1].attr.sid;
 		origin.send(st.reply(stanza):tag("query", {xmlns="http://jabber.org/protocol/bytestreams", sid=sid})
 			:tag("streamhost", {jid=host, host=proxy_address, port=("%d"):format(proxy_port)}));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/plugins/muc/muc.lib.lua new/prosody-0.11.1/plugins/muc/muc.lib.lua
--- old/prosody-0.11.0/plugins/muc/muc.lib.lua	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/plugins/muc/muc.lib.lua	2018-11-28 15:12:07.000000000 +0100
@@ -904,6 +904,7 @@
 	local item = stanza.tags[1].tags[1];
 	if not item then
 		origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+		return true;
 	end
 	if item.attr.jid then -- Validate provided JID
 		item.attr.jid = jid_prep(item.attr.jid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.11.0/prosody.release new/prosody-0.11.1/prosody.release
--- old/prosody-0.11.0/prosody.release	2018-11-19 11:42:24.000000000 +0100
+++ new/prosody-0.11.1/prosody.release	2018-11-28 15:12:07.000000000 +0100
@@ -1 +1 @@
-0.11.0
+0.11.1

    

root

tags

participants (1)