diff options
| author | John Marino <marino@FreeBSD.org> | 2015-05-17 14:44:25 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-05-17 14:44:25 +0000 |
| commit | 62883e58e22ec71ed295a39f214dd2cf259432a3 (patch) | |
| tree | ed74c916dbf28c81e261a7a16c41938a24abd901 /net-mgmt/pandorafms_console | |
| parent | f32dead653e7463dd1e665fd90ef2b0e500f6c2e (diff) | |
| download | ports-62883e58e22ec71ed295a39f214dd2cf259432a3.tar.gz ports-62883e58e22ec71ed295a39f214dd2cf259432a3.zip | |
net-mgmt/pandorafms_(agent|console|server): Upgrade version 5.1SP1 => 5.1SP2
PR: 198051
Submitted by: KIKUCHI Koichiro (maintainer)
Notes
Notes:
svn path=/head/; revision=386617
Diffstat (limited to 'net-mgmt/pandorafms_console')
| -rw-r--r-- | net-mgmt/pandorafms_console/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_console/files/pandora_console.conf.in | 3 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_console/files/patch-WLB-2014110100 | 29 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_console/pkg-plist | 7 |
4 files changed, 6 insertions, 37 deletions
diff --git a/net-mgmt/pandorafms_console/distinfo b/net-mgmt/pandorafms_console/distinfo index d59de783bf50..fd859b167b6d 100644 --- a/net-mgmt/pandorafms_console/distinfo +++ b/net-mgmt/pandorafms_console/distinfo @@ -1,2 +1,2 @@ -SHA256 (pandora/pandorafms_console-5.1SP1.tar.gz) = 5696fef415db22fd0eaffb3d8286eddfe3d123c86bae9a8a4044b7937efb8742 -SIZE (pandora/pandorafms_console-5.1SP1.tar.gz) = 27900949 +SHA256 (pandora/pandorafms_console-5.1SP2.tar.gz) = 6dd31049ea19413c142582fdf294fc0a6b4a0eaed7281d4e365850201c688387 +SIZE (pandora/pandorafms_console-5.1SP2.tar.gz) = 27951868 diff --git a/net-mgmt/pandorafms_console/files/pandora_console.conf.in b/net-mgmt/pandorafms_console/files/pandora_console.conf.in index 56e1d1711b71..7038f7971a05 100644 --- a/net-mgmt/pandorafms_console/files/pandora_console.conf.in +++ b/net-mgmt/pandorafms_console/files/pandora_console.conf.in @@ -2,6 +2,5 @@ Alias /pandora_console %%WWWDIR%% <Location /pandora_console> DirectoryIndex index.php - Order deny,allow - Allow from all + Require all granted </Location> diff --git a/net-mgmt/pandorafms_console/files/patch-WLB-2014110100 b/net-mgmt/pandorafms_console/files/patch-WLB-2014110100 deleted file mode 100644 index cbaeec44ddee..000000000000 --- a/net-mgmt/pandorafms_console/files/patch-WLB-2014110100 +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php -index 9b02b2c..9c1524a 100644 ---- general/header.php -+++ general/header.php -@@ -375,15 +375,22 @@ config_check(); - - <?php - if ($_GET["refr"]) { -+ $_get_refr = strip_tags($_GET["refr"]); - ?> -+ refr_time = parseInt("<?php echo $_get_refr; ?>"); -+ if (isNaN(refr_time)) { -+ refr_time = 0; -+ } -+ - t = new Date(); -- t.setTime (t.getTime () + <?php echo $config["refr"] * 1000; ?>); -+ t.setTime (t.getTime () + -+ parseInt(<?php echo $config["refr"] * 1000; ?>)); - $("#refrcounter").countdown ({until: t, - layout: '%M%nn%M:%S%nn%S', - labels: ['', '', '', '', '', '', ''], - onExpiry: function () { - href = $("a.autorefresh").attr ("href"); -- href = href + <?php echo $_GET["refr"]; ?>; -+ href = href + refr_time; - $(document).attr ("location", href); - } - }); diff --git a/net-mgmt/pandorafms_console/pkg-plist b/net-mgmt/pandorafms_console/pkg-plist index a04c3ebe1c91..fc032ddb8617 100644 --- a/net-mgmt/pandorafms_console/pkg-plist +++ b/net-mgmt/pandorafms_console/pkg-plist @@ -1,8 +1,5 @@ -@mode 444 -@sample %%APACHEETCDIR%%/Includes/pandora_console.conf.sample @owner www @group www -@mode %%WWWDIR%%/ajax.php %%WWWDIR%%/attachment/index.html %%WWWDIR%%/attachment/mibs/index.html @@ -669,6 +666,7 @@ %%WWWDIR%%/images/grafica_h.png %%WWWDIR%%/images/grafica_m.png %%WWWDIR%%/images/grafica_w.png +%%WWWDIR%%/images/grafico_llave.png %%WWWDIR%%/images/graphmenu_arrow.png %%WWWDIR%%/images/graphmenu_arrow_hide.png %%WWWDIR%%/images/greyback.gif @@ -2772,7 +2770,7 @@ @comment install.php @unexec if [ -e %D/%%WWWDIR%%/install.php ];then rm -f %D/%%WWWDIR%%/install.php ;fi %%WWWDIR%%/install.done -@exec [ -e %D/%B/include/config.php ] || cp -p %D/%F %B/install.php +@exec [ -e %B/include/config.php ] || cp -p %D/%F %B/install.php %%WWWDIR%%/mobile/images/ajax-loader.gif %%WWWDIR%%/mobile/images/bricks.png %%WWWDIR%%/mobile/images/datos_blue.png @@ -2927,3 +2925,4 @@ %%WWWDIR%%/pandoradb.postgreSQL.sql %%WWWDIR%%/pandoradb.sql %%WWWDIR%%/pandoradb_data.sql +@sample(,,444) %%APACHEETCDIR%%/Includes/pandora_console.conf.sample |