svn commit: r408864 - in head/net-mgmt: pandorafms_agent pandorafms_console pandorafms_console/files pandorafms_server
Jason Unovitch
junovitch at FreeBSD.org
Sun Feb 14 15:40:48 UTC 2016
Author: junovitch
Date: Sun Feb 14 15:40:46 2016
New Revision: 408864
URL: https://svnweb.freebsd.org/changeset/ports/408864
Log:
net-mgmt/pandorafms_{agent,console,server}: update 6.0 -> 6.0SP1
- Update shared PANDORA_VERSION to 6.0SP1 and bump PORTREVISION
- Include newsyslog.conf.d log rotation file
PR: 206734
Submitted by: KIKUCHI Koichiro <oi4io5me.cesium3 at gmail.com> (maintainer)
Added:
head/net-mgmt/pandorafms_console/files/newsyslog.conf.in (contents, props changed)
Deleted:
head/net-mgmt/pandorafms_console/files/patch-index.php
Modified:
head/net-mgmt/pandorafms_agent/distinfo
head/net-mgmt/pandorafms_console/Makefile
head/net-mgmt/pandorafms_console/distinfo
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
Modified: head/net-mgmt/pandorafms_agent/distinfo
==============================================================================
--- head/net-mgmt/pandorafms_agent/distinfo Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_agent/distinfo Sun Feb 14 15:40:46 2016 (r408864)
@@ -1,2 +1,2 @@
-SHA256 (pandora/pandorafms_agent_unix-6.0.tar.gz) = 31f65160091f6266e5f11b7443154ebcf645d4d36dac95c7a19ea4cff76fed9a
-SIZE (pandora/pandorafms_agent_unix-6.0.tar.gz) = 78016
+SHA256 (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 8d7af9081b23693b45afb0e46a905f0d8ae8b2340fa7b42eb8a4024c77d5027c
+SIZE (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 78486
Modified: head/net-mgmt/pandorafms_console/Makefile
==============================================================================
--- head/net-mgmt/pandorafms_console/Makefile Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_console/Makefile Sun Feb 14 15:40:46 2016 (r408864)
@@ -13,7 +13,8 @@ LICENSE_FILE= ${PANDORA_LICENSE_FILE}
RUN_DEPENDS= ${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
USES= shebangfix
-SHEBANG_FILES= include/languages/util-all \
+SHEBANG_FILES= include/languages/extract_newlines.sh \
+ include/languages/util-all \
include/languages/util-bzr-update \
include/languages/util-compile-mo \
include/languages/util-create-po \
@@ -26,12 +27,13 @@ OPTIONS_DEFINE= DOCS PGSQL
DOCS_DESC= Install AUTHORS and ChangeLog
PGSQL_DESC= Use PostgreSQL backend (experimental)
-USE_PHP= curl gd gettext json ldap mbstring mysql snmp session \
- xml zip zlib
+USE_PHP= curl filter gd gettext hash json ldap mbstring mysql \
+ snmp session xml zip zlib
WANT_PHP_WEB= yes
USE_APACHE_RUN= 22+
-SUB_FILES+= pandora_console.conf pkg-message
+SUB_FILES+= pandora_console.conf pkg-message newsyslog.conf
+SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
.include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk"
@@ -52,16 +54,13 @@ post-patch:
${WRKSRC}/pandoradb.data*.sql
@${REINPLACE_CMD} \
-e 's|/bin/bash|/bin/sh|g' \
- ${WRKSRC}/extras/check_other_languages.sh \
- ${WRKSRC}/include/languages/extract_newlines.sh
+ ${WRKSRC}/extras/check_other_languages.sh
post-install:
@cd ${STAGEDIR}${WWWDIR} \
- && ${RM} -rf pandora_console_install* *.spec \
- extras/check_other_languages.sh.bak \
- include/languages/extract_newlines.sh.bak \
- *.sql.bak COPYING ${PORTDOCS} DEBIAN/ \
- attachment/collections/.empty attachment/downloads/.gitignore
+ && ${RM} -rf pandora_console_[il]* DEBIAN/ *.spec \
+ attachment/downloads/.gitignore ${PORTDOCS} \
+ *.sql.bak extras/check_other_languages.sh.bak
@cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -69,9 +68,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
- @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
- ${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \
- ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/pandora_console.conf.sample
- @${LN} -sf ${_LICENSE_DIR}/${LICENSE} ${STAGEDIR}${WWWDIR}/COPYING
+ @(d=${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes; ${MKDIR} $$d; \
+ ${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \
+ $$d/pandora_console.conf.sample)
+ @(d=${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d; ${MKDIR} $$d; \
+ ${INSTALL_DATA} ${WRKDIR}/newsyslog.conf \
+ $$d/pandora_console.conf)
.include <bsd.port.post.mk>
Modified: head/net-mgmt/pandorafms_console/distinfo
==============================================================================
--- head/net-mgmt/pandorafms_console/distinfo Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_console/distinfo Sun Feb 14 15:40:46 2016 (r408864)
@@ -1,2 +1,2 @@
-SHA256 (pandora/pandorafms_console-6.0.tar.gz) = 3d6b2bcb833a6402bb7398f99d902f29ed8d24ad2afaac85703a662be1358378
-SIZE (pandora/pandorafms_console-6.0.tar.gz) = 29025074
+SHA256 (pandora/pandorafms_console-6.0SP1.tar.gz) = 1c7d407e8f4aa7373102a7a1ef961a3e1a04ad9c8a52ceb17f9037516c698763
+SIZE (pandora/pandorafms_console-6.0SP1.tar.gz) = 29075019
Added: head/net-mgmt/pandorafms_console/files/newsyslog.conf.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/pandorafms_console/files/newsyslog.conf.in Sun Feb 14 15:40:46 2016 (r408864)
@@ -0,0 +1,6 @@
+# configuration file for newsyslog for pandora_console
+#
+# see newsyslog.conf(5) for details
+#
+# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num]
+%%WWWDIR%%/pandora_console.log %%WWWOWN%%:%%WWWGRP%% 644 3 100 W6D0 JN
Modified: head/net-mgmt/pandorafms_console/pkg-plist
==============================================================================
--- head/net-mgmt/pandorafms_console/pkg-plist Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_console/pkg-plist Sun Feb 14 15:40:46 2016 (r408864)
@@ -985,6 +985,7 @@
%%WWWDIR%%/images/link_error.png
%%WWWDIR%%/images/link_go.png
%%WWWDIR%%/images/linkpolicy.png
+%%WWWDIR%%/images/links.menu.png
%%WWWDIR%%/images/list.png
%%WWWDIR%%/images/load.png
%%WWWDIR%%/images/local_component.png
@@ -1084,6 +1085,7 @@
%%WWWDIR%%/images/networkmap/so_win.png
%%WWWDIR%%/images/networkmap/unknown.png
%%WWWDIR%%/images/new_message.png
+%%WWWDIR%%/images/no_data_toshow.png
%%WWWDIR%%/images/noaccess.png
%%WWWDIR%%/images/normal_screen.png
%%WWWDIR%%/images/normalscreen.png
@@ -1553,6 +1555,7 @@
%%WWWDIR%%/include/functions_gis.php
%%WWWDIR%%/include/functions_graph.php
%%WWWDIR%%/include/functions_groups.php
+%%WWWDIR%%/include/functions_groupview.php
%%WWWDIR%%/include/functions_html.php
%%WWWDIR%%/include/functions_incidents.php
%%WWWDIR%%/include/functions_io.php
@@ -1573,6 +1576,7 @@
%%WWWDIR%%/include/functions_servers.php
%%WWWDIR%%/include/functions_snmp.php
%%WWWDIR%%/include/functions_snmp_browser.php
+%%WWWDIR%%/include/functions_tactical.php
%%WWWDIR%%/include/functions_tags.php
%%WWWDIR%%/include/functions_themes.php
%%WWWDIR%%/include/functions_treeview.php
@@ -1585,6 +1589,7 @@
%%WWWDIR%%/include/functions_wmi.php
%%WWWDIR%%/include/get_file.php
%%WWWDIR%%/include/gettext.php
+%%WWWDIR%%/include/graphs/bullet.js
%%WWWDIR%%/include/graphs/export_data.php
%%WWWDIR%%/include/graphs/fgraph.php
%%WWWDIR%%/include/graphs/flot/excanvas.js
@@ -1770,6 +1775,7 @@
%%WWWDIR%%/include/help/en/help_snmp_alert_custom.php
%%WWWDIR%%/include/help/en/help_snmp_alert_field1.php
%%WWWDIR%%/include/help/en/help_snmp_alert_filters.php
+%%WWWDIR%%/include/help/en/help_snmp_alert_position.php
%%WWWDIR%%/include/help/en/help_snmp_explorer.php
%%WWWDIR%%/include/help/en/help_snmp_trap_types.php
%%WWWDIR%%/include/help/en/help_snmpcommunity.php
@@ -1905,6 +1911,7 @@
%%WWWDIR%%/include/help/es/help_snmp_alert_custom.php
%%WWWDIR%%/include/help/es/help_snmp_alert_field1.php
%%WWWDIR%%/include/help/es/help_snmp_alert_filters.php
+%%WWWDIR%%/include/help/es/help_snmp_alert_position.php
%%WWWDIR%%/include/help/es/help_snmp_explorer.php
%%WWWDIR%%/include/help/es/help_snmp_trap_types.php
%%WWWDIR%%/include/help/es/help_snmpcommunity.php
@@ -2037,6 +2044,7 @@
%%WWWDIR%%/include/help/ja/help_snmp_alert.php
%%WWWDIR%%/include/help/ja/help_snmp_alert_custom.php
%%WWWDIR%%/include/help/ja/help_snmp_alert_field1.php
+%%WWWDIR%%/include/help/ja/help_snmp_alert_position.php
%%WWWDIR%%/include/help/ja/help_snmp_explorer.php
%%WWWDIR%%/include/help/ja/help_snmp_trap_types.php
%%WWWDIR%%/include/help/ja/help_snmpcommunity.php
@@ -2980,9 +2988,8 @@
%%WWWDIR%%/operation/events/events_rss.php
%%WWWDIR%%/operation/events/export_csv.php
%%WWWDIR%%/operation/events/sound_events.php
-%%WWWDIR%%/operation/extensions.php
%%WWWDIR%%/operation/gis_maps/ajax.php
-%%WWWDIR%%/operation/gis_maps/index.php
+%%WWWDIR%%/operation/gis_maps/gis_map.php
%%WWWDIR%%/operation/gis_maps/public_console.php
%%WWWDIR%%/operation/gis_maps/render_view.php
%%WWWDIR%%/operation/incidents/incident.php
@@ -3303,3 +3310,4 @@
@dir %%WWWDIR%%/operation/users
@dir %%WWWDIR%%/operation/visual_console
@sample(,,444) %%APACHEETCDIR%%/Includes/pandora_console.conf.sample
+etc/newsyslog.conf.d/pandora_console.conf
Modified: head/net-mgmt/pandorafms_server/bsd.pandora.mk
==============================================================================
--- head/net-mgmt/pandorafms_server/bsd.pandora.mk Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_server/bsd.pandora.mk Sun Feb 14 15:40:46 2016 (r408864)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PANDORA_VERSION= 6.0
+PANDORA_VERSION= 6.0SP1
PANDORA_LICENSE= GPLv2
PANDORA_LICENSE_FILE= ${WRKSRC}/COPYING
@@ -13,6 +13,9 @@ PANDORA_INSTALLER= ${PORTNAME}_installer
PANDORA_INSTALLER_ARGS= --install
PORTVERSION= ${PANDORA_VERSION:C/SP/./}
+PORTREVISION= 1
+# ignore nightly builds (*-YYYYMMDD)
+PORTSCOUT= limit:!.*-\d{8}$$
MASTER_SITES?= SF/pandora/Pandora%20FMS%20${PANDORA_VERSION:C/((SP[0-9]*)*)$/\/\1/}Final/Tarball
.if ${PORTNAME} == "pandora_agent"
Modified: head/net-mgmt/pandorafms_server/distinfo
==============================================================================
--- head/net-mgmt/pandorafms_server/distinfo Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_server/distinfo Sun Feb 14 15:40:46 2016 (r408864)
@@ -1,2 +1,2 @@
-SHA256 (pandora/pandorafms_server-6.0.tar.gz) = 9d9de2fb50e27077c9148beccb7e69e7d932d40f19bde57732bd8b94b8763e85
-SIZE (pandora/pandorafms_server-6.0.tar.gz) = 5543947
+SHA256 (pandora/pandorafms_server-6.0SP1.tar.gz) = d4de04cc82028c0c6f746bc2ab4c588ab32840270a4ef8849d1a677f322abac5
+SIZE (pandora/pandorafms_server-6.0SP1.tar.gz) = 5549580
Modified: head/net-mgmt/pandorafms_server/pkg-plist
==============================================================================
--- head/net-mgmt/pandorafms_server/pkg-plist Sun Feb 14 15:35:47 2016 (r408863)
+++ head/net-mgmt/pandorafms_server/pkg-plist Sun Feb 14 15:40:46 2016 (r408864)
@@ -63,6 +63,7 @@ man/man1/tentacle_server.1.gz
%%DATADIR%%/util/pandora_revent.pl
%%DATADIR%%/util/pandora_revent_create.pl
%%DATADIR%%/util/pandora_server
+%%DATADIR%%/util/pandora_server_logrotate
%%DATADIR%%/util/pandora_snmp.README
%%DATADIR%%/util/pandora_snmp.sh
%%DATADIR%%/util/pandora_sync_db.pl
More information about the svn-ports-all
mailing list