Attachment 195367 Details for Bug 217777 – zabbix3-java.patch

[patch] zabbix3-java.patch

zabbix3-java.patch (text/plain), 6.84 KB, created by Danilo G. Baio on 2018-07-22 14:06:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2018-07-22 14:06:54 UTC

Size: 6.84 KB

patch

obsolete

>Index: net-mgmt/Makefile
>===================================================================
>--- net-mgmt/Makefile	(revision 475064)
>+++ net-mgmt/Makefile	(working copy)
>@@ -407,6 +407,7 @@
>     SUBDIR += zabbix22-server
>     SUBDIR += zabbix3-agent
>     SUBDIR += zabbix3-frontend
>+    SUBDIR += zabbix3-java
>     SUBDIR += zabbix3-proxy
>     SUBDIR += zabbix3-server
>     SUBDIR += zabbix32-agent
>Index: net-mgmt/zabbix3-java/Makefile
>===================================================================
>--- net-mgmt/zabbix3-java/Makefile	(nonexistent)
>+++ net-mgmt/zabbix3-java/Makefile	(working copy)
>@@ -0,0 +1,14 @@
>+# $FreeBSD$
>+
>+PORTNAME=	zabbix3
>+CATEGORIES=	net-mgmt
>+PKGNAMESUFFIX=	-java
>+
>+MASTERDIR=	${.CURDIR}/../zabbix3-server
>+PLIST=		${PKGDIR}/pkg-plist.java
>+
>+OPTIONS_DEFINE=		IPV6
>+
>+USE_JAVA=	yes
>+
>+.include "${MASTERDIR}/Makefile"
>
>Property changes on: net-mgmt/zabbix3-java/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/zabbix3-server/Makefile
>===================================================================
>--- net-mgmt/zabbix3-server/Makefile	(revision 475064)
>+++ net-mgmt/zabbix3-server/Makefile	(working copy)
>@@ -53,7 +53,7 @@
> 			--datadir=${ETCDIR} \
> 			--with-iconv=${ICONV_PREFIX}
> 
>-.if ${ZABBIX_BUILD} != "agent"
>+.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
> LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -62,8 +62,7 @@
> 
> CONFIGURE_ARGS+=	--with-net-snmp
> 
>-OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \
>-			LIBXML2
>+OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
> 
> OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
> OPTIONS_SUB=		yes
>@@ -76,7 +75,6 @@
> 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
> LIBXML2_DESC=		Support for libxml2 (required by monitoring VMware)
> 
> OPTIONS_SINGLE=		DB ODBC SSL
>@@ -117,19 +115,16 @@
> 
> UNIXODBC_CONFIGURE_WITH=unixodbc
> UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
>-.else
>+.elif ${ZABBIX_BUILD} == "agent"
> OPTIONS_SINGLE=	SSL
> OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
>-.endif # if ${ZABBIX_BUILD} != "agent"
>+.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
> 
> IPV6_CONFIGURE_ENABLE=	ipv6
> 
> NMAP_RUN_DEPENDS=	nmap:security/nmap \
> 			sudo:security/sudo
> 
>-JAVAGW_CONFIGURE_ENABLE=java
>-JAVAGW_USE=		JAVA=yes
>-
> LIBXML2_CONFIGURE_WITH=	libxml2
> LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> 
>@@ -172,6 +167,11 @@
> 		${WRKSRC}/conf/zabbix_agentd*.conf
> .endif
> 
>+.if ${ZABBIX_BUILD} == "java"
>+	@${REINPLACE_CMD} -e 's#PID_FILE="/tmp/zabbix_java.pid"#PID_FILE="/var/run/zabbix/zabbix_java.pid"#g' \
>+		${WRKSRC}/src/zabbix_java/settings.sh
>+.endif
>+
> .if ${ZABBIX_BUILD} != "agent"
> .  for d in mysql oracle postgresql sqlite3
> 	@${REINPLACE_CMD} \
>@@ -189,12 +189,12 @@
> 
> post-install:
> 
>-.if ${PORT_OPTIONS:MJAVAGW}
>+.if ${ZABBIX_BUILD} == "java"
> 	${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \
> 		${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
> .endif
> 
>-.if ${ZABBIX_BUILD} != "agent"
>+.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
> 	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
> 	(cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \
> 		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/)
>Index: net-mgmt/zabbix3-server/files/zabbix_java.in
>===================================================================
>--- net-mgmt/zabbix3-server/files/zabbix_java.in	(nonexistent)
>+++ net-mgmt/zabbix3-server/files/zabbix_java.in	(working copy)
>@@ -0,0 +1,34 @@
>+#!/bin/sh
>+
>+# PROVIDE: zabbix_java
>+# REQUIRE: NETWORKING SERVERS
>+# BEFORE: DAEMON
>+# KEYWORD: shutdown
>+#
>+# Options to configure zabbix_java via /etc/rc.conf:
>+#
>+# zabbix_java_enable (bool):
>+#   Enable service on boot.
>+#   Default: NO
>+#
>+
>+. /etc/rc.subr
>+
>+name="zabbix_java"
>+rcvar=zabbix_java_enable
>+
>+load_rc_config $name
>+
>+: ${zabbix_java_enable:=NO}
>+
>+start_cmd="%%PREFIX%%/sbin/zabbix_java/startup.sh"
>+stop_cmd="%%PREFIX%%/sbin/zabbix_java/shutdown.sh"
>+start_precmd=zabbix_java_precmd 
>+
>+zabbix_java_precmd() {
>+	if [ ! -d /var/run/zabbix ] ; then
>+		install -d -m 0755 -o zabbix -g zabbix /var/run/zabbix
>+	fi
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: net-mgmt/zabbix3-server/files/zabbix_java.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/zabbix3-server/pkg-plist
>===================================================================
>--- net-mgmt/zabbix3-server/pkg-plist	(revision 475064)
>+++ net-mgmt/zabbix3-server/pkg-plist	(working copy)
>@@ -33,16 +33,6 @@
> %%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%%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/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/lib/android-json-4.3_r3.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
> %%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts
> @dir %%ETCDIR%%/zabbix/externalscripts
> %%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d
>Index: net-mgmt/zabbix3-server/pkg-plist.java
>===================================================================
>--- net-mgmt/zabbix3-server/pkg-plist.java	(nonexistent)
>+++ net-mgmt/zabbix3-server/pkg-plist.java	(working copy)
>@@ -0,0 +1,10 @@
>+sbin/zabbix_java/shutdown.sh
>+sbin/zabbix_java/lib/logback-console.xml
>+sbin/zabbix_java/lib/logback-core-0.9.27.jar
>+sbin/zabbix_java/lib/logback-classic-0.9.27.jar
>+sbin/zabbix_java/lib/logback.xml
>+sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
>+sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
>+@sample sbin/zabbix_java/settings.sh.sample
>+sbin/zabbix_java/startup.sh
>+sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
>
>Property changes on: net-mgmt/zabbix3-server/pkg-plist.java
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pg: maintainer-approval+

Actions: View | Diff

Attachments on bug 217777: 180804 | 195367