summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/arping/Manifest2
-rw-r--r--net-analyzer/arping/arping-2.22.ebuild37
-rw-r--r--net-analyzer/arping/arping-2.23.ebuild60
-rw-r--r--net-analyzer/arping/arping-2.25.ebuild4
-rw-r--r--net-analyzer/fping/fping-5.2.ebuild4
-rw-r--r--net-analyzer/nagstamon/Manifest1
-rw-r--r--net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild72
-rw-r--r--net-analyzer/nethogs/Manifest1
-rw-r--r--net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch85
-rw-r--r--net-analyzer/nethogs/nethogs-0.8.8.ebuild40
-rw-r--r--net-analyzer/nmapsi/Manifest2
-rw-r--r--net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch18
-rw-r--r--net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild35
-rw-r--r--net-analyzer/nmapsi/nmapsi-0.5_alpha2_p20240407.ebuild38
-rw-r--r--net-analyzer/trippy/Manifest3
-rw-r--r--net-analyzer/trippy/trippy-0.12.2.ebuild330
-rw-r--r--net-analyzer/wireshark/wireshark-4.4.3.ebuild4
-rw-r--r--net-analyzer/wireshark/wireshark-9999.ebuild4
-rw-r--r--net-analyzer/zabbix/Manifest16
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.46.ebuild386
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.37.ebuild4
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.38.ebuild (renamed from net-analyzer/zabbix/zabbix-6.0.36.ebuild)10
-rw-r--r--net-analyzer/zabbix/zabbix-6.4.21.ebuild392
-rw-r--r--net-analyzer/zabbix/zabbix-7.0.7.ebuild4
-rw-r--r--net-analyzer/zabbix/zabbix-7.0.9.ebuild (renamed from net-analyzer/zabbix/zabbix-7.2.0.ebuild)8
-rw-r--r--net-analyzer/zabbix/zabbix-7.2.1.ebuild4
-rw-r--r--net-analyzer/zabbix/zabbix-7.2.3.ebuild (renamed from net-analyzer/zabbix/zabbix-7.0.6.ebuild)10
27 files changed, 1314 insertions, 260 deletions
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index c5efc6126560..1905cf1b624b 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,3 +1 @@
-DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
-DIST arping-2.23.tar.gz 51911 BLAKE2B 8b0d34522957a83d0a66b47576fa0ecbd1e4fc86537df6d2737510bdb1a4ea3d30feb664077790a8f70be9cf2cdcdc30a648261e9a6a30401ce85274c45ccf12 SHA512 45295fd68717379d18fcff4270c70e0d9df3cae175f0c2a9f1e8e88e3046f5109e7a95bb717be329af8d6002c9a2338efd39831a652c0b425b75058287fa35df
DIST arping-2.25.tar.gz 62032 BLAKE2B a7b5bdfb693ee31781509584b4a0363e856d8134cebe1119fee974a57c399f1128a306b85e3f3669d4fe8f7031dfb87b9cfcc2f8df76b6f969310a12460363ad SHA512 7cfc1ed73bd7621911f9b1b0ad23680c7dde6f8674a0223e6341dc6e40c7d49bb293bc519e9e9de8abaa9209ad7fedad902901235f87b8d21395f3396739b922
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
deleted file mode 100644
index d959be9a14ba..000000000000
--- a/net-analyzer/arping/arping-2.22.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fcaps
-
-DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it"
-HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping"
-SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- net-libs/libpcap
- net-libs/libnet:1.1
- !net-misc/iputils[arping(+)]
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-libs/check
- dev-python/python-subunit
- )
-"
-
-FILECAPS=( cap_net_raw usr/sbin/arping )
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/net-analyzer/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild
deleted file mode 100644
index a403799cf52b..000000000000
--- a/net-analyzer/arping/arping-2.23.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools fcaps
-
-DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it"
-HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping"
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
- inherit git-r3
-else
- SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
- S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/libpcap
- net-libs/libnet:1.1
- sys-libs/libcap
- seccomp? ( sys-libs/libseccomp )
- !net-misc/iputils[arping(+)]"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/check
- dev-python/python-subunit
- )"
-
-FILECAPS=( cap_net_raw usr/sbin/arping )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.23-configure.ac-seccomp-disable.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- # Controls whether seccomp is used by default
- $(use_enable seccomp)
- )
-
- # Needed to actually make it optional and not automagic
- # (and we want it optional for the non-seccomp arches, like sparc)
- export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp)
- export ac_cv_header_seccomp_h=$(usex seccomp)
-
- econf "${myeconfargs[@]}"
-}
diff --git a/net-analyzer/arping/arping-2.25.ebuild b/net-analyzer/arping/arping-2.25.ebuild
index 495a5460fe68..342476df0af8 100644
--- a/net-analyzer/arping/arping-2.25.ebuild
+++ b/net-analyzer/arping/arping-2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/net-analyzer/fping/fping-5.2.ebuild b/net-analyzer/fping/fping-5.2.ebuild
index b225d8f0efb5..a3e1e13b8c7f 100644
--- a/net-analyzer/fping/fping-5.2.ebuild
+++ b/net-analyzer/fping/fping-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="fping"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug suid"
# There are some tests in ci/* but they don't seem to be for packaging
# (they want to modify the live FS by e.g. copying to /tmp.)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 90cfbd49ea47..d3a6f6e2d039 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,2 +1 @@
-DIST nagstamon-3.14.0.tar.gz 585452 BLAKE2B a05c6a5a4a2b1e98d2831bef8000f81e306807f0706915d73bcf04f67a070fbd1787d0f98f8650b08bcd94a13b13f21c2b36ef79ee820bb526ff7074b5b5d996 SHA512 6896b0c1a58f1ee6f597ff5022d3bd675760a2c7a0403fc72f0e5c7edde6e2177f0eddb2af5a66e0fbe6166d85394fdcedc92cc0e64e0ac469681a380879a0ab
DIST nagstamon-3.16.2.tar.gz 582957 BLAKE2B a4c50f0d754590e81ee76bc8f97be8a15878575831b370fec68f713f8d09fcd48f54158f2656d5e46acb45c122054ff0e0cc4424ab39cbd438a1e7e713b27eb4 SHA512 af8e4f4db0be6966a93c636ad7a44da11d54376c866034dc2779d72250f6e22603f86aedd736cf4d476aae44950f0a02953c7c2dc71ec88d4685f46b05d11a29
diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild
deleted file mode 100644
index 63ca672cf089..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit desktop distutils-r1 virtualx
-
-distutils_enable_tests pytest
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.de"
-SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="qt6 test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/lxml[${PYTHON_USEDEP}]
- qt6? ( dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] )
- !qt6? ( dev-python/pyqt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] )
- dev-python/pysocks[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
- dev-python/requests-kerberos[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-3.14.0-setup.patch" )
-
-src_prepare() {
- default_src_prepare
-
- # pre-compressed already
- rm Nagstamon/resources/nagstamon.1.gz || die
- sed -e 's:\(nagstamon\.1\)\.gz:\1:' \
- -e '/share/ s:^:#:' \
- -i setup.py || die
-
- mv ${PN}.py ${PN} || die
-
- rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
-}
-
-python_test() {
- virtx epytest
-}
-
-distutils-r1_python_install_all() {
- default
-
- doman Nagstamon/resources/nagstamon.1
- domenu Nagstamon/resources/nagstamon.desktop
- doicon Nagstamon/resources/nagstamon.svg
-}
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index c56737e97dda..3299ce9b8f89 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1 +1,2 @@
DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2
+DIST nethogs-0.8.8.tar.gz 272792 BLAKE2B ec18cd291768c1baf22ab71b4219ab050c8f919419510234e71ec3d618fb0ff72cac4ccf04a4b1b063f71cf308f2ce2db09c595e4845372e4e6c61bf074e3ef3 SHA512 df076204c329f48161b01b51f89a6e7946b83ef330349e0df39e0358b9d3d973be9cdb64eb86ab9a83fb4f9389865a7859739de6a896374952ec2a08b2084b0d
diff --git a/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch b/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch
new file mode 100644
index 000000000000..2c87197b9933
--- /dev/null
+++ b/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch
@@ -0,0 +1,85 @@
+https://github.com/raboof/nethogs/pull/285
+
+[Formatting patch 3/3 dropped.]
+
+From 049fff5623720fcd0b4fdc92501b586addbb6b48 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 25 Jan 2025 16:03:12 +0000
+Subject: [PATCH 1/3] meson: cleanup version detection
+
+Tell Meson what version the project is, so that we set the right versioning
+on libnethogs.
+---
+ meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 81d7b59..16e61b4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -5,11 +5,11 @@
+ project('nethogs',
+ ['c', 'cpp'],
+ default_options : ['warning_level=3',
+- 'cpp_std=c++14']
++ 'cpp_std=c++14'],
++ version : run_command('./determineVersion.sh').stdout().strip(),
+ )
+
+ cc = meson.get_compiler('cpp')
+-version = run_command('./determineVersion.sh', check: true).stdout().strip()
+
+ #######################################
+ ## Dependencies and flags definition ##
+@@ -19,7 +19,7 @@ projectinc = [include_directories('.', 'src')]
+
+ # flags
+ c_args = [
+- '-DVERSION="' + version + '"'
++ '-DVERSION="' + meson.project_version() + '"'
+ ]
+
+ # dependencies
+@@ -42,5 +42,5 @@ pkgconfig = import('pkgconfig')
+ pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
+ pkgconfig.generate(libnethogs,
+ requires: ['libpcap'],
+- version: version
++ version: meson.project_version()
+ )
+
+From 5afce747f142f6df6a264ab368c99f47050d9984 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 25 Jan 2025 16:05:20 +0000
+Subject: [PATCH 2/3] meson: fix build with libnethogs disabled
+
+Fix `meson.build:43:19: ERROR: Unknown variable "libnethogs".`.
+
+While src/ has this correct, the top-level meson.build wasn't right.
+---
+ meson.build | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 16e61b4..8537718 100644
+--- a/meson.build
++++ b/meson.build
+@@ -38,9 +38,11 @@ subdir('src')
+ #############################
+ ## Pkgconfig definition ##
+ #############################
+-pkgconfig = import('pkgconfig')
+-pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
+-pkgconfig.generate(libnethogs,
+- requires: ['libpcap'],
+- version: meson.project_version()
+- )
++if get_option('enable-libnethogs').enabled()
++ pkgconfig = import('pkgconfig')
++ pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
++ pkgconfig.generate(libnethogs,
++ requires: ['libpcap'],
++ version: meson.project_version()
++ )
++endif
+
diff --git a/net-analyzer/nethogs/nethogs-0.8.8.ebuild b/net-analyzer/nethogs/nethogs-0.8.8.ebuild
new file mode 100644
index 000000000000..1d255bd12fc3
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps meson
+
+DESCRIPTION="Small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:=[cxx]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+FILECAPS=(
+ cap_net_admin,cap_net_raw usr/bin/nethogs
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.8-meson.patch
+)
+
+src_prepare() {
+ default
+
+ cat <<-EOF > determineVersion.sh || die
+ #!/bin/sh
+ printf "${PV}"
+ EOF
+ chmod +x determineVersion.sh || die
+}
diff --git a/net-analyzer/nmapsi/Manifest b/net-analyzer/nmapsi/Manifest
index 75384d6b253d..0b01af0af4df 100644
--- a/net-analyzer/nmapsi/Manifest
+++ b/net-analyzer/nmapsi/Manifest
@@ -1 +1 @@
-DIST nmapsi-0.5_alpha2.tar.gz 3547174 BLAKE2B a02d60c9be2d99e46104a81502bc98a0be9892a1cd1efbb5768b420a4275ea235e89c0e331797ec4ce733631cb763f6299a7d6079055bbaec17674107c4cf768 SHA512 29f6dd383808b253fa50fe0ca25c5189e106e79a0c6aac9351b8969eec2fd0aca7a329c49acf07c04ccd079a2ae66ad0b218a066762abe21165f1c25622a50f2
+DIST nmapsi-463e5cdb516dc68d67b29f6815192cb161e4f7f3.tar.gz 3548276 BLAKE2B a63e8dbb5df7f5738e399f7ad76853cc8ee00cf429707a810a851e294dd8c0ef98037077a305dc28fe447befc69211f344fbae0bf68bcc35b2e986023d971999 SHA512 d240e5c994b338a0df746d93339987d7a62e7712f1e7f2f0a8d528b16c7e4dd25f4cfc5778cf18dddb88f0e6e940f6894c52ffa69f48db5622150ad343e21bf4
diff --git a/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch b/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch
deleted file mode 100644
index 38c73b68cbb7..000000000000
--- a/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt 2020-05-10 15:37:19.000000000 +0200
-+++ b/CMakeLists.txt 2023-10-24 21:28:56.198123618 +0200
-@@ -18,7 +18,6 @@
- Network
- WebEngineWidgets
- DBus
-- Script
- LinguistTools
- Quick
- Qml
-@@ -31,7 +30,6 @@
- Widgets
- Network
- WebEngineWidgets
-- Script
- LinguistTools
- Quick
- Qml
diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild
deleted file mode 100644
index 38dd4bb7612b..000000000000
--- a/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt frontend to nmap"
-HOMEPAGE="https://github.com/nmapsi4/nmapsi4"
-SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}4-${PV/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
- net-analyzer/nmap
- net-dns/bind-tools
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( AUTHORS HACKING README.md TODO Translation )
-
-PATCHES=( "${FILESDIR}/${P}-no-qtscript.patch" )
diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2_p20240407.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2_p20240407.ebuild
new file mode 100644
index 000000000000..085097b12464
--- /dev/null
+++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha2_p20240407.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt frontend to nmap"
+HOMEPAGE="https://github.com/nmapsi4/nmapsi4"
+
+if [[ ${PV} = *_p* ]]; then
+ COMMIT="463e5cdb516dc68d67b29f6815192cb161e4f7f3"
+ SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/${COMMIT}.tar.gz
+ -> ${PN}-${COMMIT}.tar.gz"
+ S="${WORKDIR}/${PN}4-${COMMIT}"
+else
+ SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}4-${PV/_/-}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-qt/qtbase:6[dbus,gui,network,widgets]
+ dev-qt/qtdeclarative:6
+ dev-qt/qtwebengine:6[widgets]
+ dev-qt/qt5compat:6
+"
+RDEPEND="${DEPEND}
+ net-analyzer/nmap
+ net-dns/bind-tools
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+DOCS=( AUTHORS HACKING README.md TODO Translation )
diff --git a/net-analyzer/trippy/Manifest b/net-analyzer/trippy/Manifest
index 8aaf5c8e8ad3..1d4fa042519f 100644
--- a/net-analyzer/trippy/Manifest
+++ b/net-analyzer/trippy/Manifest
@@ -364,9 +364,11 @@ DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08f
DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
DIST serde_with-3.11.0.crate 145979 BLAKE2B 83c6cbbe14d44179321ef51a3b53e6c9044c81c24512c67b1bb0c95d51f364da71ff919d4bf517c7372998e2c8a7c373688c9c8ca0973e380df4ff69428d6df2 SHA512 d2a6d5e8075194f82e42ca676307b1456dbf75cf59172a7abe84f5398ba37f7217c86c8f71b954161a5f7c7f5163ab10ac322eef4b5fe6fbbf86550f3f37ea0b
+DIST serde_with-3.12.0.crate 148666 BLAKE2B 244377aa9de46c77d12f0348a2656848ab44bda4bbac2f14a607ccfb532cbc33597e0b3336b9fff5242e8b907f59cbe093eac7e1aa9cc82e320bce011f5d177a SHA512 243b4aacf9f0aa9c3915274650c2b70ebb389ef0b1e607afba35f0144199073b573703f8b66bcaa875aeb434301ec2ad209c3d54160f6fe25dc2e4a9fe48a53d
DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142
DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
DIST serde_with_macros-3.11.0.crate 32054 BLAKE2B 4d4710b41c2b441d28f8ae95d95c74f3bdbb2306873dc66b1cd7de17daac257b19ca80c5d240b521353f3b67ca8c746ec709b6db65942b6289560367897e1c08 SHA512 222aec6c50a7b758ea15e1192c71dc19fbde3a99062beee12e24ff7691e0858fb84a0245ac86d96d818a877a89834c188f864dab1aaaeab22ae6cdd7bb416036
+DIST serde_with_macros-3.12.0.crate 32089 BLAKE2B 667db574c1a7850917a6738ba55447285085e87826b04da22b6be92ecf32ade3f0e99f63c738262f822820674b09be742778223f28507daf75324f4c62195e98 SHA512 feb186b9c51325a19643217ca2bfafc6f7e5433e2e059683ac2f271d11641a7feab728c5e7e37a99310ef259faf862b6a42ec41e77ff9b3349cb04333e008907
DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0
DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
DIST serde_yaml-0.9.33.crate 65165 BLAKE2B d72edc6e5fe569d20bd909d079d3f8a3db0aa85bf016eeee755923c5f4dcb4dbf896cc6c15920d9b2c1ccde909a6d8733b63843dd2f8149ce34ef4a09889dee1 SHA512 cd41feeabc886b1f02a240d1234f31ea0a67b787e9888e5d8d4397dd5bd389cb5c920bc6dc72f44c5b25e1cb4434e410d8c0b01559f1338e8b1a3f90505f6e02
@@ -456,6 +458,7 @@ DIST tracing-subscriber-0.3.19.crate 198345 BLAKE2B c7083168e62619c856b872570b85
DIST trippy-0.10.0.tar.gz 15288046 BLAKE2B 08cc2bc288b78fa205954db245c89fd5ce1966ac497dd8108feb816b737035f010ab5b92dda733962408ec039f4afff2d2c07505ed7f9ffe2577c545c5f0d161 SHA512 888812ba578c53403769df7c1192577e8e7e23fbcd529a21edba7fa2e0ac7f9463ca40e5f4137aa732bec8407d7b5252d485e4a5b2d29ef4a9da41e20eaa5bee
DIST trippy-0.11.0.tar.gz 15955237 BLAKE2B a69c4945ecfa98710168154182668653ed910634447b2b0b22fa5ae161b24f73ef171fded11a2eac0a0e3d9fbf9333c136b4901bfe64e153d349f23df1f46d77 SHA512 5beaaa65bd7c76a4b37abca616a3db472dcced01ae4da6e2ec834c513a4c13c32096a97960964aedb71ae4c0c23c17e04ebbce25409af281dd4406160b01575c
DIST trippy-0.12.1.tar.gz 18961273 BLAKE2B 068368d5e10df78c471b52f2dc3b2eb16fb16caa2883d6bbe98d6b4135bf6daa09d4f5dfb6db7ccd07173e1182de2fb82c1a6d1bb0dc45b53d6bfe2b11f5cf60 SHA512 e1f3178fafb7f2af726ce776f87f13edb5300f40061ee3df9ee9d8a2f876d11e020c7c1b2e5b3b22a772e498e0e85b5ef9147ec899f5f51e9f4a45510b084346
+DIST trippy-0.12.2.tar.gz 20922811 BLAKE2B e78ebdceabf4cbeab886742fa2085e05a01744cb46cc236eca81fd105dd74288a12ddf34b2231fdc238efffe1ac23a442b0ed90f1b6e6b5eebfc2e570574d0ca SHA512 703db726d28f555061dae415ca684e15ea342a733ca3318410b424ab4e45e9b411ca0956449050e8026b0db3ffa09d5ae9a7e724db7ccfeff054511ee4705586
DIST tun2-1.2.7.crate 30692 BLAKE2B 4200932f2fafbcb79dcd54ac177566c156d8bf9cfcdbaa9ed74010a0655fa48cf477b3b918e1a0c4e5fd00bfba8874a78bbfc0110f9fac6a070c5c7aa363423c SHA512 5156970a5779b13446aeec9da884ea74c48bced3a277cb84ccd80cf0b3b22f73e45f76f48e7d5ff94e772fa255a5dec30c729fcda95d4b169550954d3ee71eb4
DIST tun2-2.0.5.crate 36144 BLAKE2B 5dedf4c7e8b26e9fe01bf8f0528c49b7a2333abdf7d74f21e0312f36a43dd77c4edbf8bd30a24908dc72ee99d9ada88e280920b1ee14e9801c1edd874ce8d0d2 SHA512 823d25790577e1147b44d1a9b76097f5836d962250a4187fd49e8dc71b859099b89e3f98296b69731649b22d6e9521610d9a1b207e235b554875996170ec2f16
DIST tun2-4.0.0.crate 34496 BLAKE2B f87c9bace127f7bd616d3af68075d800c853e0140c2578d9b11134f1e79371c6cb75c5db6570c1394b8fffd365c446ca672d33dec8b12a14ee220bd0fc2216a8 SHA512 77fd0e9ddaec79c71a9081f223d3e03a20dd669329a190a22fe1df2c96e691e1455cb96fb25650276896bef5116926df43b6c359f6f76c68698242e1db98f0bc
diff --git a/net-analyzer/trippy/trippy-0.12.2.ebuild b/net-analyzer/trippy/trippy-0.12.2.ebuild
new file mode 100644
index 000000000000..312e292154b3
--- /dev/null
+++ b/net-analyzer/trippy/trippy-0.12.2.ebuild
@@ -0,0 +1,330 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ addr2line@0.24.2
+ adler2@2.0.0
+ aho-corasick@1.1.3
+ allocator-api2@0.2.21
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anstream@0.6.18
+ anstyle-parse@0.2.6
+ anstyle-query@1.1.2
+ anstyle-wincon@3.0.6
+ anstyle@1.0.10
+ anyhow@1.0.94
+ arrayvec@0.7.6
+ async-channel@2.3.1
+ async-task@4.7.1
+ async-trait@0.1.83
+ atomic-waker@1.1.2
+ autocfg@1.4.0
+ backtrace@0.3.74
+ bitflags@2.6.0
+ blocking@1.6.1
+ bumpalo@3.16.0
+ byteorder@1.5.0
+ bytes@1.9.0
+ c2rust-bitfields-derive@0.19.0
+ c2rust-bitfields@0.19.0
+ caps@0.5.5
+ cassowary@0.3.0
+ castaway@0.2.3
+ cc@1.2.3
+ cfg-if@1.0.0
+ cfg_aliases@0.2.1
+ chrono@0.4.39
+ clap@4.5.23
+ clap_builder@4.5.23
+ clap_complete@4.5.38
+ clap_derive@4.5.18
+ clap_lex@0.7.4
+ clap_mangen@0.2.24
+ colorchoice@1.0.3
+ comfy-table@7.1.3
+ compact_str@0.8.0
+ concurrent-queue@2.5.0
+ console@0.15.8
+ core-foundation-sys@0.8.7
+ crossbeam-channel@0.5.13
+ crossbeam-deque@0.8.5
+ crossbeam-epoch@0.9.18
+ crossbeam-queue@0.3.11
+ crossbeam-utils@0.8.20
+ crossbeam@0.8.4
+ crossterm@0.28.1
+ crossterm_winapi@0.9.1
+ csv-core@0.1.11
+ csv@1.3.1
+ darling@0.20.10
+ darling_core@0.20.10
+ darling_macro@0.20.10
+ data-encoding@2.6.0
+ derive_more-impl@1.0.0
+ derive_more@1.0.0
+ diff@0.1.13
+ displaydoc@0.2.5
+ dns-lookup@2.0.4
+ downcast@0.11.0
+ either@1.13.0
+ encode_unicode@0.3.6
+ encoding_rs@0.8.35
+ encoding_rs_io@0.1.7
+ enum-as-inner@0.6.1
+ equivalent@1.0.1
+ errno@0.3.10
+ etcetera@0.8.0
+ event-listener-strategy@0.5.3
+ event-listener@5.3.1
+ fastrand@2.3.0
+ fixedbitset@0.4.2
+ fnv@1.0.7
+ foldhash@0.1.3
+ form_urlencoded@1.2.1
+ fragile@2.0.0
+ futures-channel@0.3.31
+ futures-core@0.3.31
+ futures-executor@0.3.31
+ futures-io@0.3.31
+ futures-lite@2.5.0
+ futures-macro@0.3.31
+ futures-sink@0.3.31
+ futures-task@0.3.31
+ futures-util@0.3.31
+ futures@0.3.31
+ getrandom@0.2.15
+ gimli@0.31.1
+ hashbrown@0.15.2
+ heck@0.5.0
+ hex-literal@0.4.1
+ hickory-proto@0.24.2
+ hickory-resolver@0.24.2
+ home@0.5.9
+ hostname@0.3.1
+ humantime@2.1.0
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.61
+ icu_collections@1.5.0
+ icu_locid@1.5.0
+ icu_locid_transform@1.5.0
+ icu_locid_transform_data@1.5.0
+ icu_normalizer@1.5.0
+ icu_normalizer_data@1.5.0
+ icu_properties@1.5.1
+ icu_properties_data@1.5.0
+ icu_provider@1.5.0
+ icu_provider_macros@1.5.0
+ ident_case@1.0.1
+ idna@1.0.3
+ idna_adapter@1.2.0
+ indexmap@2.7.0
+ indoc@2.0.5
+ insta@1.41.1
+ instability@0.3.3
+ ipconfig@0.3.2
+ ipnet@2.10.1
+ ipnetwork@0.20.0
+ is_terminal_polyfill@1.70.1
+ itertools@0.13.0
+ itoa@1.0.14
+ js-sys@0.3.76
+ lazy_static@1.5.0
+ libc@0.2.168
+ libloading@0.8.6
+ linked-hash-map@0.5.6
+ linux-raw-sys@0.4.14
+ litemap@0.7.4
+ lock_api@0.4.12
+ log@0.4.22
+ lru-cache@0.1.2
+ lru@0.12.5
+ match_cfg@0.1.0
+ matchers@0.1.0
+ maxminddb@0.24.0
+ memchr@2.7.4
+ memoffset@0.9.1
+ miniz_oxide@0.8.0
+ mio@1.0.3
+ mockall@0.13.1
+ mockall_derive@0.13.1
+ nix@0.29.0
+ nu-ansi-term@0.46.0
+ num-traits@0.2.19
+ object@0.36.5
+ once_cell@1.20.2
+ overload@0.1.1
+ parking@2.2.1
+ parking_lot@0.12.3
+ parking_lot_core@0.9.10
+ paste@1.0.15
+ percent-encoding@2.3.1
+ petgraph@0.6.5
+ pin-project-lite@0.2.15
+ pin-utils@0.1.0
+ piper@0.2.4
+ ppv-lite86@0.2.20
+ predicates-core@1.0.8
+ predicates-tree@1.0.11
+ predicates@3.1.2
+ pretty_assertions@1.4.1
+ proc-macro2@1.0.92
+ quick-error@1.2.3
+ quote@1.0.37
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ ratatui@0.29.0
+ redox_syscall@0.5.7
+ regex-automata@0.1.10
+ regex-automata@0.4.9
+ regex-syntax@0.6.29
+ regex-syntax@0.8.5
+ regex@1.11.1
+ resolv-conf@0.7.0
+ roff@0.2.2
+ rustc-demangle@0.1.24
+ rustix@0.38.42
+ rustversion@1.0.18
+ ryu@1.0.18
+ scopeguard@1.2.0
+ serde@1.0.216
+ serde_derive@1.0.216
+ serde_json@1.0.133
+ serde_spanned@0.6.8
+ serde_with@3.12.0
+ serde_with_macros@3.12.0
+ sharded-slab@0.1.7
+ shlex@1.3.0
+ signal-hook-mio@0.2.4
+ signal-hook-registry@1.4.2
+ signal-hook@0.3.17
+ similar@2.6.0
+ slab@0.4.9
+ smallvec@1.13.2
+ socket2@0.5.8
+ stable_deref_trait@1.2.0
+ static_assertions@1.1.0
+ strsim@0.11.1
+ strum@0.26.3
+ strum_macros@0.26.4
+ syn@1.0.109
+ syn@2.0.90
+ synstructure@0.13.1
+ sys-locale@0.3.2
+ terminal_size@0.4.1
+ termtree@0.4.1
+ test-case-core@3.3.1
+ test-case-macros@3.3.1
+ test-case@3.3.1
+ thiserror-impl@1.0.69
+ thiserror-impl@2.0.6
+ thiserror@1.0.69
+ thiserror@2.0.6
+ thread_local@1.1.8
+ tinystr@0.7.6
+ tinyvec@1.8.0
+ tinyvec_macros@0.1.1
+ tokio-macros@2.4.0
+ tokio-util@0.7.13
+ tokio@1.42.0
+ toml@0.8.19
+ toml_datetime@0.6.8
+ toml_edit@0.22.22
+ tracing-attributes@0.1.28
+ tracing-chrome@0.7.2
+ tracing-core@0.1.33
+ tracing-log@0.2.0
+ tracing-serde@0.2.0
+ tracing-subscriber@0.3.19
+ tracing@0.1.41
+ tun2@4.0.0
+ unicode-ident@1.0.14
+ unicode-segmentation@1.12.0
+ unicode-truncate@1.1.0
+ unicode-width@0.1.14
+ unicode-width@0.2.0
+ url@2.5.4
+ utf16_iter@1.0.5
+ utf8_iter@1.0.4
+ utf8parse@0.2.2
+ valuable@0.1.0
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.99
+ wasm-bindgen-macro-support@0.2.99
+ wasm-bindgen-macro@0.2.99
+ wasm-bindgen-shared@0.2.99
+ wasm-bindgen@0.2.99
+ widestring@1.1.0
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-core@0.52.0
+ windows-sys@0.48.0
+ windows-sys@0.52.0
+ windows-sys@0.59.0
+ windows-targets@0.48.5
+ windows-targets@0.52.6
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_gnullvm@0.52.6
+ windows_aarch64_msvc@0.48.5
+ windows_aarch64_msvc@0.52.6
+ windows_i686_gnu@0.48.5
+ windows_i686_gnu@0.52.6
+ windows_i686_gnullvm@0.52.6
+ windows_i686_msvc@0.48.5
+ windows_i686_msvc@0.52.6
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnu@0.52.6
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_gnullvm@0.52.6
+ windows_x86_64_msvc@0.48.5
+ windows_x86_64_msvc@0.52.6
+ winnow@0.6.20
+ winreg@0.50.0
+ winreg@0.52.0
+ wintun-bindings@0.7.20
+ write16@1.0.0
+ writeable@0.5.5
+ yansi@1.0.1
+ yoke-derive@0.7.5
+ yoke@0.7.5
+ zerocopy-derive@0.7.35
+ zerocopy@0.7.35
+ zerofrom-derive@0.1.5
+ zerofrom@0.1.5
+ zerovec-derive@0.10.3
+ zerovec@0.10.4
+"
+
+inherit cargo fcaps
+
+DESCRIPTION="A network diagnostic tool"
+HOMEPAGE="https://trippy.cli.rs/ https://github.com/fujiapple852/trippy"
+SRC_URI="
+ https://github.com/fujiapple852/trippy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ ${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-3.0 WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="suid"
+
+FILECAPS=( cap_net_raw+p usr/bin/trip )
+
+QA_FLAGS_IGNORED="usr/bin/trip"
+
+src_install() {
+ cargo_src_install --path crates/trippy
+
+ dodoc README.md CHANGELOG.md
+
+ if use suid; then
+ fperms u+s usr/bin/trip
+ fi
+}
diff --git a/net-analyzer/wireshark/wireshark-4.4.3.ebuild b/net-analyzer/wireshark/wireshark-4.4.3.ebuild
index 9247e0f60c8a..475ae8d5d1a7 100644
--- a/net-analyzer/wireshark/wireshark-4.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.3.ebuild
@@ -33,7 +33,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo
IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
+IUSE+=" sdjournal test +text2pcap +tshark +udpdump wifi zlib +zstd"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@@ -209,7 +209,7 @@ src_configure() {
-DBUILD_sharkd=$(usex sharkd)
-DBUILD_sshdump=$(usex sshdump)
-DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
+ -DBUILD_tfshark=OFF
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 9247e0f60c8a..475ae8d5d1a7 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -33,7 +33,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo
IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
+IUSE+=" sdjournal test +text2pcap +tshark +udpdump wifi zlib +zstd"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@@ -209,7 +209,7 @@ src_configure() {
-DBUILD_sharkd=$(usex sharkd)
-DBUILD_sshdump=$(usex sshdump)
-DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
+ -DBUILD_tfshark=OFF
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 1ba676deaece..aafd29b0f34e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,20 +1,24 @@
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.36-go-deps.tar.xz 31343856 BLAKE2B b25ba3991e53aee09e352a76d67cce73e2ea090a9d7d8c42720f86e9011aae93b940b824b83be093eda1653475aa872fc73468345ce543a745aa86e4a1d16fde SHA512 fb54ce97279de11ed190e3524a4f77e952caf3d70a601244dd3ec7f5c2e27ac6dd8f63d42b3e5879866ae78d2f4ed87955e0a92c3061473a8018474586e6bc7d
-DIST zabbix-6.0.36.tar.gz 40473761 BLAKE2B 37f2be6213da993db7726c6aec0c09f8801b7e7cf0b1eef331506a3aa3d05c5fe4d8e1fad7d6a93133ad6dda7945453365905b9740bea4e6b843c6130c3a7616 SHA512 d3997e8131bdb320700e8041c628b7b24e9b9db1bcaf60966ce58dc7501cd555094835a1382e4c2ee35c48a5eea79876ad7b51ed66a6d5928b739af19b060082
+DIST zabbix-5.0.46-go-deps.tar.xz 27929764 BLAKE2B a957898e48dcd8826fef81077ae85ed4613b291062b63965746e0c2461c96cc199847794b471c6c231fe49c24fd9f7e40cc12a802b1f6a0fb0ee2c11eca39ab8 SHA512 e4d54d7d0d9c900460b5fd3149f9ee392f66befc49cd301f0864c7df618e8408df80692ddc03e522f9f1a47939943fa1d0d49b59887a042e83d9f3933f9dc676
+DIST zabbix-5.0.46.tar.gz 22125542 BLAKE2B fe9597767660b1dadd739375e2399f3c228f7a839b9e1eaed518cec4381e075268fe985cfee9d9bbbbe1356e0fc92a2bc3f961ec03be4e713fc3744661ebb502 SHA512 19c155cc959839b036a93edd59aa6c0e277fa0247774a479e5d4c31a5a005fe1ba036177f026d3a5f6733c063edd9ecb46ec73736c8f3047b205d18d363a002e
DIST zabbix-6.0.37-go-deps.tar.xz 31334504 BLAKE2B 3060bba678bcf2cc926ecc992b89cad4acc4ec496d0c7c8b9464d082fcd0288bfbf4310d9b02475357f4b2b209ae4cc3ca10bf37d357f3c340f2d2a7573c3fd9 SHA512 bf6a88384ca4fc2e7fa335fbdb920e9e39f7b06fd05be474a1f359e0a32ca0a278c8259890e4ee0dd6b0628539e6ad93a1a8fb726599a0e40c2463d0cc40acce
DIST zabbix-6.0.37.tar.gz 40479472 BLAKE2B 6bf65efe59963294699d8fc6b6456167ae035c075f057c6ca85c612cc41f3f812b14189ed7e03ab2446e751720f8908f8e098fc0fd7335f95251b221b66b674a SHA512 c7f638bc391cc4afa70d3322da6f0889ac846911559b544d18d61b2c1a5277a7c8cf4e86e5a63a8b6f5d94ac69a0cf11739cc2a22e251ed8ba76ee0edd8b151d
+DIST zabbix-6.0.38-go-deps.tar.xz 31357300 BLAKE2B e80dcfebb684ad36b1867e19f9bd228e3362a3236a32627503898b5d2238afc851dc41c0074559dec4d101e237e9b6aa3bd59d03149760d2f7273b6cf70e6196 SHA512 7d290b173e679390b1f239eb5688686be5d347fbb9cc4aefecc13d2f15ba4a02d629b3d20dc00026ec2a91be610eb503b3e53deffd7fcfe7adab4bc238316c3f
+DIST zabbix-6.0.38.tar.gz 40754933 BLAKE2B 071f2c355d6c9703260592c1dd9cfc125edbb01dfb2e3a39e512d579ec217877f682c460791dfd3957b9fa9e212e24b91330722b0afcd5c540cb6bfdf9b12c6b SHA512 c013c6cf7e10259b9ea500495546522cee7aeb8df63f40efa6cf2bbce3fa4bf3594a8cf83852f04dbf0a53d573a990fc2df87a0010d4c63f7054616e5158d5f4
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.6-go-deps.tar.xz 34172684 BLAKE2B f0f3f5af7f1c5d849e86b05e4bf1be48dbb78fd233e9c2b5b731ed6cf0257bd00b0ad54fa8b56f8355094af03910bb2f556d5cc3624b3c1b63dc2d5a3735a2a4 SHA512 51f64599259ad911e1befc14c3fa347f02a58c44f69694fd6ed70a6f7d0e405c7f800b8236d2d3dc0b64a09eedb6291f5509b847790f10ad6c225fd4246a5ea9
-DIST zabbix-7.0.6.tar.gz 44028175 BLAKE2B ecdaf4e2a0a949e216e662a8e691bf5627c7369b83e9d91bd9e26a99137b0741950c5910a146915689e8a761ed14facc425dc703fec080007c490c10b40d33ed SHA512 ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa
+DIST zabbix-6.4.21-go-deps.tar.xz 34149168 BLAKE2B 4951c347027f1b251befa0f5119547192c769cee56194789732cdaf30de8ec6325d4f1e5ad914008b14b461e2fce585925fcf8c217ac2f23c4233de472e19de0 SHA512 cf7aab100c64a954dbbd4b733abdbe52051e75546867a5d5f5d623b1f34d39c87477f703622a849f85e113dd9c87ecb794cddfb23772ef3d7c3d7b223f7386e1
+DIST zabbix-6.4.21.tar.gz 47299504 BLAKE2B 8aeb319c2603740f5f73c799fae1a88d2fed31733d1be3155de39130e18f42767885cc0f6a67c1432694abb92eb7940801f4e4475dcab04630cd471a60a56b3b SHA512 2be0cc96faeb50fd357ed4a9d0474d9ff60fe9804087215640addd3cd4ddb1d39c1320801b3c624388bd7ecc5b260e5b78f15d75d5b083c648d6dce95df1545e
DIST zabbix-7.0.7-go-deps.tar.xz 34173780 BLAKE2B 2b99762800cc2c7f1364f05b1ebf61083f3244bf9b7efa716450ed72cf2e52b554a3c4da639d645705cc5d733c670dfdba6bd3260a93cb34681c21db083093bf SHA512 a8d9acb2b22501fad5b3cbac5eef6af4c385030df686e52a35d6c156453564a3a95a161defc40ffc5b241a1dca7693398cb2144ed92a7ed6d4d03fdd0aa2d106
DIST zabbix-7.0.7.tar.gz 44142959 BLAKE2B 506addefd46d3765206c2268a16fca453be0eb6511ca69f38089b43e2a34c0836a8f458be08a41af18f71d96884cadf72f5c87e9681892154a45cfe35a1378f2 SHA512 670144e89554251a4e45e358fef2185d90bb610b318f637e6f9113685a983c574224d1a39e0b2a521d489a40a185712bad0c4809e39a61cbaa20477255244373
DIST zabbix-7.0.8-go-deps.tar.xz 34174372 BLAKE2B f034f8b46e5cbe860a99679a5a6dd4c66697e73a9cb47531da069ad1e0c524d8ecb828c4a38a098ef741454e46046e0585950a40d457d6e041527de52fb46333 SHA512 ba9c541ad0b7809d2e1cb78a0cd71967dee5f40b8d27515ef69d02e1092b12457b378c8eb8c0e3d9e0a02091d2eaf0d80868bd0a2c606c2b04ee5ef15764d683
DIST zabbix-7.0.8.tar.gz 44231377 BLAKE2B 5f36ac44e9b64717a7aac9409c6b3a7c4a2610fdc93a368c5c64519963b50fd1b15cfee5a653b293ec0c042522c0a9c6c164772727339b3d606a71438fe3bb41 SHA512 648030e2393fe52c1b7050134bdc73023e54371206ddba3a7cac9d97ccd8869706ddbd00d770e57a92b109446141663803d2dc6959295927780155721eae6a01
-DIST zabbix-7.2.0-go-deps.tar.xz 34463060 BLAKE2B aed6fc85ab7cf93eb01766ca919bc1dc6354c1c1c23c1b50c1ad7c5cac9eabc97fe7971181d6fdfe013952fd29fe2f91801f0945dc50455ef313fbab4871d41c SHA512 fb2549eb721a0425435e80291ede82b7107bef087c9f6a8c835405ceb9cc5d47409543cdbd9bf39b4321a27c71f23112ce47ae881d552c4a17da61f71ea2377d
-DIST zabbix-7.2.0.tar.gz 40284122 BLAKE2B 92140e4a23d46a6ad3bf24941f719acf793ee0e597c5a098d6afa25cbef3bcd9f063a8fb39645f6469febef3dea90ab69cc9c9501b8490576de2ffb7427b520a SHA512 be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb
+DIST zabbix-7.0.9-go-deps.tar.xz 34467496 BLAKE2B 4ccd08f4e2a6a2ecfc8667d016c5dc888b8b23641dd5524d0df9492890d964f2bfa52f242e8d0cae5e6697ef16213d74c02d958f009a2a7a9edd724a45c71e65 SHA512 9180a71aaba413257b862d8d86a05ef8af1a1a8036a84e4dc3c8fec5bcfa8719480f77031c6a18fce0a86810bc05c44a5b86927ec55485a1639295bca8efa8b8
+DIST zabbix-7.0.9.tar.gz 44626987 BLAKE2B 0044ec99ee6abbdc8f6b397271437ba79477641673e02dee65c13a34f8018012d2d31e01284b0dc5b5a5f395b70b8ac565de79670c4d2751980426414fd733a9 SHA512 7ff18b69b93fa6d06e1ee8494084b4054f059dfd16c2af776f9347c6e14ad16ce61e328e8eb0ca253059cb98eb794629aafff62be635a46bc61015b16e8815d3
DIST zabbix-7.2.1-go-deps.tar.xz 34175908 BLAKE2B 204abe329feb80c10bc3da8a62ab7e9b4601878812209590236f149976147a9c97c9885e9d248fcccba938c98429d65276380e432928b4d24437d3ccd89243eb SHA512 6b625e4096d008bdd279fc16152f9e0c48b36ac97ffc1da8ca6c57666c21c6f7cd9c65808c577a43966b55602a81bef734bd0aa395bd81d975061615aa3e906b
DIST zabbix-7.2.1.tar.gz 40360084 BLAKE2B 4762eacce715bb45f2ecd8393dc4b7f43670efd7dbb90604bcc99d4876185d42fa4ea9a165d7c65fbe8e900f41d684adf74e91a3749c136d4bd5af6dd784772e SHA512 ff36705e74100c23e8667f9ebc3f2b3228867dd1348c68496656c6ecc2003fc2295ec50cd9dbf9b718003383bf54e49626f0d73acc175e831d6fd15de1115c04
DIST zabbix-7.2.2-go-deps.tar.xz 34162248 BLAKE2B cb5c40bb62af88bf642f6189d349a6907194c9cbe1c832e543b6b32ebbf3e937c2634932bd77a3872a8d09a6ca008fc1afd0fee3dffdcfa9197851f2fb7a98e4 SHA512 78a04c81a792e8d7476be849ca4172a0e06736309cbf33d86710b5054642ce3b7878d59d8fb187273b0f7b8305ee5fb660a5e0fe192cbdf102fdef651d77e3ce
DIST zabbix-7.2.2.tar.gz 40372426 BLAKE2B 3cff418340428aa1de6cdbe00e5eef34068ea43eb5f6935c7e8d72bee6a484aa0b07806cd3eaaf1e09365f11a98673b07042d394109ec471055c7fdbfbf40df1 SHA512 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f
+DIST zabbix-7.2.3-go-deps.tar.xz 34185696 BLAKE2B 4269b10f175eb0b78d16cddd430b86110ee4204a2de7b16fd85e62cef95f5cf451c33ef84cf0f3b96b48c8e78103a3f5343a25cca22c6190ff8918f2c9644bf5 SHA512 e495b4085b9cc56becbec7db491cbeb0f7b877bba8c9c78110f7d5e436b517258979ff25b85ea1b89ebdef47726222b3b68205ad5eed328284c110f2c0ae2e7d
+DIST zabbix-7.2.3.tar.gz 40748423 BLAKE2B 2ef493820041d6fd776e92149ae1492208041a1de979697792d7d165365f55a3609312d32f728e6fd404d60b7293ebc032e2e1338a6fce55d8836b0407e49f5c SHA512 24cea4cd164f89b9384b01b3f58ccf1b9365c8ed04f9bafa0cc7400c12af08b3087eeeececce313c0dc082420f109c207df3d868eecfb6d8809a1f15b8d1e6ff
diff --git a/net-analyzer/zabbix/zabbix-5.0.46.ebuild b/net-analyzer/zabbix/zabbix-5.0.46.ebuild
new file mode 100644
index 000000000000..eb1548bde7d3
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.46.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2025 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 zabbix-${PV}-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/libpcre
+ net-analyzer/fping[suid]
+ )
+ selinux? ( sec-policy/selinux-zabbix )
+ server? (
+ app-admin/webapp-config
+ dev-libs/libpcre
+ 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}-5.0.22-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() {
+ econf \
+ $(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)
+}
+
+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
+ dodir "${dir}"
+ 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 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 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
+
+ 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.5.16.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-1.5.16.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-2.0.16.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 <nodeid>"
+ 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
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.37.ebuild b/net-analyzer/zabbix/zabbix-6.0.37.ebuild
index 44884d9f45ff..d9fd70808b8f 100644
--- a/net-analyzer/zabbix/zabbix-6.0.37.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+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 )
diff --git a/net-analyzer/zabbix/zabbix-6.0.36.ebuild b/net-analyzer/zabbix/zabbix-6.0.38.ebuild
index 7cbc451d3735..cfbde6d11dca 100644
--- a/net-analyzer/zabbix/zabbix-6.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+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 )
@@ -305,12 +305,12 @@ src_install() {
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-classic-1.5.16.jar \
src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-1.2.9.jar \
+ src/zabbix_java/lib/logback-core-1.5.16.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
+ src/zabbix_java/lib/slf4j-api-2.0.16.jar
newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi
diff --git a/net-analyzer/zabbix/zabbix-6.4.21.ebuild b/net-analyzer/zabbix/zabbix-6.4.21.ebuild
new file mode 100644
index 000000000000..8b7730edcfc1
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.21.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2025 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="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.4.0-configure-sscanf.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
+
+ # 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 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.5.16.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-1.5.16.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-2.0.16.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 <nodeid>"
+ 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.7.ebuild b/net-analyzer/zabbix/zabbix-7.0.7.ebuild
index f90e2783580f..44d89bbbef48 100644
--- a/net-analyzer/zabbix/zabbix-7.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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 )
diff --git a/net-analyzer/zabbix/zabbix-7.2.0.ebuild b/net-analyzer/zabbix/zabbix-7.0.9.ebuild
index f90e2783580f..8124788a5c25 100644
--- a/net-analyzer/zabbix/zabbix-7.2.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -295,12 +295,12 @@ src_install() {
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-classic-1.5.16.jar \
src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-1.2.9.jar \
+ src/zabbix_java/lib/logback-core-1.5.16.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
+ src/zabbix_java/lib/slf4j-api-2.0.16.jar
newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi
diff --git a/net-analyzer/zabbix/zabbix-7.2.1.ebuild b/net-analyzer/zabbix/zabbix-7.2.1.ebuild
index f90e2783580f..44d89bbbef48 100644
--- a/net-analyzer/zabbix/zabbix-7.2.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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 )
diff --git a/net-analyzer/zabbix/zabbix-7.0.6.ebuild b/net-analyzer/zabbix/zabbix-7.2.3.ebuild
index 132e5bd1913b..8124788a5c25 100644
--- a/net-analyzer/zabbix/zabbix-7.0.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
+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 )
@@ -295,12 +295,12 @@ src_install() {
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-classic-1.5.16.jar \
src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-1.2.9.jar \
+ src/zabbix_java/lib/logback-core-1.5.16.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
+ src/zabbix_java/lib/slf4j-api-2.0.16.jar
newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi