[debian-edu-commits] debian-edu/pkg-team/ 02/08: debian/patches: Add 2009_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 debian/jessie/updates
in repository gosa.

commit 3cd550d0ba36bff7106b9ae6f477f9571ab86535
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 31 06:03:50 2015 +0200

    debian/patches: Add 2009_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).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/patches/series
---
 ...allow-Debian-blends-to-override-gosa-conf.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/2009_allow-Debian-blends-to-override-gosa-conf.patch b/debian/patches/2009_allow-Debian-blends-to-override-gosa-conf.patch
new file mode 100644
index 0000000..2e197e9
--- /dev/null
+++ b/debian/patches/2009_allow-Debian-blends-to-override-gosa-conf.patch
@@ -0,0 +1,27 @@
+Description: Debian Edu and Debian LAN take care of maintaining its own version of gosa.conf
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- 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 6431df8..5e4756b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 2006_sasl-password-change.patch
 2007_gen-uids-like-gosa26.patch
 2008_enable-csv-import-on-clean-installs.patch
+2009_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