From 8372b8054cc3aa13d2296aac710b0a3539bf54f1 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sun, 15 May 2016 16:44:44 +0000 Subject: [PATCH] Update to upstream release 6.0SP2 PR: 208813 Submitted by: koichiro@rworks.jp (maintainer) --- net-mgmt/pandorafms_agent/distinfo | 4 ++-- net-mgmt/pandorafms_console/Makefile | 1 + net-mgmt/pandorafms_console/distinfo | 4 ++-- net-mgmt/pandorafms_console/pkg-plist | 1 - net-mgmt/pandorafms_server/bsd.pandora.mk | 3 +-- net-mgmt/pandorafms_server/distinfo | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/net-mgmt/pandorafms_agent/distinfo b/net-mgmt/pandorafms_agent/distinfo index f62c09d6dd9c..a874067c178d 100644 --- a/net-mgmt/pandorafms_agent/distinfo +++ b/net-mgmt/pandorafms_agent/distinfo @@ -1,2 +1,2 @@ -SHA256 (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 8d7af9081b23693b45afb0e46a905f0d8ae8b2340fa7b42eb8a4024c77d5027c -SIZE (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 78486 +SHA256 (pandora/pandorafms_agent_unix-6.0SP2.tar.gz) = c7b08e933e9dd54cc7fd05cb2fdd058008e2d8784f2f4afde4a11156e6475e6c +SIZE (pandora/pandorafms_agent_unix-6.0SP2.tar.gz) = 79212 diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile index 2dec70613b33..d7da7e1267be 100644 --- a/net-mgmt/pandorafms_console/Makefile +++ b/net-mgmt/pandorafms_console/Makefile @@ -58,6 +58,7 @@ post-install: @cd ${STAGEDIR}${WWWDIR} \ && ${RM} -rf pandora_console_[il]* DEBIAN/ *.spec \ attachment/downloads/.gitignore ${PORTDOCS} \ + Dockerfile docker_entrypoint.sh \ *.sql.bak extras/check_other_languages.sh.bak @cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php @(d=${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes; ${MKDIR} $$d; \ diff --git a/net-mgmt/pandorafms_console/distinfo b/net-mgmt/pandorafms_console/distinfo index 3cc8f58d4e7e..ceedb4e52bdc 100644 --- a/net-mgmt/pandorafms_console/distinfo +++ b/net-mgmt/pandorafms_console/distinfo @@ -1,2 +1,2 @@ -SHA256 (pandora/pandorafms_console-6.0SP1.tar.gz) = 1c7d407e8f4aa7373102a7a1ef961a3e1a04ad9c8a52ceb17f9037516c698763 -SIZE (pandora/pandorafms_console-6.0SP1.tar.gz) = 29075019 +SHA256 (pandora/pandorafms_console-6.0SP2.tar.gz) = a48323cc6044b6315a5766775573ed4e22d318a02bc7e464144a8bce35ca2c28 +SIZE (pandora/pandorafms_console-6.0SP2.tar.gz) = 29228053 diff --git a/net-mgmt/pandorafms_console/pkg-plist b/net-mgmt/pandorafms_console/pkg-plist index c29351e962d0..d2e3cf96e821 100644 --- a/net-mgmt/pandorafms_console/pkg-plist +++ b/net-mgmt/pandorafms_console/pkg-plist @@ -140,7 +140,6 @@ %%WWWDIR%%/godmode/events/events.php %%WWWDIR%%/godmode/extensions.php %%WWWDIR%%/godmode/gis_maps/configure_gis_map.php -%%WWWDIR%%/godmode/gis_maps/index.php %%WWWDIR%%/godmode/groups/configure_group.php %%WWWDIR%%/godmode/groups/configure_modu_group.php %%WWWDIR%%/godmode/groups/group_list.php diff --git a/net-mgmt/pandorafms_server/bsd.pandora.mk b/net-mgmt/pandorafms_server/bsd.pandora.mk index cc7e8c1ade2e..d11195a812c3 100644 --- a/net-mgmt/pandorafms_server/bsd.pandora.mk +++ b/net-mgmt/pandorafms_server/bsd.pandora.mk @@ -1,6 +1,6 @@ # $FreeBSD$ -PANDORA_VERSION= 6.0SP1 +PANDORA_VERSION= 6.0SP2 PANDORA_LICENSE= GPLv2 PANDORA_LICENSE_FILE= ${WRKSRC}/COPYING @@ -13,7 +13,6 @@ PANDORA_INSTALLER= ${PORTNAME}_installer PANDORA_INSTALLER_ARGS= --install PORTVERSION= ${PANDORA_VERSION:C/SP/./} -PORTREVISION= 1 # ignore nightly builds (*-YYYYMMDD) PORTSCOUT= limit:!.*-\d{8}$$ diff --git a/net-mgmt/pandorafms_server/distinfo b/net-mgmt/pandorafms_server/distinfo index 313fd990cf1e..c0d8b3fe8287 100644 --- a/net-mgmt/pandorafms_server/distinfo +++ b/net-mgmt/pandorafms_server/distinfo @@ -1,2 +1,2 @@ -SHA256 (pandora/pandorafms_server-6.0SP1.tar.gz) = d4de04cc82028c0c6f746bc2ab4c588ab32840270a4ef8849d1a677f322abac5 -SIZE (pandora/pandorafms_server-6.0SP1.tar.gz) = 5549580 +SHA256 (pandora/pandorafms_server-6.0SP2.tar.gz) = 0ceb0d8de9f940adb09a9438f15d59e994026a54bf858027f31cdc0d354c4580 +SIZE (pandora/pandorafms_server-6.0SP2.tar.gz) = 5563773