View | Details | Raw Unified | Return to bug 206734
Collapse All | Expand All

(-)b/net-mgmt/pandorafms_agent/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_agent_unix-6.0.tar.gz) = 31f65160091f6266e5f11b7443154ebcf645d4d36dac95c7a19ea4cff76fed9a
1
SHA256 (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 8d7af9081b23693b45afb0e46a905f0d8ae8b2340fa7b42eb8a4024c77d5027c
2
SIZE (pandora/pandorafms_agent_unix-6.0.tar.gz) = 78016
2
SIZE (pandora/pandorafms_agent_unix-6.0SP1.tar.gz) = 78486
(-)b/net-mgmt/pandorafms_console/Makefile (-15 / +16 lines)
Lines 13-19 Link Here
13
RUN_DEPENDS=	${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
13
RUN_DEPENDS=	${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
14
14
15
USES=		shebangfix
15
USES=		shebangfix
16
SHEBANG_FILES=	include/languages/util-all \
16
SHEBANG_FILES=	include/languages/extract_newlines.sh \
17
		include/languages/util-all \
17
		include/languages/util-bzr-update \
18
		include/languages/util-bzr-update \
18
		include/languages/util-compile-mo \
19
		include/languages/util-compile-mo \
19
		include/languages/util-create-po \
20
		include/languages/util-create-po \
Lines 26-37 Link Here
26
DOCS_DESC=	Install AUTHORS and ChangeLog
27
DOCS_DESC=	Install AUTHORS and ChangeLog
27
PGSQL_DESC=	Use PostgreSQL backend (experimental)
28
PGSQL_DESC=	Use PostgreSQL backend (experimental)
28
29
29
USE_PHP=	curl gd gettext json ldap mbstring mysql snmp session \
30
USE_PHP=	curl filter gd gettext hash json ldap mbstring mysql \
30
		xml zip zlib
31
		snmp session xml zip zlib
31
WANT_PHP_WEB=	yes
32
WANT_PHP_WEB=	yes
32
USE_APACHE_RUN=	22+
33
USE_APACHE_RUN=	22+
33
34
34
SUB_FILES+=	pandora_console.conf pkg-message
35
SUB_FILES+=	pandora_console.conf pkg-message newsyslog.conf
36
SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
35
37
36
.include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk"
38
.include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk"
37
39
Lines 52-67 Link Here
52
		${WRKSRC}/pandoradb.data*.sql
54
		${WRKSRC}/pandoradb.data*.sql
53
	@${REINPLACE_CMD} \
55
	@${REINPLACE_CMD} \
54
		-e 's|/bin/bash|/bin/sh|g' \
56
		-e 's|/bin/bash|/bin/sh|g' \
55
		${WRKSRC}/extras/check_other_languages.sh \
57
		${WRKSRC}/extras/check_other_languages.sh
56
		${WRKSRC}/include/languages/extract_newlines.sh
57
58
58
post-install:
59
post-install:
59
	@cd ${STAGEDIR}${WWWDIR} \
60
	@cd ${STAGEDIR}${WWWDIR} \
60
		&& ${RM} -rf pandora_console_install* *.spec \
61
		&& ${RM} -rf pandora_console_[il]* DEBIAN/ *.spec \
61
			extras/check_other_languages.sh.bak \
62
			attachment/downloads/.gitignore ${PORTDOCS} \
62
			include/languages/extract_newlines.sh.bak \
63
			*.sql.bak extras/check_other_languages.sh.bak
63
			*.sql.bak COPYING ${PORTDOCS} DEBIAN/ \
64
			attachment/collections/.empty attachment/downloads/.gitignore
65
	@cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php
64
	@cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php
66
.if ${PORT_OPTIONS:MDOCS}
65
.if ${PORT_OPTIONS:MDOCS}
67
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
66
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Lines 69-77 Link Here
69
	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
68
	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
70
.endfor
69
.endfor
71
.endif
70
.endif
72
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
71
	@(d=${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes; ${MKDIR} $$d; \
73
	${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \
72
		${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \
74
		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/pandora_console.conf.sample
73
			$$d/pandora_console.conf.sample)
75
	@${LN} -sf ${_LICENSE_DIR}/${LICENSE} ${STAGEDIR}${WWWDIR}/COPYING
74
	@(d=${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d; ${MKDIR} $$d; \
75
		${INSTALL_DATA} ${WRKDIR}/newsyslog.conf \
76
			$$d/pandora_console.conf)
76
77
77
.include <bsd.port.post.mk>
78
.include <bsd.port.post.mk>
(-)b/net-mgmt/pandorafms_console/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_console-6.0.tar.gz) = 3d6b2bcb833a6402bb7398f99d902f29ed8d24ad2afaac85703a662be1358378
1
SHA256 (pandora/pandorafms_console-6.0SP1.tar.gz) = 1c7d407e8f4aa7373102a7a1ef961a3e1a04ad9c8a52ceb17f9037516c698763
2
SIZE (pandora/pandorafms_console-6.0.tar.gz) = 29025074
2
SIZE (pandora/pandorafms_console-6.0SP1.tar.gz) = 29075019
(-)b/net-mgmt/pandorafms_console/files/newsyslog.conf.in (+6 lines)
Line 0 Link Here
1
# configuration file for newsyslog for pandora_console
2
#
3
# see newsyslog.conf(5) for details
4
#
5
# logfilename                                          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
6
%%WWWDIR%%/pandora_console.log	%%WWWOWN%%:%%WWWGRP%%		644  3	   100	W6D0  JN
(-)b/net-mgmt/pandorafms_console/files/patch-index.php (-11 lines)
Lines 1-11 Link Here
1
--- index.php
2
+++ index.php
3
@@ -45,7 +45,7 @@ if ($develop_bypass != 1) {
4
 	if (isset($_POST["rename_file"])){
5
 		$rename_file_install = (bool)$_POST["rename_file"];
6
 		if ($rename_file_install) {
7
-			$salida_rename = rename("/var/www/html/pandora_console/install.php", "/var/www/html/pandora_console/install_old.php");
8
+			$salida_rename = rename("install.php", "install_old.php");
9
 		}
10
 	}
11
 
(-)b/net-mgmt/pandorafms_console/pkg-plist (-2 / +10 lines)
Lines 985-990 Link Here
985
%%WWWDIR%%/images/link_error.png
985
%%WWWDIR%%/images/link_error.png
986
%%WWWDIR%%/images/link_go.png
986
%%WWWDIR%%/images/link_go.png
987
%%WWWDIR%%/images/linkpolicy.png
987
%%WWWDIR%%/images/linkpolicy.png
988
%%WWWDIR%%/images/links.menu.png
988
%%WWWDIR%%/images/list.png
989
%%WWWDIR%%/images/list.png
989
%%WWWDIR%%/images/load.png
990
%%WWWDIR%%/images/load.png
990
%%WWWDIR%%/images/local_component.png
991
%%WWWDIR%%/images/local_component.png
Lines 1084-1089 Link Here
1084
%%WWWDIR%%/images/networkmap/so_win.png
1085
%%WWWDIR%%/images/networkmap/so_win.png
1085
%%WWWDIR%%/images/networkmap/unknown.png
1086
%%WWWDIR%%/images/networkmap/unknown.png
1086
%%WWWDIR%%/images/new_message.png
1087
%%WWWDIR%%/images/new_message.png
1088
%%WWWDIR%%/images/no_data_toshow.png
1087
%%WWWDIR%%/images/noaccess.png
1089
%%WWWDIR%%/images/noaccess.png
1088
%%WWWDIR%%/images/normal_screen.png
1090
%%WWWDIR%%/images/normal_screen.png
1089
%%WWWDIR%%/images/normalscreen.png
1091
%%WWWDIR%%/images/normalscreen.png
Lines 1553-1558 Link Here
1553
%%WWWDIR%%/include/functions_gis.php
1555
%%WWWDIR%%/include/functions_gis.php
1554
%%WWWDIR%%/include/functions_graph.php
1556
%%WWWDIR%%/include/functions_graph.php
1555
%%WWWDIR%%/include/functions_groups.php
1557
%%WWWDIR%%/include/functions_groups.php
1558
%%WWWDIR%%/include/functions_groupview.php
1556
%%WWWDIR%%/include/functions_html.php
1559
%%WWWDIR%%/include/functions_html.php
1557
%%WWWDIR%%/include/functions_incidents.php
1560
%%WWWDIR%%/include/functions_incidents.php
1558
%%WWWDIR%%/include/functions_io.php
1561
%%WWWDIR%%/include/functions_io.php
Lines 1573-1578 Link Here
1573
%%WWWDIR%%/include/functions_servers.php
1576
%%WWWDIR%%/include/functions_servers.php
1574
%%WWWDIR%%/include/functions_snmp.php
1577
%%WWWDIR%%/include/functions_snmp.php
1575
%%WWWDIR%%/include/functions_snmp_browser.php
1578
%%WWWDIR%%/include/functions_snmp_browser.php
1579
%%WWWDIR%%/include/functions_tactical.php
1576
%%WWWDIR%%/include/functions_tags.php
1580
%%WWWDIR%%/include/functions_tags.php
1577
%%WWWDIR%%/include/functions_themes.php
1581
%%WWWDIR%%/include/functions_themes.php
1578
%%WWWDIR%%/include/functions_treeview.php
1582
%%WWWDIR%%/include/functions_treeview.php
Lines 1585-1590 Link Here
1585
%%WWWDIR%%/include/functions_wmi.php
1589
%%WWWDIR%%/include/functions_wmi.php
1586
%%WWWDIR%%/include/get_file.php
1590
%%WWWDIR%%/include/get_file.php
1587
%%WWWDIR%%/include/gettext.php
1591
%%WWWDIR%%/include/gettext.php
1592
%%WWWDIR%%/include/graphs/bullet.js
1588
%%WWWDIR%%/include/graphs/export_data.php
1593
%%WWWDIR%%/include/graphs/export_data.php
1589
%%WWWDIR%%/include/graphs/fgraph.php
1594
%%WWWDIR%%/include/graphs/fgraph.php
1590
%%WWWDIR%%/include/graphs/flot/excanvas.js
1595
%%WWWDIR%%/include/graphs/flot/excanvas.js
Lines 1770-1775 Link Here
1770
%%WWWDIR%%/include/help/en/help_snmp_alert_custom.php
1775
%%WWWDIR%%/include/help/en/help_snmp_alert_custom.php
1771
%%WWWDIR%%/include/help/en/help_snmp_alert_field1.php
1776
%%WWWDIR%%/include/help/en/help_snmp_alert_field1.php
1772
%%WWWDIR%%/include/help/en/help_snmp_alert_filters.php
1777
%%WWWDIR%%/include/help/en/help_snmp_alert_filters.php
1778
%%WWWDIR%%/include/help/en/help_snmp_alert_position.php
1773
%%WWWDIR%%/include/help/en/help_snmp_explorer.php
1779
%%WWWDIR%%/include/help/en/help_snmp_explorer.php
1774
%%WWWDIR%%/include/help/en/help_snmp_trap_types.php
1780
%%WWWDIR%%/include/help/en/help_snmp_trap_types.php
1775
%%WWWDIR%%/include/help/en/help_snmpcommunity.php
1781
%%WWWDIR%%/include/help/en/help_snmpcommunity.php
Lines 1905-1910 Link Here
1905
%%WWWDIR%%/include/help/es/help_snmp_alert_custom.php
1911
%%WWWDIR%%/include/help/es/help_snmp_alert_custom.php
1906
%%WWWDIR%%/include/help/es/help_snmp_alert_field1.php
1912
%%WWWDIR%%/include/help/es/help_snmp_alert_field1.php
1907
%%WWWDIR%%/include/help/es/help_snmp_alert_filters.php
1913
%%WWWDIR%%/include/help/es/help_snmp_alert_filters.php
1914
%%WWWDIR%%/include/help/es/help_snmp_alert_position.php
1908
%%WWWDIR%%/include/help/es/help_snmp_explorer.php
1915
%%WWWDIR%%/include/help/es/help_snmp_explorer.php
1909
%%WWWDIR%%/include/help/es/help_snmp_trap_types.php
1916
%%WWWDIR%%/include/help/es/help_snmp_trap_types.php
1910
%%WWWDIR%%/include/help/es/help_snmpcommunity.php
1917
%%WWWDIR%%/include/help/es/help_snmpcommunity.php
Lines 2037-2042 Link Here
2037
%%WWWDIR%%/include/help/ja/help_snmp_alert.php
2044
%%WWWDIR%%/include/help/ja/help_snmp_alert.php
2038
%%WWWDIR%%/include/help/ja/help_snmp_alert_custom.php
2045
%%WWWDIR%%/include/help/ja/help_snmp_alert_custom.php
2039
%%WWWDIR%%/include/help/ja/help_snmp_alert_field1.php
2046
%%WWWDIR%%/include/help/ja/help_snmp_alert_field1.php
2047
%%WWWDIR%%/include/help/ja/help_snmp_alert_position.php
2040
%%WWWDIR%%/include/help/ja/help_snmp_explorer.php
2048
%%WWWDIR%%/include/help/ja/help_snmp_explorer.php
2041
%%WWWDIR%%/include/help/ja/help_snmp_trap_types.php
2049
%%WWWDIR%%/include/help/ja/help_snmp_trap_types.php
2042
%%WWWDIR%%/include/help/ja/help_snmpcommunity.php
2050
%%WWWDIR%%/include/help/ja/help_snmpcommunity.php
Lines 2980-2988 Link Here
2980
%%WWWDIR%%/operation/events/events_rss.php
2988
%%WWWDIR%%/operation/events/events_rss.php
2981
%%WWWDIR%%/operation/events/export_csv.php
2989
%%WWWDIR%%/operation/events/export_csv.php
2982
%%WWWDIR%%/operation/events/sound_events.php
2990
%%WWWDIR%%/operation/events/sound_events.php
2983
%%WWWDIR%%/operation/extensions.php
2984
%%WWWDIR%%/operation/gis_maps/ajax.php
2991
%%WWWDIR%%/operation/gis_maps/ajax.php
2985
%%WWWDIR%%/operation/gis_maps/index.php
2992
%%WWWDIR%%/operation/gis_maps/gis_map.php
2986
%%WWWDIR%%/operation/gis_maps/public_console.php
2993
%%WWWDIR%%/operation/gis_maps/public_console.php
2987
%%WWWDIR%%/operation/gis_maps/render_view.php
2994
%%WWWDIR%%/operation/gis_maps/render_view.php
2988
%%WWWDIR%%/operation/incidents/incident.php
2995
%%WWWDIR%%/operation/incidents/incident.php
Lines 3303-3305 Link Here
3303
@dir %%WWWDIR%%/operation/users
3310
@dir %%WWWDIR%%/operation/users
3304
@dir %%WWWDIR%%/operation/visual_console
3311
@dir %%WWWDIR%%/operation/visual_console
3305
@sample(,,444) %%APACHEETCDIR%%/Includes/pandora_console.conf.sample
3312
@sample(,,444) %%APACHEETCDIR%%/Includes/pandora_console.conf.sample
3313
etc/newsyslog.conf.d/pandora_console.conf
(-)b/net-mgmt/pandorafms_server/bsd.pandora.mk (-1 / +3 lines)
Lines 1-6 Link Here
1
# $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 402346 2015-11-24 06:13:51Z pi $
1
# $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 402346 2015-11-24 06:13:51Z pi $
2
2
3
PANDORA_VERSION=	6.0
3
PANDORA_VERSION=	6.0SP1
4
PANDORA_LICENSE=	GPLv2
4
PANDORA_LICENSE=	GPLv2
5
PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
5
PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
6
6
Lines 13-18 Link Here
13
PANDORA_INSTALLER_ARGS=	--install
13
PANDORA_INSTALLER_ARGS=	--install
14
14
15
PORTVERSION=	${PANDORA_VERSION:C/SP/./}
15
PORTVERSION=	${PANDORA_VERSION:C/SP/./}
16
# ignore nightly builds (*-YYYYMMDD)
17
PORTSCOUT=      limit:!.*-\d{8}$$
16
18
17
MASTER_SITES?=	SF/pandora/Pandora%20FMS%20${PANDORA_VERSION:C/((SP[0-9]*)*)$/\/\1/}Final/Tarball
19
MASTER_SITES?=	SF/pandora/Pandora%20FMS%20${PANDORA_VERSION:C/((SP[0-9]*)*)$/\/\1/}Final/Tarball
18
.if ${PORTNAME} == "pandora_agent"
20
.if ${PORTNAME} == "pandora_agent"
(-)b/net-mgmt/pandorafms_server/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_server-6.0.tar.gz) = 9d9de2fb50e27077c9148beccb7e69e7d932d40f19bde57732bd8b94b8763e85
1
SHA256 (pandora/pandorafms_server-6.0SP1.tar.gz) = d4de04cc82028c0c6f746bc2ab4c588ab32840270a4ef8849d1a677f322abac5
2
SIZE (pandora/pandorafms_server-6.0.tar.gz) = 5543947
2
SIZE (pandora/pandorafms_server-6.0SP1.tar.gz) = 5549580
(-)b/net-mgmt/pandorafms_server/pkg-plist (+1 lines)
Lines 63-68 Link Here
63
%%DATADIR%%/util/pandora_revent.pl
63
%%DATADIR%%/util/pandora_revent.pl
64
%%DATADIR%%/util/pandora_revent_create.pl
64
%%DATADIR%%/util/pandora_revent_create.pl
65
%%DATADIR%%/util/pandora_server
65
%%DATADIR%%/util/pandora_server
66
%%DATADIR%%/util/pandora_server_logrotate
66
%%DATADIR%%/util/pandora_snmp.README
67
%%DATADIR%%/util/pandora_snmp.README
67
%%DATADIR%%/util/pandora_snmp.sh
68
%%DATADIR%%/util/pandora_snmp.sh
68
%%DATADIR%%/util/pandora_sync_db.pl
69
%%DATADIR%%/util/pandora_sync_db.pl

Return to bug 206734