From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A4911581EC for ; Sat, 23 Nov 2024 07:53:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A508DE0815; Sat, 23 Nov 2024 07:53:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 795C3E0815 for ; Sat, 23 Nov 2024 07:53:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B6A734092E for ; Sat, 23 Nov 2024 07:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0501B1295 for ; Sat, 23 Nov 2024 07:53:29 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1732348406.e0474ba3b5f190f617dba2a0a864bb5a8c3c7cda.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/Manifest net-analyzer/zabbix/zabbix-6.0.34.ebuild net-analyzer/zabbix/zabbix-7.0.4.ebuild X-VCS-Directories: net-analyzer/zabbix/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: e0474ba3b5f190f617dba2a0a864bb5a8c3c7cda X-VCS-Branch: master Date: Sat, 23 Nov 2024 07:53:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04a1a777-fa66-466e-a812-b183e00ab6e0 X-Archives-Hash: cb780ed8b05d123bb12174c0e6dc6fff commit: e0474ba3b5f190f617dba2a0a864bb5a8c3c7cda Author: Miroslav Šulc gentoo org> AuthorDate: Sat Nov 23 07:53:20 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Nov 23 07:53:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0474ba3 net-analyzer/zabbix: dropped obsolete 6.0.34 & 7.0.4 Signed-off-by: Miroslav Šulc gentoo.org> net-analyzer/zabbix/Manifest | 4 - net-analyzer/zabbix/zabbix-6.0.34.ebuild | 389 ------------------------------- net-analyzer/zabbix/zabbix-7.0.4.ebuild | 371 ----------------------------- 3 files changed, 764 deletions(-) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 13fe661a1aed..a5a3231fd3fd 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -2,8 +2,6 @@ DIST zabbix-5.0.44-go-deps.tar.xz 27826116 BLAKE2B 0b96e7cbb40da4652945b7092d71e DIST zabbix-5.0.44.tar.gz 21884200 BLAKE2B ca5c75a789692b0b30c897a965ab6365848320cb1f3b1adfdcfa42e5ca731ca9058429964e7cfe8eac9a36982ae53c3a377a2e7d5062830adbe4255f10d10e5c SHA512 9624159c131736d8d4a8dfae72ab57427466298ed7b05f9ac28254aa4cbfdb23b94e37b633664b36bd0d65fe156b2d7b0f069cd5baaf7fc95fa9348f73ba892c DIST zabbix-5.0.45-go-deps.tar.xz 27797872 BLAKE2B f56bf82ebd1e66e2d0a9867f85b1fe21e4726cd6cf64976a14997b8ddd7abdec6414035819c94d906620a3d02841b27675c9880d69fcebc71bcf80a8b5fbc41a SHA512 baa2167aa33e9e1b7156b8cf1393a3bf51d19410066dee4805a2a37576c95ad62cb5176cc49168641b8d0feafc3c1154abfbf8319081f2bee6f9216c1beccc25 DIST zabbix-5.0.45.tar.gz 21885357 BLAKE2B 892050f2d4ef9c1972afadb856ca2e37c9a9e35820f39aab4efb0fa0dc3a62a2e1dcb63f12f779764f5990f8bc17d25e463e85234d6e59947742ceb0544c7e6f SHA512 3a181b63aed307d2ac6133dbac90c593d7f98648c545490a717501ab11da018f4cfc2abb35a573102a7fcf700423045fcd469a8d5f8e5b1d7c047e4f302af756 -DIST zabbix-6.0.34-go-deps.tar.xz 30898908 BLAKE2B fb37b29d4127cac5911cc84632047a835f167917d4c5651bb82cf15303c138782efc69c72580d7862c1fa8029efe30676c5a62ebf0dce586a85f2604734931a7 SHA512 b003b0bacbda0867d812a316a867ee5256714f957f19d343d66eacc91917fb4396782607b0510318b4d39d8bf3ba9a34c329ae3af3549203da9f1fb86f3557d2 -DIST zabbix-6.0.34.tar.gz 45586283 BLAKE2B c1448065d32fea1f3b08566a82f165cf1f37c9f44f3bd0c5228f1df2d86173ee073216e11be5af9df13e48ede20a1ced52afa645c451c0bab98b06fa46ce0b03 SHA512 17f4481d0c480f52c21d58774c79de9101f30842d2e48dde373087e457bfad45155baa61e64502b3fe908051f019e3fe08b61c994afd1ad9db2c2e0dc6aee9e4 DIST zabbix-6.0.35-go-deps.tar.xz 30910056 BLAKE2B 92559257aa3e266fff7b43ae17e9836d54895452f43dbf98744bdc200c3bf36bcb72780eee97dfe9fbbc27e906d34762be071dbae36565a9f98774fc5382e18a SHA512 fcdfeb4a0d6f361feb714f1eb451979c89eed696f9d6abee50799f6a2e133b28b410b436d3b1bfeb9392b06a89e10060d43a6f5eb3c349705dc3d9d3ea73ea54 DIST zabbix-6.0.35.tar.gz 45651728 BLAKE2B 82f76fefeb45450a02f04f1fd51a68cfb3c73e727e0dccbe77e9afb0c21d847ab2894954fb4bb56b0101614ef922a11910721c302e3cd8b51d79eb905cbd0b3d SHA512 21d068aacad7d8df6096c62e51a67d75f4067ed8e8e00d35124a899686ad083bb2ec249b0e087076af96f76fb4cb95628e613b3b99e349ae7ace076946483261 DIST zabbix-6.0.36-go-deps.tar.xz 31343856 BLAKE2B b25ba3991e53aee09e352a76d67cce73e2ea090a9d7d8c42720f86e9011aae93b940b824b83be093eda1653475aa872fc73468345ce543a745aa86e4a1d16fde SHA512 fb54ce97279de11ed190e3524a4f77e952caf3d70a601244dd3ec7f5c2e27ac6dd8f63d42b3e5879866ae78d2f4ed87955e0a92c3061473a8018474586e6bc7d @@ -12,8 +10,6 @@ DIST zabbix-6.4.19-go-deps.tar.xz 33706768 BLAKE2B 721512ca80a4b9b256d66f19b4cfd DIST zabbix-6.4.19.tar.gz 46901802 BLAKE2B c42b7c197642140ce5750357bf4fd9fd38e64326df8ba7a6c4c098b39373ecccead504f8b480412b3242864e1043b26b5495268807a07ca485bf121dfd71573c SHA512 7b03e185c89f33cf145f2758a906c4a1a914fee82bf0b79e92526c82abf38c6a2a4a0b6078fd6384dc5da6df53aa29562eddbbcf83911f44f09ee09df86a4ebc DIST zabbix-6.4.20-go-deps.tar.xz 34456784 BLAKE2B d703a985d578580af16810dd7c030976e15fb7695311581069a6b6f5050d30848bb0abdae987ca73e9d283d56b8fe7265e418ff973072eaa7f9297f576122939 SHA512 710d7ddc479f9b1c59af6c9345d0ca0d6dc1d81c3ae7c872c81d09a37cf394abd67e9c48650d913d661497728ad405f7c415667f34185c0f1bd1115e0779b2f2 DIST zabbix-6.4.20.tar.gz 47050234 BLAKE2B 06e523d51e49625285bd6cfbed4ba790218f69eeddbb57e6b635ff7ed6f710dce5b3c9fd5b9333bfb1e582187b5a6c3b3400763eb129fe6c03f52b55c4521499 SHA512 cde89b8bf4b5e6c39a8a7e661e7c229da9f189bf6ffd9960505daf3d63627d7bc12d420a9262244d789b30ceda34b7668e49ec9d52b8eea7144b9897871d1ae0 -DIST zabbix-7.0.4-go-deps.tar.xz 33741412 BLAKE2B 305577865b59312f39cfe06858280a12ec467a0ea09ea6921c714797523bad32f8b410cdc453632ff7097dab84de43c143c7f40d82864d49568fee872337d415 SHA512 edc84b83f333a19bfa24c692bd796605916f9ecb598764052c28295ed2338c5daf59d549fda395998c861963f01309413d8a7230032102407cb46f1f375ce3f4 -DIST zabbix-7.0.4.tar.gz 48621273 BLAKE2B fdd1acd8d1f97495005338f4eb0a4c35818a0291965f44dd2e1aa7469f5612b90a102f5dd81a41b4053353166bca7454297acedf0d12ec10fad169030b5a8e91 SHA512 4c4b05d2371a2e78c0b419e467ecb261911096b3603b52aab296aa40ab86cdb4e7006703c9aa5a63f0cfee93bc5320c402b083b45497cdd5d804ed7e774f291e DIST zabbix-7.0.5-go-deps.tar.xz 34041280 BLAKE2B ca0d1884df70f9fc32361d104b9917007b1f0563503c44078fb3cd302c0a3a59cbeb9432dea154db5d73018b0c886d3b7500f5406f2ae3a45cb7fad07fe5f867 SHA512 33edc4b0fb145dfc85b216d4332df311b91e9fa4e56eb306750d2d2c36c73fc3b76728a186113bcce39e6f357c906f383523506a08ff819ba3fc02893d48ff31 DIST zabbix-7.0.5.tar.gz 48797102 BLAKE2B f838fc783bb93dff52fb59252940e07a2c1f037a5dfce5ae4b0c0257a328a898642a1d36de93b838177baf556a678598f84ec83e71832ce39d45891d426df7f9 SHA512 4538dd76c8c9518e2238afb67b355cdbb6a7094a6a2b9a6705d9cba0b0515ae0797e593538514469cbf74c4eed2ce142d7f815f8ad90a311cc9c1f7c92f05744 DIST zabbix-7.0.6-go-deps.tar.xz 34172684 BLAKE2B f0f3f5af7f1c5d849e86b05e4bf1be48dbb78fd233e9c2b5b731ed6cf0257bd00b0ad54fa8b56f8355094af03910bb2f556d5cc3624b3c1b63dc2d5a3735a2a4 SHA512 51f64599259ad911e1befc14c3fa347f02a58c44f69694fd6ed70a6f7d0e405c7f800b8236d2d3dc0b64a09eedb6291f5509b847790f10ad6c225fd4246a5ea9 diff --git a/net-analyzer/zabbix/zabbix-6.0.34.ebuild b/net-analyzer/zabbix/zabbix-6.0.34.ebuild deleted file mode 100644 index 7cbc451d3735..000000000000 --- a/net-analyzer/zabbix/zabbix-6.0.34.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# To create the go modules tarball: -# cd src/go -# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod - -EAPI=8 - -GO_OPTIONAL="yes" -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info - -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://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz - agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) -" - -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 ~x86" -IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" -REQUIRED_USE="|| ( agent agent2 frontend proxy server ) - ?? ( gnutls openssl ) - agent2? ( !gnutls ) - proxy? ( ^^ ( mysql oracle postgres sqlite ) ) - server? ( ^^ ( mysql oracle postgres ) !sqlite ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - gnutls? ( net-libs/gnutls:0= ) - java? ( >=virtual/jdk-1.8:* ) - ldap? ( - =dev-libs/cyrus-sasl-2* - net-libs/gnutls:= - net-nds/openldap:= - ) - libxml2? ( dev-libs/libxml2 ) - mysql? ( dev-db/mysql-connector-c:= ) - odbc? ( dev-db/unixODBC ) - openipmi? ( sys-libs/openipmi ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) - postgres? ( dev-db/postgresql:* ) - proxy? ( - dev-libs/libevent:= - sys-libs/zlib - ) - server? ( - dev-libs/libevent:= - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp:= ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( - dev-libs/libpcre2:= - net-analyzer/fping[suid] - ) - selinux? ( sec-policy/selinux-zabbix ) - server? ( - app-admin/webapp-config - dev-libs/libpcre2:= - net-analyzer/fping[suid] - ) - frontend? ( - app-admin/webapp-config - dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - media-libs/gd[png] - virtual/httpd-php:* - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - ) -" -DEPEND="${COMMON_DEPEND} - static? ( - curl? ( net-misc/curl[static-libs] ) - ldap? ( - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - net-nds/openldap[static-libs] - ) - libxml2? ( dev-libs/libxml2[static-libs] ) - mysql? ( dev-db/mysql-connector-c[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - sqlite? ( dev-db/sqlite[static-libs] ) - ssh? ( net-libs/libssh2 ) - ) -" -BDEPEND=" - virtual/pkgconfig - agent2? ( - >=dev-lang/go-1.12 - app-arch/unzip - ) -" - -# upstream tests fail for agent2 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" - "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" -) - -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 - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - local econf_args=( - --with-libpcre2 - "$(use_enable agent)" - "$(use_enable agent2)" - "$(use_enable ipv6)" - "$(use_enable java)" - "$(use_enable proxy)" - "$(use_enable server)" - "$(use_enable static)" - "$(use_with curl libcurl)" - "$(use_with gnutls)" - "$(use_with ldap)" - "$(use_with libxml2)" - "$(use_with mysql)" - "$(use_with odbc unixodbc)" - "$(use_with openipmi openipmi)" - "$(use_with openssl)" - "$(use_with oracle)" - "$(use_with postgres postgresql)" - "$(use_with snmp net-snmp)" - "$(use_with sqlite sqlite3)" - "$(use_with ssh ssh2)" - ) - - econf ${econf_args[@]} -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - local dirs=( - /etc/zabbix - /var/lib/zabbix - /var/lib/zabbix/home - /var/lib/zabbix/scripts - /var/lib/zabbix/alertscripts - /var/lib/zabbix/externalscripts - /var/log/zabbix - ) - - for dir in "${dirs[@]}"; do - keepdir "${dir}" - done - - if use server; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - fowners root:zabbix /etc/zabbix/zabbix_server.conf - - newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf - fi - - if use proxy; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_proxy.conf - fperms 0640 /etc/zabbix/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf - - newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy - - dosbin src/zabbix_proxy/zabbix_proxy - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-proxy.service - newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf - - newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd - - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - - systemd_dounit "${FILESDIR}"/zabbix-agentd.service - newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf - fi - if use agent2; then - insinto /etc/zabbix - doins "${S}"/src/go/conf/zabbix_agent2.conf - fperms 0640 /etc/zabbix/zabbix_agent2.conf - fowners root:zabbix /etc/zabbix/zabbix_agent2.conf - keepdir /etc/zabbix/zabbix_agent2.d/plugins.d - - newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 - - dosbin src/go/bin/zabbix_agent2 - - systemd_dounit "${FILESDIR}"/zabbix-agent2.service - newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf - fi - - fowners root:zabbix /etc/zabbix - fowners zabbix: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 ui/* "${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-1.2.9.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar - newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy - newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - tmpfiles_process zabbix-server.conf - - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - if use oracle; then - ewarn - ewarn "Support for Oracle database has been dropped from PHP" - ewarn "so to make the web frontend work, you need to install" - ewarn "PECL extension for Oracle database." - ewarn "For details see https://bugs.gentoo.org/928386" - fi - - if use proxy; then - tmpfiles_process zabbix-proxy.conf - fi - - if use agent; then - tmpfiles_process zabbix-agentd.conf - fi - - if use agent2; then - tmpfiles_process zabbix-agent2.conf - 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 -} - -pkg_prerm() { - (use frontend || use server) && webapp_pkg_prerm -} diff --git a/net-analyzer/zabbix/zabbix-7.0.4.ebuild b/net-analyzer/zabbix/zabbix-7.0.4.ebuild deleted file mode 100644 index 132e5bd1913b..000000000000 --- a/net-analyzer/zabbix/zabbix-7.0.4.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# To create the go modules tarball: -# cd src/go -# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod - -EAPI=8 - -GO_OPTIONAL="yes" -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info - -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://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz - agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) -" - -S=${WORKDIR}/${MY_P} - -LICENSE="AGPL-3" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static" -REQUIRED_USE="|| ( agent agent2 frontend proxy server ) - ?? ( gnutls openssl ) - agent2? ( !gnutls ) - proxy? ( ^^ ( mysql postgres sqlite ) ) - server? ( ^^ ( mysql postgres ) !sqlite ) - static? ( !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - gnutls? ( net-libs/gnutls:0= ) - java? ( >=virtual/jdk-1.8:* ) - ldap? ( - =dev-libs/cyrus-sasl-2* - net-libs/gnutls:= - net-nds/openldap:= - ) - libxml2? ( dev-libs/libxml2 ) - mysql? ( dev-db/mysql-connector-c:= ) - odbc? ( dev-db/unixODBC ) - openipmi? ( sys-libs/openipmi ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - postgres? ( dev-db/postgresql:* ) - proxy? ( - dev-libs/libevent:= - sys-libs/zlib - ) - server? ( - dev-libs/libevent:= - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp:= ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( - dev-libs/libpcre2:= - net-analyzer/fping[suid] - ) - selinux? ( sec-policy/selinux-zabbix ) - server? ( - app-admin/webapp-config - dev-libs/libpcre2:= - net-analyzer/fping[suid] - ) - frontend? ( - app-admin/webapp-config - dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - media-libs/gd[png] - virtual/httpd-php:* - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - ) -" -DEPEND="${COMMON_DEPEND} - static? ( - curl? ( net-misc/curl[static-libs] ) - ldap? ( - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - net-nds/openldap[static-libs] - ) - libxml2? ( dev-libs/libxml2[static-libs] ) - mysql? ( dev-db/mysql-connector-c[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - sqlite? ( dev-db/sqlite[static-libs] ) - ssh? ( net-libs/libssh2 ) - ) -" -BDEPEND=" - virtual/pkgconfig - agent2? ( - >=dev-lang/go-1.12 - app-arch/unzip - ) -" - -# upstream tests fail for agent2 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" - "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" -) - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". - eautoreconf -} - -src_configure() { - local econf_args=( - --with-libpcre2 - "$(use_enable agent)" - "$(use_enable agent2)" - "$(use_enable ipv6)" - "$(use_enable java)" - "$(use_enable proxy)" - "$(use_enable server)" - "$(use_enable static)" - "$(use_with curl libcurl)" - "$(use_with gnutls)" - "$(use_with ldap)" - "$(use_with libxml2)" - "$(use_with mysql)" - "$(use_with odbc unixodbc)" - "$(use_with openipmi openipmi)" - "$(use_with openssl)" - "$(use_with postgres postgresql)" - "$(use_with snmp net-snmp)" - "$(use_with sqlite sqlite3)" - "$(use_with ssh ssh2)" - ) - - econf ${econf_args[@]} -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - local dirs=( - /etc/zabbix - /var/lib/zabbix - /var/lib/zabbix/home - /var/lib/zabbix/scripts - /var/lib/zabbix/alertscripts - /var/lib/zabbix/externalscripts - /var/log/zabbix - ) - - for dir in "${dirs[@]}"; do - keepdir "${dir}" - done - - if use server; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - fowners root:zabbix /etc/zabbix/zabbix_server.conf - - newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf - fi - - if use proxy; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_proxy.conf - fperms 0640 /etc/zabbix/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf - - newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy - - dosbin src/zabbix_proxy/zabbix_proxy - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-proxy.service - newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${S}"/conf/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf - - newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd - - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - - systemd_dounit "${FILESDIR}"/zabbix-agentd.service - newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf - fi - if use agent2; then - insinto /etc/zabbix - doins "${S}"/src/go/conf/zabbix_agent2.conf - fperms 0640 /etc/zabbix/zabbix_agent2.conf - fowners root:zabbix /etc/zabbix/zabbix_agent2.conf - keepdir /etc/zabbix/zabbix_agent2.d/plugins.d - - newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 - - dosbin src/go/bin/zabbix_agent2 - - systemd_dounit "${FILESDIR}"/zabbix-agent2.service - newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf - fi - - fowners root:zabbix /etc/zabbix - fowners zabbix: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 ui/* "${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-1.2.9.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar - newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy - newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - tmpfiles_process zabbix-server.conf - - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - if use proxy; then - tmpfiles_process zabbix-proxy.conf - fi - - if use agent; then - tmpfiles_process zabbix-agentd.conf - fi - - if use agent2; then - tmpfiles_process zabbix-agent2.conf - 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 -} - -pkg_prerm() { - (use frontend || use server) && webapp_pkg_prerm -}