Hello community, here is the log from the commit of package prosody for openSUSE:Factory checked in at 2017-01-19 10:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prosody (Old) and /work/SRC/openSUSE:Factory/.prosody.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prosody" Changes: -------- --- /work/SRC/openSUSE:Factory/prosody/prosody.changes 2016-11-11 14:35:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.prosody.new/prosody.changes 2017-01-19 10:43:19.513523933 +0100 @@ -1,0 +2,16 @@ + +Wed Jan 11 22:10:06 UTC 2017 - mathias.hom...@opensuse.org + +- added patch: prosody-lua51coexist.patch + * makes prosody work on systems that have lua 5.1 and lua 5.2 installed. + +------------------------------------------------------------------- +Wed Jan 11 09:02:59 UTC 2017 - mvet...@suse.com + +- Update to 0.9.12: + * Dependencies: Fix certificate verification failures when using LuaSec 0.6 (fixes #781) + * mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered protocol issues + * certs/Makefile: Remove -c flag from chmod call (a GNU extension) + * Networking: Prevent writes after a handler is closed (fixes #783) + +------------------------------------------------------------------- Old: ---- prosody-0.9.11.tar.gz prosody-0.9.11.tar.gz.asc New: ---- prosody-0.9.12.tar.gz prosody-0.9.12.tar.gz.asc prosody-lua51coexist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prosody.spec ++++++ --- /var/tmp/diff_new_pack.W0NJur/_old 2017-01-19 10:43:20.049448333 +0100 +++ /var/tmp/diff_new_pack.W0NJur/_new 2017-01-19 10:43:20.049448333 +0100 @@ -1,7 +1,7 @@ # # spec file for package prosody # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} > 1230 || 0%{?rhel_version} > 600 || 0%{?centos_version} > 600 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without systemd %define _piddir /run @@ -26,7 +27,7 @@ %{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d } Name: prosody -Version: 0.9.11 +Version: 0.9.12 Release: 0 Summary: Modern flexible communications server for Jabber/XMPP License: MIT @@ -37,6 +38,8 @@ Source3: %{name}.keyring Source4: %{name}.service Source5: prosody.tmpfile +# Make prosody work on systems that have lua 5.1 AND 5.2 installed +Patch0: prosody-lua51coexist.patch Patch1: prosody-configure.patch Patch2: prosody-makefile.patch # PATCH-FIX-OPENSUSE marguer...@opensuse.org - enable Unix features @@ -74,6 +77,7 @@ %prep %setup -q +%patch0 -p1 %patch1 %patch2 %patch3 -p1 @@ -84,7 +88,7 @@ %build # CFLAGS need to keep -fPIC for shared modules -./configure --lua-suffix="" --cflags="%{optflags} -fPIC" --c-compiler=gcc +./configure --lua-suffix="5.1" --cflags="%{optflags} -fPIC" --c-compiler=gcc make %{?_smp_mflags} ++++++ prosody-0.9.11.tar.gz -> prosody-0.9.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.9.11/.hg_archival.txt new/prosody-0.9.12/.hg_archival.txt --- old/prosody-0.9.11/.hg_archival.txt 2016-09-28 18:04:13.000000000 +0200 +++ new/prosody-0.9.12/.hg_archival.txt 2016-12-05 13:54:23.000000000 +0100 @@ -1,6 +1,6 @@ repo: 3e3171b59028ee70122cfec6ecf98f518f946b59 -node: 8613086779fa9276615c2af066d2a10c38d0c86e +node: 2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 branch: default -latesttag: 0.9.10 -latesttagdistance: 26 -changessincelatesttag: 26 +latesttag: 0.9.11 +latesttagdistance: 4 +changessincelatesttag: 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.9.11/certs/Makefile new/prosody-0.9.12/certs/Makefile --- old/prosody-0.9.11/certs/Makefile 2016-09-28 18:04:13.000000000 +0200 +++ new/prosody-0.9.12/certs/Makefile 2016-12-05 13:54:23.000000000 +0100 @@ -27,4 +27,4 @@ %.key: umask 0077 && openssl genrsa -out $@ $(keysize) - @chmod 400 $@ -c + @chmod 400 $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.9.11/net/server_select.lua new/prosody-0.9.12/net/server_select.lua --- old/prosody-0.9.11/net/server_select.lua 2016-09-28 18:04:13.000000000 +0200 +++ new/prosody-0.9.12/net/server_select.lua 2016-12-05 13:54:23.000000000 +0100 @@ -415,6 +415,7 @@ end handler.port = handler.clientport -- COMPAT server_event local write = function( self, data ) + if not handler then return false end bufferlen = bufferlen + #data if bufferlen > maxsendlen then _closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.9.11/prosody.release new/prosody-0.9.12/prosody.release --- old/prosody-0.9.11/prosody.release 2016-09-28 18:04:13.000000000 +0200 +++ new/prosody-0.9.12/prosody.release 2016-12-05 13:54:23.000000000 +0100 @@ -1 +1 @@ -0.9.11 +0.9.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prosody-0.9.11/util/dependencies.lua new/prosody-0.9.12/util/dependencies.lua --- old/prosody-0.9.11/util/dependencies.lua 2016-09-28 18:04:13.000000000 +0200 +++ new/prosody-0.9.12/util/dependencies.lua 2016-12-05 13:54:23.000000000 +0100 @@ -102,6 +102,7 @@ elseif not _G.ssl then _G.ssl = ssl; _G.ssl.context = require "ssl.context"; + _G.ssl.x509 = softreq "ssl.x509"; end local encodings, err = softreq "util.encodings" ++++++ prosody-lua51coexist.patch ++++++ diff -bruNE prosody-0.9.11_orig/prosody prosody-0.9.11/prosody --- prosody-0.9.11_orig/prosody 2016-12-14 11:10:56.135550760 +0100 +++ prosody-0.9.11/prosody 2016-12-14 11:11:33.025945126 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env lua5.1 -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain diff -bruNE prosody-0.9.11_orig/prosodyctl prosody-0.9.11/prosodyctl --- prosody-0.9.11_orig/prosodyctl 2016-12-14 11:10:55.927559814 +0100 +++ prosody-0.9.11/prosodyctl 2016-12-14 11:11:39.469664663 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env lua5.1 -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain
