diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/error_reporting.patch | 27 | ||||
| -rw-r--r-- | debian/patches/php8.2.patch | 124 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 153 insertions, 0 deletions
diff --git a/debian/patches/error_reporting.patch b/debian/patches/error_reporting.patch new file mode 100644 index 0000000..f37b719 --- /dev/null +++ b/debian/patches/error_reporting.patch @@ -0,0 +1,27 @@ +Description: Suppress Deprecated notices, upstream doesn't support PHP 8.2 yet. +Author: Bas Couwenberg <sebastic@debian.org> +Bug: https://github.com/Icinga/icingaweb2/issues/4918 +Bug-Debian: https://bugs.debian.org/1037925 + +--- a/library/Icinga/Application/ApplicationBootstrap.php ++++ b/library/Icinga/Application/ApplicationBootstrap.php +@@ -591,7 +591,7 @@ abstract class ApplicationBootstrap + */ + protected function setupErrorHandling() + { +- error_reporting(E_ALL | E_STRICT); ++ error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT); + ini_set('display_startup_errors', 1); + ini_set('display_errors', 1); + set_error_handler(function ($errno, $errstr, $errfile, $errline) { +--- a/library/Icinga/Application/webrouter.php ++++ b/library/Icinga/Application/webrouter.php +@@ -8,7 +8,7 @@ use Icinga\Web\Controller\StaticControll + use Icinga\Web\JavaScript; + use Icinga\Web\StyleSheet; + +-error_reporting(E_ALL | E_STRICT); ++error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT); + + if (isset($_SERVER['REQUEST_URI'])) { + $ruri = $_SERVER['REQUEST_URI']; diff --git a/debian/patches/php8.2.patch b/debian/patches/php8.2.patch new file mode 100644 index 0000000..3747076 --- /dev/null +++ b/debian/patches/php8.2.patch @@ -0,0 +1,124 @@ +Description: Fix issues with php8.2. +Author: Bas Couwenberg <sebastic@debian.org> +Bug: https://github.com/Icinga/icingaweb2/issues/4918 +Bug-Debian: https://bugs.debian.org/1023354 + +--- a/library/Icinga/Application/Modules/Module.php ++++ b/library/Icinga/Application/Modules/Module.php +@@ -77,6 +77,13 @@ class Module + private $libdir; + + /** ++ * Configuration directory ++ * ++ * @var string ++ */ ++ private $configdir; ++ ++ /** + * Directory containing translations + * + * @var string +--- a/library/Icinga/Less/ColorProp.php ++++ b/library/Icinga/Less/ColorProp.php +@@ -21,7 +21,7 @@ class ColorProp extends Less_Tree_Color + protected $index; + + /** @var string Color variable name */ +- protected $name; ++ public $name; + + public function __construct() + { +--- a/library/Icinga/Util/LessParser.php ++++ b/library/Icinga/Util/LessParser.php +@@ -10,6 +10,8 @@ require_once 'lessphp/lessc.inc.php'; + + class LessParser extends lessc + { ++ public $importDisabled; ++ + public function __construct() + { + $this->setOption('plugins', [new Visitor()]); +--- a/library/Icinga/Web/Navigation/ConfigMenu.php ++++ b/library/Icinga/Web/Navigation/ConfigMenu.php +@@ -33,6 +33,8 @@ class ConfigMenu extends BaseHtmlElement + + protected $state; + ++ protected $title; ++ + public function __construct() + { + $this->children = [ +--- a/library/vendor/lessphp/lib/Less/Tree/Color.php ++++ b/library/vendor/lessphp/lib/Less/Tree/Color.php +@@ -11,6 +11,7 @@ class Less_Tree_Color extends Less_Tree + public $alpha; + public $isTransparentKeyword; + public $type = 'Color'; ++ public $name = 'n/a'; + + public function __construct( $rgb, $a = 1, $isTransparentKeyword = null ) { + if ( $isTransparentKeyword ) { +--- a/library/vendor/lessphp/lib/Less/Tree/Dimension.php ++++ b/library/vendor/lessphp/lib/Less/Tree/Dimension.php +@@ -11,6 +11,7 @@ class Less_Tree_Dimension extends Less_T + public $value; + public $unit; + public $type = 'Dimension'; ++ public $parensInOp; + + public function __construct( $value, $unit = null ) { + $this->value = floatval( $value ); +--- a/library/vendor/lessphp/lib/Less/Tree/Operation.php ++++ b/library/vendor/lessphp/lib/Less/Tree/Operation.php +@@ -12,6 +12,7 @@ class Less_Tree_Operation extends Less_T + public $operands; + public $isSpaced; + public $type = 'Operation'; ++ public $parensInOp; + + /** + * @param string $op +--- a/library/vendor/lessphp/lib/Less/Tree/Variable.php ++++ b/library/vendor/lessphp/lib/Less/Tree/Variable.php +@@ -13,6 +13,7 @@ class Less_Tree_Variable extends Less_Tr + public $currentFileInfo; + public $evaluating = false; + public $type = 'Variable'; ++ public $parensInOp; + + /** + * @param string $name +--- a/library/vendor/Zend/Form/Decorator/Label.php ++++ b/library/vendor/Zend/Form/Decorator/Label.php +@@ -43,6 +43,7 @@ + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ ++#[AllowDynamicProperties] + class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract + { + /** +--- a/library/vendor/Zend/Form/Element.php ++++ b/library/vendor/Zend/Form/Element.php +@@ -36,6 +36,7 @@ + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ ++#[AllowDynamicProperties] + class Zend_Form_Element implements Zend_Validate_Interface + { + /** +--- a/library/vendor/Zend/View/Abstract.php ++++ b/library/vendor/Zend/View/Abstract.php +@@ -33,6 +33,7 @@ + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ ++#[AllowDynamicProperties] + abstract class Zend_View_Abstract implements Zend_View_Interface + { + /** diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..54fb168 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +php8.2.patch +error_reporting.patch |