Bug#801304: jessie-pu: package ejabberd/14.07-4+deb8u3

[Philipp Huebner <debalance@debian.org>]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I would like to upload ejabberd 14.07-4+deb8u3 to Jessie.
It closes a bug regarding broken LDAP queries: #797645

The only difference is a small additional patch that has been tested
and included upstream.

The complete output of
 git diff debian/14.07-4+deb8u2 debian/14.07-4+deb8u3
is attached.

Regards,
Philipp

diff --git a/debian/changelog b/debian/changelog
index fdf5242..36879a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ejabberd (14.07-4+deb8u3) jessie; urgency=medium
+
+  * Add patch to fix broken ldap queries (Closes: #797645)
+
+ -- Philipp Huebner <debalance@debian.org>  Tue, 01 Sep 2015 14:57:47 +0200
+
 ejabberd (14.07-4+deb8u2) jessie; urgency=medium
 
   * Adjust logrotate postrotate command in case ejabberd is not running (Closes: #786588)
diff --git a/debian/patches/ELDAPv3.diff b/debian/patches/ELDAPv3.diff
new file mode 100644
index 0000000..ffa08dc
--- /dev/null
+++ b/debian/patches/ELDAPv3.diff
@@ -0,0 +1,22 @@
+Description: fix broken ldap queries
+ Occuring with any LDAP server when ldap_uid is set to
+ ldap_uids: "someAttribute" : "%u@anydomain.com"
+ ejabberd is unable to create proper LDAP queries for retrieving list of users,
+ as a result list of server users remains empty.
+Author: Holger Weiss <holger@zedat.fu-berlin.de>
+
+diff --git a/src/ELDAPv3.erl b/src/ELDAPv3.erl
+index 4945731..c66fa97 100644
+--- a/src/ELDAPv3.erl
++++ b/src/ELDAPv3.erl
+@@ -1765,6 +1765,10 @@ encode_tags(TagIn, BytesSoFar, LenSoFar).
+       {EncBytes,EncLen} = 'enc_SubstringFilter_substrings_components'(Val,[],0),
+    encode_tags(TagIn, EncBytes, EncLen).
+ 
++'enc_SubstringFilter_substrings_components'({'SubstringFilter_substrings', L}, AccBytes, AccLen)
++   when is_list(L) ->
++   'enc_SubstringFilter_substrings_components'(L, AccBytes, AccLen);
++
+ 'enc_SubstringFilter_substrings_components'([], AccBytes, AccLen) -> 
+    {lists:reverse(AccBytes),AccLen};
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cd8897c..a2b4827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ avoid_hanging_c2s.patch
 base64.patch
 fix_muc_logs.patch
 fix_ldap_dn_filter.patch
+ELDAPv3.diff