From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 4 14:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0129A54 for ; Wed, 4 Dec 2013 14:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A48F1275 for ; Wed, 4 Dec 2013 14:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4E00J3043750 for ; Wed, 4 Dec 2013 14:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB4E005U043749; Wed, 4 Dec 2013 14:00:00 GMT (envelope-from gnats) Resent-Date: Wed, 4 Dec 2013 14:00:00 GMT Resent-Message-Id: <201312041400.rB4E005U043749@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pakhom Golynga Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61D9D9DC for ; Wed, 4 Dec 2013 13:54:46 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 422E91243 for ; Wed, 4 Dec 2013 13:54:46 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rB4Dsj7h071324 for ; Wed, 4 Dec 2013 13:54:45 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rB4DsjEg071320; Wed, 4 Dec 2013 13:54:45 GMT (envelope-from nobody) Message-Id: <201312041354.rB4DsjEg071320@oldred.freebsd.org> Date: Wed, 4 Dec 2013 13:54:45 GMT From: Pakhom Golynga To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/184495: update to 2.0.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 14:00:00 -0000 >Number: 184495 >Category: ports >Synopsis: update to 2.0.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 04 14:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Pakhom Golynga >Release: 9.1-RELEASE >Organization: >Environment: >Description: update to 2.0.9 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN zabbix2-frontend.orig/Makefile zabbix2-frontend/Makefile --- zabbix2-frontend.orig/Makefile 2013-12-04 15:15:57.504083000 +0400 +++ zabbix2-frontend/Makefile 2013-12-04 17:51:12.625082957 +0400 @@ -1,9 +1,9 @@ # Created by: Jim Riggs # $FreeBSD: head/net-mgmt/zabbix2-frontend/Makefile 327757 2013-09-20 22:24:43Z bapt $ -PORTNAME= zabbix2 -PKGNAMESUFFIX= -frontend -CATEGORIES= net-mgmt +PORTNAME= zabbix2 +PKGNAMESUFFIX= -frontend +CATEGORIES= net-mgmt MASTERDIR= ${.CURDIR}/../zabbix2-server @@ -12,11 +12,11 @@ PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ - xmlreader xmlwriter simplexml gettext + xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE +OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend @@ -39,6 +39,11 @@ USE_PHP+= sqlite3 .endif +.if ${PORT_OPTIONS:MORACLE} +ZABBIX_REQUIRE= +CONFIGURE_ARGS+= --with-oracle +.endif + do-install: @${INSTALL} -d ${WWWDIR} @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR} diff -urN zabbix2-server.orig/Makefile zabbix2-server/Makefile --- zabbix2-server.orig/Makefile 2013-11-13 12:06:46.949763000 +0400 +++ zabbix2-server/Makefile 2013-12-04 17:31:34.847080653 +0400 @@ -1,13 +1,13 @@ -# Created by: Jim Riggs +reated by: Jim Riggs # $FreeBSD: head/net-mgmt/zabbix2-server/Makefile 328009 2013-09-23 14:26:59Z rm $ -PORTNAME= zabbix2 -PORTVERSION= 2.0.8 -PORTREVISION?= 0 -CATEGORIES= net-mgmt -MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} -PKGNAMESUFFIX?= -server -DISTNAME= zabbix-${PORTVERSION} +PORTNAME= zabbix2 +PORTVERSION= 2.0.9 +PORTREVISION?= 0 +CATEGORIES= net-mgmt +MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} +PKGNAMESUFFIX?= -server +DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pakhom706@gmail.com COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) @@ -16,6 +16,8 @@ CONFLICTS= ${PKGBASE}-1.[0-8]* +IGNORE_WITH_MYSQL= 41 + .if ${PKGNAMESUFFIX} != "-agent" CONFLICTS+= ${PORTNAME}-1.[0-8]* .endif @@ -68,8 +70,8 @@ OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW -OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL LDAP +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW MYSQL +OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks @@ -84,7 +86,7 @@ UNIXODBC_DESC= Use UnixODBC for ODBC support OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC NO_STAGE= yes @@ -103,11 +105,16 @@ .endif .if ${PORT_OPTIONS:MSQLITE} -ZABBIX_REQUIRE= +ZABBIX_REQUIRE= " sqlite" USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite3 .endif +.if ${PORT_OPTIONS:MORACLE} +ZABBIX_REQUIRE= +CONFIGURE_ARGS+= --with-oracle +.endif + .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-libcurl @@ -173,7 +180,6 @@ .if ${ZABBIX_BUILD} != "agent" .if empty(PORT_OPTIONS:MFPING) - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf .endif .for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \ @@ -187,6 +193,11 @@ @${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 ${PREFIX}/sbin/zabbix_java/settings.sh.sample +.endif + .if ${ZABBIX_BUILD} != "agent" @${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database" @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/ diff -urN zabbix2-server.orig/distinfo zabbix2-server/distinfo --- zabbix2-server.orig/distinfo 2013-08-29 10:41:26.173356000 +0400 +++ zabbix2-server/distinfo 2013-12-04 17:24:24.227083114 +0400 @@ -1,2 +1,2 @@ -SHA256 (zabbix-2.0.8.tar.gz) = c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a -SIZE (zabbix-2.0.8.tar.gz) = 13457936 +SHA256 (zabbix-2.0.9.tar.gz) = d5ef1ea94f6f09992a7f1f6fb9b58f99c3bca6196c5454ad29fa63c03996ee14 +SIZE (zabbix-2.0.9.tar.gz) = 13648392 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 1970-01-01 03:00:00.000000000 +0300 +++ zabbix2-server/files/patch-src_shutdown.sh 2013-12-04 17:17:21.711084439 +0400 @@ -0,0 +1,12 @@ +--- 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 1970-01-01 03:00:00.000000000 +0300 +++ zabbix2-server/files/patch-src_startup.sh 2013-12-04 17:17:21.710084092 +0400 @@ -0,0 +1,32 @@ +--- 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 2013-11-13 12:06:47.103762000 +0400 +++ zabbix2-server/pkg-plist 2013-12-04 17:21:35.211084668 +0400 @@ -38,7 +38,7 @@ %%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 +%%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 diff -urN zabbix2-server.orig/pkg-plist.frontend zabbix2-server/pkg-plist.frontend --- zabbix2-server.orig/pkg-plist.frontend 2013-08-29 10:26:36.010356000 +0400 +++ zabbix2-server/pkg-plist.frontend 2013-12-04 17:39:14.461083542 +0400 @@ -645,6 +645,8 @@ %%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.mo %%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.po %%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.mo +%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.po +%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.mo %%WWWDIR%%/locale/add_new_language.sh %%WWWDIR%%/conf/zabbix.conf.php.example %%WWWDIR%%/conf/maintenance.inc.php @@ -858,6 +860,8 @@ @dirrm %%WWWDIR%%/locale/bg/ @dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/ @dirrm %%WWWDIR%%/locale/lt/ +@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/ +@dirrm %%WWWDIR%%/locale/ro/ @dirrm %%WWWDIR%%/locale @dirrm %%WWWDIR%%/conf @dirrm %%WWWDIR%%/js/jquery >Release-Note: >Audit-Trail: >Unformatted: