Hello community, here is the log from the commit of package prosody for openSUSE:Factory checked in at 2017-10-03 23:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prosody (Old) and /work/SRC/openSUSE:Factory/.prosody.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prosody" Tue Oct 3 23:20:29 2017 rev:7 rq:530942 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prosody/prosody.changes 2017-09-15 22:31:40.344413680 +0200 +++ /work/SRC/openSUSE:Factory/.prosody.new/prosody.changes 2017-10-03 23:20:31.875007529 +0200 @@ -1,0 +2,14 @@ +Tue Oct 3 09:28:29 UTC 2017 - [email protected] + +- Update to 0.10.0: + See https://blog.prosody.im/prosody-0-10-0-released/ for details +- Remove because contained in new upstream: + * prosody-upstream-0.9-branch-fixes-since-0.12-tag.patch + * prosody-backport-555.patch + * prosody-local-socket.patch +- Update: + * prosody-configure.patch + * prosody-makefile.patch + * prosody-cfg.patch + +------------------------------------------------------------------- Old: ---- prosody-0.9.12.tar.gz prosody-0.9.12.tar.gz.asc prosody-backport-555.patch prosody-local-socket.patch prosody-upstream-0.9-branch-fixes-since-0.12-tag.patch New: ---- prosody-0.10.0.tar.gz prosody-0.10.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prosody.spec ++++++ --- /var/tmp/diff_new_pack.fWym1P/_old 2017-10-03 23:20:32.850870195 +0200 +++ /var/tmp/diff_new_pack.fWym1P/_new 2017-10-03 23:20:32.854869632 +0200 @@ -18,7 +18,7 @@ %define _piddir /run Name: prosody -Version: 0.9.12 +Version: 0.10.0 Release: 0 Summary: Communications server for Jabber/XMPP License: MIT @@ -35,11 +35,6 @@ Patch2: prosody-makefile.patch # PATCH-FIX-OPENSUSE [email protected] - enable Unix features Patch3: prosody-cfg.patch -# PATCH-FIX-UPSTREAM declare socket as local -Patch4: prosody-local-socket.patch -# PATCH-FIX-UPSTREAM use latest fixes -Patch5: prosody-upstream-0.9-branch-fixes-since-0.12-tag.patch -Patch6: prosody-backport-555.patch BuildRequires: libidn-devel BuildRequires: libopenssl-devel BuildRequires: lua51-devel @@ -67,12 +62,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 sed -i 's|@@LIBDIR@@|%{_libdir}|g;s|@@INCLUDEDIR@@|%{_includedir}|g;' configure sed -i 's|@@LIBDIR@@|%{_libdir}|g;s|@@INCLUDEDIR@@|%{_includedir}|g;' Makefile @@ -125,146 +117,11 @@ %{_bindir}/prosody %{_bindir}/prosodyctl %dir %{_libdir}/prosody -%dir %{_libdir}/prosody/core -%{_libdir}/prosody/core/certmanager.lua -%{_libdir}/prosody/core/configmanager.lua -%{_libdir}/prosody/core/hostmanager.lua -%{_libdir}/prosody/core/loggingmanager.lua -%{_libdir}/prosody/core/moduleapi.lua -%{_libdir}/prosody/core/modulemanager.lua -%{_libdir}/prosody/core/portmanager.lua -%{_libdir}/prosody/core/rostermanager.lua -%{_libdir}/prosody/core/s2smanager.lua -%{_libdir}/prosody/core/sessionmanager.lua -%{_libdir}/prosody/core/stanza_router.lua -%{_libdir}/prosody/core/storagemanager.lua -%{_libdir}/prosody/core/usermanager.lua -%dir %{_libdir}/prosody/modules -%dir %{_libdir}/prosody/modules/adhoc -%{_libdir}/prosody/modules/adhoc/adhoc.lib.lua -%{_libdir}/prosody/modules/adhoc/mod_adhoc.lua -%{_libdir}/prosody/modules/mod_admin_adhoc.lua -%{_libdir}/prosody/modules/mod_admin_telnet.lua -%{_libdir}/prosody/modules/mod_announce.lua -%{_libdir}/prosody/modules/mod_auth_anonymous.lua -%{_libdir}/prosody/modules/mod_auth_cyrus.lua -%{_libdir}/prosody/modules/mod_auth_internal_hashed.lua -%{_libdir}/prosody/modules/mod_auth_internal_plain.lua -%{_libdir}/prosody/modules/mod_bosh.lua -%{_libdir}/prosody/modules/mod_c2s.lua -%{_libdir}/prosody/modules/mod_component.lua -%{_libdir}/prosody/modules/mod_compression.lua -%{_libdir}/prosody/modules/mod_dialback.lua -%{_libdir}/prosody/modules/mod_disco.lua -%{_libdir}/prosody/modules/mod_groups.lua -%{_libdir}/prosody/modules/mod_http.lua -%{_libdir}/prosody/modules/mod_http_errors.lua -%{_libdir}/prosody/modules/mod_http_files.lua -%{_libdir}/prosody/modules/mod_iq.lua -%{_libdir}/prosody/modules/mod_lastactivity.lua -%{_libdir}/prosody/modules/mod_legacyauth.lua -%{_libdir}/prosody/modules/mod_message.lua -%{_libdir}/prosody/modules/mod_motd.lua -%{_libdir}/prosody/modules/mod_net_multiplex.lua -%{_libdir}/prosody/modules/mod_offline.lua -%{_libdir}/prosody/modules/mod_pep.lua -%{_libdir}/prosody/modules/mod_ping.lua -%{_libdir}/prosody/modules/mod_posix.lua -%{_libdir}/prosody/modules/mod_presence.lua -%{_libdir}/prosody/modules/mod_privacy.lua -%{_libdir}/prosody/modules/mod_private.lua -%{_libdir}/prosody/modules/mod_proxy65.lua -%{_libdir}/prosody/modules/mod_pubsub.lua -%{_libdir}/prosody/modules/mod_register.lua -%{_libdir}/prosody/modules/mod_roster.lua -%dir %{_libdir}/prosody/modules/mod_s2s -%{_libdir}/prosody/modules/mod_s2s/mod_s2s.lua -%{_libdir}/prosody/modules/mod_s2s/s2sout.lib.lua -%{_libdir}/prosody/modules/mod_saslauth.lua -%{_libdir}/prosody/modules/mod_storage_internal.lua -%{_libdir}/prosody/modules/mod_storage_none.lua -%{_libdir}/prosody/modules/mod_storage_sql.lua -%{_libdir}/prosody/modules/mod_time.lua -%{_libdir}/prosody/modules/mod_tls.lua -%{_libdir}/prosody/modules/mod_uptime.lua -%{_libdir}/prosody/modules/mod_vcard.lua -%{_libdir}/prosody/modules/mod_version.lua -%{_libdir}/prosody/modules/mod_watchregistrations.lua -%{_libdir}/prosody/modules/mod_welcome.lua -%dir %{_libdir}/prosody/modules/muc -%{_libdir}/prosody/modules/muc/mod_muc.lua -%{_libdir}/prosody/modules/muc/muc.lib.lua -%{_libdir}/prosody/modules/sql.lib.lua -%dir %{_libdir}/prosody/modules/storage -%{_libdir}/prosody/modules/storage/mod_xep0227.lua -%{_libdir}/prosody/modules/storage/sqlbasic.lib.lua -%{_libdir}/prosody/modules/storage/xep227store.lib.lua -%dir %{_libdir}/prosody/net -%{_libdir}/prosody/net/adns.lua -%{_libdir}/prosody/net/connlisteners.lua -%{_libdir}/prosody/net/dns.lua -%dir %{_libdir}/prosody/net/http -%{_libdir}/prosody/net/http/codes.lua -%{_libdir}/prosody/net/http/parser.lua -%{_libdir}/prosody/net/http/server.lua -%{_libdir}/prosody/net/http.lua -%{_libdir}/prosody/net/httpserver.lua -%{_libdir}/prosody/net/server_event.lua -%{_libdir}/prosody/net/server.lua -%{_libdir}/prosody/net/server_select.lua +%{_libdir}/prosody/core +%{_libdir}/prosody/modules/ +%{_libdir}/prosody/net %{_libdir}/prosody/prosody.version -%dir %{_libdir}/prosody/util -%{_libdir}/prosody/util/adhoc.lua -%{_libdir}/prosody/util/array.lua -%{_libdir}/prosody/util/caps.lua -%{_libdir}/prosody/util/dataforms.lua -%{_libdir}/prosody/util/datamanager.lua -%{_libdir}/prosody/util/datetime.lua -%{_libdir}/prosody/util/debug.lua -%{_libdir}/prosody/util/dependencies.lua -%{_libdir}/prosody/util/encodings.so -%{_libdir}/prosody/util/envload.lua -%{_libdir}/prosody/util/events.lua -%{_libdir}/prosody/util/filters.lua -%{_libdir}/prosody/util/hashes.so -%{_libdir}/prosody/util/helpers.lua -%{_libdir}/prosody/util/hmac.lua -%{_libdir}/prosody/util/http.lua -%{_libdir}/prosody/util/import.lua -%{_libdir}/prosody/util/ip.lua -%{_libdir}/prosody/util/iterators.lua -%{_libdir}/prosody/util/jid.lua -%{_libdir}/prosody/util/json.lua -%{_libdir}/prosody/util/logger.lua -%{_libdir}/prosody/util/multitable.lua -%{_libdir}/prosody/util/net.so -%{_libdir}/prosody/util/openssl.lua -%{_libdir}/prosody/util/pluginloader.lua -%{_libdir}/prosody/util/pposix.so -%{_libdir}/prosody/util/prosodyctl.lua -%{_libdir}/prosody/util/pubsub.lua -%{_libdir}/prosody/util/rfc6724.lua -%dir %{_libdir}/prosody/util/sasl -%{_libdir}/prosody/util/sasl/anonymous.lua -%{_libdir}/prosody/util/sasl_cyrus.lua -%{_libdir}/prosody/util/sasl/digest-md5.lua -%{_libdir}/prosody/util/sasl.lua -%{_libdir}/prosody/util/sasl/plain.lua -%{_libdir}/prosody/util/sasl/scram.lua -%{_libdir}/prosody/util/serialization.lua -%{_libdir}/prosody/util/set.lua -%{_libdir}/prosody/util/signal.so -%{_libdir}/prosody/util/sql.lua -%{_libdir}/prosody/util/stanza.lua -%{_libdir}/prosody/util/template.lua -%{_libdir}/prosody/util/termcolours.lua -%{_libdir}/prosody/util/throttle.lua -%{_libdir}/prosody/util/timer.lua -%{_libdir}/prosody/util/uuid.lua -%{_libdir}/prosody/util/watchdog.lua -%{_libdir}/prosody/util/x509.lua -%{_libdir}/prosody/util/xml.lua -%{_libdir}/prosody/util/xmppstream.lua +%{_libdir}/prosody/util %{_mandir}/man1/prosodyctl.1* %dir %attr(-,prosody,prosody) %{_localstatedir}/lib/prosody %dir %attr(-,prosody,prosody) %{_localstatedir}/log/prosody ++++++ prosody-0.9.12.tar.gz -> prosody-0.10.0.tar.gz ++++++ ++++ 34614 lines of diff (skipped) ++++++ prosody-cfg.patch ++++++ --- /var/tmp/diff_new_pack.fWym1P/_old 2017-10-03 23:20:33.058840926 +0200 +++ /var/tmp/diff_new_pack.fWym1P/_new 2017-10-03 23:20:33.058840926 +0200 @@ -1,34 +1,23 @@ -Index: prosody-0.9.2/prosody.cfg.lua.dist -=================================================================== ---- prosody-0.9.2.orig/prosody.cfg.lua.dist -+++ prosody-0.9.2/prosody.cfg.lua.dist -@@ -63,7 +63,7 @@ modules_enabled = { - --"http_files"; -- Serve static files from a directory over HTTP - - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -80,6 +80,9 @@ modules_disabled = { +diff -urEbwB prosody-0.10.0/prosody.cfg.lua.dist prosody-0.10.0.new/prosody.cfg.lua.dist +--- prosody-0.10.0/prosody.cfg.lua.dist 2017-09-28 15:07:47.000000000 +0200 ++++ prosody-0.10.0.new/prosody.cfg.lua.dist 2017-10-03 11:20:46.660122361 +0200 +@@ -86,7 +86,7 @@ + -- "offline"; -- Store offline messages + -- "c2s"; -- Handle client connections -- "s2s"; -- Handle server-to-server connections - }; +- -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + } -+-- Unix specific -+pidfile = "@@PIDDIR@@/prosody/prosody.pid" -+ -- Disable account creation by default, for security - -- For more information see http://prosody.im/doc/creating_accounts - allow_registration = false; -@@ -139,8 +142,8 @@ authentication = "internal_plain" +@@ -161,8 +161,8 @@ -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging + -- For advanced logging see https://prosody.im/doc/logging log = { - info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - error = "prosody.err"; -+ info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ error = "/var/log/prosody/prosody.err"; ++ info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ error = "/var/log/prosody/prosody.err"; -- "*syslog"; -- Uncomment this for logging to syslog -- "*console"; -- Log to the console, useful for debugging with daemonize=false } ++++++ prosody-configure.patch ++++++ --- /var/tmp/diff_new_pack.fWym1P/_old 2017-10-03 23:20:33.074838675 +0200 +++ /var/tmp/diff_new_pack.fWym1P/_new 2017-10-03 23:20:33.074838675 +0200 @@ -1,17 +1,18 @@ ---- configure 2015-03-24 20:18:04.000000000 +0100 -+++ configure 2015-04-07 11:17:38.445610977 +0200 -@@ -2,15 +2,15 @@ +diff -urEbwB prosody-0.10.0/configure prosody-0.10.0.new/configure +--- prosody-0.10.0/configure 2017-09-28 15:07:47.000000000 +0200 ++++ prosody-0.10.0.new/configure 2017-10-03 11:08:26.653596943 +0200 +@@ -4,15 +4,15 @@ - # Defaults - --PREFIX=/usr/local --SYSCONFDIR="$PREFIX/etc/prosody" + APP_NAME="Prosody" + APP_DIRNAME="prosody" +-PREFIX="/usr/local" +-SYSCONFDIR="$PREFIX/etc/$APP_DIRNAME" -LIBDIR="$PREFIX/lib" --DATADIR="$PREFIX/var/lib/prosody" -+PREFIX=/usr -+SYSCONFDIR="/etc/prosody" +-DATADIR="$PREFIX/var/lib/$APP_DIRNAME" ++PREFIX="/usr" ++SYSCONFDIR="/etc/$APP_DIRNAME" +LIBDIR="/lib" -+DATADIR="/var/lib/prosody" ++DATADIR="/var/lib/$APP_DIRNAME" LUA_SUFFIX="" LUA_DIR="/usr" LUA_BINDIR="/usr/bin" @@ -19,6 +20,6 @@ -LUA_LIBDIR="/usr/lib" +LUA_INCDIR="@@INCLUDEDIR@@" +LUA_LIBDIR="@@LIBDIR@@" - IDN_LIB=idn + IDN_LIB="idn" ICU_FLAGS="-licui18n -licudata -licuuc" - OPENSSL_LIB=crypto + OPENSSL_LIB="crypto" ++++++ prosody-makefile.patch ++++++ --- /var/tmp/diff_new_pack.fWym1P/_old 2017-10-03 23:20:33.090836424 +0200 +++ /var/tmp/diff_new_pack.fWym1P/_new 2017-10-03 23:20:33.090836424 +0200 @@ -1,5 +1,6 @@ ---- Makefile 2015-03-24 20:18:04.000000000 +0100 -+++ Makefile 2015-04-07 11:30:05.602236338 +0200 +diff -urEbwB prosody-0.10.0/Makefile prosody-0.10.0.new/Makefile +--- prosody-0.10.0/Makefile 2017-09-28 15:07:47.000000000 +0200 ++++ prosody-0.10.0.new/Makefile 2017-10-03 11:18:19.609730580 +0200 @@ -3,14 +3,14 @@ BIN = $(DESTDIR)$(PREFIX)/bin @@ -18,4 +19,4 @@ +INSTALLEDMODULES = @@LIBDIR@@/prosody/modules INSTALLEDDATA = $(DATADIR) - .PHONY: all clean install + INSTALL=install -p
