retitle #780262 unblock: fusiondirectory/1.0.8.2-5 thanks
Hi Ivo, On Sa 11 Apr 2015 17:58:56 CEST, Ivo De Decker wrote:
Control: confirmed moreinfo Hi, On Wed, Mar 11, 2015 at 11:42:43AM +0100, Mike Gabriel wrote:Please consider unblocking planned upload of package fusiondirectory. + * debian/patches: + + Add 0002_fix-sieve-script-creation.patch. Don't fail when creating + sieve mail filter scripts via fusiondirectory's sieve plugin. + (Closes: #780214).Please go ahead. Cheers, Ivo
I actually just dput another revision of fusiondirectory to unstable (1.0.8.2-5) fixing the below issue:
+ * debian/patches: + + Add 0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch + and 0004_Fixes-3447-Debug-is-back.patch. Make login possible while + debug mode is enabled. (Closes: #781805). -> while debugging a FD installation, login must/should be possible.Being aware of the risk of not getting an unblock for this in time, I nonetheless dput that package. Hope you agree about RC'ish nature of the recently files bug #781805.
Full debdiff between jessie+unstable attached to this mail. light+love, Mike -- mike gabriel aka sunweaver (Debian Developer) fon: +49 (1520) 1976 148 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: sunwea...@debian.org, http://sunweavers.net
diff -Nru fusiondirectory-1.0.8.2/debian/changelog
fusiondirectory-1.0.8.2/debian/changelog
--- fusiondirectory-1.0.8.2/debian/changelog 2015-01-14 15:04:39.000000000
+0100
+++ fusiondirectory-1.0.8.2/debian/changelog 2015-04-13 03:40:29.000000000
+0200
@@ -1,3 +1,21 @@
+fusiondirectory (1.0.8.2-5) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
+ and 0004_Fixes-3447-Debug-is-back.patch. Make login possible while
+ debug mode is enabled. (Closes: #781805).
+
+ -- Mike Gabriel <sunwea...@debian.org> Mon, 13 Apr 2015 03:32:05 +0200
+
+fusiondirectory (1.0.8.2-4) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0002_fix-sieve-script-creation.patch. Don't fail when creating
+ sieve mail filter scripts via fusiondirectory's sieve plugin.
+ (Closes: #780214).
+
+ -- Mike Gabriel <sunwea...@debian.org> Wed, 11 Mar 2015 11:35:42 +0100
+
fusiondirectory (1.0.8.2-3) unstable; urgency=medium
* debian/fusiondirectory.postrm:
diff -Nru
fusiondirectory-1.0.8.2/debian/patches/0002_fix-sieve-script-creation.patch
fusiondirectory-1.0.8.2/debian/patches/0002_fix-sieve-script-creation.patch
--- fusiondirectory-1.0.8.2/debian/patches/0002_fix-sieve-script-creation.patch
1970-01-01 01:00:00.000000000 +0100
+++ fusiondirectory-1.0.8.2/debian/patches/0002_fix-sieve-script-creation.patch
2015-03-11 11:36:45.000000000 +0100
@@ -0,0 +1,25 @@
+From 497008368f89db54f810457633ca3c9bd2e97a95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernig...@opensides.be>
+Date: Wed, 11 Mar 2015 10:34:13 +0100
+Subject: [PATCH] Fixes #3638 Error in cyrus sieve script template
+
+---
+ cyrus/personal/mail/mail-methods/sieve_script.tpl | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/cyrus/personal/mail/mail-methods/sieve_script.tpl
b/cyrus/personal/mail/mail-methods/sieve_script.tpl
+index 3a85556..769f779 100644
+--- a/plugins/cyrus/personal/mail/mail-methods/sieve_script.tpl
++++ b/plugins/cyrus/personal/mail/mail-methods/sieve_script.tpl
+@@ -1,8 +1,6 @@
+-{if $content}
+ ###FUSIONDIRECTORY
+ require ["fileinto", "reject", "vacation"];
+
+-{/if}
+ {if $spamfilter}
+ # Sort mails with higher spam level
+ if header :contains "X-Spam-Level" "{$spamlevel}" {literal}{{/literal}
+--
+1.9.1
+
diff -Nru
fusiondirectory-1.0.8.2/debian/patches/0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
fusiondirectory-1.0.8.2/debian/patches/0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
---
fusiondirectory-1.0.8.2/debian/patches/0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
1970-01-01 01:00:00.000000000 +0100
+++
fusiondirectory-1.0.8.2/debian/patches/0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
2015-04-13 03:40:29.000000000 +0200
@@ -0,0 +1,42 @@
+From e205afaad3b16dbb015ab72fbbc328ca45b99b83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernig...@opensides.be>
+Date: Tue, 4 Nov 2014 11:19:13 +0100
+Subject: [PATCH 01/36] Fixes #3447 Setting debug level to 0 during login
+
+Comment:
+ Original commit from upstream Git has been stripped off of unnecessary
+ white space changes by Mike Gabriel <sunwea...@debian.org>.
+
+---
+ html/index.php | 9 +++++++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/html/index.php b/html/index.php
+index 33bfef6..ce56f39 100644
+--- a/core/html/index.php
++++ b/core/html/index.php
+@@ -141,8 +141,10 @@ if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)) {
+
+ /* Parse configuration file */
+ $config = new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
+-session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+-if ($_SERVER["REQUEST_METHOD"] != "POST") {
++if ($_SERVER["REQUEST_METHOD"] == "POST") {
++ session::global_set('DEBUGLEVEL', 0);
++} else {
++ session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+ @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data,
"config");
+ }
+
+@@ -207,6 +209,9 @@ if (!$htaccess_authenticated) {
+ }
+ }
+ $config->set_current($server);
++if ($_SERVER["REQUEST_METHOD"] == "POST") {
++ session::global_set('DEBUGLEVEL', 0);
++}
+
+ /* If SSL is forced, just forward to the SSL enabled site */
+ if (($config->get_cfg_value("forcessl") == "TRUE") && ($ssl != '')) {
+--
+1.9.1
diff -Nru
fusiondirectory-1.0.8.2/debian/patches/0004_Fixes-3447-Debug-is-back.patch
fusiondirectory-1.0.8.2/debian/patches/0004_Fixes-3447-Debug-is-back.patch
--- fusiondirectory-1.0.8.2/debian/patches/0004_Fixes-3447-Debug-is-back.patch
1970-01-01 01:00:00.000000000 +0100
+++ fusiondirectory-1.0.8.2/debian/patches/0004_Fixes-3447-Debug-is-back.patch
2015-04-13 03:40:29.000000000 +0200
@@ -0,0 +1,24 @@
+From c36659626882ac00c14ab6e4b0652ed60983ebac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernig...@opensides.be>
+Date: Mon, 17 Nov 2014 15:28:55 +0100
+Subject: [PATCH 07/35] Fixes #3447 Debug is back
+
+---
+ html/index.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/html/index.php b/html/index.php
+index ce56f39..e2f6335 100644
+--- a/core/html/index.php
++++ b/core/html/index.php
+@@ -344,6 +344,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" &&
isset($_POST['login'])) || $htacces
+ /* Not account expired or password forced change go to main page */
+ new log("security", "login", "", array(), "User \"$username\" logged in
successfully");
+ session::global_set('connected', 1);
++ session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+ $config->checkLdapConfig(); // check that newly installed plugins have
their configuration in the LDAP
+ header ("Location: main.php?global_check=1");
+ exit;
+--
+1.9.1
+
diff -Nru fusiondirectory-1.0.8.2/debian/patches/series
fusiondirectory-1.0.8.2/debian/patches/series
--- fusiondirectory-1.0.8.2/debian/patches/series 2014-10-25
18:50:49.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/patches/series 2015-04-13
03:36:42.000000000 +0200
@@ -1,4 +1,7 @@
0001_fdSaslRealm-and-fdSaslExop-are-not-booleans.patch
+0002_fix-sieve-script-creation.patch
+0003_Fixes-3447-Setting-debug-level-to-0-during-login.patch
+0004_Fixes-3447-Debug-is-back.patch
2001_fusiondirectory-apache.patch
2002_fusiondirectory-headers.patch
2003_fusiondirectory-password.patch
pgpOQtrX2_DTl.pgp
Description: Digitale PGP-Signatur
