View | Details | Raw Unified | Return to bug 209891 | Differences between
and this patch

Collapse All | Expand All

(-)zabbix22-server/Makefile (-11 / +25 lines)
Lines 1-9 Link Here
1
# Created by: Pakhom Golynga <pakhom@pakhom.spb.ru>
1
# Created by: Pakhom Golynga <pakhom@pakhom.spb.ru>
2
# $FreeBSD: head/net-mgmt/zabbix22-server/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $
2
# $FreeBSD: head/net-mgmt/zabbix22-server/Makefile 414096 2016-04-27 09:17:44Z robak $
3
3
4
PORTNAME=	zabbix22
4
PORTNAME=	zabbix22
5
PORTVERSION=	2.2.12
5
PORTVERSION=	2.2.14
6
PORTREVISION=	0
7
CATEGORIES=	net-mgmt
6
CATEGORIES=	net-mgmt
8
MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
7
MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
9
PKGNAMESUFFIX?=	-server
8
PKGNAMESUFFIX?=	-server
Lines 15-20 Link Here
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
16
15
17
CONFLICTS=	${PKGBASE}-1.[0-8]*
16
CONFLICTS=	${PKGBASE}-1.[0-8]*
17
LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
18
18
19
IGNORE_WITH_PHP=	52
19
IGNORE_WITH_PHP=	52
20
IGNORE_WITH_MYSQL=	41
20
IGNORE_WITH_MYSQL=	41
Lines 60-66 Link Here
60
			--with-iconv=${ICONV_PREFIX}
60
			--with-iconv=${ICONV_PREFIX}
61
61
62
.if ${ZABBIX_BUILD} != "agent"
62
.if ${ZABBIX_BUILD} != "agent"
63
LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
64
USES+=		execinfo
63
USES+=		execinfo
65
64
66
CPPFLAGS+=	${EXECINFO_CPPFLAGS}
65
CPPFLAGS+=	${EXECINFO_CPPFLAGS}
Lines 71-77 Link Here
71
CONFIGURE_ARGS+=	--with-net-snmp
70
CONFIGURE_ARGS+=	--with-net-snmp
72
71
73
OPTIONS_DEFINE=	IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2
72
OPTIONS_DEFINE=	IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2
74
OPTIONS_DEFAULT=	MYSQL FPING JABBER CURL UNIXODBC
73
OPTIONS_DEFAULT=	MYSQL IPV6 FPING JABBER CURL UNIXODBC
75
OPTIONS_SUB=	yes
74
OPTIONS_SUB=	yes
76
75
77
CURL_DESC=	Support for web monitoring
76
CURL_DESC=	Support for web monitoring
Lines 90-102 Link Here
90
OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
89
OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
91
90
92
MYSQL_CONFIGURE_WITH=	mysql
91
MYSQL_CONFIGURE_WITH=	mysql
93
MYSQL_USE=	MYSQL=yes
92
USES+=	mysql
94
93
95
PGSQL_CONFIGURE_WITH=	postgresql
94
PGSQL_CONFIGURE_WITH=	postgresql
96
PGSQL_USES=	pgsql
95
USES+=	pgsql
97
96
98
SQLITE_CONFIGURE_WITH=	sqlite3
97
SQLITE_CONFIGURE_WITH=	sqlite3
99
SQLITE_USES=	sqlite:3
98
USES+=	sqlite:3
100
99
101
ORACLE_CONFIGURE_WITH=	oracle
100
ORACLE_CONFIGURE_WITH=	oracle
102
101
Lines 156-164 Link Here
156
		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
155
		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
157
	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +
156
	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +
158
157
159
post-install:
158
.if ${ZABBIX_BUILD} == "server"
160
.if ${PORT_OPTIONS:MJAVAGW}
159
	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
161
	@${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
160
		${WRKSRC}/conf/zabbix_server*.conf
161
.endif
162
163
.if ${ZABBIX_BUILD} == "proxy"
164
	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \
165
		${WRKSRC}/conf/zabbix_proxy*.conf
166
.endif
167
168
.if ${ZABBIX_BUILD} == "agent"
169
	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \
170
		${WRKSRC}/conf/zabbix_agentd.conf
162
.endif
171
.endif
163
172
164
.if ${ZABBIX_BUILD} != "agent"
173
.if ${ZABBIX_BUILD} != "agent"
Lines 168-171 Link Here
168
.endif
177
.endif
169
.endif
178
.endif
170
179
180
post-install:
181
.if ${PORT_OPTIONS:MJAVAGW}
182
	@${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
183
.endif
184
171
.include <bsd.port.mk>
185
.include <bsd.port.mk>
(-)zabbix22-server/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (zabbix-2.2.12.tar.gz) = 7481021c2d62fa7d090f8401c87e99107c3e0227e5b10406380c4ac5a768e9e9
1
SHA256 (zabbix-2.2.14.tar.gz) = 76fa3f45168946b9fb4a22840b4b06054f1a09da93c910969eacd04217fa21c8
2
SIZE (zabbix-2.2.12.tar.gz) = 15467504
2
SIZE (zabbix-2.2.14.tar.gz) = 15481807
(-)zabbix22-server/files/patch-src-zabbix_agent_zabbix_agentd.c (+11 lines)
Line 0 Link Here
1
--- src/zabbix_agent/zabbix_agentd.c.orig	2016-05-13 14:37:25.696606000 +0300
2
+++ src/zabbix_agent/zabbix_agentd.c	2016-05-13 14:49:45.011554761 +0300
3
@@ -521,7 +521,7 @@
4
 		CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, LIBDIR "/modules");
5
 
6
 	if (NULL == CONFIG_PID_FILE)
7
-		CONFIG_PID_FILE = "/tmp/zabbix_agentd.pid";
8
+		CONFIG_PID_FILE = "/var/run/zabbix/zabbix_agentd.pid";
9
 #endif
10
 	if (NULL == CONFIG_LOG_TYPE_STR)
11
 		CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
(-)zabbix22-server/files/patch-src-zabbix_proxy_proxy.c (+11 lines)
Line 0 Link Here
1
--- src/zabbix_proxy/proxy.c.orig	2016-04-20 12:51:20.000000000 +0300
2
+++ src/zabbix_proxy/proxy.c	2016-05-13 14:46:44.193569184 +0300
3
@@ -389,7 +389,7 @@
4
 		CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
5
 
6
 	if (NULL == CONFIG_PID_FILE)
7
-		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid");
8
+		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid");
9
 
10
 	if (NULL == CONFIG_TMPDIR)
11
 		CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
(-)zabbix22-server/files/patch-src-zabbix_server_server.c (+11 lines)
Line 0 Link Here
1
--- src/zabbix_server/server.c.orig	2016-04-20 12:51:20.000000000 +0300
2
+++ src/zabbix_server/server.c	2016-05-13 14:20:17.603677788 +0300
3
@@ -369,7 +369,7 @@
4
 		CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
5
 
6
 	if (NULL == CONFIG_PID_FILE)
7
-		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid");
8
+		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid");
9
 
10
 	if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
11
 		CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DATADIR "/zabbix/alertscripts");
(-)zabbix22-server/files/pkg-message.in (-1 / +1 lines)
Lines 39-45 Link Here
39
    Accepted data limit when using Zabbix protocol was changed from 128MB to 64MB.
39
    Accepted data limit when using Zabbix protocol was changed from 128MB to 64MB.
40
40
41
New upgrade procedure
41
New upgrade procedure
42
There are no upgrade SQL scripts anymore - database upgrade is performed by the Zabbix server.
42
There are no upgrade SQL scripts anymore - database upgrade is performed by the Zabbix server. 
43
43
44
To upgrade an existing database, see the scripts in
44
To upgrade an existing database, see the scripts in
45
Upgrade notes for 2.2.0 https://www.zabbix.com/documentation/2.2/manual/installation/upgrade_notes_220
45
Upgrade notes for 2.2.0 https://www.zabbix.com/documentation/2.2/manual/installation/upgrade_notes_220
(-)zabbix22-server/files/zabbix_agentd.in (-12 / +15 lines)
Lines 9-18 Link Here
9
#
9
#
10
# zabbix_agentd_enable (bool): Set to NO by default.  Set it to YES to
10
# zabbix_agentd_enable (bool): Set to NO by default.  Set it to YES to
11
#         enable zabbix_agentd.
11
#         enable zabbix_agentd.
12
# zabbix_agentd_paths (string): Set to standard path by default.  Set a search
13
#         if you have custom userparams that need binaries elsewhere.
14
# zabbix_agentd_config (string): Set to the standard config file path by
12
# zabbix_agentd_config (string): Set to the standard config file path by
15
#         default.
13
#         default.
14
# zabbix_agentd_pidfile (string):    Location of the zabbix_agentd pid file
15
#                               Default is /var/run/zabbix/zabbix_agentd.pid
16
#
16
#
17
17
18
. /etc/rc.subr
18
. /etc/rc.subr
Lines 22-43 Link Here
22
22
23
load_rc_config $name
23
load_rc_config $name
24
24
25
: ${zabbix_agentd_enable="NO"}
25
: ${zabbix_agentd_enable:=NO}
26
: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
26
: ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf}
27
: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"}
27
: ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid}
28
28
29
command="%%PREFIX%%/sbin/${name}"
29
command="%%PREFIX%%/sbin/${name}"
30
required_files="${zabbix_agentd_config}"
30
required_files="${zabbix_agentd_config}"
31
start_precmd="find_pidfile"
32
status_precmd="find_pidfile"
33
stop_precmd="find_pidfile"
34
31
35
find_pidfile()
32
start_precmd=zabbix_agentd_precmd 
33
status_precmd=zabbix_agentd_precmd
34
stop_precmd=zabbix_agentd_precmd
35
36
zabbix_agentd_precmd()
36
{
37
{
37
	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
38
	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
38
		pidfile="$_pidfile_from_conf"
39
		pidfile="$_pidfile_from_conf"
39
	else
40
	else
40
		pidfile="/tmp/${name}.pid"
41
		pidfile=${zabbix_agentd_pidfile}
42
		local rundir=${zabbix_agentd_pidfile%/*}
43
		if [ ! -d $rundir ] ; then
44
			install -d -m 0755 -o zabbix -g zabbix $rundir
45
		fi
41
	fi
46
	fi
42
47
43
	# This shouldn't be necessary with pidfile, but empirically it was the
48
	# This shouldn't be necessary with pidfile, but empirically it was the
Lines 47-52 Link Here
47
	rc_pid=$(check_pidfile ${pidfile} ${command})
52
	rc_pid=$(check_pidfile ${pidfile} ${command})
48
}
53
}
49
54
50
export PATH="${zabbix_agentd_paths}"
51
52
run_rc_command "$1"
55
run_rc_command "$1"
(-)zabbix22-server/files/zabbix_proxy.in (-13 / +16 lines)
Lines 11-20 Link Here
11
#
11
#
12
# zabbix_proxy_enable (bool): Set to NO by default.  Set it to YES to
12
# zabbix_proxy_enable (bool): Set to NO by default.  Set it to YES to
13
#         enable zabbix_proxy.
13
#         enable zabbix_proxy.
14
# zabbix_proxy_paths (string): Set to standard path by default.  Set a search
15
#         if you have custom externals that need binaries elsewhere.
16
# zabbix_proxy_config (string): Set to the standard config file path by
14
# zabbix_proxy_config (string): Set to the standard config file path by
17
#         default.
15
#         default.
16
# zabbix_proxy_pidfile (string):    Location of the zabbix_proxy pid file
17
#                               Default is /var/run/zabbix/zabbix_proxy.pid
18
#
18
#
19
19
20
. /etc/rc.subr
20
. /etc/rc.subr
Lines 24-45 Link Here
24
24
25
load_rc_config $name
25
load_rc_config $name
26
26
27
: ${zabbix_proxy_enable="NO"}
27
: ${zabbix_proxy_enable:=NO}
28
: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
28
: ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf}
29
: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"}
29
: ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid}
30
30
31
command="%%PREFIX%%/sbin/${name}"
31
command="%%PREFIX%%/sbin/${name}"
32
required_files="${zabbix_proxy_config}"
32
required_files="${zabbix_proxy_config}"
33
start_precmd="find_pidfile"
34
status_precmd="find_pidfile"
35
stop_precmd="find_pidfile"
36
33
37
find_pidfile()
34
start_precmd=zabbix_proxy_precmd 
35
status_precmd=zabbix_proxy_precmd
36
stop_precmd=zabbix_proxy_precmd
37
38
zabbix_proxy_precmd()
38
{
39
{
39
	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
40
	if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then
40
		pidfile="$_pidfile_from_conf"
41
		pidfile="$_pidfile_from_conf"
41
	else
42
	else
42
		pidfile="/tmp/${name}.pid"
43
		pidfile=${zabbix_proxy_pidfile}
44
		local rundir=${zabbix_proxy_pidfile%/*}
45
		if [ ! -d $rundir ] ; then
46
			install -d -m 0755 -o zabbix -g zabbix $rundir
47
		fi
43
	fi
48
	fi
44
49
45
	# This shouldn't be necessary with pidfile, but empirically it was the
50
	# This shouldn't be necessary with pidfile, but empirically it was the
Lines 49-54 Link Here
49
	rc_pid=$(check_pidfile ${pidfile} ${command})
54
	rc_pid=$(check_pidfile ${pidfile} ${command})
50
}
55
}
51
56
52
export PATH="${zabbix_proxy_paths}"
53
54
run_rc_command "$1"
57
run_rc_command "$1"
(-)zabbix22-server/files/zabbix_server.in (-13 / +16 lines)
Lines 11-20 Link Here
11
#
11
#
12
# zabbix_server_enable (bool): Set to NO by default.  Set it to YES to
12
# zabbix_server_enable (bool): Set to NO by default.  Set it to YES to
13
#         enable zabbix_server.
13
#         enable zabbix_server.
14
# zabbix_server_paths (string): Set to standard path by default.  Set a search
15
#         if you have custom externals that need binaries elsewhere.
16
# zabbix_server_config (string): Set to the standard config file path by
14
# zabbix_server_config (string): Set to the standard config file path by
17
#         default.
15
#         default.
16
# zabbix_server_pidfile (string):    Location of the zabbix_server pid file
17
#                               Default is /var/run/zabbix/zabbix_server.pid
18
#
18
#
19
19
20
. /etc/rc.subr
20
. /etc/rc.subr
Lines 24-45 Link Here
24
24
25
load_rc_config $name
25
load_rc_config $name
26
26
27
: ${zabbix_server_enable="NO"}
27
: ${zabbix_server_enable:=NO}
28
: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
28
: ${zabbix_server_config:=%%ETCDIR%%/${name}.conf}
29
: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"}
29
: ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid}
30
30
31
command="%%PREFIX%%/sbin/${name}"
31
command="%%PREFIX%%/sbin/${name}"
32
required_files="${zabbix_server_config}"
32
required_files="${zabbix_server_config}"
33
start_precmd="find_pidfile"
34
status_precmd="find_pidfile"
35
stop_precmd="find_pidfile"
36
33
37
find_pidfile()
34
start_precmd=zabbix_server_precmd 
35
status_precmd=zabbix_server_precmd
36
stop_precmd=zabbix_server_precmd
37
38
zabbix_server_precmd()
38
{
39
{
39
	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
40
	if get_pidfile_from_conf PidFile ${zabbix_server_config}; then
40
		pidfile="$_pidfile_from_conf"
41
		pidfile="$_pidfile_from_conf"
41
	else
42
	else
42
		pidfile="/tmp/${name}.pid"
43
		pidfile=${zabbix_server_pidfile}
44
		local rundir=${zabbix_server_pidfile%/*}
45
		if [ ! -d $rundir ] ; then
46
			install -d -m 0755 -o zabbix -g zabbix $rundir
47
		fi
43
	fi
48
	fi
44
49
45
	# This shouldn't be necessary with pidfile, but empirically it was the
50
	# This shouldn't be necessary with pidfile, but empirically it was the
Lines 49-54 Link Here
49
	rc_pid=$(check_pidfile ${pidfile} ${command})
54
	rc_pid=$(check_pidfile ${pidfile} ${command})
50
}
55
}
51
56
52
export PATH="${zabbix_server_paths}"
53
54
run_rc_command "$1"
57
run_rc_command "$1"

Return to bug 209891