public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Peter Lemenkov <lemenkov@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ejabberd] f45: Ver. 2.1.8
Date: Wed, 23 Sep 2026 19:07:04 GMT [thread overview]
Message-ID: <179019042470.1.7279158031025870588.rpms-ejabberd-ece61a2d8c3d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ejabberd
Branch : f45
Commit : ece61a2d8c3df86dd632b15ecf4f4907f4652f62
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2011-06-03T14:23:28+04:00
Stats : +61/-319 in 14 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/ece61a2d8c3df86dd632b15ecf4f4907f4652f62?branch=f45
Log:
Ver. 2.1.8
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/.gitignore b/.gitignore
index 7794ea3..f38c163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ejabberd-2.1.4.tar.gz
ejabberd-2.1.5.tar.gz
/ejabberd-2.1.6.tar.gz
+/ejabberd-2.1.8.tar.gz
diff --git a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
index 5b91cf4..a6d356d 100644
--- a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
+++ b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
@@ -1,7 +1,7 @@
-From 9087a0b27b3d56f8fdb28e5190012796f348d43a Mon Sep 17 00:00:00 2001
+From f9092944be760c1af2dabd68b6f2e50663da9a13 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:03:38 +0300
-Subject: [PATCH 01/11] Fix PAM service example name to match actual one
+Subject: [PATCH 01/10] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
-index a95689b..005c73c 100644
+index 92e78e3..d1d0b00 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -236,7 +236,7 @@
@@ -22,5 +22,5 @@ index a95689b..005c73c 100644
%%
%% Authentication using LDAP
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch b/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
index 841f503..b4a8edd 100644
--- a/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
+++ b/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
@@ -1,7 +1,7 @@
-From 85b432d0293d867dd5c11ae8e7b5c724b7fad056 Mon Sep 17 00:00:00 2001
+From df3f20bb62d4ec3f7b08e3763c7c710d8f8d120d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:05:53 +0300
-Subject: [PATCH 02/11] Add mod_ctlextra as an ejabberd module
+Subject: [PATCH 02/10] Add mod_ctlextra as an ejabberd module
See this link for the details:
http://www.ejabberd.im/mod_ctlextra
@@ -19,7 +19,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
create mode 100644 src/mod_ctlextra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index c2d282d..6db563c 100644
+index 5ab3b53..d390047 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -70,6 +70,7 @@
@@ -932,5 +932,5 @@ index 0000000..bc61024
+ Ps),
+ lists:reverse(Grouped_Ps).
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index fe644a7..be49252 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,7 +1,7 @@
-From cf4847224a1180836d1caee3621ff0d562e4e8a7 Mon Sep 17 00:00:00 2001
+From bf4c641645e7a491eeca12e6dd635c6b3f8a1ae5 Mon Sep 17 00:00:00 2001
From: Sergei Golovan <sgolovan@nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
-Subject: [PATCH 03/11] Fixed delays in s2s connections.
+Subject: [PATCH 03/10] Fixed delays in s2s connections.
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
@@ -13,7 +13,7 @@ network split when the delay is inadmissible).
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
-index eb8c05a..0ab9d94 100644
+index 848e58c..af5dc78 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -404,7 +404,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
@@ -26,7 +26,7 @@ index eb8c05a..0ab9d94 100644
{verify, self(),
Key, StateData#state.streamid}),
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index f59e8ec..1422d3a 100644
+index 55f48af..fdc9cf4 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -93,7 +93,7 @@
@@ -47,7 +47,7 @@ index f59e8ec..1422d3a 100644
+ {stop, normal, StateData}
end
end;
- open_socket(stop, StateData) ->
+ open_socket(closed, StateData) ->
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index 32d000d..2e7029e 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,7 +1,7 @@
-From 9c419c9531e16a1bafcecd3257bfc4646ebdc9d5 Mon Sep 17 00:00:00 2001
+From 58aaef301edcb3e9f0ee5914d3e2c0777c7cd3ee Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
-Subject: [PATCH 04/11] Introducing mod_admin_extra
+Subject: [PATCH 04/10] Introducing mod_admin_extra
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
@@ -17,7 +17,7 @@ https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
create mode 100644 src/mod_admin_extra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 6db563c..57f8a61 100644
+index d390047..a0154d4 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -105,6 +105,7 @@
@@ -1314,5 +1314,5 @@ index 0000000..9f3ca14
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, regexp:sh_to_awk(Glob)).
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index a97d9fa..f4fb340 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,7 +1,7 @@
-From e5f84e1f8e62e073be61843cc124f3150e4d2206 Mon Sep 17 00:00:00 2001
+From 4f33ceced08741491f7f792562322c00daf82c99 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
-Subject: [PATCH 05/11] Fedora-specific changes to ejabberdctl
+Subject: [PATCH 05/10] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
-index 67eafbf..1665a02 100644
+index d2f20fa..a5459c3 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -9,10 +9,10 @@ ERL_MAX_ETS_TABLES=1400
@@ -44,5 +44,5 @@ index 67eafbf..1665a02 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
index f4a80fc..560cbc1 100644
--- a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
@@ -1,7 +1,7 @@
-From de49bf5543375fbccaf112bdd189a71d43acbbf0 Mon Sep 17 00:00:00 2001
+From a859041a1c5a4edf53c907b34e771a5bfe56ec4c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
-Subject: [PATCH 06/11] Install *.so objects with 0755 permissions
+Subject: [PATCH 06/10] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
-index 4e56181..ef8a55e 100644
+index 42af5b2..64ed856 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -236,7 +236,7 @@ install: all
+@@ -237,7 +237,7 @@ install: all
#
# Binary system libraries
install -d $(SODIR)
@@ -22,5 +22,5 @@ index 4e56181..ef8a55e 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
index 07ad3a9..f5a3998 100644
--- a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
@@ -1,7 +1,7 @@
-From 3e1eeccdfdd315c4e660e48098cb3a8c8802f75c Mon Sep 17 00:00:00 2001
+From d4358b8cc6984242c4246b9378b84b1b4ae40bb0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
-Subject: [PATCH 07/11] Use versioned directory for storing docs
+Subject: [PATCH 07/10] Use versioned directory for storing docs
It's also a good idea to store doc-files under the versioned directory.
This may greatly simplify parallel installation of different versions of
@@ -18,7 +18,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
-index ef8a55e..d15739c 100644
+index 64ed856..43b5e1f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -98,7 +98,7 @@ SBINDIR = $(DESTDIR)@sbindir@
@@ -31,5 +31,5 @@ index ef8a55e..d15739c 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
index 4c37561..120417e 100644
--- a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,7 +1,8 @@
-From 60b08ab02f17070d66558a37fae69a735bda696a Mon Sep 17 00:00:00 2001
+From 84e497dd8b6f3f6d4dc0c831a759d109c554b37c Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 15 Apr 2010 17:20:16 +0200
-Subject: [PATCH 08/11] Support SASL GSSAPI authentication (thanks to Mikael Magnusson)(EJAB-831)
+Subject: [PATCH 08/10] Support SASL GSSAPI authentication (thanks to Mikael
+ Magnusson)(EJAB-831)
---
src/cyrsasl.erl | 76 +++++++++++++++++----
@@ -17,7 +18,7 @@ Subject: [PATCH 08/11] Support SASL GSSAPI authentication (thanks to Mikael Magn
create mode 100644 src/cyrsasl_gssapi.erl
diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl
-index 121ef6d..ea358f0 100644
+index fd54ce4..66d4e42 100644
--- a/src/cyrsasl.erl
+++ b/src/cyrsasl.erl
@@ -30,19 +30,39 @@
@@ -157,7 +158,7 @@ index 0000000..b4cc3e3
+ check_password_digest,
+ socket}).
diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
-index 2b3ba36..2647d28 100644
+index 3af9991..01c8e2b 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -27,7 +27,9 @@
@@ -181,7 +182,7 @@ index 2b3ba36..2647d28 100644
mech_step(State, _ClientIn) ->
diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl
-index 2a7ce2a..9628137 100644
+index 40e7edf..e979127 100644
--- a/src/cyrsasl_digest.erl
+++ b/src/cyrsasl_digest.erl
@@ -29,10 +29,11 @@
@@ -380,7 +381,7 @@ index 0000000..11d9955
+ ?DEBUG("GSSAPI authenticated ~p ~p~n", [Authid, Authzid]),
+ {ok, [{username, Authid}, {authzid, Authzid}]}.
diff --git a/src/cyrsasl_plain.erl b/src/cyrsasl_plain.erl
-index 129fb8b..4799a41 100644
+index 1b7108e..9b884eb 100644
--- a/src/cyrsasl_plain.erl
+++ b/src/cyrsasl_plain.erl
@@ -27,7 +27,9 @@
@@ -404,7 +405,7 @@ index 129fb8b..4799a41 100644
mech_step(State, ClientIn) ->
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 6dbcd77..8818cfe 100644
+index 67fee64..e008ebe 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -305,9 +305,16 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
@@ -436,7 +437,7 @@ index 6dbcd77..8818cfe 100644
fun(S) ->
{xmlelement, "mechanism", [],
diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
-index 4d21e40..66b9c4c 100644
+index 785ee2f..2edf685 100644
--- a/src/ejabberd_socket.erl
+++ b/src/ejabberd_socket.erl
@@ -44,9 +44,11 @@
@@ -476,5 +477,5 @@ index 4d21e40..66b9c4c 100644
%% Internal functions
%%====================================================================
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
index 0642cf8..d145f75 100644
--- a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
+++ b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
@@ -1,7 +1,7 @@
-From c28b04f3abf3a4e233115c3d783db356c9567d9b Mon Sep 17 00:00:00 2001
+From 6e83f4370eb5c6051b3e3f8c1fc52c849fcaaf69 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 14 Dec 2010 18:28:44 +0300
-Subject: [PATCH 09/11] Added old modules for Active Directory
+Subject: [PATCH 09/10] Added old modules for Active Directory
These modules were extracted from a patch found on
http://realloc.spb.ru/share/ejabberdad.html
@@ -1262,5 +1262,5 @@ index 0000000..52ddbec
+ true.
+
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch b/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
index 1bad3d6..6c695b2 100644
--- a/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
+++ b/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
@@ -1,7 +1,7 @@
-From 244c5ae4bfab64220a1d7ff492bdb67dc6612f51 Mon Sep 17 00:00:00 2001
+From 75448031ff63e562e05a11e1f2991b3e1753a0b8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 14 Dec 2010 18:52:04 +0300
-Subject: [PATCH 10/11] last minute fix - correct version in configure
+Subject: [PATCH 10/10] last minute fix - correct version in configure
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -9,20 +9,20 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/configure b/src/configure
-index d515abc..ab0beca 100755
+index 89e32a5..f377732 100755
--- a/src/configure
+++ b/src/configure
-@@ -552,8 +552,8 @@ MAKEFLAGS=
+@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ejabberd'
PACKAGE_TARNAME='ejabberd'
-PACKAGE_VERSION='2.1.x'
-PACKAGE_STRING='ejabberd 2.1.x'
-+PACKAGE_VERSION='2.1.6'
-+PACKAGE_STRING='ejabberd 2.1.6'
++PACKAGE_VERSION='2.1.8'
++PACKAGE_STRING='ejabberd 2.1.8'
PACKAGE_BUGREPORT='ejabberd@process-one.net'
PACKAGE_URL=''
--
-1.7.4.1
+1.7.5.2
diff --git a/ejabberd-0011-Add-support-for-online-Shared-Roster-Group-thanks-to.patch b/ejabberd-0011-Add-support-for-online-Shared-Roster-Group-thanks-to.patch
deleted file mode 100644
index b54782b..0000000
--- a/ejabberd-0011-Add-support-for-online-Shared-Roster-Group-thanks-to.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 7be587955e435f9ceff4fa63f7a2f25838f1a858 Mon Sep 17 00:00:00 2001
-From: Badlop <badlop@process-one.net>
-Date: Mon, 21 Feb 2011 22:33:23 +0100
-Subject: [PATCH 11/11] Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
-
-New version of the @online@ patch originally by Collabora.
-Notes:
-- the presence push is mediated via the group rather than
- per user - this may reduce memory footprint... _if_ ejabberd
- has some smart optimisation in that codepath
-- it assumes that any group with membership @online@ _displays_
- online as well -- this is a simplification and breaks the
- decoupling that ejabberd has in this regard.
----
- doc/guide.tex | 10 ++--
- src/mod_shared_roster.erl | 113 +++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 111 insertions(+), 12 deletions(-)
-
-diff --git a/doc/guide.tex b/doc/guide.tex
-index 0ae3053..8fda148 100644
---- a/doc/guide.tex
-+++ b/doc/guide.tex
-@@ -4020,11 +4020,13 @@ has a unique identification and the following parameters:
- \item[Name] The name of the group, which will be displayed in the roster.
- \item[Description] The description of the group. This parameter does not affect
- anything.
--\item[Members] A list of full JIDs of group members, entered one per line in
-+\item[Members] A list of JIDs of group members, entered one per line in
- the Web Admin.
-- To put as members all the registered users in the virtual hosts,
-- you can use the special directive: @all@.
-- Note that this directive is designed for a small server with just a few hundred users.
-+ The special member directive \term{@all@}
-+ represents all the registered users in the virtual host;
-+ which is only recommended for a small server with just a few hundred users.
-+ The special member directive \term{@online@}
-+ represents the online users in the virtual host.
- \item[Displayed groups] A list of groups that will be in the rosters of this
- group's members.
- \end{description}
-diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
-index 64a8291..6f58b0e 100644
---- a/src/mod_shared_roster.erl
-+++ b/src/mod_shared_roster.erl
-@@ -37,6 +37,8 @@
- process_item/2,
- in_subscription/6,
- out_subscription/4,
-+ user_available/1,
-+ unset_presence/4,
- register_user/2,
- remove_user/2,
- list_groups/1,
-@@ -85,6 +87,10 @@ start(Host, _Opts) ->
- ?MODULE, get_jid_info, 70),
- ejabberd_hooks:add(roster_process_item, Host,
- ?MODULE, process_item, 50),
-+ ejabberd_hooks:add(user_available_hook, Host,
-+ ?MODULE, user_available, 50),
-+ ejabberd_hooks:add(unset_presence_hook, Host,
-+ ?MODULE, unset_presence, 50),
- ejabberd_hooks:add(register_user, Host,
- ?MODULE, register_user, 50),
- ejabberd_hooks:add(remove_user, Host,
-@@ -109,6 +115,10 @@ stop(Host) ->
- ?MODULE, get_jid_info, 70),
- ejabberd_hooks:delete(roster_process_item, Host,
- ?MODULE, process_item, 50),
-+ ejabberd_hooks:delete(user_available_hook, Host,
-+ ?MODULE, user_available, 50),
-+ ejabberd_hooks:delete(unset_presence_hook, Host,
-+ ?MODULE, unset_presence, 50),
- ejabberd_hooks:delete(register_user, Host,
- ?MODULE, register_user, 50),
- ejabberd_hooks:delete(remove_user, Host,
-@@ -470,21 +480,38 @@ get_group_opt(Host, Group, Opt, Default) ->
- Default
- end.
-
-+get_online_users(Host) ->
-+ lists:usort([{U, S} || {U, S, _} <- ejabberd_sm:get_vh_session_list(Host)]).
-+
- get_group_users(Host, Group) ->
- case get_group_opt(Host, Group, all_users, false) of
- true ->
- ejabberd_auth:get_vh_registered_users(Host);
- false ->
- []
-- end ++ get_group_explicit_users(Host, Group).
-+ end ++
-+ case get_group_opt(Host, Group, online_users, false) of
-+ true ->
-+ get_online_users(Host);
-+ false ->
-+ []
-+ end ++
-+ get_group_explicit_users(Host, Group).
-
--get_group_users(_User, Host, Group, GroupOpts) ->
-+get_group_users(Host, Group, GroupOpts) ->
- case proplists:get_value(all_users, GroupOpts, false) of
- true ->
- ejabberd_auth:get_vh_registered_users(Host);
- false ->
- []
-- end ++ get_group_explicit_users(Host, Group).
-+ end ++
-+ case proplists:get_value(online_users, GroupOpts, false) of
-+ true ->
-+ get_online_users(Host);
-+ false ->
-+ []
-+ end ++
-+ get_group_explicit_users(Host, Group).
-
- %% @spec (Host::string(), Group::string()) -> [{User::string(), Server::string()}]
- get_group_explicit_users(Host, Group) ->
-@@ -502,11 +529,20 @@ get_group_explicit_users(Host, Group) ->
- get_group_name(Host, Group) ->
- get_group_opt(Host, Group, name, Group).
-
--%% Get list of names of groups that have @all@ in the memberlist
-+%% Get list of names of groups that have @all@/@online@/etc in the memberlist
- get_special_users_groups(Host) ->
- lists:filter(
- fun(Group) ->
- get_group_opt(Host, Group, all_users, false)
-+ orelse get_group_opt(Host, Group, online_users, false)
-+ end,
-+ list_groups(Host)).
-+
-+%% Get list of names of groups that have @online@ in the memberlist
-+get_special_users_groups_online(Host) ->
-+ lists:filter(
-+ fun(Group) ->
-+ get_group_opt(Host, Group, online_users, false)
- end,
- list_groups(Host)).
-
-@@ -661,7 +697,7 @@ push_user_to_members(User, Server, Subscription) ->
- lists:foreach(
- fun({U, S}) ->
- push_roster_item(U, S, LUser, LServer, GroupName, Subscription)
-- end, get_group_users(LUser, LServer, Group, GroupOpts))
-+ end, get_group_users(LServer, Group, GroupOpts))
- end, lists:usort(SpecialGroups++UserGroups)).
-
- push_user_to_displayed(LUser, LServer, Group, Subscription) ->
-@@ -673,7 +709,8 @@ push_user_to_displayed(LUser, LServer, Group, Subscription) ->
-
- push_user_to_group(LUser, LServer, Group, GroupName, Subscription) ->
- lists:foreach(
-- fun({U, S}) ->
-+ fun({U, S}) when (U == LUser) and (S == LServer) -> ok;
-+ ({U, S}) ->
- push_roster_item(U, S, LUser, LServer, GroupName, Subscription)
- end, get_group_users(LServer, Group)).
-
-@@ -757,6 +794,51 @@ ask_to_pending(subscribe) -> out;
- ask_to_pending(unsubscribe) -> none;
- ask_to_pending(Ask) -> Ask.
-
-+user_available(New) ->
-+ LUser = New#jid.luser,
-+ LServer = New#jid.lserver,
-+ Resources = ejabberd_sm:get_user_resources(LUser, LServer),
-+ ?DEBUG("user_available for ~p @ ~p (~p resources)",
-+ [LUser, LServer, length(Resources)]),
-+ case length(Resources) of
-+ %% first session for this user
-+ 1 ->
-+ %% This is a simplification - we ignore he 'display'
-+ %% property - @online@ is always reflective.
-+ OnlineGroups = get_special_users_groups_online(LServer),
-+ lists:foreach(
-+ fun(OG) ->
-+ ?DEBUG("user_available: pushing ~p @ ~p grp ~p",
-+ [LUser, LServer, OG ]),
-+ push_user_to_displayed(LUser, LServer, OG, both)
-+ end, OnlineGroups);
-+ _ ->
-+ ok
-+ end.
-+
-+unset_presence(LUser, LServer, Resource, Status) ->
-+ Resources = ejabberd_sm:get_user_resources(LUser, LServer),
-+ ?DEBUG("unset_presence for ~p @ ~p / ~p -> ~p (~p resources)",
-+ [LUser, LServer, Resource, Status, length(Resources)]),
-+ %% if user has no resources left...
-+ case length(Resources) of
-+ 0 ->
-+ %% This is a simplification - we ignore he 'display'
-+ %% property - @online@ is always reflective.
-+ OnlineGroups = get_special_users_groups_online(LServer),
-+ %% for each of these groups...
-+ lists:foreach(
-+ fun(OG) ->
-+ %% Push removal of the old user to members of groups
-+ %% where the group that this uwas members was displayed
-+ push_user_to_displayed(LUser, LServer, OG, remove),
-+ %% Push removal of members of groups that where
-+ %% displayed to the group which thiuser has left
-+ push_displayed_to_user(LUser, LServer, OG, LServer,remove)
-+ end, OnlineGroups);
-+ _ ->
-+ ok
-+ end.
-
- %%---------------------
- %% Web Admin
-@@ -860,6 +942,7 @@ shared_roster_group(Host, Group, Query, Lang) ->
- Name = get_opt(GroupOpts, name, ""),
- Description = get_opt(GroupOpts, description, ""),
- AllUsers = get_opt(GroupOpts, all_users, false),
-+ OnlineUsers = get_opt(GroupOpts, online_users, false),
- %%Disabled = false,
- DisplayedGroups = get_opt(GroupOpts, displayed_groups, []),
- Members = mod_shared_roster:get_group_explicit_users(Host, Group),
-@@ -869,7 +952,14 @@ shared_roster_group(Host, Group, Query, Lang) ->
- "@all@\n";
- true ->
- []
-- end ++ [[us_to_list(Member), $\n] || Member <- Members],
-+ end ++
-+ if
-+ OnlineUsers ->
-+ "@online@\n";
-+ true ->
-+ []
-+ end ++
-+ [[us_to_list(Member), $\n] || Member <- Members],
- FDisplayedGroups = [[DG, $\n] || DG <- DisplayedGroups],
- DescNL = length(element(2, regexp:split(Description, "\n"))),
- FGroup =
-@@ -953,6 +1043,8 @@ shared_roster_group_parse_query(Host, Group, Query) ->
- case SJID of
- "@all@" ->
- USs;
-+ "@online@" ->
-+ USs;
- _ ->
- case jlib:string_to_jid(SJID) of
- JID when is_record(JID, jid) ->
-@@ -967,10 +1059,15 @@ shared_roster_group_parse_query(Host, Group, Query) ->
- true -> [{all_users, true}];
- false -> []
- end,
-+ OnlineUsersOpt =
-+ case lists:member("@online@", SJIDs) of
-+ true -> [{online_users, true}];
-+ false -> []
-+ end,
-
- mod_shared_roster:set_group_opts(
- Host, Group,
-- NameOpt ++ DispGroupsOpt ++ DescriptionOpt ++ AllUsersOpt),
-+ NameOpt ++ DispGroupsOpt ++ DescriptionOpt ++ AllUsersOpt ++ OnlineUsersOpt),
-
- if
- NewMembers == error -> error;
---
-1.7.4.1
-
diff --git a/ejabberd.spec b/ejabberd.spec
index 88eed8d..b12b3ef 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -10,8 +10,8 @@
%endif
Name: ejabberd
-Version: 2.1.6
-Release: 5%{?dist}
+Version: 2.1.8
+Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
@@ -47,8 +47,6 @@ Patch8: ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
Patch9: ejabberd-0009-Added-old-modules-for-Active-Directory.patch
# Correct version in configure (DON'T FORGET TO REMOVE IN THE NEXT VERSION)
Patch10: ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
-# OLPC's @online@ shared roster group patch - EJAB-1391 (backported from upstream)
-Patch11: ejabberd-0011-Add-support-for-online-Shared-Roster-Group-thanks-to.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,7 +112,6 @@ Documentation for ejabberd.
%patch8 -p1 -b .gssapi
%patch9 -p1 -b .ad_stuff
%patch10 -p1 -b .fix_version
-%patch11 -p1 -b .online_srg
touch -r src/configure.fix_version src/configure
@@ -341,6 +338,12 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Fri Jun 03 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-1
+- Ver. 2.1.8 (very urgent bugfix for 2.1.7)
+
+* Wed Jun 01 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.7-1
+- Ver. 2.1.7 (bugfixes and security)
+
* Wed Jun 01 2011 Paul Whalen <paul.whalen@senecac.on.ca> - 2.1.6-5
- Added arm to conditional to build without hevea.
diff --git a/sources b/sources
index 408014a..0d36fba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5a41edee2204c414150075331ced506 ejabberd-2.1.6.tar.gz
+e814d9b4ab10b716f2722b26afe4fad7 ejabberd-2.1.8.tar.gz
reply other threads:[~2026-09-23 19:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179019042470.1.7279158031025870588.rpms-ejabberd-ece61a2d8c3d@fedoraproject.org \
--to=lemenkov@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox