Attachment 189020 Details for Bug 224510 – nagvis support for php7

[patch] nagvis support for php7

nagvis.diff (text/plain), 4.28 KB, created by Palle Girgensohn on 2017-12-21 20:49:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2017-12-21 20:49:26 UTC

Size: 4.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 456846)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nagvis
> PORTVERSION=	1.8.5
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://www.nagvis.org/share/
> 
>Index: files/patch-share_server_core_classes_objects_NagVisService.php
>===================================================================
>--- files/patch-share_server_core_classes_objects_NagVisService.php	(nonexistent)
>+++ files/patch-share_server_core_classes_objects_NagVisService.php	(working copy)
>@@ -0,0 +1,22 @@
>+--- share/server/core/classes/objects/NagVisMapObj.php.orig	2017-12-21 20:54:27.936999000 +0100
>++++ share/server/core/classes/objects/NagVisMapObj.php	2017-12-21 20:54:31.229491000 +0100
>+@@ -187,7 +187,7 @@
>+      *
>+      * @author	Lars Michelsen <lars@vertical-visions.de>
>+      */
>+-    public function queueState($_unused_flag = true, $_unused_flag = true) {
>++    public function queueState($_unused_flag = true, $_unused_flag2 = true) {
>+         // Get state of all member objects
>+         foreach($this->getStateRelevantMembers() AS $OBJ) {
>+             // The states of the map objects members only need to be fetched when this
>+--- share/server/core/classes/objects/NagVisService.php.orig	2017-12-21 20:55:07.358180000 +0100
>++++ share/server/core/classes/objects/NagVisService.php	2017-12-21 20:55:31.487418000 +0100
>+@@ -56,7 +56,7 @@
>+     /**
>+      * Queues state fetching for this object
>+      */
>+-    public function queueState($_unused_flag = true, $_unused_flag = true) {
>++    public function queueState($_unused_flag = true, $_unused_flag2 = true) {
>+         global $_BACKEND;
>+         $_BACKEND->queue(Array('serviceState' => true), $this);
>+     }
>
>Property changes on: files/patch-share_server_core_classes_objects_NagVisService.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-share_server_core_ext_php_gettext.php
>===================================================================
>--- files/patch-share_server_core_ext_php_gettext.php	(nonexistent)
>+++ files/patch-share_server_core_ext_php_gettext.php	(working copy)
>@@ -0,0 +1,40 @@
>+--- share/server/core/ext/php-gettext-1.0.9/gettext.php.orig	2017-12-21 20:52:04.548840000 +0100
>++++ share/server/core/ext/php-gettext-1.0.9/gettext.php	2017-12-21 20:52:26.904652000 +0100
>+@@ -98,7 +98,7 @@
>+    * @param object Reader the StreamReader object
>+    * @param boolean enable_cache Enable or disable caching of strings (default on)
>+    */
>+-  function gettext_reader($Reader, $enable_cache = true) {
>++  function __construct($Reader, $enable_cache = true) {
>+     // If there isn't a StreamReader, turn on short circuit mode.
>+     if (! $Reader || isset($Reader->error) ) {
>+       $this->short_circuit = true;
>+--- share/server/core/ext/php-gettext-1.0.9/streams.php.orig	2017-12-21 20:52:12.507752000 +0100
>++++ share/server/core/ext/php-gettext-1.0.9/streams.php	2017-12-21 20:53:08.533635000 +0100
>+@@ -49,7 +49,7 @@
>+   var $_pos;
>+   var $_str;
>+ 
>+-  function StringReader($str='') {
>++  function __construct($str='') {
>+     $this->_str = $str;
>+     $this->_pos = 0;
>+   }
>+@@ -86,7 +86,7 @@
>+   var $_fd;
>+   var $_length;
>+ 
>+-  function FileReader($filename) {
>++  function __construct($filename) {
>+     if (file_exists($filename)) {
>+ 
>+       $this->_length=filesize($filename);
>+@@ -143,7 +143,7 @@
>+ // Preloads entire file in memory first, then creates a StringReader
>+ // over it (it assumes knowledge of StringReader internals)
>+ class CachedFileReader extends StringReader {
>+-  function CachedFileReader($filename) {
>++  function __construct($filename) {
>+     if (file_exists($filename)) {
>+ 
>+       $length=filesize($filename);
>
>Property changes on: files/patch-share_server_core_ext_php_gettext.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224510: 189020