[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Add 2005_allow-Debian-blends-to-override-gosa-conf.patch. Allow Debian blends to provide their own version of gosa.conf and not get bugged by GOsa's notification message on gosa.conf template changes. Debian blends using GOsa (e.g., Edu, LAN) must handle gosa.conf updates themselves. (Closes: #794118).

[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 9552ca14b4b83d2f55fcd5a2ed693e632301a8d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 31 06:03:50 2015 +0200

    debian/patches: Add 2005_allow-Debian-blends-to-override-gosa-conf.patch. Allow Debian blends to provide their own version of gosa.conf and not get bugged by GOsa's notification message on gosa.conf template changes. Debian blends using GOsa (e.g., Edu, LAN) must handle gosa.conf updates themselves. (Closes: #794118).
---
 ...allow-Debian-blends-to-override-gosa-conf.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/2005_allow-Debian-blends-to-override-gosa-conf.patch b/debian/patches/2005_allow-Debian-blends-to-override-gosa-conf.patch
new file mode 100644
index 0000000..6bf2780
--- /dev/null
+++ b/debian/patches/2005_allow-Debian-blends-to-override-gosa-conf.patch
@@ -0,0 +1,24 @@
+--- a/gosa-core/include/class_config.inc
++++ b/gosa-core/include/class_config.inc
+@@ -1124,6 +1124,21 @@
+          */
+         session::global_set("LastChecked",$this->config_version);
+ 
++        /* Debian Edu and Debian LAN take care of maintaining its own
++           version of gosa.conf.
++
++           Do not compare our gosa.conf template with the actual config
++           version in /etc/gosa/gosa.conf to avoid the misleading message
++           dialog asking the GOsa admin to re-run the GOsa setup. With
++           Debian Edu and Debian LAN, re-running the GOsa setup will
++           break GOsa for those setups.
++        */
++
++        // The below regexp is the PHP way of a <string>.startsWith() function...
++        if (preg_match('~'.preg_quote("Managed-by-Debian",'~').'~A', $this->config_version) > 0) {
++            return;
++        }
++
+         $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/gosa.conf"));
+ 
+         /* Check contributed config version and current config version.
diff --git a/debian/patches/series b/debian/patches/series
index 6a87aa4..b3723ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch
 2004_fix-locale-location.patch
+2005_allow-Debian-blends-to-override-gosa-conf.patch

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