Attachment 166265 Details for Bug 206734 – Patch for net-mgmt/pandorafms_*

[patch] Patch for net-mgmt/pandorafms_*

update-to-pandorafms6.0sp1.diff (text/plain), 10.44 KB, created by KIKUCHI Koichiro on 2016-01-29 09:31:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: KIKUCHI Koichiro

Created: 2016-01-29 09:31:16 UTC

Size: 10.44 KB

patch

obsolete

>diff -uNr a/net-mgmt/pandorafms_agent/distinfo b/net-mgmt/pandorafms_agent/distinfo
>--- a/net-mgmt/pandorafms_agent/distinfo	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_agent/distinfo	2016-01-28 22:24:40.095152000 +0900
>@@ -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
>diff -uNr a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile
>--- a/net-mgmt/pandorafms_console/Makefile	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_console/Makefile	2016-01-28 22:24:40.095448000 +0900
>@@ -13,7 +13,8 @@
> 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 @@
> 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 @@
> 		${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 @@
> 	${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>
>diff -uNr a/net-mgmt/pandorafms_console/distinfo b/net-mgmt/pandorafms_console/distinfo
>--- a/net-mgmt/pandorafms_console/distinfo	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_console/distinfo	2016-01-28 22:24:40.095653000 +0900
>@@ -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
>diff -uNr a/net-mgmt/pandorafms_console/files/newsyslog.conf.in b/net-mgmt/pandorafms_console/files/newsyslog.conf.in
>--- a/net-mgmt/pandorafms_console/files/newsyslog.conf.in	1970-01-01 09:00:00.000000000 +0900
>+++ b/net-mgmt/pandorafms_console/files/newsyslog.conf.in	2016-01-28 22:24:40.095854000 +0900
>@@ -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
>diff -uNr a/net-mgmt/pandorafms_console/files/patch-index.php b/net-mgmt/pandorafms_console/files/patch-index.php
>--- a/net-mgmt/pandorafms_console/files/patch-index.php	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_console/files/patch-index.php	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- index.php
>-+++ index.php
>-@@ -45,7 +45,7 @@ if ($develop_bypass != 1) {
>- 	if (isset($_POST["rename_file"])){
>- 		$rename_file_install = (bool)$_POST["rename_file"];
>- 		if ($rename_file_install) {
>--			$salida_rename = rename("/var/www/html/pandora_console/install.php", "/var/www/html/pandora_console/install_old.php");
>-+			$salida_rename = rename("install.php", "install_old.php");
>- 		}
>- 	}
>- 
>diff -uNr a/net-mgmt/pandorafms_console/pkg-plist b/net-mgmt/pandorafms_console/pkg-plist
>--- a/net-mgmt/pandorafms_console/pkg-plist	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_console/pkg-plist	2016-01-28 22:24:40.096795000 +0900
>@@ -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
>diff -uNr a/net-mgmt/pandorafms_server/bsd.pandora.mk b/net-mgmt/pandorafms_server/bsd.pandora.mk
>--- a/net-mgmt/pandorafms_server/bsd.pandora.mk	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_server/bsd.pandora.mk	2016-01-28 22:24:40.097445000 +0900
>@@ -1,6 +1,6 @@
> # $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 402346 2015-11-24 06:13:51Z pi $
> 
>-PANDORA_VERSION=	6.0
>+PANDORA_VERSION=	6.0SP1
> PANDORA_LICENSE=	GPLv2
> PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
> 
>@@ -13,6 +13,8 @@
> PANDORA_INSTALLER_ARGS=	--install
> 
> PORTVERSION=	${PANDORA_VERSION:C/SP/./}
>+# 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"
>diff -uNr a/net-mgmt/pandorafms_server/distinfo b/net-mgmt/pandorafms_server/distinfo
>--- a/net-mgmt/pandorafms_server/distinfo	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_server/distinfo	2016-01-28 22:24:40.097662000 +0900
>@@ -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
>diff -uNr a/net-mgmt/pandorafms_server/pkg-plist b/net-mgmt/pandorafms_server/pkg-plist
>--- a/net-mgmt/pandorafms_server/pkg-plist	2015-11-24 15:13:51.000000000 +0900
>+++ b/net-mgmt/pandorafms_server/pkg-plist	2016-01-28 22:24:40.097880000 +0900
>@@ -63,6 +63,7 @@
> %%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

Flags:

oi4io5me.cesium3: maintainer-approval+

Actions: View | Diff

Attachments on bug 206734: 166265 | 166266 | 166267 | 166268