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.12
Date: Wed, 23 Sep 2026 19:07:11 GMT [thread overview]
Message-ID: <179019043197.1.17509305654205418511.rpms-ejabberd-9fe454b58ddf@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ejabberd
Branch : f45
Commit : 9fe454b58ddf385f511a923d5bf97b65594c9c23
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2013-03-16T10:38:53+04:00
Stats : +93/-212 in 15 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/9fe454b58ddf385f511a923d5bf97b65594c9c23?branch=f45
Log:
Ver. 2.1.12
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/.gitignore b/.gitignore
index 98e9716..f504d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ejabberd-2.1.5.tar.gz
/ejabberd-2.1.9.tar.gz
/ejabberd-2.1.10.tar.gz
/ejabberd-2.1.11.tgz
+/processone-ejabberd-v2.1.12-0-gc058687.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 b4e7952..ad54acc 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 72718b8fcbb19b34e348efcb874fa480e83d7a02 Mon Sep 17 00:00:00 2001
+From 3ee03a76e4b07c782236c8cb5be53ab39d990f03 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/12] Fix PAM service example name to match actual one
+Subject: [PATCH 1/8] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -22,5 +22,5 @@ index a4068ad..9b24a4a 100644
%%
%% Authentication using LDAP
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0002-Fixed-delays-in-s2s-connections.patch b/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
index fcac79f..69e840a 100644
--- a/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
@@ -1,7 +1,7 @@
-From 30037ec8a73263f0d0524b2e1409736838cbb33b Mon Sep 17 00:00:00 2001
+From 143c1d60d594f30c1b411bdc5101f17208e6fe68 Mon Sep 17 00:00:00 2001
From: Sergei Golovan <sgolovan@nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
-Subject: [PATCH 02/12] Fixed delays in s2s connections.
+Subject: [PATCH 2/8] 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 1597ec7..7d411cd 100644
+index 6ae4f34..a54e9ab 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -414,7 +414,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
@@ -26,7 +26,7 @@ index 1597ec7..7d411cd 100644
{verify, self(),
Key, StateData#state.streamid}),
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index 65711fa..cab413f 100644
+index 0dedb4c..9376d16 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -93,7 +93,7 @@
@@ -49,5 +49,5 @@ index 65711fa..cab413f 100644
end;
open_socket(closed, StateData) ->
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0003-Introducing-mod_admin_extra.patch b/ejabberd-0003-Introducing-mod_admin_extra.patch
index b782c04..d557bc0 100644
--- a/ejabberd-0003-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0003-Introducing-mod_admin_extra.patch
@@ -1,7 +1,7 @@
-From 35ddb138ec297a1b5c456fdca73b2ed0cc10c1cf Mon Sep 17 00:00:00 2001
+From ebbdab726ecd36daa21e44f6bb2b61692d1b573b Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
-Subject: [PATCH 03/12] Introducing mod_admin_extra
+Subject: [PATCH 3/8] Introducing mod_admin_extra
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
@@ -17,12 +17,12 @@ svn export -r 1125 https://svn.process-one.net/ejabberd-modules/mod_admin_extra/
create mode 100644 src/mod_admin_extra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 2f08601..3d7ffe4 100644
+index 7202783..93d0e5c 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
-@@ -105,6 +105,7 @@
+@@ -99,6 +99,7 @@
+ mod_vcard,
mod_vcard_ldap,
- mod_vcard_odbc,
mod_version,
+ mod_admin_extra,
node_buddy,
@@ -1603,5 +1603,5 @@ index 0000000..1cef25a
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
index ed5fdbc..520e6a0 100644
--- a/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,7 +1,7 @@
-From 2c01b391dcfdc3cb34f5984a10a1bba3ca341c02 Mon Sep 17 00:00:00 2001
+From 9ce8d01601dde950e3627d6be0cc606e562f0f3c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
-Subject: [PATCH 04/12] Fedora-specific changes to ejabberdctl
+Subject: [PATCH 4/8] 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 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
-index 0960f9a..c22478a 100644
+index 461ec1a..b298e01 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -9,10 +9,10 @@ ERL_MAX_ETS_TABLES=1400
@@ -44,5 +44,5 @@ index 0960f9a..c22478a 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
index 2599fd1..06125ae 100644
--- a/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
@@ -1,7 +1,7 @@
-From 924dab202126d7644a8e50e81d1b2de21875bb7f Mon Sep 17 00:00:00 2001
+From 441140e0df7fc04365e180260a7bafa61c21bef9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
-Subject: [PATCH 05/12] Install *.so objects with 0755 permissions
+Subject: [PATCH 5/8] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
index 2004162..d97ee67 100644
--- a/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
@@ -1,7 +1,7 @@
-From 889d68a28b4442cf71e8c4ad335a98718402f4a5 Mon Sep 17 00:00:00 2001
+From a6e85638dcf57b4332762aa0097882aa42926021 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
-Subject: [PATCH 06/12] Use versioned directory for storing docs
+Subject: [PATCH 6/8] 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
@@ -31,5 +31,5 @@ index 64ed856..43b5e1f 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch b/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
index afe5275..017a568 100644
--- a/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,7 +1,7 @@
-From f2a612dba3d6ab5dd5b522f74c493c78cdfed6c9 Mon Sep 17 00:00:00 2001
+From 3b7e1cbea3991a0353967b6e71f5827e8456ff4a Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 15 Apr 2010 17:20:16 +0200
-Subject: [PATCH 07/12] Support SASL GSSAPI authentication (thanks to Mikael
+Subject: [PATCH 7/8] Support SASL GSSAPI authentication (thanks to Mikael
Magnusson)(EJAB-831)
---
@@ -19,7 +19,7 @@ Subject: [PATCH 07/12] Support SASL GSSAPI authentication (thanks to Mikael
create mode 100644 src/cyrsasl_gssapi.erl
diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl
-index 23f1721..5ff0916 100644
+index 9d1377f..802c679 100644
--- a/src/cyrsasl.erl
+++ b/src/cyrsasl.erl
@@ -30,21 +30,36 @@
@@ -156,7 +156,7 @@ index 0000000..b4cc3e3
+ check_password_digest,
+ socket}).
diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
-index 25fcd66..aeb09ea 100644
+index cb0b1e3..085e98c 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -27,7 +27,9 @@
@@ -180,7 +180,7 @@ index 25fcd66..aeb09ea 100644
mech_step(State, _ClientIn) ->
diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl
-index 134a86d..d904801 100644
+index 557e498..e4199f8 100644
--- a/src/cyrsasl_digest.erl
+++ b/src/cyrsasl_digest.erl
@@ -29,10 +29,11 @@
@@ -379,7 +379,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 a0804fd..14b3c19 100644
+index 7192cd1..7bf41b3 100644
--- a/src/cyrsasl_plain.erl
+++ b/src/cyrsasl_plain.erl
@@ -27,7 +27,9 @@
@@ -403,7 +403,7 @@ index a0804fd..14b3c19 100644
mech_step(State, ClientIn) ->
diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl
-index 74977bd..c3bf5c6 100644
+index dc671b2..d65cc6f 100644
--- a/src/cyrsasl_scram.erl
+++ b/src/cyrsasl_scram.erl
@@ -29,10 +29,11 @@
@@ -429,7 +429,7 @@ index 74977bd..c3bf5c6 100644
mech_step(#state{step = 2} = State, ClientIn) ->
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 552aa6d..038d3c5 100644
+index ed26400..11ae5dd 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -305,9 +305,16 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
@@ -461,7 +461,7 @@ index 552aa6d..038d3c5 100644
fun(S) ->
{xmlelement, "mechanism", [],
diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
-index 254751b..3509018 100644
+index 836e7d9..59e4034 100644
--- a/src/ejabberd_socket.erl
+++ b/src/ejabberd_socket.erl
@@ -44,9 +44,11 @@
@@ -501,5 +501,5 @@ index 254751b..3509018 100644
%% Internal functions
%%====================================================================
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
index 1769bf6..1474084 100644
--- a/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
+++ b/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -1,7 +1,7 @@
-From a6a1ee5a9d5a8400415a96456dbb79f4341c3410 Mon Sep 17 00:00:00 2001
+From fd4edcd89a43fc88daccb58ad156155c6c94d429 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Jun 2011 23:24:28 +0400
-Subject: [PATCH 08/12] Disable INET_DIST_INTERFACE by default
+Subject: [PATCH 8/8] Disable INET_DIST_INTERFACE by default
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -22,5 +22,5 @@ index b72058a..5ee43cf 100644
#.
#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
--
-1.7.12.1
+1.8.1.2
diff --git a/ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch b/ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
deleted file mode 100644
index 9ad114d..0000000
--- a/ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15e0cac1523696eac5e9c09b8447429457ff6901 Mon Sep 17 00:00:00 2001
-From: Badlop <badlop@process-one.net>
-Date: Wed, 25 Jul 2012 13:02:21 +0200
-Subject: [PATCH 09/12] On shutdown, first stop listeners, then modules
- (thanks to Vishal Xica)(EJAB-1566)
-
----
- src/ejabberd_app.erl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index ea467cb..3550f58 100644
---- a/src/ejabberd_app.erl
-+++ b/src/ejabberd_app.erl
-@@ -78,6 +78,7 @@ start(_, _) ->
- %% This function is called when an application is about to be stopped,
- %% before shutting down the processes of the application.
- prep_stop(State) ->
-+ ejabberd_listener:stop_listeners(),
- stop_modules(),
- ejabberd_admin:stop(),
- broadcast_c2s_shutdown(),
---
-1.7.12.1
-
diff --git a/ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch b/ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch
deleted file mode 100644
index f70487d..0000000
--- a/ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e04d73120c0b236acb26816e0464b1cd79d2c0bd Mon Sep 17 00:00:00 2001
-From: Badlop <badlop@process-one.net>
-Date: Mon, 27 Aug 2012 16:38:52 +0200
-Subject: [PATCH 10/12] Added clause so ejabberdctl number of arguments error
- report works with R15
-
----
- src/ejabberd_ctl.erl | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
-index ceb4c34..01b07ea 100644
---- a/src/ejabberd_ctl.erl
-+++ b/src/ejabberd_ctl.erl
-@@ -292,6 +292,7 @@ call_command([CmdString | Args], Auth, AccessCommands) ->
- Result = ejabberd_commands:execute_command(AccessCommands, Auth, Command,
- ArgsFormatted),
- format_result(Result, ResultFormat);
-+ %% This case clause is for Erlang R14 and older
- {'EXIT', {function_clause,[{lists,zip,[A1, A2]} | _]}} ->
- {NumCompa, TextCompa} =
- case {length(A1), length(A2)} of
-@@ -300,6 +301,16 @@ call_command([CmdString | Args], Auth, AccessCommands) ->
- end,
- {io_lib:format("Error: the command ~p requires ~p ~s.",
- [CmdString, NumCompa, TextCompa]),
-+ wrong_command_arguments};
-+ %% This case clause is for Erlang R15 and newer
-+ {'EXIT', {function_clause,[{lists,zip,[A1, A2],_} | _]}} ->
-+ {NumCompa, TextCompa} =
-+ case {length(A1), length(A2)} of
-+ {L1, L2} when L1 < L2 -> {L2-L1, "less argument"};
-+ {L1, L2} when L1 > L2 -> {L1-L2, "more argument"}
-+ end,
-+ {io_lib:format("Error: the command ~p requires ~p ~s.",
-+ [CmdString, NumCompa, TextCompa]),
- wrong_command_arguments}
- end
- end.
---
-1.7.12.1
-
diff --git a/ejabberd-0011-Log-IP-address-when-auth-attempt-fails-thanks-to-Zac.patch b/ejabberd-0011-Log-IP-address-when-auth-attempt-fails-thanks-to-Zac.patch
deleted file mode 100644
index 2375173..0000000
--- a/ejabberd-0011-Log-IP-address-when-auth-attempt-fails-thanks-to-Zac.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 6ce4398360d5bab4322eb1ca93550c0cb553f94e Mon Sep 17 00:00:00 2001
-From: Badlop <badlop@process-one.net>
-Date: Mon, 27 Aug 2012 17:40:01 +0200
-Subject: [PATCH 11/12] Log IP address when auth attempt fails (thanks to Zach
- Calvert)
-
----
- src/ejabberd_c2s.erl | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 038d3c5..8e4a7b6 100644
---- a/src/ejabberd_c2s.erl
-+++ b/src/ejabberd_c2s.erl
-@@ -564,10 +564,11 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
- fsm_next_state_pack(session_established,
- NewStateData);
- _ ->
-+ IP = peerip(StateData#state.sockmod, StateData#state.socket),
- ?INFO_MSG(
-- "(~w) Failed legacy authentication for ~s",
-+ "(~w) Failed legacy authentication for ~s from IP ~s (~w)",
- [StateData#state.socket,
-- jlib:jid_to_string(JID)]),
-+ jlib:jid_to_string(JID), jlib:ip_to_list(IP), IP]),
- Err = jlib:make_error_reply(
- El, ?ERR_NOT_AUTHORIZED),
- send_element(StateData, Err),
-@@ -654,10 +655,11 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
- StateData#state{
- sasl_state = NewSASLState});
- {error, Error, Username} ->
-+ IP = peerip(StateData#state.sockmod, StateData#state.socket),
- ?INFO_MSG(
-- "(~w) Failed authentication for ~s@~s",
-+ "(~w) Failed authentication for ~s@~s from IP ~s (~w)",
- [StateData#state.socket,
-- Username, StateData#state.server]),
-+ Username, StateData#state.server, jlib:ip_to_list(IP), IP]),
- send_element(StateData,
- {xmlelement, "failure",
- [{"xmlns", ?NS_SASL}],
-@@ -807,10 +809,11 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
- fsm_next_state(wait_for_sasl_response,
- StateData#state{sasl_state = NewSASLState});
- {error, Error, Username} ->
-+ IP = peerip(StateData#state.sockmod, StateData#state.socket),
- ?INFO_MSG(
-- "(~w) Failed authentication for ~s@~s",
-+ "(~w) Failed authentication for ~s@~s from IP ~s (~w)",
- [StateData#state.socket,
-- Username, StateData#state.server]),
-+ Username, StateData#state.server, jlib:ip_to_list(IP), IP]),
- send_element(StateData,
- {xmlelement, "failure",
- [{"xmlns", ?NS_SASL}],
---
-1.7.12.1
-
diff --git a/ejabberd-0012-Broken-JPEG-Photo.patch b/ejabberd-0012-Broken-JPEG-Photo.patch
deleted file mode 100644
index aa8e3c5..0000000
--- a/ejabberd-0012-Broken-JPEG-Photo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af2c01770cf03e956d9852819f05250d786b9fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Renaud=20P=C3=A9richon?= <>
-Date: Sun, 28 Oct 2012 20:16:42 +0400
-Subject: [PATCH 12/12] Broken JPEG Photo
-
-* https://support.process-one.net/browse/EJAB-1526
-* https://bugzilla.redhat.com/846856
----
- src/eldap/eldap_filter.erl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/eldap/eldap_filter.erl b/src/eldap/eldap_filter.erl
-index f8f20be..c830d06 100644
---- a/src/eldap/eldap_filter.erl
-+++ b/src/eldap/eldap_filter.erl
-@@ -181,5 +181,6 @@ do_sub(S, {RegExp, New, Times}, Iter) ->
- replace_amps(String) ->
- lists:flatmap(
- fun($&) -> "\\&";
-+ ($\\) -> "\\\\";
- (Chr) -> [Chr]
- end, String).
---
-1.7.12.1
-
diff --git a/ejabberd.spec b/ejabberd.spec
index dd75212..a76f42e 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,23 +1,34 @@
+%global realname ejabberd
+%global upstream processone
+%global git_tag c058687
+%global patchnumber 0
+
+
%global uid 27
+
# Currently, hevea available only in Fedora
%if 0%{?fedora}
-# No hevea for ppc64
+%ifarch %{power64} s390 s390x sparc64
+# No hevea for these architectures
# see https://bugzilla.redhat.com/bugzilla/250253
-%ifnarch ppc64 s390 s390x sparc64
-%define with_hevea 1
+%global with_hevea 0
+%else
+%global with_hevea 1
%endif
%endif
+
Name: ejabberd
-Version: 2.1.11
-Release: 7%{?dist}
+Version: 2.1.12
+Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
License: GPLv2+
URL: http://www.ejabberd.im/
-Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tgz
+# wget --content-disposition https://github.com/processone/ejabberd/tarball/v2.1.12
+Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Source1: ejabberd.init
Source2: ejabberd.logrotate
Source3: ejabberd.sysconfig
@@ -47,14 +58,6 @@ Patch6: ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
Patch7: ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
# Disable IP restriction for ejabberdctl (seems that it doesn't work well)
Patch8: ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
-# cherry-picked from trunk
-Patch9: ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
-# cherry-picked from trunk
-Patch10: ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch
-# cherry-picked from trunk
-Patch11: ejabberd-0011-Log-IP-address-when-auth-attempt-fails-thanks-to-Zac.patch
-# Taken from https://support.process-one.net/browse/EJAB-1526
-Patch12: ejabberd-0012-Broken-JPEG-Photo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +71,8 @@ BuildRequires: erlang
BuildRequires: fedora-usermgmt-devel
%if 0%{?with_hevea}
BuildRequires: hevea
+BuildRequires: texlive
+BuildRequires: texlive-comment
%endif
%{?FE_USERADD_REQ}
@@ -86,7 +91,37 @@ Requires(postun): /sbin/service
Provides: user(%{name}) = %{uid}
Provides: group(%{name}) = %{uid}
+#Error:erlang(exmpp_jid:domain_as_list/1)
+#Error:erlang(exmpp_jid:make/2)
+#Error:erlang(exmpp_jid:node_as_list/1)
+#Error:erlang(exmpp_jid:parse/1)
+#Error:erlang(exmpp_jid:prep_domain_as_list/1)
+#Error:erlang(exmpp_jid:prep_node_as_list/1)
+#Error:erlang(exmpp_jid:prep_resource_as_list/1)
+#Error:erlang(exmpp_jid:resource_as_list/1)
+#Error:erlang(exmpp:start/0)
+#Error:erlang(exmpp_xml:document_to_list/1)
+#Error:erlang(exmpp_xml:foreach/2)
+#Error:erlang(exmpp_xml:get_attribute/3)
+#Error:erlang(exmpp_xml:get_attribute_as_list/3)
+#Error:erlang(exmpp_xml:get_element/2)
+#Error:erlang(exmpp_xml:get_elements/2)
+#Error:erlang(exmpp_xml:parse/2)
+#Error:erlang(exmpp_xml:start_parser/1)
+#Error:erlang(exmpp_xml:stop_parser/1)
+#Error:erlang(exmpp_xml:xmlelement_to_xmlel/1)
+#Error:erlang(exmpp_xml:xmlel_to_xmlelement/1)
+#Error:erlang(mysql_conn:fetch/3)
+#Error:erlang(mysql_conn:start/6)
+#Error:erlang(mysql_conn:stop/1)
+#Error:erlang(mysql:get_result_affected_rows/1)
+#Error:erlang(mysql:get_result_field_info/1)
+#Error:erlang(mysql:get_result_reason/1)
+#Error:erlang(mysql:get_result_rows/1)
+#Error:erlang(release_handler_1:eval_script/3)
+#Error:erlang(ssl:seed/1)
Requires: erlang
+#Error:erlang(esasl:str_error/2)
Requires: erlang-esasl
Requires: usermode
# for flock in ejabberdctl
@@ -113,7 +148,7 @@ Group: Documentation
Documentation for ejabberd.
%prep
-%setup -q
+%setup -q -n %{upstream}-%{realname}-6ae7e5d
%patch1 -p1 -b .pam_name
%patch2 -p1 -b .s2s_delays
@@ -123,14 +158,6 @@ Documentation for ejabberd.
%patch6 -p1 -b .versioned_docdir
%patch7 -p1 -b .gssapi
%patch8 -p1 -b .disable_ip_restriction_for_ejabberdctl
-%patch9 -p1 -b .stop_listeners_first
-%patch10 -p1 -b .r15b
-%patch11 -p1 -b .log_intruders_ip
-%patch12 -p1 -b .fix_mod_vcard_ldap
-
-# FIXME last-minute fix for 2.1.11 only
-sed -i -e "s,2.1.x,2.1.11,g" src/configure
-touch -r src/configure.ac src/configure
%build
@@ -399,7 +426,11 @@ rm -rf %{buildroot}
%endif
%doc %{_docdir}/%{name}-%{version}/*.txt
+
%changelog
+* Fri Mar 15 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.12-1
+- Ver. 2.1.12
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 7b914cc..fcc0b0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a70b040c4e7602f47718c8afe8780d50 ejabberd-2.1.11.tgz
+2188f2c858d8e96fadef7c04373ebd92 processone-ejabberd-v2.1.12-0-gc058687.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=179019043197.1.17509305654205418511.rpms-ejabberd-9fe454b58ddf@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