Date: Sun, 17 May 2015 14:44:25 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386617 - in head/net-mgmt: pandorafms_agent pandorafms_console pandorafms_console/files pandorafms_server Message-ID: <201505171444.t4HEiPFv021927@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun May 17 14:44:25 2015 New Revision: 386617 URL: https://svnweb.freebsd.org/changeset/ports/386617 Log: net-mgmt/pandorafms_(agent|console|server): Upgrade version 5.1SP1 => 5.1SP2 PR: 198051 Submitted by: KIKUCHI Koichiro (maintainer) Deleted: head/net-mgmt/pandorafms_console/files/patch-WLB-2014110100 Modified: head/net-mgmt/pandorafms_agent/distinfo head/net-mgmt/pandorafms_console/distinfo head/net-mgmt/pandorafms_console/files/pandora_console.conf.in head/net-mgmt/pandorafms_console/pkg-plist head/net-mgmt/pandorafms_server/bsd.pandora.mk head/net-mgmt/pandorafms_server/distinfo head/net-mgmt/pandorafms_server/pkg-plist head/net-mgmt/pandorafms_server/pkg-plist.spool Modified: head/net-mgmt/pandorafms_agent/distinfo ============================================================================== --- head/net-mgmt/pandorafms_agent/distinfo Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_agent/distinfo Sun May 17 14:44:25 2015 (r386617) @@ -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 Modified: head/net-mgmt/pandorafms_console/distinfo ============================================================================== --- head/net-mgmt/pandorafms_console/distinfo Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_console/distinfo Sun May 17 14:44:25 2015 (r386617) @@ -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 Modified: head/net-mgmt/pandorafms_console/files/pandora_console.conf.in ============================================================================== --- head/net-mgmt/pandorafms_console/files/pandora_console.conf.in Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_console/files/pandora_console.conf.in Sun May 17 14:44:25 2015 (r386617) @@ -2,6 +2,5 @@ Alias /pandora_console %%WWWDIR%% <Location /pandora_console> DirectoryIndex index.php - Order deny,allow - Allow from all + Require all granted </Location> Modified: head/net-mgmt/pandorafms_console/pkg-plist ============================================================================== --- head/net-mgmt/pandorafms_console/pkg-plist Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_console/pkg-plist Sun May 17 14:44:25 2015 (r386617) @@ -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 Modified: head/net-mgmt/pandorafms_server/bsd.pandora.mk ============================================================================== --- head/net-mgmt/pandorafms_server/bsd.pandora.mk Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_server/bsd.pandora.mk Sun May 17 14:44:25 2015 (r386617) @@ -1,6 +1,6 @@ # $FreeBSD$ -PANDORA_VERSION= 5.1SP1 +PANDORA_VERSION= 5.1SP2 PANDORA_LICENSE= GPLv2 PANDORA_LICENSE_FILE= ${WRKSRC}/COPYING @@ -23,6 +23,7 @@ DISTNAME= ${PORTNAME:S/pandora_/pandoraf DIST_SUBDIR= pandora NO_BUILD= yes +NO_ARCH= yes USERS= pandora GROUPS= pandora Modified: head/net-mgmt/pandorafms_server/distinfo ============================================================================== --- head/net-mgmt/pandorafms_server/distinfo Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_server/distinfo Sun May 17 14:44:25 2015 (r386617) @@ -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 Modified: head/net-mgmt/pandorafms_server/pkg-plist ============================================================================== --- head/net-mgmt/pandorafms_server/pkg-plist Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_server/pkg-plist Sun May 17 14:44:25 2015 (r386617) @@ -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 Modified: head/net-mgmt/pandorafms_server/pkg-plist.spool ============================================================================== --- head/net-mgmt/pandorafms_server/pkg-plist.spool Sun May 17 14:43:37 2015 (r386616) +++ head/net-mgmt/pandorafms_server/pkg-plist.spool Sun May 17 14:44:25 2015 (r386617) @@ -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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505171444.t4HEiPFv021927>