Attachment 144762 Details for Bug 191934 – patch to update 2.0.12

patch to update 2.0.12

zabbix2012.txt (text/plain), 9.13 KB, created by pg on 2014-07-17 21:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pg

Created: 2014-07-17 21:57:47 UTC

Size: 9.13 KB

patch

obsolete

>diff -urN zabbix2-server.orig/Makefile zabbix2-server/Makefile
>--- zabbix2-server.orig/Makefile	2014-06-22 16:40:32.998320000 +0400
>+++ zabbix2-server/Makefile	2014-07-18 01:25:59.122692305 +0400
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/net-mgmt/zabbix2-server/Makefile 353512 2014-05-09 20:14:47Z bdrewery $
> 
> PORTNAME=	zabbix2
>-PORTVERSION=	2.0.10
>-PORTREVISION?=	1
>+PORTVERSION=	2.0.12
>+PORTREVISION?=	0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -68,7 +68,8 @@
> OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
> 
> OPTIONS_DEFINE=	IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW
>-OPTIONS_DEFAULT=	MYSQL IPV6 FPING JABBER CURL
>+OPTIONS_DEFAULT=	MYSQL IPV6 FPING JABBER CURL UNIXODBC
>+OPTIONS_SUB=    yes
> 
> CURL_DESC=	Support for web monitoring
> FPING_DESC=	Build/install fping for ping checks
>@@ -77,89 +78,57 @@
> LDAP_DESC=	Support for LDAP server checks
> NMAP_DESC=	Build/install nmap for o/s detection
> SSH_DESC=	Support for SSH-based checks
>-ODBC_DESC=	Support for database checks via ODBC
> JAVAGW_DESC=	Support for Java gateway
>+ODBC_DESC=      Support for database checks via ODBC
> 
>-OPTIONS_SINGLE=	DB
>-OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE ODBC
>+OPTIONS_SINGLE=	DB ODBC
>+OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
>+OPTIONS_SINGLE_ODBC=   IODBC UNIXODBC
> 
>-.include <bsd.port.options.mk>
>+MYSQL_CONFIGURE_WITH=   mysql
>+MYSQL_USE=      MYSQL=yes
> 
>-.if ${PORT_OPTIONS:MMYSQL}
>-ZABBIX_REQUIRE=	" mysql"
>-USE_MYSQL=	yes
>-CONFIGURE_ARGS+=	--with-mysql
>-.endif
>+PGSQL_CONFIGURE_WITH=   postgresql
>+PGSQL_USES=     pgsql
> 
>-.if ${PORT_OPTIONS:MPGSQL}
>-ZABBIX_REQUIRE=	" postgresql"
>-USE_PGSQL=	yes
>-CONFIGURE_ARGS+=	--with-postgresql
>-.endif
>+SQLITE_CONFIGURE_WITH=  sqlite3
>+SQLITE_USE=     SQLITE=3
>+ 
>+ORACLE_CONFIGURE_WITH=  oracle
> 
>-.if ${PORT_OPTIONS:MSQLITE}
>-ZABBIX_REQUIRE= " sqlite"
>-USE_SQLITE=	3
>-CONFIGURE_ARGS+=	--with-sqlite3
>-.endif
>+CURL_CONFIGURE_WITH=    libcurl
>+CURL_LIB_DEPENDS=       libcurl.so:${PORTSDIR}/ftp/curl
> 
>-.if ${PORT_OPTIONS:MORACLE}
>-ZABBIX_REQUIRE=
>-CONFIGURE_ARGS+=	--with-oracle
>-.endif
>+LDAP_CONFIGURE_WITH=    ldap
>+LDAP_USE=       OPENLDAP=yes
> 
>-.if ${PORT_OPTIONS:MCURL}
>-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
>-CONFIGURE_ARGS+=	--with-libcurl
>-.endif
>+IPMI_CONFIGURE_WITH=    openipmi
>+IPMI_LIB_DEPENDS=       libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
> 
>-.if ${PORT_OPTIONS:MLDAP}
>-USE_OPENLDAP=	yes
>-CONFIGURE_ARGS+=	--with-ldap
>-.endif
>+JABBER_CONFIGURE_WITH=  jabber
>+JABBER_LIB_DEPENDS=     libiksemel.so:${PORTSDIR}/textproc/iksemel
> 
>-.if ${PORT_OPTIONS:MIPMI}
>-LIB_DEPENDS+=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
>-CONFIGURE_ARGS+=	--with-openipmi
>-.endif
>+FPING_RUN_DEPENDS=      fping:${PORTSDIR}/net/fping
> 
>-.if ${PORT_OPTIONS:MJABBER}
>-LIB_DEPENDS+=	libiksemel.so:${PORTSDIR}/textproc/iksemel
>-CONFIGURE_ARGS+=	--with-jabber
>-.endif
>-
>-.if ${PORT_OPTIONS:MFPING}
>-RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
>-.endif
>+SSH_CONFIGURE_WITH=     ssh2
>+SSH_LIB_DEPENDS=        libssh2.so:${PORTSDIR}/security/libssh2
> 
>-.if ${PORT_OPTIONS:MSSH}
>-LIB_DEPENDS+=	libssh2.so:${PORTSDIR}/security/libssh2
>-CONFIGURE_ARGS+=	--with-ssh2
>-.endif
>+IODBC_CONFIGURE_WITH=   iodbc
>+IODBC_LIB_DEPENDS=      libiodbc.so:${PORTSDIR}/databases/libiodbc
> 
>-.if ${PORT_OPTIONS:MODBC}
>-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
>-CONFIGURE_ARGS+=	--with-unixodbc
>-.endif
>+UNIXODBC_CONFIGURE_WITH=        unixodbc
>+UNIXODBC_LIB_DEPENDS=   libodbc.so:${PORTSDIR}/databases/unixODBC
> .endif # if ${ZABBIX_BUILD} != "agent"
> 
>-.if ${PORT_OPTIONS:MIPV6}
>-CONFIGURE_ARGS+=	--enable-ipv6
>-.endif
>+IPV6_CONFIGURE_ENABLE=  ipv6
> 
>-.if ${PORT_OPTIONS:MNMAP}
>-RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap \
>-		sudo:${PORTSDIR}/security/sudo
>-.endif
>+NMAP_RUN_DEPENDS=       nmap:${PORTSDIR}/security/nmap \
>+                sudo:${PORTSDIR}/security/sudo
> 
>-.if ${PORT_OPTIONS:MJAVAGW}
>-USE_JAVA=	yes
>-CONFIGURE_ARGS+=	--enable-java
>-PLIST_SUB+=	ZABBIX_JAVA="sbin/zabbix_java"
>-PLIST_SUB+=	JAVAGW=""
>-.else
>-PLIST_SUB+=	JAVAGW="@comment "
>-.endif
>+JAVAGW_CONFIGURE_ENABLE=        java
>+JAVAGW_USE=     JAVA=yes
>+
>+.include <bsd.port.options.mk>
> 
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
>@@ -181,9 +150,8 @@
> 	@${FIND} ${WRKSRC} -type f $ -name '*.bak' -or -name '*.orig' $ -exec ${RM} -f {} +
> 
> post-install:
>-
>-.if defined(WITH_JAVAGW)
>-	@${MV} ${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
>+.if ${PORT_OPTIONS:MJAVAGW}
>+	@${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
> .endif
> 
> .if ${ZABBIX_BUILD} != "agent"
>diff -urN zabbix2-server.orig/distinfo zabbix2-server/distinfo
>--- zabbix2-server.orig/distinfo	2014-06-22 16:40:34.483312000 +0400
>+++ zabbix2-server/distinfo	2014-07-17 10:37:04.749362292 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (zabbix-2.0.10.tar.gz) = 71415b5da223c6c0ba2f1c21c3c03cad9a5be0c8986791d7031c014986a9065d
>-SIZE (zabbix-2.0.10.tar.gz) = 13671284
>+SHA256 (zabbix-2.0.12.tar.gz) = f9237297b37d41eb0ed4f0b2e1f3f2e30dc17fe19d3bbd57fb06d5f6f8acd8b7
>+SIZE (zabbix-2.0.12.tar.gz) = 13699618
>diff -urN zabbix2-server.orig/files/patch-src_shutdown.sh zabbix2-server/files/patch-src_shutdown.sh
>--- zabbix2-server.orig/files/patch-src_shutdown.sh	2014-06-22 16:40:36.615318000 +0400
>+++ zabbix2-server/files/patch-src_shutdown.sh	1970-01-01 03:00:00.000000000 +0300
>@@ -1,12 +0,0 @@
>---- src/zabbix_java/shutdown.sh.orig	2013-11-12 10:07:23.000000000 +0400
>-+++ src/zabbix_java/shutdown.sh	2013-12-04 16:37:38.000000000 +0400
>-@@ -1,7 +1,7 @@
>--#!/bin/bash
>-+#!/bin/sh
>- 
>- cd $(dirname $0)
>--source settings.sh
>-+. settings.sh
>- 
>- if [ -n "$PID_FILE" ]; then
>- 	if [ -e "$PID_FILE" ]; then
>diff -urN zabbix2-server.orig/files/patch-src_startup.sh zabbix2-server/files/patch-src_startup.sh
>--- zabbix2-server.orig/files/patch-src_startup.sh	2014-06-22 16:40:33.072320000 +0400
>+++ zabbix2-server/files/patch-src_startup.sh	1970-01-01 03:00:00.000000000 +0300
>@@ -1,32 +0,0 @@
>---- src/zabbix_java/startup.sh.orig	2013-11-12 10:07:23.000000000 +0400
>-+++ src/zabbix_java/startup.sh	2013-12-04 16:37:05.000000000 +0400
>-@@ -1,7 +1,7 @@
>--#!/bin/bash
>-+#!/bin/sh
>- 
>- cd $(dirname $0)
>--source settings.sh
>-+. settings.sh
>- 
>- if [ -n "$PID_FILE" -a -e "$PID_FILE" ]; then
>- 	echo "Zabbix Java Gateway is already running"
>-@@ -16,8 +16,8 @@
>- fi
>- 
>- CLASSPATH="lib"
>--for jar in {lib,bin}/*.jar; do
>--	if [[ $jar != *junit* ]]; then
>-+for jar in lib/*.jar bin/*.jar; do
>-+	if [ "$jar" != "*junit*" ]; then
>- 		CLASSPATH="$CLASSPATH:$jar"
>- 	fi
>- done
>-@@ -39,7 +39,7 @@
>- COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway"
>- 
>- if [ -n "$PID_FILE" ]; then
>--	PID=$(/bin/bash -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
>-+	PID=$(/bin/sh -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
>- 	if ps -p $PID > /dev/null 2>&1; then
>- 		echo $PID > $PID_FILE
>- 	else
>diff -urN zabbix2-server.orig/pkg-plist zabbix2-server/pkg-plist
>--- zabbix2-server.orig/pkg-plist	2014-06-22 16:40:33.065323000 +0400
>+++ zabbix2-server/pkg-plist	2014-07-18 01:08:27.862760783 +0400
>@@ -32,19 +32,19 @@
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
>-%%JAVAGW%%%%ZABBIX_JAVA%%/shutdown.sh
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-console.xml
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-core-0.9.27.jar
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/org-json-2010-12-28.jar
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml
>-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar
>-%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh.sample
>-%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh
>-%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
>-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib
>-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/bin
>-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%
>+%%JAVAGW%%sbin/zabbix_java/shutdown.sh
>+%%JAVAGW%%sbin/zabbix_java/lib/logback-console.xml
>+%%JAVAGW%%sbin/zabbix_java/lib/logback-core-0.9.27.jar
>+%%JAVAGW%%sbin/zabbix_java/lib/org-json-2010-12-28.jar
>+%%JAVAGW%%sbin/zabbix_java/lib/logback-classic-0.9.27.jar
>+%%JAVAGW%%sbin/zabbix_java/lib/logback.xml
>+%%JAVAGW%%sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
>+%%JAVAGW%%sbin/zabbix_java/settings.sh.sample
>+%%JAVAGW%%sbin/zabbix_java/startup.sh
>+%%JAVAGW%%sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
>+%%JAVAGW%%@dirrmtry sbin/zabbix_java/lib
>+%%JAVAGW%%@dirrmtry sbin/zabbix_java/bin
>+%%JAVAGW%%@dirrmtry sbin/zabbix_java
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle
>diff -urN zabbix2-server.orig/pkg-plist.frontend zabbix2-server/pkg-plist.frontend
>--- zabbix2-server.orig/pkg-plist.frontend	2014-06-22 16:40:36.598310000 +0400
>+++ zabbix2-server/pkg-plist.frontend	2014-07-17 11:41:59.815113362 +0400
>@@ -18,6 +18,7 @@
> %%WWWDIR%%/popup_right.php
> %%WWWDIR%%/report5.php
> %%WWWDIR%%/report2.php
>+%%WWWDIR%%/robots.txt
> %%WWWDIR%%/popup_bitem.php
> %%WWWDIR%%/warning.php
> %%WWWDIR%%/hostinventoriesoverview.php

Actions: View

Attachments on bug 191934: 144762