[net-analyzer/zabbix] bump to 4.2.1
This commit is contained in:
		
							
								
								
									
										1
									
								
								net-analyzer/zabbix/Manifest
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								net-analyzer/zabbix/Manifest
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| DIST zabbix-4.2.1.tar.gz 18284589 BLAKE2B 18979be7d0c39c901ed76421016f4604eb9be91416af1cb98c3280182be4a45c49c0214b87b5f78ef3aab9340bd22487a81fa9e788c76168262a3b60801ec770 SHA512 9fed2262a35b70645fb85c78113ccbd51b1e1426a634a5dfcdf8054ee65ce1d27bb7a9d9827e8e73f3cc6ec5d325e0edc4c58bbdc176dcc9cf4623997b1bbcc5 | ||||
| @@ -0,0 +1,11 @@ | ||||
| --- zabbix-4.0.1/configure	2018-10-29 10:36:05.000000000 -0700 | ||||
| +++ zfx/configure	2018-11-07 16:59:28.015968345 -0800 | ||||
| @@ -12510,7 +12510,7 @@ | ||||
|  CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs" | ||||
|  CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys" | ||||
|   | ||||
| -LOAD_MODULE_PATH="${libdir}/modules" | ||||
| +LOAD_MODULE_PATH="${libdir}/zabbix" | ||||
|   | ||||
|   | ||||
|   | ||||
							
								
								
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-agentd.service
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-agentd.service
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| [Unit] | ||||
| Description=Zabbix agent daemon | ||||
| After=network.target | ||||
|  | ||||
| [Service] | ||||
| Type=forking | ||||
| User=zabbix | ||||
| Group=zabbix | ||||
| ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf | ||||
| PIDFile=/run/zabbix/zabbix_agentd.pid | ||||
|  | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
|  | ||||
							
								
								
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-agentd.tmpfiles
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-agentd.tmpfiles
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| d /run/zabbix 0755 zabbix zabbix - | ||||
							
								
								
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-proxy.service
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-proxy.service
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| [Unit] | ||||
| Description=Zabbix proxy | ||||
| After=network.target | ||||
|  | ||||
| [Service] | ||||
| Type=forking | ||||
| User=zabbix | ||||
| Group=zabbix | ||||
| ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf | ||||
| PIDFile=/run/zabbix/zabbix_proxy.pid | ||||
|  | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
|  | ||||
							
								
								
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-proxy.tmpfiles
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-proxy.tmpfiles
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| d /run/zabbix 0755 zabbix zabbix - | ||||
							
								
								
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-server.service
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								net-analyzer/zabbix/files/zabbix-server.service
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| [Unit] | ||||
| Description=Zabbix server | ||||
| After=syslog.target network.target postgresql.service | ||||
|  | ||||
| [Service] | ||||
| Type=forking | ||||
| User=zabbix | ||||
| Group=zabbix | ||||
| ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf | ||||
| PIDFile=/run/zabbix/zabbix_server.pid | ||||
|  | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
|  | ||||
							
								
								
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-server.tmpfiles
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								net-analyzer/zabbix/files/zabbix-server.tmpfiles
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| d /run/zabbix 0755 zabbix zabbix - | ||||
							
								
								
									
										333
									
								
								net-analyzer/zabbix/zabbix-4.2.1.ebuild
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										333
									
								
								net-analyzer/zabbix/zabbix-4.2.1.ebuild
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,333 @@ | ||||
| # Copyright 1999-2019 Gentoo Authors | ||||
| # Distributed under the terms of the GNU General Public License v2 | ||||
|  | ||||
| EAPI="6" | ||||
|  | ||||
| # needed to make webapp-config dep optional | ||||
| WEBAPP_OPTIONAL="yes" | ||||
| inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs | ||||
|  | ||||
| DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" | ||||
| HOMEPAGE="https://www.zabbix.com/" | ||||
| MY_P=${P/_/} | ||||
| MY_PV=${PV/_/} | ||||
| SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" | ||||
| LICENSE="GPL-2" | ||||
| SLOT="0" | ||||
| WEBAPP_MANUAL_SLOT="yes" | ||||
| KEYWORDS="~amd64 ~x86" | ||||
| IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" | ||||
| REQUIRED_USE="|| ( agent frontend proxy server ) | ||||
| 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) | ||||
| 	server? ( ^^ ( mysql oracle postgres odbc ) ) | ||||
| 	static? ( !oracle !snmp )" | ||||
|  | ||||
| COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) | ||||
| 	ldap? ( | ||||
| 		net-nds/openldap | ||||
| 		=dev-libs/cyrus-sasl-2* | ||||
| 		net-libs/gnutls | ||||
| 	) | ||||
| 	mysql? ( >=virtual/mysql-5.0.3 ) | ||||
| 	sqlite? ( >=dev-db/sqlite-3.3.5 ) | ||||
| 	postgres? ( >=dev-db/postgresql-8.1:* ) | ||||
| 	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) | ||||
| 	xmpp? ( dev-libs/iksemel ) | ||||
| 	libxml2? ( dev-libs/libxml2 ) | ||||
| 	curl? ( net-misc/curl ) | ||||
| 	openipmi? ( sys-libs/openipmi ) | ||||
| 	ssh? ( net-libs/libssh2 ) | ||||
| 	java? ( virtual/jdk:* ) | ||||
| 	odbc? ( dev-db/unixODBC ) | ||||
| 	server? ( sys-libs/zlib ) | ||||
| 	proxy?  ( sys-libs/zlib ) | ||||
| 	ssl? ( dev-libs/openssl:=[-bindist] )" | ||||
|  | ||||
| RDEPEND="${COMMON_DEPEND} | ||||
| 	proxy? ( net-analyzer/fping[suid] ) | ||||
| 	server? ( net-analyzer/fping[suid] | ||||
| 		app-admin/webapp-config | ||||
| 		dev-libs/libpcre | ||||
| 		dev-libs/libevent ) | ||||
| 	java?	( | ||||
| 		>=virtual/jre-1.4 | ||||
| 		dev-java/slf4j-api | ||||
| 	) | ||||
| 	frontend? ( | ||||
| 		>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] | ||||
| 		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) | ||||
| 		mysql? ( dev-lang/php[mysqli] ) | ||||
| 		odbc? ( dev-lang/php[odbc] ) | ||||
| 		oracle? ( dev-lang/php[oci8-instant-client] ) | ||||
| 		postgres? ( dev-lang/php[postgres] ) | ||||
| 		sqlite? ( dev-lang/php[sqlite] ) | ||||
| 		media-libs/gd[png] | ||||
| 		app-admin/webapp-config )" | ||||
| DEPEND="${COMMON_DEPEND} | ||||
| 	static? ( | ||||
| 		ldap? ( | ||||
| 			net-nds/openldap[static-libs] | ||||
| 			=dev-libs/cyrus-sasl-2*[static-libs] | ||||
| 			net-libs/gnutls[static-libs] | ||||
| 		) | ||||
| 	mysql? ( >=virtual/mysql-5.0.3[static-libs] ) | ||||
| 	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) | ||||
| 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) | ||||
| 	libxml2? ( dev-libs/libxml2[static-libs] ) | ||||
| 	curl? ( net-misc/curl[static-libs] ) | ||||
| 	ssh? ( net-libs/libssh2[static-libs] ) | ||||
| 	odbc? ( dev-db/unixODBC[static-libs] ) | ||||
| 	) | ||||
| 	virtual/pkgconfig" | ||||
|  | ||||
| S=${WORKDIR}/${MY_P} | ||||
|  | ||||
| ZABBIXJAVA_BASE="opt/zabbix_java" | ||||
|  | ||||
| pkg_setup() { | ||||
| 	if use oracle; then | ||||
| 		if [ -z "${ORACLE_HOME}" ]; then | ||||
| 			eerror | ||||
| 			eerror "The environment variable ORACLE_HOME must be set" | ||||
| 			eerror "and point to the correct location." | ||||
| 			eerror "It looks like you don't have Oracle installed." | ||||
| 			eerror | ||||
| 			die "Environment variable ORACLE_HOME is not set" | ||||
| 		fi | ||||
| 		if has_version 'dev-db/oracle-instantclient-basic'; then | ||||
| 			ewarn | ||||
| 			ewarn "Please ensure you have a full install of the Oracle client." | ||||
| 			ewarn "dev-db/oracle-instantclient* is NOT sufficient." | ||||
| 			ewarn | ||||
| 		fi | ||||
| 	fi | ||||
|  | ||||
| 	if use frontend; then | ||||
| 		webapp_pkg_setup | ||||
| 	fi | ||||
|  | ||||
| 	enewgroup zabbix | ||||
| 	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix | ||||
| } | ||||
|  | ||||
| java_prepare() { | ||||
| 	cd "${S}/src/zabbix_java/lib" | ||||
| 	rm -v *.jar || die | ||||
|  | ||||
| 	java-pkg_jar-from slf4j-api | ||||
| } | ||||
|  | ||||
| src_prepare() { | ||||
| 	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" | ||||
| 	eapply_user | ||||
| } | ||||
|  | ||||
| src_configure() { | ||||
| 	econf \ | ||||
| 		$(use_enable server) \ | ||||
| 		$(use_enable proxy) \ | ||||
| 		$(use_enable agent) \ | ||||
| 		$(use_enable ipv6) \ | ||||
| 		$(use_enable static) \ | ||||
| 		$(use_enable java) \ | ||||
| 		$(use_with ldap) \ | ||||
| 		$(use_with snmp net-snmp) \ | ||||
| 		$(use_with mysql) \ | ||||
| 		$(use_with postgres postgresql) \ | ||||
| 		$(use_with oracle) \ | ||||
| 		$(use_with sqlite sqlite3) \ | ||||
| 		$(use_with xmpp jabber) \ | ||||
| 		$(use_with curl libcurl) \ | ||||
| 		$(use_with openipmi openipmi) \ | ||||
| 		$(use_with ssh ssh2) \ | ||||
| 		$(use_with libxml2) \ | ||||
| 		$(use_with odbc unixodbc) \ | ||||
| 		$(use_with ssl openssl) \ | ||||
| 		|| die "econf failed" | ||||
| } | ||||
|  | ||||
| src_compile() { | ||||
| 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then | ||||
| 		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" | ||||
| 	fi | ||||
| } | ||||
|  | ||||
| src_install() { | ||||
| 	dodir \ | ||||
| 		/etc/zabbix \ | ||||
| 		/var/lib/zabbix \ | ||||
| 		/var/lib/zabbix/home \ | ||||
| 		/var/lib/zabbix/scripts \ | ||||
| 		/var/lib/zabbix/alertscripts \ | ||||
| 		/var/lib/zabbix/externalscripts \ | ||||
| 		/var/log/zabbix | ||||
|  | ||||
| 	keepdir \ | ||||
| 		/etc/zabbix \ | ||||
| 		/var/lib/zabbix \ | ||||
| 		/var/lib/zabbix/home \ | ||||
| 		/var/lib/zabbix/scripts \ | ||||
| 		/var/lib/zabbix/alertscripts \ | ||||
| 		/var/lib/zabbix/externalscripts \ | ||||
| 		/var/log/zabbix | ||||
|  | ||||
| 	if use server; then | ||||
| 		insinto /etc/zabbix | ||||
| 		doins "${FILESDIR}/3.0"/zabbix_server.conf | ||||
| 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server | ||||
| 		dosbin src/zabbix_server/zabbix_server | ||||
| 		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf | ||||
| 		fperms 0640 /etc/zabbix/zabbix_server.conf | ||||
| 		dodir /usr/share/zabbix | ||||
| 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ | ||||
| 		systemd_dounit "${FILESDIR}/zabbix-server.service" | ||||
| 		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf | ||||
| 	fi | ||||
|  | ||||
| 	if use proxy; then | ||||
| 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy | ||||
| 		dosbin src/zabbix_proxy/zabbix_proxy | ||||
| 		insinto /etc/zabbix | ||||
| 		doins "${FILESDIR}/3.0"/zabbix_proxy.conf | ||||
| 		dodir /usr/share/zabbix | ||||
| 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ | ||||
| 		systemd_dounit "${FILESDIR}/zabbix-proxy.service" | ||||
| 		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf | ||||
| 	fi | ||||
|  | ||||
| 	if use agent; then | ||||
| 		insinto /etc/zabbix | ||||
| 		doins "${FILESDIR}/3.0"/zabbix_agentd.conf | ||||
| 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd | ||||
| 		dosbin src/zabbix_agent/zabbix_agentd | ||||
| 		dobin \ | ||||
| 			src/zabbix_sender/zabbix_sender \ | ||||
| 			src/zabbix_get/zabbix_get | ||||
| 		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf | ||||
| 		fperms 0640 /etc/zabbix/zabbix_agentd.conf | ||||
| 		systemd_dounit "${FILESDIR}/zabbix-agentd.service" | ||||
| 		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf | ||||
| 	fi | ||||
|  | ||||
| 	fowners zabbix:zabbix \ | ||||
| 		/etc/zabbix \ | ||||
| 		/var/lib/zabbix \ | ||||
| 		/var/lib/zabbix/home \ | ||||
| 		/var/lib/zabbix/scripts \ | ||||
| 		/var/lib/zabbix/alertscripts \ | ||||
| 		/var/lib/zabbix/externalscripts \ | ||||
| 		/var/log/zabbix | ||||
| 	fperms 0750 \ | ||||
| 		/etc/zabbix \ | ||||
| 		/var/lib/zabbix \ | ||||
| 		/var/lib/zabbix/home \ | ||||
| 		/var/lib/zabbix/scripts \ | ||||
| 		/var/lib/zabbix/alertscripts \ | ||||
| 		/var/lib/zabbix/externalscripts \ | ||||
| 		/var/log/zabbix | ||||
|  | ||||
| 	dodoc README INSTALL NEWS ChangeLog \ | ||||
| 		conf/zabbix_agentd.conf \ | ||||
| 		conf/zabbix_proxy.conf \ | ||||
| 		conf/zabbix_agentd/userparameter_examples.conf \ | ||||
| 		conf/zabbix_agentd/userparameter_mysql.conf \ | ||||
| 		conf/zabbix_server.conf | ||||
|  | ||||
| 	if use frontend; then | ||||
| 		webapp_src_preinst | ||||
| 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" | ||||
| 		webapp_configfile \ | ||||
| 			"${MY_HTDOCSDIR}"/include/db.inc.php \ | ||||
| 			"${MY_HTDOCSDIR}"/include/config.inc.php | ||||
| 		webapp_src_install | ||||
| 	fi | ||||
|  | ||||
| 	if use java; then | ||||
| 		dodir \ | ||||
| 			/${ZABBIXJAVA_BASE} \ | ||||
| 			/${ZABBIXJAVA_BASE}/bin \ | ||||
| 			/${ZABBIXJAVA_BASE}/lib | ||||
| 		keepdir /${ZABBIXJAVA_BASE} | ||||
| 		exeinto /${ZABBIXJAVA_BASE}/bin | ||||
| 		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar | ||||
| 		exeinto /${ZABBIXJAVA_BASE}/lib | ||||
| 		doexe \ | ||||
| 			src/zabbix_java/lib/logback-classic-0.9.27.jar \ | ||||
| 			src/zabbix_java/lib/logback-console.xml \ | ||||
| 			src/zabbix_java/lib/logback-core-0.9.27.jar \ | ||||
| 			src/zabbix_java/lib/logback.xml \ | ||||
| 			src/zabbix_java/lib/android-json-4.3_r3.1.jar \ | ||||
| 			src/zabbix_java/lib/slf4j-api-1.6.1.jar | ||||
| 		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} | ||||
| 		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy | ||||
| 		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy | ||||
| 	fi | ||||
| } | ||||
|  | ||||
| pkg_postinst() { | ||||
| 	if use server || use proxy ; then | ||||
| 		elog | ||||
| 		elog "You may need to configure your database for Zabbix," | ||||
| 		elog "if you have not already done so. " | ||||
| 		elog | ||||
|  | ||||
| 		zabbix_homedir=$(egethome zabbix) | ||||
| 		if [ -n "${zabbix_homedir}" ] && \ | ||||
| 		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then | ||||
| 			ewarn | ||||
| 			ewarn "The user 'zabbix' should have his homedir changed" | ||||
| 			ewarn "to /var/lib/zabbix/home if you want to use" | ||||
| 			ewarn "custom alert scripts." | ||||
| 			ewarn | ||||
| 			ewarn "A real homedir might be needed for configfiles" | ||||
| 			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" | ||||
| 			ewarn "using sendxmpp for Jabber alerts)." | ||||
| 			ewarn | ||||
| 			ewarn "To change the homedir use:" | ||||
| 			ewarn "  usermod -d /var/lib/zabbix/home zabbix" | ||||
| 			ewarn | ||||
| 		fi | ||||
| 	fi | ||||
|  | ||||
| 	if use server; then | ||||
| 		elog | ||||
| 		elog "For distributed monitoring you have to run:" | ||||
| 		elog | ||||
| 		elog "zabbix_server -n <nodeid>" | ||||
| 		elog | ||||
| 		elog "This will convert database data for use with Node ID" | ||||
| 		elog "and also adds a local node." | ||||
| 		elog | ||||
| 	fi | ||||
|  | ||||
| 	elog "--" | ||||
| 	elog | ||||
| 	elog "You may need to add these lines to /etc/services:" | ||||
| 	elog | ||||
| 	elog "zabbix-agent     10050/tcp Zabbix Agent" | ||||
| 	elog "zabbix-agent     10050/udp Zabbix Agent" | ||||
| 	elog "zabbix-trapper   10051/tcp Zabbix Trapper" | ||||
| 	elog "zabbix-trapper   10051/udp Zabbix Trapper" | ||||
| 	elog | ||||
|  | ||||
| 	if use server || use proxy ; then | ||||
| 		# check for fping | ||||
| 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) | ||||
| 		case "${fping_perms}" in | ||||
| 			4[157][157][157]) | ||||
| 				;; | ||||
| 			*) | ||||
| 				ewarn | ||||
| 				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," | ||||
| 				ewarn "you have to make /usr/sbin/fping setuid root and executable" | ||||
| 				ewarn "by everyone. Run the following command to fix it:" | ||||
| 				ewarn | ||||
| 				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" | ||||
| 				ewarn | ||||
| 				ewarn "Please be aware that this might impose a security risk," | ||||
| 				ewarn "depending on the code quality of fping." | ||||
| 				ewarn | ||||
| 				;; | ||||
| 		esac | ||||
| 	fi | ||||
| } | ||||
		Reference in New Issue
	
	Block a user