- up to 19.08; builds without logdb

diff --git a/ejabberd-mod_logdb.patch b/ejabberd-mod_logdb.patch
index 5fc53d199f5d6f98f1c5ee31e53661677f0a950a..c58586059cf437c4f7054ce368f98488d2be07ff 100644 (file)
--- a/ejabberd-mod_logdb.patch
+++ b/ejabberd-mod_logdb.patch
@@ -2,10 +2,10 @@ diff --git a/priv/msgs/nl.msg b/priv/msgs/nl.msg
 index 9dfd896b..f35ff07a 100644
 --- a/priv/msgs/nl.msg
 +++ b/priv/msgs/nl.msg
-@@ -386,3 +386,17 @@
+@@ -345,3 +345,17 @@
+ {"Your contact offline message queue is full. The message has been discarded.","Te veel offline berichten voor dit contactpersoon. Het bericht is niet opgeslagen."}.
  {"Your Jabber account was successfully created.","Uw Jabber-account is succesvol gecreeerd."}.
  {"Your Jabber account was successfully deleted.","Uw Jabber-account is succesvol verwijderd."}.
- {"Your messages to ~s are being blocked. To unblock them, visit ~s","Uw berichten aan ~s worden geblokkeerd. Om ze te deblokkeren, ga naar ~s"}.
 +% mod_logdb
 +{"users messages", "gebruikersberichten"}.
 +{"date", "datum"}.
@@ -24,10 +24,10 @@ diff --git a/priv/msgs/pl.msg b/priv/msgs/pl.msg
 index 6b303cc9..664f1c95 100644
 --- a/priv/msgs/pl.msg
 +++ b/priv/msgs/pl.msg
-@@ -390,3 +390,29 @@
- {"Your Jabber account was successfully deleted.","Twoje konto zostało usunięte."}.
- {"Your messages to ~s are being blocked. To unblock them, visit ~s","Twoje wiadomości do ~s są blokowane. Aby je odblokować, odwiedź ~s"}.
+@@ -444,3 +444,29 @@
  {"You're not allowed to create nodes","Nie masz uprawnień do tworzenia węzłów"}.
+ {"Your Jabber account was successfully created.","Twoje konto zostało stworzone."}.
+ {"Your Jabber account was successfully deleted.","Twoje konto zostało usunięte."}.
 +% mod_logdb
 +{"Users Messages", "Wiadomości użytkownika"}.
 +{"Date", "Data"}.
@@ -58,10 +58,10 @@ diff --git a/priv/msgs/ru.msg b/priv/msgs/ru.msg
 index 05849f51..b87bf9bb 100644
 --- a/priv/msgs/ru.msg
 +++ b/priv/msgs/ru.msg
-@@ -386,3 +386,33 @@
+@@ -507,3 +507,33 @@
+ {"Your Jabber account was successfully created.","Ваш Jabber-аккаунт был успешно создан."}.
  {"Your Jabber account was successfully deleted.","Ваш Jabber-аккаунт был успешно удален."}.
- {"Your messages to ~s are being blocked. To unblock them, visit ~s","Ваши сообщения к ~s блокируются. Для снятия блокировки перейдите по ссылке ~s"}.
- {"You're not allowed to create nodes","Вам не разрешается создавать узлы"}.
+ {"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","Ваши запросы на добавление в контакт-лист, а также сообщения к ~s блокируются. Для снятия блокировки перейдите по ссылке ~s"}.
 +% mod_logdb.erl
 +{"Users Messages", "Сообщения пользователей"}.
 +{"Date", "Дата"}.
@@ -96,10 +96,10 @@ diff --git a/priv/msgs/uk.msg b/priv/msgs/uk.msg
 index a1159b53..4bdab4c5 100644
 --- a/priv/msgs/uk.msg
 +++ b/priv/msgs/uk.msg
-@@ -390,3 +390,33 @@
+@@ -349,3 +349,33 @@
+ {"Your contact offline message queue is full. The message has been discarded.","Черга повідомлень, що не були доставлені, переповнена. Повідомлення не було збережено."}.
  {"Your Jabber account was successfully created.","Ваш Jabber-акаунт було успішно створено."}.
  {"Your Jabber account was successfully deleted.","Ваш Jabber-акаунт було успішно видалено."}.
- {"Your messages to ~s are being blocked. To unblock them, visit ~s","Ваші повідомлення до ~s блокуються. Для розблокування відвідайте ~s"}.
 +% mod_logdb
 +{"Users Messages", "Повідомлення користувачів"}.
 +{"Date", "Дата"}.
@@ -135,15 +135,15 @@ index 477343c5..db58ab69 100644
 --- a/rebar.config
 +++ b/rebar.config
 @@ -33,8 +33,8 @@
-         {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.2"}}}
-         {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.27"}}}},
-         {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.28"}}}},
+         {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.4"}}}
+         {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.29"}}}},
+         {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.30"}}}},
 -        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
--                                               {tag, "1.0.9"}}}},
+-                                               {tag, "1.0.11"}}}},
 +        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/paleg/p1_mysql",
 +                                               {branch, "multi"}}}},
          {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
-                                                {tag, "1.1.7"}}}},
+                                                {tag, "1.1.8"}}}},
          {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
 diff --git a/src/gen_logdb.erl b/src/gen_logdb.erl
 new file mode 100644
@@ -6023,15 +6023,15 @@ diff --git a/src/mod_roster.erl b/src/mod_roster.erl
 index 38c3a78b..f02f2cd3 100644
 --- a/src/mod_roster.erl
 +++ b/src/mod_roster.erl
-@@ -66,6 +66,8 @@
+@@ -65,6 +65,8 @@
  -define(ROSTER_ITEM_CACHE, roster_item_cache).
  -define(ROSTER_VERSION_CACHE, roster_version_cache).
  
 +-include("mod_logdb.hrl").
 +
+ -type c2s_state() :: ejabberd_c2s:state().
  -export_type([subscription/0]).
  
- -callback init(binary(), gen_mod:opts()) -> any().
 @@ -911,6 +913,14 @@ user_roster(User, Server, Query, Lang) ->
                                  Query),
      Items = get_roster(LUser, LServer),
@@ -6051,8 +6051,8 @@ index 38c3a78b..f02f2cd3 100644
                                                          [?INPUTT(<<"submit">>,
                                                                   <<"remove",
                                                                     (ejabberd_web_admin:term_to_id(R#roster.jid))/binary>>,
--                                                                 <<"Remove">>)])])
-+                                                                   <<"Remove">>)]),
+-                                                                 ?T("Remove"))])])
++                                                                   ?T("Remove"))]),
 +                             case gen_mod:is_loaded(Server, mod_logdb) of
 +                                  true ->
 +                                     Peer = jid:encode(R#roster.jid),

diff --git a/ejabberd.spec b/ejabberd.spec
index ab6fcff7d1702a0aa9b0ef2fd9e360c997a1efe7..197c25634833a037782df3996fc5a4e0df948074 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -9,62 +9,64 @@
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
-Version:       19.02
-Release:       2
+Version:       19.08
+Release:       0.1
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5: 0ad4ca190161b18cf9d923f6abb3c44a
+# Source0-md5: c8a3215a85bc3c5f021306747f76b730
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.service
 Source4:       %{name}.logrotate
 #
 # Archives created with the ejabberd-pack_deps.sh script (in this repo)
-Source10:       ejabberd-base64url-20150806.tar.gz
-# Source10-md5:        380365a24cbd8cff33115fd7ae696db4
-Source11:       ejabberd-cache_tab-20190226.tar.gz
-# Source11-md5:        601a809bea3037253412abb5e9497236
-Source12:       ejabberd-eimp-20190226.tar.gz
-# Source12-md5:        a490c92b9ff8505a69cb591dd5a8faa3
-Source13:       ejabberd-elixir-20170515.tar.gz
+Source10:      %{name}-base64url-20190617.tar.gz
+# Source10-md5:        5a12fd2fb1f992c850aba5115aab3dd4
+Source11:      %{name}-cache_tab-20190802.tar.gz
+# Source11-md5:        cf0e72d17802d2e10d850f0e339a1c11
+Source12:      %{name}-eimp-20190802.tar.gz
+# Source12-md5:        ec256209f4c1798f1fc4c863881f9e43
+Source13:      %{name}-elixir-20170515.tar.gz
 # Source13-md5:        73be42f7d0cda7aeee5c0e6dadc0c451
-Source14:       ejabberd-ezlib-20190226.tar.gz
-# Source14-md5:        ef779ed1f0e56746ff81a42397f66168
-Source15:       ejabberd-fast_tls-20190226.tar.gz
-# Source15-md5:        75aabc6f73cacaeea627424b7e3b8177
-Source16:       ejabberd-fast_xml-20190226.tar.gz
-# Source16-md5:        22ff10a6d53075becd59c57fe845844a
-Source17:       ejabberd-fast_yaml-20190226.tar.gz
-# Source17-md5:        7de2c0c783ef7f7a47d53caa10c559e1
-Source18:       ejabberd-goldrush-20160531.tar.gz
+Source14:      %{name}-ezlib-20190523.tar.gz
+# Source14-md5:        e521f10bba8fd2208aa5c15272050399
+Source15:      %{name}-fast_tls-20190802.tar.gz
+# Source15-md5:        80359622cc6d929923d5c316f9b9061f
+Source16:      %{name}-fast_xml-20190802.tar.gz
+# Source16-md5:        628bc356a896e6921818700738d977e5
+Source17:      %{name}-fast_yaml-20190802.tar.gz
+# Source17-md5:        9a277749887e10ef34a50ff08c6b2d82
+Source18:      %{name}-goldrush-20160531.tar.gz
 # Source18-md5:        acac73f0fc85d23671f0c49c68f8df8a
-Source19:       ejabberd-jiffy-20160331.tar.gz
+Source19:      %{name}-jiffy-20160331.tar.gz
 # Source19-md5:        78f31a7dea7538ef3e63f77351f4d0b7
-Source20:       ejabberd-jose-20170518.tar.gz
+Source20:      %{name}-jose-20170518.tar.gz
 # Source20-md5:        b1675bfc57c1b3b7e154270e2bcd4559
-Source21:       ejabberd-lager-20181014.tar.gz
-# Source21-md5:        ebe0b027d39ade9b99dbc77740b2c7fe
-Source22:       ejabberd-mqtree-20190226.tar.gz
-# Source22-md5:        1d3c328f1c008e5b62e6657951665cf6
-Source23:       ejabberd-p1_mysql-20180723.tar.gz
+Source21:      %{name}-lager-20190430.tar.gz
+# Source21-md5:        66205d931dd27b496529c19addf6d7d9
+Source22:      %{name}-mqtree-20190802.tar.gz
+# Source22-md5:        16cd0ea398c505e12bd886c5fd311012
+Source23:      %{name}-p1_mysql-20180723.tar.gz
 # Source23-md5:        801894f56f9118a077bb6c4d4f10701d
-Source24:       ejabberd-p1_oauth2-20190226.tar.gz
-# Source24-md5:        19d4659a50b2b728dc9a1fd40f047758
-Source25:       ejabberd-p1_pgsql-20190226.tar.gz
-# Source25-md5:        4889ca18dd619168a65c7bfb8ba97977
-Source26:       ejabberd-p1_utils-20190226.tar.gz
-# Source26-md5:        83a273540bd0e4482c4a4d702ab2d2a9
-Source27:       ejabberd-pkix-20190226.tar.gz
-# Source27-md5:        23dbf61b04f415a5ae880b1e209cc498
-Source28:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
+Source24:      %{name}-p1_oauth2-20190523.tar.gz
+# Source24-md5:        5a1284f4e055d414f5867fdf54baf164
+Source25:      %{name}-p1_pgsql-20190523.tar.gz
+# Source25-md5:        348772eb0ccb9952cb202a7900eb905d
+Source26:      %{name}-p1_utils-20190802.tar.gz
+# Source26-md5:        19c97dcdc6a37a4b574f67bdce6b9566
+Source27:      %{name}-pkix-20190802.tar.gz
+# Source27-md5:        96c39ddde79ccce22e3ed3785be4861d
+Source28:      %{name}-rebar_elixir_plugin-20160105.tar.gz
 # Source28-md5:        6a069a566d71c3daa45fc4736364adf0
-Source29:       ejabberd-sqlite3-20180130.tar.gz
+Source29:      %{name}-sqlite3-20180130.tar.gz
 # Source29-md5:        cc8950eb769eb6ceb13723a7b61fe507
-Source30:       ejabberd-stringprep-20190226.tar.gz
-# Source30-md5:        cec9cabb413973fc2ea1e904f5be7ee7
-Source31:       ejabberd-xmpp-20190226.tar.gz
-# Source31-md5:        7bdf3e5c5d3e6acb2837357137cdf27f
+Source30:      %{name}-stringprep-20190802.tar.gz
+# Source30-md5:        cd354de1ee12712a2434c39241cf5488
+Source31:      %{name}-xmpp-20190802.tar.gz
+# Source31-md5:        73587aa235b062e592d5f043b32fe3b8
+Source32:      %{name}-yconf-20190802.tar.gz
+# Source32-md5:        8ad82ed92e339c67a63f3ef5e3f95a2c
 
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-config.patch
@@ -117,7 +119,7 @@ Requires:   %{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32
 %patch0 -p1
 %patch1 -p1
 #%%patch2 -p1
@@ -368,6 +370,7 @@ fi
 %attr(755,root,root) %{_libdir}/sqlite3-*/priv/sqlite3_drv.so
 %{_libdir}/stringprep-*
 %{_libdir}/xmpp-*
+%{_libdir}/yconf-*
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %ghost %attr(400,jabber,jabber) %ghost %config(noreplace) %verify(not md5 mtime size) /var/lib/ejabberd/.erlang.cookie
 %attr(754,root,root) /etc/rc.d/init.d/%{name}