Attachment 153539 Details for Bug 198051 – Patch for net-mgmt/pandorafms_*

[patch] Patch for net-mgmt/pandorafms_*

patch-pandorafms_ports (text/plain), 7.25 KB, created by KIKUCHI Koichiro on 2015-02-26 10:44:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: KIKUCHI Koichiro

Created: 2015-02-26 10:44:29 UTC

Size: 7.25 KB

patch

obsolete

>diff --git a/net-mgmt/pandorafms_agent/distinfo b/net-mgmt/pandorafms_agent/distinfo
>index 6694bac..656a90e 100644
>--- a/net-mgmt/pandorafms_agent/distinfo
>+++ b/net-mgmt/pandorafms_agent/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (pandora/pandorafms_agent_unix-5.1SP1.tar.gz) = b4e4363784a133d4679bdab22c977177ccebc9758e9b6f051d15a7a6a81a7a95
>-SIZE (pandora/pandorafms_agent_unix-5.1SP1.tar.gz) = 80277
>+SHA256 (pandora/pandorafms_agent_unix-5.1SP2.tar.gz) = dc9ad9e5b6f6d0bae00398c543d05c610f1a438783153f30228daaffa43f7d2f
>+SIZE (pandora/pandorafms_agent_unix-5.1SP2.tar.gz) = 78121
>diff --git a/net-mgmt/pandorafms_console/distinfo b/net-mgmt/pandorafms_console/distinfo
>index d59de78..fd859b1 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 56e1d17..7038f79 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 cbaeec4..0000000
>--- 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 a04c3eb..fc032dd 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
>diff --git a/net-mgmt/pandorafms_server/bsd.pandora.mk b/net-mgmt/pandorafms_server/bsd.pandora.mk
>index e41b721..96d61c6 100644
>--- a/net-mgmt/pandorafms_server/bsd.pandora.mk
>+++ b/net-mgmt/pandorafms_server/bsd.pandora.mk
>@@ -1,6 +1,6 @@
> # $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 374927 2014-12-18 22:41:58Z pawel $
> 
>-PANDORA_VERSION=	5.1SP1
>+PANDORA_VERSION=	5.1SP2
> PANDORA_LICENSE=	GPLv2
> PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
> 
>@@ -23,6 +23,7 @@ DISTNAME=	${PORTNAME:S/pandora_/pandorafms_/}-${PANDORA_VERSION}
> DIST_SUBDIR=	pandora
> 
> NO_BUILD=	yes
>+NO_ARCH=	yes
> 
> USERS=		pandora
> GROUPS=		pandora
>diff --git a/net-mgmt/pandorafms_server/distinfo b/net-mgmt/pandorafms_server/distinfo
>index 5b1a04f..dd0b4d3 100644
>--- a/net-mgmt/pandorafms_server/distinfo
>+++ b/net-mgmt/pandorafms_server/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (pandora/pandorafms_server-5.1SP1.tar.gz) = c7b49da0b941315a59de9d3edebb10f0103eb4ee59956e961d3b6787f4449b27
>-SIZE (pandora/pandorafms_server-5.1SP1.tar.gz) = 4011575
>+SHA256 (pandora/pandorafms_server-5.1SP2.tar.gz) = ede3c6aa28bc65d8a0fd614c1b4ca697f107ae913d76dae387b984f9eacd3912
>+SIZE (pandora/pandorafms_server-5.1SP2.tar.gz) = 4017932
>diff --git a/net-mgmt/pandorafms_server/pkg-plist b/net-mgmt/pandorafms_server/pkg-plist
>index 83adb4c..9814492 100644
>--- a/net-mgmt/pandorafms_server/pkg-plist
>+++ b/net-mgmt/pandorafms_server/pkg-plist
>@@ -1,12 +1,3 @@
>-@mode 440
>-@sample %%ETCDIR%%/pandora_server.conf.sample
>-@mode 555
>-bin/pandora_exec
>-bin/pandora_server
>-%%TENTACLE%%bin/tentacle_server
>-etc/rc.d/pandora_server
>-etc/rc.d/tentacle_server
>-@mode
> %%PERL5_MAN3%%/PandoraFMS::Core.3.gz
> %%PERL5_MAN3%%/PandoraFMS::GIS.3.gz
> %%PERL5_MAN3%%/PandoraFMS::GeoIP.3.gz
>@@ -115,3 +106,10 @@ man/man1/tentacle_server.1.gz
> %%DATADIR%%/util/trap_rate.sh
> %%DATADIR%%/util/udp_client.pl
> %%DATADIR%%/util/windows.README
>+@mode 555
>+bin/pandora_exec
>+bin/pandora_server
>+%%TENTACLE%%bin/tentacle_server
>+etc/rc.d/pandora_server
>+etc/rc.d/tentacle_server
>+@sample(,,440) %%ETCDIR%%/pandora_server.conf.sample
>diff --git a/net-mgmt/pandorafms_server/pkg-plist.spool b/net-mgmt/pandorafms_server/pkg-plist.spool
>index b3b510e..8583497 100644
>--- a/net-mgmt/pandorafms_server/pkg-plist.spool
>+++ b/net-mgmt/pandorafms_server/pkg-plist.spool
>@@ -1,18 +1,8 @@
>-@owner pandora
>-@group wheel
>-%%USE_LOGDIR%%@mode 770
>-%%USE_LOGDIR%%@dir %%LOGDIR%%
>-%%USE_SPOOL_OUT%%@mode 700
>-%%USE_SPOOL_OUT%%@dir %%SPOOLDIR%%/data_out
>-@mode 770
>-@group www
>-%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/collections
>-%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/conf
>-%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/md5
>-%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/netflow
>-%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in
>-@dir %%SPOOLDIR%%
>-@comment unset mode/owner/group
>-@mode
>-@owner
>-@group
>+%%USE_LOGDIR%%@dir(pandora,wheel,770) %%LOGDIR%%
>+%%USE_SPOOL_OUT%%@dir(pandora,wheel,700) %%SPOOLDIR%%/data_out
>+%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/collections
>+%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/conf
>+%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/md5
>+%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/netflow
>+%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in
>+@dir(pandora,www,770) %%SPOOLDIR%%

Actions: View | Diff

Attachments on bug 198051: 153539 | 153540 | 153541 | 153542