Date: Wed, 16 Jan 2019 13:37:50 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490480 - in head/net-mgmt: pnp pnp-icinga2 pnp/files Message-ID: <201901161337.x0GDbogS066422@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Wed Jan 16 13:37:50 2019 New Revision: 490480 URL: https://svnweb.freebsd.org/changeset/ports/490480 Log: net-mgmt/pnp: - Add patches from Check_MK that workaround missing sizeof() function in PHP 7.x - Bump PORTREVSION Added: head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_ajax.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_image.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_page.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_pdf.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_helpers_rrd.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_lib_json.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_models_auth.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_models_config.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_models_data.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_application_views_basket__box.php (contents, props changed) head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_pnp-runtime.php (contents, props changed) Modified: head/net-mgmt/pnp-icinga2/Makefile head/net-mgmt/pnp/Makefile Modified: head/net-mgmt/pnp-icinga2/Makefile ============================================================================== --- head/net-mgmt/pnp-icinga2/Makefile Wed Jan 16 13:20:45 2019 (r490479) +++ head/net-mgmt/pnp-icinga2/Makefile Wed Jan 16 13:37:50 2019 (r490480) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -icinga2 MAINTAINER= lme@FreeBSD.org Modified: head/net-mgmt/pnp/Makefile ============================================================================== --- head/net-mgmt/pnp/Makefile Wed Jan 16 13:20:45 2019 (r490479) +++ head/net-mgmt/pnp/Makefile Wed Jan 16 13:37:50 2019 (r490480) @@ -3,6 +3,7 @@ PORTNAME= pnp PORTVERSION= 0.6.26 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/pnp4nagios/PNP-0.6 DISTNAME= pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} Added: head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_ajax.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_ajax.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,20 @@ +--- share/pnp/application/controllers/ajax.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/controllers/ajax.php +@@ -59,7 +59,7 @@ class Ajax_Controller extends System_Controller { + + if($action == "list"){ + $basket = $this->session->get("basket"); +- if(is_array($basket) && sizeof($basket) > 0){ ++ if(is_array($basket) && (!empty($basket))){ + foreach($basket as $item){ + printf("<li class=\"ui-state-default %s\" id=\"%s\"><a title=\"%s\" id=\"%s\"><img width=12px height=12px src=\"%smedia/images/remove.png\"></a>%s</li>\n", + "basket_action_remove", +@@ -135,7 +135,7 @@ class Ajax_Controller extends System_Controller { + echo "Action $action not known"; + } + $basket = $this->session->get("basket"); +- if(is_array($basket) && sizeof($basket) == 0){ ++ if(is_array($basket) && empty($basket)){ + echo Kohana::lang('common.basket-empty'); + }else{ + echo "<div align=\"center\" class=\"p2\">\n"; Added: head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_image.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_image.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/application/controllers/image.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/controllers/image.php +@@ -47,7 +47,7 @@ class Image_Controller extends System_Controller { + $this->rrdtool->streamImage("ERROR: NOT_AUTHORIZED"); + + #print Kohana::debug($this->data->STRUCT); +- if(sizeof($this->data->STRUCT) > 0){ ++ if(!empty($this->data->STRUCT)){ + $image = $this->rrdtool->doImage($this->data->STRUCT[0]['RRD_CALL']); + }else{ + $image = FALSE; Added: head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_page.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_page.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/application/controllers/page.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/controllers/page.php +@@ -58,7 +58,7 @@ class Page_Controller extends System_Controller { + + public function basket(){ + $basket = $this->session->get("basket"); +- if(is_array($basket) && sizeof($basket) > 0){ ++ if(is_array($basket) && (!empty($basket))){ + $this->data->buildBasketStruct($basket,$this->view); + $this->template->page->basket_box = $this->add_view('basket_box'); + $this->template->page->header->title = Kohana::lang('common.page-basket'); Added: head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_pdf.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_controllers_pdf.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/application/controllers/pdf.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/controllers/pdf.php +@@ -202,7 +202,7 @@ class Pdf_Controller extends System_Controller { + } + $this->data->getTimeRange($this->start,$this->end,$this->view); + $basket = $this->session->get("basket"); +- if(is_array($basket) && sizeof($basket) > 0){ ++ if(is_array($basket) && (!empty($basket))){ + $this->data->buildBasketStruct($basket,$this->view); + } + //echo Kohana::debug($this->data->STRUCT); Added: head/net-mgmt/pnp/files/patch-share_pnp_application_helpers_rrd.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_helpers_rrd.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,20 @@ +--- share/pnp/application/helpers/rrd.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/helpers/rrd.php +@@ -207,7 +207,7 @@ class rrd_Core { + if(is_array($cf)){ + foreach($cf as $key => $val){ + $line .= sprintf("GPRINT:%s:%s:",$vname,$val); +- if($key == sizeof($cf)-1){ ++ if($key == count($cf)-1){ + $line .= '"'.$text.' '.ucfirst(strtolower($val)).'\\l" '; + }else{ + $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; +@@ -234,7 +234,7 @@ class rrd_Core { + if(is_array($cf)){ + foreach($cf as $key => $val){ + $line .= sprintf("GPRINT:%s:%s:",$vname,$val); +- if(($key == sizeof($cf)-1)and($align != "")){ ++ if(($key == count($cf)-1)and($align != "")){ + $line .= '"'.$text.' '.ucfirst(strtolower($val)).$align.'" '; + }else{ + $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; Added: head/net-mgmt/pnp/files/patch-share_pnp_application_lib_json.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_lib_json.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/application/lib/json.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/lib/json.php +@@ -375,7 +375,7 @@ class Services_JSON + */ + + // treat as a JSON object +- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { ++ if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) { + $properties = array_map(array($this, 'name_value'), + array_keys($var), + array_values($var)); Added: head/net-mgmt/pnp/files/patch-share_pnp_application_models_auth.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_models_auth.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,15 @@ +--- share/pnp/application/models/auth.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/models/auth.php +@@ -116,11 +116,7 @@ class Auth_Model extends System_Model { + $result = $this->queryLivestatus($query); + } + +- if(sizeof($result) > 0){ +- return TRUE; +- }else{ +- return FALSE; +- } ++ return (!empty($result)); + } + + Added: head/net-mgmt/pnp/files/patch-share_pnp_application_models_config.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_models_config.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/application/models/config.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/models/config.php +@@ -68,7 +68,7 @@ class Config_Model extends System_Model + $views = array(); + include ($config_file); + $array_b = $views; +- if(sizeof($views) == 0 ){ ++ if(empty($views)){ + $views = $array_a; + } + } Added: head/net-mgmt/pnp/files/patch-share_pnp_application_models_data.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_models_data.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,193 @@ +--- share/pnp/application/models/data.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/models/data.php +@@ -45,11 +45,11 @@ class Data_Model extends System_Model + } + } + } +- if(sizeof($templates) > 0){ ++ if(empty($templates)){ ++ return FALSE; ++ }else{ + sort($templates); + return $templates; +- }else{ +- return FALSE; + } + } + +@@ -97,7 +97,9 @@ class Data_Model extends System_Model + throw new Kohana_User_Exception('Perfdata Dir', "Can not open $path"); + } + } +- if(sizeof($hosts)>0){ ++ if(empty($hosts)){ ++ throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); ++ }else{ + # Obtain a list of columns + foreach ($hosts as $key => $row) { + $sort[$key] = $row['sort']; +@@ -105,8 +107,6 @@ class Data_Model extends System_Model + # Sort the data with volume descending, edition ascending + # Add $data as the last parameter, to sort by the common key + array_multisort($sort, SORT_ASC, $hosts); +- }else{ +- throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); + } + return $hosts; + } +@@ -147,7 +147,7 @@ class Data_Model extends System_Model + }else{ + throw new Kohana_Exception('error.perfdata-dir-for-host', $path, $hostname ); + } +- if( is_array($services) && sizeof($services) > 0){ ++ if( is_array($services) && (!empty($services))){ + # Obtain a list of columns + foreach ($services as $key => $row) { + $sort[$key] = $row['name']; +@@ -205,7 +205,7 @@ class Data_Model extends System_Model + $i++; + } + #print Kohana::debug($services); +- if( is_array($services) && sizeof($services) > 0){ ++ if( is_array($services) && (!empty($services))){ + # Obtain a list of columns + foreach ($services as $key => $row) { + $sort[$key] = $row['sort']; +@@ -214,7 +214,7 @@ class Data_Model extends System_Model + # Add $data as the last parameter, to sort by the common key + array_multisort($sort, SORT_STRING, $services); + } +- if(is_array($host) && sizeof($host) > 0 ){ ++ if(is_array($host) && (!empty($host))){ + array_unshift($services, $host[0]); + } + return $services; +@@ -232,7 +232,7 @@ class Data_Model extends System_Model + break; + } + } +- if(sizeof($srv) == 0){ ++ if(empty($srv)){ + throw new Kohana_Exception('error.get-first-service', $hostname ); + } + return $srv['name']; +@@ -250,7 +250,7 @@ class Data_Model extends System_Model + break; + } + } +- if(sizeof($host) == 0){ ++ if(empty($host)){ + throw new Kohana_Exception('error.get-first-host'); + } + return $host['name']; +@@ -693,7 +693,7 @@ class Data_Model extends System_Model + } + + $view=intval( pnp::clean($view) ); +- if($view >= sizeof($this->config->views)){ ++ if($view >= count($this->config->views)){ + $view = 1; + } + +@@ -735,7 +735,7 @@ class Data_Model extends System_Model + $timerange['f_end'] = date($this->config->conf['date_fmt'],$end); + $timerange['cmd'] = " --start $start --end $end "; + $timerange['type'] = "views"; +- for ($i = 0; $i < sizeof($this->config->views); $i++) { ++ for ($i = 0; $i < count($this->config->views); $i++) { + $timerange[$i]['title'] = $this->config->views[$i]['title']; + $timerange[$i]['start'] = $end - $this->config->views[$i]['start']; + $timerange[$i]['f_start'] = date($this->config->conf['date_fmt'],$end - $this->config->views[$i]['start']); +@@ -747,7 +747,7 @@ class Data_Model extends System_Model + } + + public function buildBasketStruct($basket,$view = NULL){ +- if(is_array($basket) && sizeof($basket) > 0){ ++ if(is_array($basket) && (!empty($basket))){ + if($view == ""){ + $views = array_keys($this->config->views); + }else{ +@@ -757,9 +757,9 @@ class Data_Model extends System_Model + foreach($basket as $item){ + # explode host::service::source + $slices = explode("::",$item); +- if(sizeof($slices) == 2) ++ if(count($slices) == 2) + $this->buildDataStruct($slices[0], $slices[1], $view); +- if(sizeof($slices) == 3) ++ if(count($slices) == 3) + $this->buildDataStruct($slices[0], $slices[1], $view, $slices[2]); + } + # break on custom time ranges +@@ -806,12 +806,12 @@ class Data_Model extends System_Model + } + } + #print Kohana::debug($servicelist); +- if(sizeof($servicelist) > 0 ){ ++ if(empty($servicelist)){ ++ $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); ++ }else{ + foreach($servicelist as $s){ + $this->buildDataStruct($s['host'],$s['service'],$view,$s['source']); + } +- }else{ +- $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); + } + } + +@@ -962,11 +962,11 @@ class Data_Model extends System_Model + die("Cannot open directory: $path"); + } + } +- if(sizeof($pages)>0){ ++ if(empty($pages)){ ++ return FALSE; ++ }else{ + + natsort($pages); +- }else{ +- return FALSE; + } + return $pages; + } +@@ -976,10 +976,10 @@ class Data_Model extends System_Model + */ + public function getFirstPage(){ + $pages = $this->getPages(); +- if(sizeof($pages) > 0 ){ +- return urldecode($pages[0]); +- }else{ ++ if(empty($pages)){ + return FALSE; ++ }else{ ++ return urldecode($pages[0]); + } + } + +@@ -1093,7 +1093,7 @@ class Data_Model extends System_Model + } + } + +- if(sizeof($new_hosts) == 0){ ++ if(empty($new_hosts)){ + throw new Kohana_Exception('error.tpl-no-hosts-found', $hostregex); + } + +@@ -1101,7 +1101,7 @@ class Data_Model extends System_Model + $new_services = array(); + foreach($new_hosts as $host){ + $services = $this->getRawServices($host); +- if(sizeof($services) == 0){ ++ if(empty($services)){ + throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); + } + foreach($services as $service){ +@@ -1115,7 +1115,7 @@ class Data_Model extends System_Model + } + } + +- if(sizeof($new_services) == 0){ ++ if(empty($new_services)){ + throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); + } + Added: head/net-mgmt/pnp/files/patch-share_pnp_application_views_basket__box.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_application_views_basket__box.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,20 @@ +--- share/pnp/application/views/basket_box.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/application/views/basket_box.php +@@ -6,7 +6,7 @@ echo "<div class=\"p2 ui-widget-header ui-corner-top\" + echo Kohana::lang('common.basket-box-header')."</div>\n"; + echo "<div class=\"p4 ui-widget-content ui-corner-bottom\">\n"; + echo "<div id=\"basket_items\">\n"; +-if(is_array($basket) && sizeof($basket) > 0 ){ ++if(is_array($basket) && !empty($basket)){ + foreach($basket as $key=>$item){ + echo "<li class=\"ui-state-default basket_action_remove\" id=\"". + $item."\"><a title=\"".Kohana::lang('common.basket-remove', $item)."\"". +@@ -16,7 +16,7 @@ if(is_array($basket) && sizeof($basket) > 0 ){ + pnp::shorten($item)."</li>\n"; + } + } +-if(is_array($basket) && sizeof($basket) > 0 ){ ++if(is_array($basket) && !empty($basket)){ + echo "<div align=\"center\" class=\"p2\">\n"; + echo "<button id=\"basket-show\">".Kohana::lang('common.basket-show')."</button>\n"; + echo "<button id=\"basket-clear\">".Kohana::lang('common.basket-clear')."</button>\n"; Added: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_pnp-runtime.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_pnp-runtime.php Wed Jan 16 13:37:50 2019 (r490480) @@ -0,0 +1,11 @@ +--- share/pnp/templates.dist/pnp-runtime.php.orig 2017-08-21 15:52:37 UTC ++++ share/pnp/templates.dist/pnp-runtime.php +@@ -34,7 +34,7 @@ $opt[2] = "--vertical-label \"Counter\" --title \"Numb + # + $ds_name[2] = "Errors and updates"; + $def[2] = ''; +-for($i=2; $i <= sizeof($DS); $i++) { ++for($i=2; $i <= count($DS); $i++) { + $def[2] .= rrd::def("var$i", $RRDFILE[$i], $DS[$i] , "AVERAGE") ; + $def[2] .= rrd::line1("var$i", rrd::color($i), rrd::cut(ucfirst($LABEL[$i]),12) ); + $def[2] .= rrd::gprint("var$i", array('LAST', 'MAX', 'AVERAGE'), "%4.0lf$UNIT[$i]");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901161337.x0GDbogS066422>