[debian-edu-commits] debian-edu/pkg-team/ 17/32: Imported Debian patch 2.7.4-4
Mike Gabriel
sunweaver at debian.org
Tue Apr 1 16:52:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit 1f6a7b212ac4308fb518123256b8b765c59c39dc
Author: Cajus Pollmeier <cajus at debian.org>
Date: Tue Jun 19 09:36:39 2012 +0200
Imported Debian patch 2.7.4-4
---
debian/changelog | 7 ++
debian/control | 2 +-
debian/gosa.postrm | 1 -
debian/patches/01_fix_smarty_location.patch | 4 +-
debian/patches/series | 2 +-
debian/patches/smarty3.patch | 44 +++++++++
debian/patches/smarty31.patch | 143 ----------------------------
7 files changed, 55 insertions(+), 148 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe2879c..372600d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gosa (2.7.4-4) unstable; urgency=low
+
+ * New smarty3 package fixes problems with template loading. This
+ release removes the workarounds for that issue.
+
+ -- Cajus Pollmeier <cajus at debian.org> Tue, 19 Jun 2012 09:36:39 +0200
+
gosa (2.7.4-3) unstable; urgency=low
* Reverted Apache2 transition because it has been aborted. Closes: #674357.
diff --git a/debian/control b/debian/control
index 2369cc7..7933e0c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ DM-Upload-Allowed: yes
Package: gosa
Architecture: all
-Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, php5-recode, smarty3, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl, ttf-liberation
+Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, php5-recode, smarty3 (>= 3.1.10-1), gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl, ttf-liberation
Recommends: ${misc:Recommends}
Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
Conflicts: smarty3-gosa, smarty3-gettext, smarty-acl-render
diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index 253fcf3..dce38ee 100644
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -3,7 +3,6 @@
#
set -e
-set -x
case "$1" in
purge)
diff --git a/debian/patches/01_fix_smarty_location.patch b/debian/patches/01_fix_smarty_location.patch
index 50144b3..d7325ae 100644
--- a/debian/patches/01_fix_smarty_location.patch
+++ b/debian/patches/01_fix_smarty_location.patch
@@ -13,5 +13,5 @@ Description: Adapt location for debian packaged smarty
+ require("/usr/share/php/smarty3/libs/Smarty.class.php");
+}
$smarty = new Smarty;
- $smarty->setCaching(false);
-
+ $smarty->template_dir = $BASE_DIR.'/ihtml/';
+ $smarty->caching= false;
diff --git a/debian/patches/series b/debian/patches/series
index c00a57f..661e56f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
+smarty3.patch
style-robustness.patch
-smarty31.patch
01_fix_smarty_location.patch
02_fix_template_location.patch
03_fix_class_mapping.patch
diff --git a/debian/patches/smarty3.patch b/debian/patches/smarty3.patch
new file mode 100644
index 0000000..914cc83
--- /dev/null
+++ b/debian/patches/smarty3.patch
@@ -0,0 +1,44 @@
+--- a/gosa-core/html/index.php
++++ b/gosa-core/html/index.php
+@@ -167,6 +167,7 @@
+
+ /* Enable compressed output */
+ if ($config->get_cfg_value("core","sendCompressedOutput") != "") {
++ ob_end_clean();
+ ob_start("ob_gzhandler");
+ }
+
+--- a/gosa-core/html/main.php
++++ b/gosa-core/html/main.php
+@@ -80,6 +80,7 @@
+
+ /* Enable compressed output */
+ if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
++ ob_end_clean();
+ ob_start("ob_gzhandler");
+ }
+
+--- a/gosa-core/include/smartyAddons/block.t.php
++++ b/gosa-core/include/smartyAddons/block.t.php
+@@ -72,6 +72,10 @@
+ */
+ function smarty_block_t($params, $text, &$smarty)
+ {
++ if ($text == "") {
++ return "";
++ }
++
+ $text = stripslashes($text);
+
+ // set escape mode
+--- a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
++++ b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
+@@ -180,7 +180,7 @@
+ $smarty->assign("emptyArrAccess",false);
+
+
+- $smarty->assign($smarty->assign("use_trustmode",in_array_strict("trustmode", $this->multi_boxes)));
++ $smarty->assign("use_trustmode", in_array_strict("trustmode", $this->multi_boxes));
+ $smarty->assign("multiple_support" , $this->multiple_support_active);
+ # $this->trustList->update();
+ $smarty->assign("trustList", $this->trustList->render());
diff --git a/debian/patches/smarty31.patch b/debian/patches/smarty31.patch
deleted file mode 100644
index ddbe232..0000000
--- a/debian/patches/smarty31.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/gosa-core/html/index.php
-+++ b/gosa-core/html/index.php
-@@ -167,6 +167,7 @@
-
- /* Enable compressed output */
- if ($config->get_cfg_value("core","sendCompressedOutput") != "") {
-+ ob_end_clean();
- ob_start("ob_gzhandler");
- }
-
---- a/gosa-core/html/main.php
-+++ b/gosa-core/html/main.php
-@@ -80,6 +80,7 @@
-
- /* Enable compressed output */
- if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
-+ ob_end_clean();
- ob_start("ob_gzhandler");
- }
-
-@@ -110,7 +111,7 @@
- @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
-
- /* Set template compile directory */
--$smarty->compile_dir= $config->get_cfg_value("core","templateCompileDirectory");
-+$smarty->setCompileDir($config->get_cfg_value("core","templateCompileDirectory"));
- $smarty->error_unassigned= true;
-
- /* Set default */
---- a/gosa-core/html/setup.php
-+++ b/gosa-core/html/setup.php
-@@ -60,7 +60,8 @@
- session::set('errorsAlreadyPosted',array());
- session::set('LastError',"");
-
--$smarty->compile_dir= "/var/spool/gosa/";
-+$smarty->setTemplateDir("$BASE_DIR/setup");
-+$smarty->setCompileDir("/var/spool/gosa");
- if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
-
- if(isset($_SERVER['SCRIPT_FILENAME'])){
-@@ -157,6 +158,6 @@
- $smarty->assign("version","");
- }
-
--echo $header.$smarty->fetch("../setup/setup_frame.tpl");
-+echo $header.$smarty->fetch("setup_frame.tpl");
- // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
- ?>
---- a/gosa-core/include/class_pluglist.inc
-+++ b/gosa-core/include/class_pluglist.inc
-@@ -504,10 +504,11 @@
- */
- function get_path($index)
- {
-+ global $BASE_DIR;
- if(!isset($this->dirlist[$index])){
- return ("");
- }
-- return ("../".$this->dirlist[$index]);
-+ return ("$BASE_DIR/".$this->dirlist[$index]);
- }
-
-
---- a/gosa-core/include/php_setup.inc
-+++ b/gosa-core/include/php_setup.inc
-@@ -297,8 +297,7 @@
- /* Do smarty setup */
- require("smarty/Smarty.class.php");
- $smarty = new Smarty;
--$smarty->template_dir = $BASE_DIR.'/ihtml/';
--$smarty->caching= false;
-+$smarty->setCaching(false);
-
- // To be able to switch between smarty version 2/3
- if(defined('SMARTY_PHP_REMOVE')){
---- a/gosa-core/include/smartyAddons/block.t.php
-+++ b/gosa-core/include/smartyAddons/block.t.php
-@@ -73,6 +73,11 @@
- function smarty_block_t($params, $text, &$smarty)
- {
- $text = stripslashes($text);
-+
-+ //TODO: need to figure out why this happens for every string...
-+ if ($text == "") {
-+ return ("");
-+ }
-
- // set escape mode
- if (isset($params['escape'])) {
-@@ -119,7 +124,7 @@
- break;
- }
- }
--
-+
- return $text;
- }
-
---- a/gosa-core/setup/class_setupStep_Finish.inc
-+++ b/gosa-core/setup/class_setupStep_Finish.inc
-@@ -117,7 +117,7 @@
- $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
-
- $smarty->assign("cv",$this->parent->captured_values);
-- return($smarty -> fetch (get_template_path("../setup/setup_finish.tpl")));
-+ return($smarty->fetch(get_template_path("setup_finish.tpl")));
- }
-
-
---- a/gosa-core/setup/class_setupStep_Ldap.inc
-+++ b/gosa-core/setup/class_setupStep_Ldap.inc
-@@ -88,7 +88,7 @@
- $base_to_append = substr($base_to_append,0,17)."...";
- }
- $smarty->assign("base_to_append",$base_to_append);
-- return($smarty -> fetch (get_template_path("../setup/setup_ldap.tpl")));
-+ return($smarty->fetch (get_template_path("setup_ldap.tpl")));
- }
-
- function get_connection_status()
---- a/gosa-core/setup/class_setupStep_License.inc
-+++ b/gosa-core/setup/class_setupStep_License.inc
-@@ -68,7 +68,7 @@
- $smarty -> assign("license_found",$this->license_found);
- $smarty -> assign("accepted",$this->accepted);
-
-- return($smarty -> fetch (get_template_path("../setup/setup_license.tpl")));
-+ return($smarty->fetch (get_template_path("setup_license.tpl")));
- }
-
-
---- a/gosa-core/setup/class_setupStep_Schema.inc
-+++ b/gosa-core/setup/class_setupStep_Schema.inc
-@@ -101,7 +101,7 @@
- $smarty->assign('message', $message);
- }
- $smarty->assign('checkFailed', !$this->is_completed);
-- return($smarty->fetch (get_template_path("../setup/setup_schema.tpl")));
-+ return($smarty->fetch (get_template_path("setup_schema.tpl")));
- }
- }
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list