FreeBSD Bugzilla – Attachment 171540 Details for
Bug 209890
net-mgmt/zabbix2 (server/agent/proxy) Update to 2.0.18 and Fix PID
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to 2.0.18
zabbix2-209890.patch (text/plain), 10.31 KB, created by
pg
on 2016-06-18 09:39:42 UTC
(
hide
)
Description:
patch to 2.0.18
Filename:
MIME Type:
Creator:
pg
Created:
2016-06-18 09:39:42 UTC
Size:
10.31 KB
patch
obsolete
>diff -uNr zabbix2-server.orig/Makefile zabbix2-server/Makefile >--- zabbix2-server.orig/Makefile 2016-06-18 12:27:01.501942380 +0300 >+++ zabbix2-server/Makefile 2016-06-18 12:21:17.431965000 +0300 >@@ -2,7 +2,7 @@ > # $FreeBSD: head/net-mgmt/zabbix2-server/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $ > > PORTNAME= zabbix2 >-PORTVERSION= 2.0.17 >+PORTVERSION= 2.0.18 > PORTREVISION?= 0 > CATEGORIES= net-mgmt > MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} >@@ -14,6 +14,8 @@ > > LICENSE= GPLv2 > >+LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp >+ > CONFLICTS= ${PKGBASE}-1.[0-8]* > > IGNORE_WITH_MYSQL= 41 >@@ -58,7 +60,6 @@ > --datadir=${ETCDIR} > > .if ${ZABBIX_BUILD} != "agent" >-LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp > USES+= execinfo > > CPPFLAGS+= ${EXECINFO_CPPFLAGS} >diff -uNr zabbix2-server.orig/distinfo zabbix2-server/distinfo >--- zabbix2-server.orig/distinfo 2016-06-18 12:27:01.504942176 +0300 >+++ zabbix2-server/distinfo 2016-06-18 12:18:51.530974000 +0300 >@@ -1,2 +1,2 @@ >-SHA256 (zabbix-2.0.17.tar.gz) = 0cab75a73473eefbdaeeb8984e7cab8dc60c4d1daa9fe9750a9c08994e629f59 >-SIZE (zabbix-2.0.17.tar.gz) = 13962665 >+SHA256 (zabbix-2.0.18.tar.gz) = 4b81406ad25d83a4922177afc2f6cd558ec759df7015161ceb2090c9d6ace4ae >+SIZE (zabbix-2.0.18.tar.gz) = 13958980 >diff -uNr zabbix2-server.orig/files/patch-src-zabbix_agent_zabbix_agentd.c zabbix2-server/files/patch-src-zabbix_agent_zabbix_agentd.c >--- zabbix2-server.orig/files/patch-src-zabbix_agent_zabbix_agentd.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix2-server/files/patch-src-zabbix_agent_zabbix_agentd.c 2016-05-13 14:51:12.786550000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_agent/zabbix_agentd.c.orig 2016-05-13 14:37:25.696606000 +0300 >++++ src/zabbix_agent/zabbix_agentd.c 2016-05-13 14:49:45.011554761 +0300 >+@@ -521,7 +521,7 @@ >+ CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, LIBDIR "/modules"); >+ >+ if (NULL == CONFIG_PID_FILE) >+- CONFIG_PID_FILE = "/tmp/zabbix_agentd.pid"; >++ CONFIG_PID_FILE = "/var/run/zabbix/zabbix_agentd.pid"; >+ #endif >+ if (NULL == CONFIG_LOG_TYPE_STR) >+ CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE); >diff -uNr zabbix2-server.orig/files/patch-src-zabbix_proxy_proxy.c zabbix2-server/files/patch-src-zabbix_proxy_proxy.c >--- zabbix2-server.orig/files/patch-src-zabbix_proxy_proxy.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix2-server/files/patch-src-zabbix_proxy_proxy.c 2016-05-13 14:47:29.182567000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/proxy.c.orig 2016-04-20 12:51:20.000000000 +0300 >++++ src/zabbix_proxy/proxy.c 2016-05-13 14:46:44.193569184 +0300 >+@@ -389,7 +389,7 @@ >+ CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp"); >+ >+ if (NULL == CONFIG_PID_FILE) >+- CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid"); >++ CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid"); >+ >+ if (NULL == CONFIG_TMPDIR) >+ CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp"); >diff -uNr zabbix2-server.orig/files/patch-src-zabbix_server_server.c zabbix2-server/files/patch-src-zabbix_server_server.c >--- zabbix2-server.orig/files/patch-src-zabbix_server_server.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix2-server/files/patch-src-zabbix_server_server.c 2016-05-13 14:28:09.669645000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/server.c.orig 2016-04-20 12:51:20.000000000 +0300 >++++ src/zabbix_server/server.c 2016-05-13 14:20:17.603677788 +0300 >+@@ -369,7 +369,7 @@ >+ CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp"); >+ >+ if (NULL == CONFIG_PID_FILE) >+- CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid"); >++ CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid"); >+ >+ if (NULL == CONFIG_ALERT_SCRIPTS_PATH) >+ CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DATADIR "/zabbix/alertscripts"); >diff -uNr zabbix2-server.orig/files/zabbix_agentd.in zabbix2-server/files/zabbix_agentd.in >--- zabbix2-server.orig/files/zabbix_agentd.in 2016-06-18 12:27:01.486943634 +0300 >+++ zabbix2-server/files/zabbix_agentd.in 2016-06-08 01:35:41.962179000 +0300 >@@ -9,10 +9,10 @@ > # > # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to > # enable zabbix_agentd. >-# zabbix_agentd_paths (string): Set to standard path by default. Set a search >-# if you have custom userparams that need binaries elsewhere. > # zabbix_agentd_config (string): Set to the standard config file path by > # default. >+# zabbix_agentd_pidfile (string): Location of the asterisk pid file >+# Default is /var/run/zabbix/zabbix_agentd.pid > # > > . /etc/rc.subr >@@ -22,22 +22,27 @@ > > load_rc_config $name > >-: ${zabbix_agentd_enable="NO"} >-: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} >-: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} >+: ${zabbix_agentd_enable:=NO} >+: ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf} >+: ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid} > > command="%%PREFIX%%/sbin/${name}" > required_files="${zabbix_agentd_config}" >-start_precmd="find_pidfile" >-status_precmd="find_pidfile" >-stop_precmd="find_pidfile" > >-find_pidfile() >+start_precmd=zabbix_agentd_precmd >+status_precmd=zabbix_agentd_precmd >+stop_precmd=zabbix_agentd_precmd >+ >+zabbix_agentd_precmd() > { > if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then > pidfile="$_pidfile_from_conf" > else >- pidfile="/tmp/${name}.pid" >+ pidfile=${zabbix_agentd_pidfile} >+ local rundir=${zabbix_agentd_pidfile%/*} >+ if [ ! -d $rundir ] ; then >+ install -d -m 0755 -o zabbix -g zabbix $rundir >+ fi > fi > > # This shouldn't be necessary with pidfile, but empirically it was the >@@ -47,6 +52,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_agentd_paths}" >- > run_rc_command "$1" >diff -uNr zabbix2-server.orig/files/zabbix_proxy.in zabbix2-server/files/zabbix_proxy.in >--- zabbix2-server.orig/files/zabbix_proxy.in 2016-06-18 12:27:01.483943602 +0300 >+++ zabbix2-server/files/zabbix_proxy.in 2016-06-08 01:35:41.963180000 +0300 >@@ -1,7 +1,9 @@ > #!/bin/sh > > # PROVIDE: zabbix_proxy >-# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% >+# REQUIRE: DAEMON >+%%PGSQL%%# REQUIRE: postgresql >+%%MYSQL%%# REQUIRE: mysql-server > # KEYWORD: shutdown > # > # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to >@@ -9,10 +11,10 @@ > # > # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to > # enable zabbix_proxy. >-# zabbix_proxy_paths (string): Set to standard path by default. Set a search >-# if you have custom externals that need binaries elsewhere. > # zabbix_proxy_config (string): Set to the standard config file path by > # default. >+# zabbix_proxy_pidfile (string): Location of the asterisk pid file >+# Default is /var/run/zabbix/zabbix_proxy.pid > # > > . /etc/rc.subr >@@ -22,23 +24,27 @@ > > load_rc_config $name > >-: ${zabbix_proxy_enable="NO"} >-: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} >-: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} >+: ${zabbix_proxy_enable:=NO} >+: ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf} >+: ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid} > > command="%%PREFIX%%/sbin/${name}" > required_files="${zabbix_proxy_config}" >-start_precmd="find_pidfile" >-status_precmd="find_pidfile" >-stop_precmd="find_pidfile" > >+start_precmd=zabbix_proxy_precmd >+status_precmd=zabbix_proxy_precmd >+stop_precmd=zabbix_proxy_precmd > >-find_pidfile() >+zabbix_proxy_precmd() > { >- if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then >+ if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then > pidfile="$_pidfile_from_conf" > else >- pidfile="/tmp/${name}.pid" >+ pidfile=${zabbix_proxy_pidfile} >+ local rundir=${zabbix_proxy_pidfile%/*} >+ if [ ! -d $rundir ] ; then >+ install -d -m 0755 -o zabbix -g zabbix $rundir >+ fi > fi > > # This shouldn't be necessary with pidfile, but empirically it was the >@@ -48,6 +54,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_proxy_paths}" >- > run_rc_command "$1" >diff -uNr zabbix2-server.orig/files/zabbix_server.in zabbix2-server/files/zabbix_server.in >--- zabbix2-server.orig/files/zabbix_server.in 2016-06-18 12:27:01.491941242 +0300 >+++ zabbix2-server/files/zabbix_server.in 2016-06-08 01:35:41.964179000 +0300 >@@ -1,7 +1,9 @@ > #!/bin/sh > > # PROVIDE: zabbix_server >-# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% >+# REQUIRE: DAEMON >+%%PGSQL%%# REQUIRE: postgresql >+%%MYSQL%%# REQUIRE: mysql-server > # KEYWORD: shutdown > # > # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to >@@ -9,10 +11,10 @@ > # > # zabbix_server_enable (bool): Set to NO by default. Set it to YES to > # enable zabbix_server. >-# zabbix_server_paths (string): Set to standard path by default. Set a search >-# if you have custom externals that need binaries elsewhere. > # zabbix_server_config (string): Set to the standard config file path by > # default. >+# zabbix_server_pidfile (string): Location of the asterisk pid file >+# Default is /var/run/zabbix/zabbix_server.pid > # > > . /etc/rc.subr >@@ -22,22 +24,27 @@ > > load_rc_config $name > >-: ${zabbix_server_enable="NO"} >-: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} >-: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} >+: ${zabbix_server_enable:=NO} >+: ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} >+: ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} > > command="%%PREFIX%%/sbin/${name}" > required_files="${zabbix_server_config}" >-start_precmd="find_pidfile" >-status_precmd="find_pidfile" >-stop_precmd="find_pidfile" > >-find_pidfile() >+start_precmd=zabbix_server_precmd >+status_precmd=zabbix_server_precmd >+stop_precmd=zabbix_server_precmd >+ >+zabbix_server_precmd() > { >- if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then >+ if get_pidfile_from_conf PidFile ${zabbix_server_config}; then > pidfile="$_pidfile_from_conf" > else >- pidfile="/tmp/${name}.pid" >+ pidfile=${zabbix_server_pidfile} >+ local rundir=${zabbix_server_pidfile%/*} >+ if [ ! -d $rundir ] ; then >+ install -d -m 0755 -o zabbix -g zabbix $rundir >+ fi > fi > > # This shouldn't be necessary with pidfile, but empirically it was the >@@ -47,6 +54,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_server_paths}" >- > run_rc_command "$1"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
pg:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 209890
:
170866
|
171146
| 171540