[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Add 2007_gen-uids-like-gosa26.patch. Fix idGenerator for patterns like {%sn[3-6}-{%givenName[3-6]}. (Closes: #793455).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 6aa37f93b0ffaf18702294b897b626b1fc4356c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 24 10:54:16 2015 +0200

    debian/patches: Add 2007_gen-uids-like-gosa26.patch. Fix idGenerator for patterns like {%sn[3-6}-{%givenName[3-6]}. (Closes: #793455).
---
 debian/patches/2007_gen-uids-like-gosa26.patch | 16 ++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/2007_gen-uids-like-gosa26.patch b/debian/patches/2007_gen-uids-like-gosa26.patch
new file mode 100644
index 0000000..097be2a
--- /dev/null
+++ b/debian/patches/2007_gen-uids-like-gosa26.patch
@@ -0,0 +1,16 @@
+Description: Re-instate GOsa² 2.6 uid-from-fullname generation
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ For details, see http://bugs.debian.org/793455
+
+--- a/gosa-core/include/functions.inc
++++ b/gosa-core/include/functions.inc
+@@ -3831,7 +3831,7 @@
+             for($i=$match[5]; $i<= $match[7]; $i++){
+                 if(isset($attributes[$match[2]][$i])){
+                     $tmp = " ".$attributes[$match[2]];
+-                    $str .= $tmp[$i];
++                    $str = substr ($tmp, 1, $i);
+                     $replacements[$match[0]][] = trim($str);
+                 }
+             }
diff --git a/debian/patches/series b/debian/patches/series
index 3750c40..0338300 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 2004_fix-locale-location.patch
 2005_no-image-warning.patch
 2006_sasl-password-change.patch
+2007_gen-uids-like-gosa26.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git