[ejabberd] Fixed rhbz #846856
Peter Lemenkov
peter at fedoraproject.org
Sun Oct 28 16:49:16 UTC 2012
commit da714ab1260c7ae391d790bc562f8388c11ce856
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Oct 28 20:49:05 2012 +0400
Fixed rhbz #846856
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...-service-example-name-to-match-actual-one.patch | 4 +-
...berd-0002-Fixed-delays-in-s2s-connections.patch | 4 +-
ejabberd-0003-Introducing-mod_admin_extra.patch | 4 +-
...04-Fedora-specific-changes-to-ejabberdctl.patch | 4 +-
...Install-.so-objects-with-0755-permissions.patch | 4 +-
...-Use-versioned-directory-for-storing-docs.patch | 4 +-
...L-GSSAPI-authentication-thanks-to-Mikael-.patch | 4 +-
...08-Disable-INET_DIST_INTERFACE-by-default.patch | 4 +-
...-first-stop-listeners-then-modules-thanks.patch | 4 +-
...e-so-ejabberdctl-number-of-arguments-erro.patch | 4 +-
...ess-when-auth-attempt-fails-thanks-to-Zac.patch | 4 +-
ejabberd-0012-Broken-JPEG-Photo.patch | 25 ++++++++++++++++++++
ejabberd.spec | 12 +++++----
13 files changed, 54 insertions(+), 27 deletions(-)
---
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 f5b2add..b4e7952 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: Peter Lemenkov <lemenkov at 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/12] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index a4068ad..9b24a4a 100644
%%
%% Authentication using LDAP
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0002-Fixed-delays-in-s2s-connections.patch b/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
index d22bd56..fcac79f 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: Sergei Golovan <sgolovan at nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
-Subject: [PATCH 02/11] Fixed delays in s2s connections.
+Subject: [PATCH 02/12] 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
@@ -49,5 +49,5 @@ index 65711fa..cab413f 100644
end;
open_socket(closed, StateData) ->
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0003-Introducing-mod_admin_extra.patch b/ejabberd-0003-Introducing-mod_admin_extra.patch
index 8401ef9..b782c04 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: Badlop <badlop at process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
-Subject: [PATCH 03/11] Introducing mod_admin_extra
+Subject: [PATCH 03/12] Introducing mod_admin_extra
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
@@ -1603,5 +1603,5 @@ index 0000000..1cef25a
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
index f75606f..ed5fdbc 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: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
-Subject: [PATCH 04/11] Fedora-specific changes to ejabberdctl
+Subject: [PATCH 04/12] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -44,5 +44,5 @@ index 0960f9a..c22478a 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
index f0f535b..2599fd1 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: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
-Subject: [PATCH 05/11] Install *.so objects with 0755 permissions
+Subject: [PATCH 05/12] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
index edd0ec9..2004162 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: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
-Subject: [PATCH 06/11] Use versioned directory for storing docs
+Subject: [PATCH 06/12] 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.11.5
+1.7.12.1
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 37edf83..afe5275 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: Badlop <badlop at process-one.net>
Date: Thu, 15 Apr 2010 17:20:16 +0200
-Subject: [PATCH 07/11] Support SASL GSSAPI authentication (thanks to Mikael
+Subject: [PATCH 07/12] Support SASL GSSAPI authentication (thanks to Mikael
Magnusson)(EJAB-831)
---
@@ -501,5 +501,5 @@ index 254751b..3509018 100644
%% Internal functions
%%====================================================================
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
index 21bc3e0..1769bf6 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: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 18 Jun 2011 23:24:28 +0400
-Subject: [PATCH 08/11] Disable INET_DIST_INTERFACE by default
+Subject: [PATCH 08/12] Disable INET_DIST_INTERFACE by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index b72058a..5ee43cf 100644
#.
#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
--
-1.7.11.5
+1.7.12.1
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
index d24d3b3..9ad114d 100644
--- a/ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
+++ b/ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
@@ -1,7 +1,7 @@
From 15e0cac1523696eac5e9c09b8447429457ff6901 Mon Sep 17 00:00:00 2001
From: Badlop <badlop at process-one.net>
Date: Wed, 25 Jul 2012 13:02:21 +0200
-Subject: [PATCH 09/11] On shutdown, first stop listeners, then modules
+Subject: [PATCH 09/12] On shutdown, first stop listeners, then modules
(thanks to Vishal Xica)(EJAB-1566)
---
@@ -21,5 +21,5 @@ index ea467cb..3550f58 100644
ejabberd_admin:stop(),
broadcast_c2s_shutdown(),
--
-1.7.11.5
+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
index e416892..f70487d 100644
--- a/ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch
+++ b/ejabberd-0010-Added-clause-so-ejabberdctl-number-of-arguments-erro.patch
@@ -1,7 +1,7 @@
From e04d73120c0b236acb26816e0464b1cd79d2c0bd Mon Sep 17 00:00:00 2001
From: Badlop <badlop at process-one.net>
Date: Mon, 27 Aug 2012 16:38:52 +0200
-Subject: [PATCH 10/11] Added clause so ejabberdctl number of arguments error
+Subject: [PATCH 10/12] Added clause so ejabberdctl number of arguments error
report works with R15
---
@@ -38,5 +38,5 @@ index ceb4c34..01b07ea 100644
end
end.
--
-1.7.11.5
+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
index e624b1f..2375173 100644
--- 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
@@ -1,7 +1,7 @@
From 6ce4398360d5bab4322eb1ca93550c0cb553f94e Mon Sep 17 00:00:00 2001
From: Badlop <badlop at process-one.net>
Date: Mon, 27 Aug 2012 17:40:01 +0200
-Subject: [PATCH 11/11] Log IP address when auth attempt fails (thanks to Zach
+Subject: [PATCH 11/12] Log IP address when auth attempt fails (thanks to Zach
Calvert)
---
@@ -55,5 +55,5 @@ index 038d3c5..8e4a7b6 100644
{xmlelement, "failure",
[{"xmlns", ?NS_SASL}],
--
-1.7.11.5
+1.7.12.1
diff --git a/ejabberd-0012-Broken-JPEG-Photo.patch b/ejabberd-0012-Broken-JPEG-Photo.patch
new file mode 100644
index 0000000..aa8e3c5
--- /dev/null
+++ b/ejabberd-0012-Broken-JPEG-Photo.patch
@@ -0,0 +1,25 @@
+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 9c98a83..9729367 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -11,7 +11,7 @@
Name: ejabberd
Version: 2.1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
@@ -53,6 +53,8 @@ Patch9: ejabberd-0009-On-shutdown-first-stop-listeners-then-modules-thanks.patch
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)
@@ -88,11 +90,7 @@ Requires: erlang
Requires: erlang-esasl
Requires: usermode
# for flock in ejabberdctl
-%if 0%{?el6}%{?fedora}
-Requires: util-linux-ng
-%else
Requires: util-linux
-%endif
%description
@@ -128,6 +126,7 @@ Documentation for ejabberd.
%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
@@ -401,6 +400,9 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Sun Oct 28 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.1.11-6
+- Fixed rhbz #846856
+
* Mon Sep 10 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.1.11-5
- Cherry-picked three new patches from upstream trunk
More information about the scm-commits
mailing list