FreeBSD Bugzilla – Attachment 173342 Details for
Bug 209893
net-mgmt/zabbix3 (server/agent/proxy): Update to 3.0.4 and Fix PID
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to 3.0.4
zabbix3-209893_4.patch (text/plain), 46.56 KB, created by
pg
on 2016-08-05 21:25:02 UTC
(
hide
)
Description:
patch to 3.0.4
Filename:
MIME Type:
Creator:
pg
Created:
2016-08-05 21:25:02 UTC
Size:
46.56 KB
patch
obsolete
>diff -uNr zabbix3-server.orig/Makefile zabbix3-server/Makefile >--- zabbix3-server.orig/Makefile 2016-08-02 11:23:05.054252495 +0300 >+++ zabbix3-server/Makefile 2016-08-06 00:20:26.159174957 +0300 >@@ -1,8 +1,8 @@ > # Created by: Pakhom Golynga <pg@pakhom.spb.ru> >-# $FreeBSD: head/net-mgmt/zabbix3-server/Makefile 416966 2016-06-16 13:23:13Z mat $ >+# $FreeBSD: head/net-mgmt/zabbix3-server/Makefile 414097 2016-04-27 10:44:40Z robak $ > > PORTNAME= zabbix3 >-PORTVERSION= 3.0.2 >+PORTVERSION= 3.0.4 > PORTREVISION?= 0 > CATEGORIES= net-mgmt > MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} >@@ -14,15 +14,12 @@ > > LICENSE= GPLv2 > >-CONFLICTS= ${PKGBASE}-1.[0-8]* >+CONFLICTS= zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* >+LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp > > IGNORE_WITH_PHP= 52 > IGNORE_WITH_MYSQL= 41 > >-.if ${PKGNAMESUFFIX} != "-agent" >-CONFLICTS+= ${PORTNAME}-1.[0-8]* >-.endif >- > ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} > > .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings >@@ -60,7 +57,6 @@ > --with-iconv=${ICONV_PREFIX} > > .if ${ZABBIX_BUILD} != "agent" >-LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp > USES+= execinfo > > CPPFLAGS+= ${EXECINFO_CPPFLAGS} >@@ -73,7 +69,7 @@ > OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ > LIBXML2 > >-OPTIONS_DEFAULT= FPING JABBER CURL UNIXODBC MYSQL SSH OPENSSL >+OPTIONS_DEFAULT= IPV6 FPING CURL UNIXODBC MYSQL OPENSSL > OPTIONS_SUB= yes > > CURL_DESC= Support for web monitoring >@@ -93,13 +89,13 @@ > OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL > > MYSQL_CONFIGURE_WITH= mysql >-MYSQL_USE= MYSQL=yes >+USES+= mysql > > PGSQL_CONFIGURE_WITH= postgresql >-PGSQL_USES= pgsql >+USES+= pgsql > > SQLITE_CONFIGURE_WITH= sqlite3 >-SQLITE_USES= sqlite:3 >+USES+= sqlite:3 > > ORACLE_CONFIGURE_WITH= oracle > >@@ -126,8 +122,8 @@ > UNIXODBC_CONFIGURE_WITH=unixodbc > UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC > .else >-OPTIONS_SINGLE= SSL >-OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL >+OPTIONS_SINGLE= SSL >+OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL > .endif # if ${ZABBIX_BUILD} != "agent" > > IPV6_CONFIGURE_ENABLE= ipv6 >@@ -141,19 +137,19 @@ > LIBXML2_CONFIGURE_WITH= libxml2 > LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 > >-OPENSSL_CONFIGURE_WITH= openssl >-OPENSSL_USE= OPENSSL=yes >+OPENSSL_CONFIGURE_WITH= openssl >+USES+= ssl > > GNUTLS_CONFIGURE_WITH= gnutls >-GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls >+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls > > POLARSSL_CONFIGURE_WITH=mbedtls > POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 > >-.include <bsd.port.pre.mk> >+.include <bsd.port.options.mk> > >-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base >-IGNORE= OpenSSL from the base system is too old, add DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything that needs SSL. >+.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) >+IGNORE= openSSL from the base system is too old, add WITH_OPENSSL_PORT to your /etc/make.conf and rebuild everything that needs SSL > .endif > > post-patch: >@@ -162,6 +158,21 @@ > @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ > ${WRKSRC}/conf/zabbix_*.conf > >+.if ${ZABBIX_BUILD} == "server" >+ @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ >+ ${WRKSRC}/conf/zabbix_server*.conf >+.endif >+ >+.if ${ZABBIX_BUILD} == "proxy" >+ @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ >+ ${WRKSRC}/conf/zabbix_proxy*.conf >+.endif >+ >+.if ${ZABBIX_BUILD} == "agent" >+ @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ >+ ${WRKSRC}/conf/zabbix_agentd*.conf >+.endif >+ > .if ${ZABBIX_BUILD} != "agent" > . for d in mysql oracle postgresql sqlite3 > @${REINPLACE_CMD} \ >@@ -192,8 +203,6 @@ > ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ > ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) > .endif >-.else # frontend >-.include <bsd.port.pre.mk> > .endif > >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >diff -uNr zabbix3-server.orig/distinfo zabbix3-server/distinfo >--- zabbix3-server.orig/distinfo 2016-08-02 11:23:05.064252421 +0300 >+++ zabbix3-server/distinfo 2016-08-02 10:39:58.498429000 +0300 >@@ -1,2 +1,2 @@ >-SHA256 (zabbix-3.0.2.tar.gz) = e432fc86ea16956d52a9d8754b1b84456d11d96e1534fe1006f055a87208bff5 >-SIZE (zabbix-3.0.2.tar.gz) = 15391497 >+SHA256 (zabbix-3.0.4.tar.gz) = 9fa47d97843b6ca9f550d706b40ee6b35b76c5165ff32ff11ef0474f161e7700 >+SIZE (zabbix-3.0.4.tar.gz) = 15403727 >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxalgo_Makefile.in zabbix3-server/files/patch-src_libs_zbxalgo_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxalgo_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxalgo_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxalgo/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxalgo/Makefile.in >+@@ -185,7 +185,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxcommon_Makefile.in zabbix3-server/files/patch-src_libs_zbxcommon_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxcommon_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxcommon_Makefile.in 2016-08-02 16:39:56.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxcommon/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxcommon/Makefile.in >+@@ -188,7 +188,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxcomms_Makefile.in zabbix3-server/files/patch-src_libs_zbxcomms_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxcomms_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxcomms_Makefile.in 2016-08-02 16:48:20.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxcomms/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxcomms/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxcommshigh_Makefile.in zabbix3-server/files/patch-src_libs_zbxcommshigh_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxcommshigh_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxcommshigh_Makefile.in 2016-08-02 16:52:28.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxcommshigh/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxcommshigh/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxconf_Makefile.in zabbix3-server/files/patch-src_libs_zbxconf_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxconf_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxconf_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxconf/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxconf/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxcrypto_Makefile.in zabbix3-server/files/patch-src_libs_zbxcrypto_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxcrypto_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxcrypto_Makefile.in 2016-08-02 16:37:41.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxcrypto/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxcrypto/Makefile.in >+@@ -183,7 +183,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxdbcache_Makefile.in zabbix3-server/files/patch-src_libs_zbxdbcache_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxdbcache_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxdbcache_Makefile.in 2016-08-02 16:54:37.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxdbcache/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxdbcache/Makefile.in >+@@ -185,7 +185,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxdbupgrade_Makefile.in zabbix3-server/files/patch-src_libs_zbxdbupgrade_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxdbupgrade_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxdbupgrade_Makefile.in 2016-08-02 16:53:32.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxdbupgrade/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxdbupgrade/Makefile.in >+@@ -181,7 +181,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxexec_Makefile.in zabbix3-server/files/patch-src_libs_zbxexec_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxexec_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxexec_Makefile.in 2016-08-02 16:50:02.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxexec/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxexec/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxicmpping_Makefile.in zabbix3-server/files/patch-src_libs_zbxicmpping_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxicmpping_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxicmpping_Makefile.in 2016-08-02 16:57:40.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxicmpping/Makefile.in.orig 2016-07-22 15:06:34 UTC >++++ src/libs/zbxicmpping/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxjson_Makefile.in zabbix3-server/files/patch-src_libs_zbxjson_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxjson_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxjson_Makefile.in 2016-08-02 16:49:17.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxjson/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxjson/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxlog_Makefile.in zabbix3-server/files/patch-src_libs_zbxlog_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxlog_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxlog_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxlog/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxlog/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxmedia_Makefile.in zabbix3-server/files/patch-src_libs_zbxmedia_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxmedia_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxmedia_Makefile.in 2016-08-02 16:58:45.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxmedia/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxmedia/Makefile.in >+@@ -184,7 +184,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxmemory_Makefile.in zabbix3-server/files/patch-src_libs_zbxmemory_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxmemory_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxmemory_Makefile.in 2016-08-02 16:55:37.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxmemory/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxmemory/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxmodules_Makefile.in zabbix3-server/files/patch-src_libs_zbxmodules_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxmodules_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxmodules_Makefile.in 2016-08-02 16:50:48.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxmodules/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxmodules/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxnix_Makefile.in zabbix3-server/files/patch-src_libs_zbxnix_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxnix_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxnix_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxnix/Makefile.in.orig 2016-07-22 15:06:35 UTC >++++ src/libs/zbxnix/Makefile.in >+@@ -180,7 +180,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxregexp_Makefile.in zabbix3-server/files/patch-src_libs_zbxregexp_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxregexp_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxregexp_Makefile.in 2016-08-02 16:51:46.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxregexp/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxregexp/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxself_Makefile.in zabbix3-server/files/patch-src_libs_zbxself_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxself_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxself_Makefile.in 2016-08-02 16:59:52.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxself/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxself/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxserver_Makefile.in zabbix3-server/files/patch-src_libs_zbxserver_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxserver_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxserver_Makefile.in 2016-08-02 16:56:38.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxserver/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxserver/Makefile.in >+@@ -183,7 +183,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsys_Makefile.in zabbix3-server/files/patch-src_libs_zbxsys_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsys_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsys_Makefile.in 2016-08-02 16:44:59.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsys/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxsys/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_Makefile.in zabbix3-server/files/patch-src_libs_zbxsysinfo_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsysinfo_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsysinfo/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxsysinfo/Makefile.in >+@@ -238,7 +238,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_agent_Makefile.in zabbix3-server/files/patch-src_libs_zbxsysinfo_agent_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_agent_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsysinfo_agent_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsysinfo/agent/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxsysinfo/agent/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_common_Makefile.in zabbix3-server/files/patch-src_libs_zbxsysinfo_common_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_common_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsysinfo_common_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsysinfo/common/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxsysinfo/common/Makefile.in >+@@ -187,7 +187,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_freebsd_Makefile.in zabbix3-server/files/patch-src_libs_zbxsysinfo_freebsd_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_freebsd_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsysinfo_freebsd_Makefile.in 2016-08-02 16:42:49.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsysinfo/freebsd/Makefile.in.orig 2016-07-22 15:06:36 UTC >++++ src/libs/zbxsysinfo/freebsd/Makefile.in >+@@ -201,7 +201,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_simple_Makefile.in zabbix3-server/files/patch-src_libs_zbxsysinfo_simple_Makefile.in >--- zabbix3-server.orig/files/patch-src_libs_zbxsysinfo_simple_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_libs_zbxsysinfo_simple_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/libs/zbxsysinfo/simple/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/libs/zbxsysinfo/simple/Makefile.in >+@@ -183,7 +183,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__agent_Makefile.in zabbix3-server/files/patch-src_zabbix__agent_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__agent_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__agent_Makefile.in 2016-08-02 16:31:44.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_agent/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_agent/Makefile.in >+@@ -206,7 +206,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__proxy_Makefile.in zabbix3-server/files/patch-src_zabbix__proxy_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__proxy_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__proxy_Makefile.in 2016-08-03 12:43:47.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_proxy/Makefile.in >+@@ -260,7 +260,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__proxy_datasender_Makefile.in zabbix3-server/files/patch-src_zabbix__proxy_datasender_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__proxy_datasender_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__proxy_datasender_Makefile.in 2016-08-03 12:40:15.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/datasender/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_proxy/datasender/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__proxy_heart_Makefile.in zabbix3-server/files/patch-src_zabbix__proxy_heart_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__proxy_heart_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__proxy_heart_Makefile.in 2016-08-03 12:24:56.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/heart/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_proxy/heart/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__proxy_housekeeper_Makefile.in zabbix3-server/files/patch-src_zabbix__proxy_housekeeper_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__proxy_housekeeper_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__proxy_housekeeper_Makefile.in 2016-08-03 12:35:20.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/housekeeper/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_proxy/housekeeper/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__proxy_proxyconfig_Makefile.in zabbix3-server/files/patch-src_zabbix__proxy_proxyconfig_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__proxy_proxyconfig_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__proxy_proxyconfig_Makefile.in 2016-08-03 12:38:26.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_proxy/proxyconfig/Makefile.in.orig 2016-07-22 15:06:37 UTC >++++ src/zabbix_proxy/proxyconfig/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_Makefile.in zabbix3-server/files/patch-src_zabbix__server_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_Makefile.in 2016-08-02 17:00:57.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/Makefile.in.orig 2016-08-02 13:59:57 UTC >++++ src/zabbix_server/Makefile.in >+@@ -257,7 +257,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_alerter_Makefile.in zabbix3-server/files/patch-src_zabbix__server_alerter_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_alerter_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_alerter_Makefile.in 2016-08-02 17:02:28.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/alerter/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/alerter/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_dbconfig_Makefile.in zabbix3-server/files/patch-src_zabbix__server_dbconfig_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_dbconfig_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_dbconfig_Makefile.in 2016-08-02 17:04:32.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/dbconfig/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/dbconfig/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_dbsyncer_Makefile.in zabbix3-server/files/patch-src_zabbix__server_dbsyncer_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_dbsyncer_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_dbsyncer_Makefile.in 2016-08-02 17:03:21.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/dbsyncer/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/dbsyncer/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_discoverer_Makefile.in zabbix3-server/files/patch-src_zabbix__server_discoverer_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_discoverer_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_discoverer_Makefile.in 2016-08-02 17:05:15.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/discoverer/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/discoverer/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_escalator_Makefile.in zabbix3-server/files/patch-src_zabbix__server_escalator_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_escalator_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_escalator_Makefile.in 2016-08-02 17:14:06.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/escalator/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/escalator/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_housekeeper_Makefile.in zabbix3-server/files/patch-src_zabbix__server_housekeeper_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_housekeeper_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_housekeeper_Makefile.in 2016-08-02 17:06:10.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/housekeeper/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/housekeeper/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_httppoller_Makefile.in zabbix3-server/files/patch-src_zabbix__server_httppoller_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_httppoller_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_httppoller_Makefile.in 2016-08-02 17:07:17.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/httppoller/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/httppoller/Makefile.in >+@@ -179,7 +179,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_pinger_Makefile.in zabbix3-server/files/patch-src_zabbix__server_pinger_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_pinger_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_pinger_Makefile.in 2016-08-02 17:08:08.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/pinger/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/pinger/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_proxypoller_Makefile.in zabbix3-server/files/patch-src_zabbix__server_proxypoller_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_proxypoller_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_proxypoller_Makefile.in 2016-08-02 17:14:52.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/proxypoller/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/proxypoller/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_selfmon_Makefile.in zabbix3-server/files/patch-src_zabbix__server_selfmon_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_selfmon_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_selfmon_Makefile.in 2016-08-02 17:16:19.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/selfmon/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/selfmon/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_snmptrapper_Makefile.in zabbix3-server/files/patch-src_zabbix__server_snmptrapper_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_snmptrapper_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_snmptrapper_Makefile.in 2016-08-02 17:09:24.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/snmptrapper/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/snmptrapper/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_timer_Makefile.in zabbix3-server/files/patch-src_zabbix__server_timer_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_timer_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_timer_Makefile.in 2016-08-02 17:10:11.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/timer/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/timer/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_trapper_Makefile.in zabbix3-server/files/patch-src_zabbix__server_trapper_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_trapper_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_trapper_Makefile.in 2016-08-02 17:11:22.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/trapper/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/trapper/Makefile.in >+@@ -181,7 +181,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_vmware_Makefile.in zabbix3-server/files/patch-src_zabbix__server_vmware_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_vmware_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_vmware_Makefile.in 2016-08-02 17:17:18.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/vmware/Makefile.in.orig 2016-07-22 15:06:38 UTC >++++ src/zabbix_server/vmware/Makefile.in >+@@ -182,7 +182,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix__server_watchdog_Makefile.in zabbix3-server/files/patch-src_zabbix__server_watchdog_Makefile.in >--- zabbix3-server.orig/files/patch-src_zabbix__server_watchdog_Makefile.in 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix__server_watchdog_Makefile.in 2016-08-02 17:12:15.000000000 +0300 >@@ -0,0 +1,11 @@ >+--- src/zabbix_server/watchdog/Makefile.in.orig 2016-07-22 15:06:39 UTC >++++ src/zabbix_server/watchdog/Makefile.in >+@@ -178,7 +178,7 @@ AUTOMAKE = @AUTOMAKE@ >+ AWK = @AWK@ >+ CC = @CC@ >+ CCDEPMODE = @CCDEPMODE@ >+-CFLAGS = @CFLAGS@ >++CFLAGS = @CFLAGS@ @LIBCURL_CFLAGS@ >+ CPP = @CPP@ >+ CPPFLAGS = @CPPFLAGS@ >+ CYGPATH_W = @CYGPATH_W@ >diff -uNr zabbix3-server.orig/files/patch-src_zabbix_agent_zabbix_agentd.c zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c >--- zabbix3-server.orig/files/patch-src_zabbix_agent_zabbix_agentd.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c 2016-05-13 14:51:12.000000000 +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 zabbix3-server.orig/files/patch-src_zabbix_proxy_proxy.c zabbix3-server/files/patch-src_zabbix_proxy_proxy.c >--- zabbix3-server.orig/files/patch-src_zabbix_proxy_proxy.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix_proxy_proxy.c 2016-05-13 14:47:29.000000000 +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 zabbix3-server.orig/files/patch-src_zabbix_server_server.c zabbix3-server/files/patch-src_zabbix_server_server.c >--- zabbix3-server.orig/files/patch-src_zabbix_server_server.c 1970-01-01 03:00:00.000000000 +0300 >+++ zabbix3-server/files/patch-src_zabbix_server_server.c 2016-05-13 14:28:09.000000000 +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 zabbix3-server.orig/files/zabbix_agentd.in zabbix3-server/files/zabbix_agentd.in >--- zabbix3-server.orig/files/zabbix_agentd.in 2016-08-02 11:23:05.079253329 +0300 >+++ zabbix3-server/files/zabbix_agentd.in 2016-08-04 16:21:15.278110733 +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 zabbix_agent pid file >+# Default is /var/run/zabbix/zabbix_agentd.pid > # > > . /etc/rc.subr >@@ -20,27 +20,29 @@ > name="zabbix_agentd" > rcvar=zabbix_agentd_enable > >-command="%%PREFIX%%/sbin/${name}" >-required_files="%%ETCDIR%%/${name}.conf" >- > 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 >@@ -50,6 +52,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_agentd_paths}" >- > run_rc_command "$1" >diff -uNr zabbix3-server.orig/files/zabbix_proxy.in zabbix3-server/files/zabbix_proxy.in >--- zabbix3-server.orig/files/zabbix_proxy.in 2016-08-02 11:23:05.070253656 +0300 >+++ zabbix3-server/files/zabbix_proxy.in 2016-08-04 16:22:22.362106498 +0300 >@@ -11,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 zabbix_proxy pid file >+# Default is /var/run/zabbix/zabbix_proxy.pid > # > > . /etc/rc.subr >@@ -24,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 >@@ -50,6 +54,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_proxy_paths}" >- > run_rc_command "$1" >diff -uNr zabbix3-server.orig/files/zabbix_server.in zabbix3-server/files/zabbix_server.in >--- zabbix3-server.orig/files/zabbix_server.in 2016-08-02 11:23:05.090251519 +0300 >+++ zabbix3-server/files/zabbix_server.in 2016-08-04 16:21:38.208109682 +0300 >@@ -11,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 zabbix_server pid file >+# Default is /var/run/zabbix/zabbix_server.pid > # > > . /etc/rc.subr >@@ -24,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_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 >@@ -49,6 +54,4 @@ > rc_pid=$(check_pidfile ${pidfile} ${command}) > } > >-export PATH="${zabbix_server_paths}" >- > run_rc_command "$1" >diff -uNr zabbix3-server.orig/pkg-plist.frontend zabbix3-server/pkg-plist.frontend >--- zabbix3-server.orig/pkg-plist.frontend 2016-08-02 11:23:05.122251836 +0300 >+++ zabbix3-server/pkg-plist.frontend 2016-08-03 13:00:05.958897439 +0300 >@@ -397,6 +397,8 @@ > %%WWWDIR%%/include/classes/screens/CScreenTriggersInfo.php > %%WWWDIR%%/include/classes/screens/CScreenTriggersOverview.php > %%WWWDIR%%/include/classes/screens/CScreenUrl.php >+%%WWWDIR%%/include/classes/screens/CScreenDiscovery.php >+%%WWWDIR%%/include/classes/screens/CScreenHttpTest.php > %%WWWDIR%%/include/classes/server/CZabbixServer.php > %%WWWDIR%%/include/classes/services/CServicesSlaCalculator.php > %%WWWDIR%%/include/classes/setup/CFrontendSetup.php >diff -uNr zabbix3-frontend.orig/Makefile zabbix3-frontend/Makefile >--- zabbix3-frontend.orig/Makefile 2016-08-02 11:23:04.335252000 +0300 >+++ zabbix3-frontend/Makefile 2016-08-03 16:00:48.432150012 +0300 >@@ -5,6 +5,11 @@ > CATEGORIES= net-mgmt > PKGNAMESUFFIX= -frontend > >+MAINTAINER= pg@pakhom.spb.ru >+COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS >+ >+LICENSE= GPLv2 >+ > MASTERDIR= ${.CURDIR}/../zabbix3-server > > NO_BUILD= yes >@@ -14,10 +19,11 @@ > > USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ > xmlreader xmlwriter simplexml gettext ldap >-WANT_PHP_WEB= yes >+ >+USES= php:web gettext > > OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE >-OPTIONS_DEFAULT= MYSQL MYSQLI >+OPTIONS_DEFAULT= MYSQL > MYSQLI_DESC= MySQLI backend > > .include <bsd.port.options.mk> >@@ -40,7 +46,7 @@ > > .if ${PORT_OPTIONS:MORACLE} > ZABBIX_REQUIRE= >-CONFIGURE_ARGS+= --with-oracle >+CONFIGURE_ARGS+= --with-oracle > .endif > > do-install:
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=173342">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
pg:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 209893
:
170869
|
171538
|
173226
|
173279
|
173341
|
173342
|
174819
|
174890
|
174891