summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin44903 -> 44902 bytes
-rw-r--r--net-analyzer/sngrep/Manifest11
-rw-r--r--net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch11
-rw-r--r--net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch24
-rw-r--r--net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch79
-rw-r--r--net-analyzer/sngrep/metadata.xml1
-rw-r--r--net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild45
-rw-r--r--net-analyzer/sngrep/sngrep-1.5.0.ebuild50
-rw-r--r--net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild (renamed from net-analyzer/sngrep/sngrep-1.6.0.ebuild)2
-rw-r--r--net-analyzer/zabbix/Manifest8
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.11.ebuild22
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.12.ebuild22
-rw-r--r--net-analyzer/zabbix/zabbix-6.2.5.ebuild22
-rw-r--r--net-analyzer/zabbix/zabbix-6.2.6.ebuild22
14 files changed, 23 insertions, 296 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f3355594b1f2..e7b0d8c85b62 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 39e45cca8f60..ce04655a0612 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,10 +1,3 @@
-AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
-AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
-AUX sngrep-1.5.0-bashisms.patch 2821 BLAKE2B d2f035182f8183870b16a4137f0abcc32776db01592a0432be8189be39ee0e5e627e01335766e2d656561e0ad5dc12be667b351ca551975678068d8cf7325765 SHA512 6c85cf1670b7b9f376e1409f833090bc5ba8aed705698dad5f82b782537804eac32f71a716a960c4ed042a3a81d4005acbd3cf1f0d171e00ce9c0094971be77d
-DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
-DIST sngrep-1.5.0.tar.gz 244965 BLAKE2B 85c8ddbbb5c81dfa886086543df9ccb6f4a297c95a23afddfcf1a359e4af19a1f37cd75136881aba07fd70c177737fa93440f04f97ed9ffd01afef3055971472 SHA512 20be55f80d029739b1db4c0ccbc028604019acd8ca45181eb9952759ced4f20549d991c2916c9d1c84c989ccb123cad44f545a9146471a79273c0a6053615fbe
DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3
-EBUILD sngrep-1.4.7-r1.ebuild 910 BLAKE2B d2a839a65c30f662def7cecf6c2dd3816a97d1affa8c23ac67f5ef04b881a4bda243ef7e9acaffcc6995015ab01b5a6f209dbfa743d594b0e13bf7ff54c15596 SHA512 000db85ac51346367bfe39630367839711aa31100e2725db8cca54f36b47e24ce136705d7a13d03d20ebbb81697c074a390df12540693f8b7f261fb90d1978d8
-EBUILD sngrep-1.5.0.ebuild 914 BLAKE2B 75b222192e6334bde5850937f11a8b3b8cdb2e0351c1bbcaea2179ffcede360902f4b10b094e3f641fda6104ebc6f80196ec3bce1f10539e09799a4bbfe4ba34 SHA512 b15fbf07226d7b5a3241c95a78539517f1dde107c8cce3e4cb9267db10f6dc1be9dd5fe42a059286e34fa5fb44d22e86b460ae3c4fc979e046d2bc20840c1037
-EBUILD sngrep-1.6.0.ebuild 862 BLAKE2B 69fe6e51473583d23d77c092ff7b6fbf54de1cec53f0a619e3d2dce37da8667eb401bd0ee7a6b168bb395afe4ab16093ced8b4d52f1fd5d7c3600d4e90b87ce1 SHA512 b85d3e7a35a37a1bb4d0e2d1ddab6ddde6e3cafba8274992ac0be355ea0c336f02e590b52342e09c084edfcb5c80433a7662a9f1e5ac3331883920df515b8692
-MISC metadata.xml 560 BLAKE2B 9cb2c1875c153efdefe1dd06f5f6b3dd04aa90a5b07450bc47cd40002de94fd138d94c7132d9a634dd942a136252aa0439796722411d9c3709f8ee5c9019f2a0 SHA512 d5acc8af69c7483ec2c0870f7ff3586f6e46196aec0ed735647da79bc4a627427eae9b7baac9eb96abb2ae64093117b93c17a981656148f0a832286ea2ad53cd
+EBUILD sngrep-1.6.0-r1.ebuild 878 BLAKE2B e65118d52a01866a4cbb8484deac943bca129b80ead7335de22aa333bb1fa2a56c755cc9ab9253b27bec6c281d12541df999b6ce9743a493780d2ea9ec7c92af SHA512 2dc5e5ff66dd11633f6494e44431a7f1652c8bfae970351082e5556c213cf55779e577e235635806a164abdf65d6b6db68b688a062d0c899efe341a8cbce39e2
+MISC metadata.xml 468 BLAKE2B 7b8e43ef6cb3bd733bc3321a2f5436b43bd846def6ac09d648e09bfe412a2cbb8f2b8d26cdb2721a2e44c33a183c4ab1d60e5fc9f899d7b8bbc0beac4e19abf5 SHA512 f6614eac2fdb609c8bd4ca7f3719b672a300ea52f96906c5ca6de204c345dbc80b5ec9e673046c24031b96118d0c70168c290fcdfda0063e7bd4493e6f7e58ae
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
deleted file mode 100644
index 3e63dc245dab..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/sngrep.m4
-+++ b/m4/sngrep.m4
-@@ -44,7 +44,7 @@
- LIBS="$sngrep_config_script $LIBS "
- sngrep_script_success=yes
- ], [])
-- LDFLAGS="$save_LDFLAGS"
-+ LDFLAGS="$sngrep_save_LDFLAGS"
- fi
- if test "x$sngrep_script_success" = xno; then
- [$5]
diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
deleted file mode 100644
index 8a01eeb2560b..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,6 +74,10 @@
- AC_CHECK_LIB([menuw], [new_item], [], [
- AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.])
- ])
-+
-+ AC_SEARCH_LIBS([keyname], [tinfow], [], [
-+ AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.])
-+ ])
- ], [
-
- # Ncurses without wide-character support
-@@ -96,6 +100,10 @@
- AC_CHECK_LIB([menu], [new_item], [], [
- AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.])
- ])
-+
-+ AC_SEARCH_LIBS([keyname], [tinfo], [], [
-+ AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.])
-+ ])
- ])
-
- ####
diff --git a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
deleted file mode 100644
index ffcd38d2f7f3..000000000000
--- a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://github.com/irontec/sngrep/pull/404
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,7 @@ AC_ARG_ENABLE([unicode],
- [AC_SUBST(UNICODE, no)]
- )
-
--AS_IF([test "x$enable_unicode" == "xyes"], [
-+AS_IF([test "x$enable_unicode" = "xyes"], [
- # Ncurses with wide-character support
- AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
-
-@@ -123,7 +123,7 @@ AC_ARG_WITH([gnutls],
- [AC_SUBST(WITH_GNUTLS, no)]
- )
-
--AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
-+AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
-
- m4_ifdef([PKG_CHECK_MODULES], [
- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
-@@ -160,8 +160,8 @@ AC_ARG_WITH([openssl],
- [AC_SUBST(WITH_OPENSSL, no)]
- )
-
--AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
-- AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
-+AS_IF([test "x$WITH_OPENSSL" = "xyes"], [
-+ AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
- AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ])
- ], [])
- m4_ifdef([PKG_CHECK_MODULES], [
-@@ -187,7 +187,7 @@ AC_ARG_WITH([pcre],
- [AC_SUBST(WITH_PCRE, no)]
- )
-
--AS_IF([test "x$WITH_PCRE" == "xyes"], [
-+AS_IF([test "x$WITH_PCRE" = "xyes"], [
- AC_CHECK_HEADER([pcre.h], [], [
- AC_MSG_ERROR([ You need libpcre development files installed to compile with pcre support.])
- ])
-@@ -206,7 +206,7 @@ AC_ARG_ENABLE([ipv6],
- [AC_SUBST(USE_IPV6, no)]
- )
-
--AS_IF([test "x$USE_IPV6" == "xyes"], [
-+AS_IF([test "x$USE_IPV6" = "xyes"], [
- AC_CHECK_HEADERS([netinet/in.h netinet/ip6.h], [], [
- AC_MSG_ERROR([ You dont seem to have ipv6 support (no ip6.h found).])
- ], [
-@@ -231,15 +231,15 @@ AC_ARG_ENABLE([eep],
- [AC_SUBST(USE_EEP, no)]
- )
-
--AS_IF([test "x$USE_EEP" == "xyes"], [
-+AS_IF([test "x$USE_EEP" = "xyes"], [
- AC_DEFINE([USE_EEP],[],[Compile With EEP support])
- ], [])
-
-
- # Conditional Source inclusion
--AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" == "xyes"])
--AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" == "xyes"])
--AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" == "xyes"])
-+AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" = "xyes"])
-+AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" = "xyes"])
-+AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" = "xyes"])
-
-
- ######################################################################
-@@ -249,7 +249,7 @@ AC_ARG_ENABLE(logo,
- [ enable_logo=$enableval],
- [ enable_logo=yes])
-
--AS_IF([test "x$enable_logo" == "xyes"], [
-+AS_IF([test "x$enable_logo" = "xyes"], [
- echo ''
- echo ' ██╗██████╗ ██████╗ ███╗ ██╗████████╗███████╗ ██████╗'
- echo ' ██║██╔══██╗██╔═══██╗████╗ ██║╚══██╔══╝██╔════╝██╔════╝'
diff --git a/net-analyzer/sngrep/metadata.xml b/net-analyzer/sngrep/metadata.xml
index 2c8180a3d655..6891786f5ba3 100644
--- a/net-analyzer/sngrep/metadata.xml
+++ b/net-analyzer/sngrep/metadata.xml
@@ -7,7 +7,6 @@
<use>
<flag name="eep">Enable EEP packet send/receive support</flag>
<flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag>
- <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag>
</use>
<upstream>
<remote-id type="github">irontec/sngrep</remote-id>
diff --git a/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
deleted file mode 100644
index 3af1d0702e40..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Ncurses SIP Messages flow viewer"
-HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eep gnutls ipv6 openssl pcre unicode"
-REQUIRED_USE="
- gnutls? ( !openssl )
-"
-
-DEPEND="
- net-libs/libpcap
- sys-libs/ncurses:=[unicode(+)?]
- openssl? ( dev-libs/openssl:0= )
- gnutls? ( net-libs/gnutls )
- pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.7-tinfo.patch
- "${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable eep) \
- $(use_enable ipv6) \
- $(use_enable unicode) \
- $(use_with gnutls) \
- $(use_with openssl) \
- $(use_with pcre)
-}
diff --git a/net-analyzer/sngrep/sngrep-1.5.0.ebuild b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
deleted file mode 100644
index af7e30fcebf6..000000000000
--- a/net-analyzer/sngrep/sngrep-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Ncurses SIP Messages flow viewer"
-HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eep gnutls pcre ssl unicode"
-
-# In next release, libpcre -> libpcre2
-DEPEND="
- net-libs/libpcap
- sys-libs/ncurses:=[unicode(+)?]
- ssl? (
- !gnutls? ( dev-libs/openssl:= )
- gnutls? ( net-libs/gnutls:= )
- )
- pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-bashisms.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-ipv6
-
- $(use_enable eep)
- $(use_enable unicode)
- $(use_with pcre)
- $(use_with ssl $(usex gnutls gnutls openssl))
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/net-analyzer/sngrep/sngrep-1.6.0.ebuild b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
index aedd0cf3f8d1..89771013483f 100644
--- a/net-analyzer/sngrep/sngrep-1.6.0.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
@@ -36,7 +36,7 @@ src_configure() {
local myeconfargs=(
--enable-ipv6
--enable-unicode
-
+ --without-pcre
$(use_enable eep)
$(use_with pcre pcre2)
$(use_with ssl $(usex gnutls gnutls openssl))
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 26421f1687e0..550b5332072b 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -37,9 +37,9 @@ EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514
EBUILD zabbix-5.0.29.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
EBUILD zabbix-5.0.30.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
EBUILD zabbix-6.0.10.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.0.11.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
-EBUILD zabbix-6.0.12.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.0.11.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
+EBUILD zabbix-6.0.12.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
EBUILD zabbix-6.2.4.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.2.5.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
-EBUILD zabbix-6.2.6.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.2.5.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
+EBUILD zabbix-6.2.6.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
MISC metadata.xml 1757 BLAKE2B 4c44773ec6767f5d7edf927347cfae3f45ba1afb0ac1399c5fd31a9ce8c493647b16d22b891d803a820cac76ab2b3a3966ac33704e6e1d728cb23c18f30e02d4 SHA512 e953034478edb317a3657e44725e5e18d0033d70f53a10a3e8d317f0cc2a014a3c5485135999435cf222fa63748d093888054d6556b8ca78b00e39a699d98968
diff --git a/net-analyzer/zabbix/zabbix-6.0.11.ebuild b/net-analyzer/zabbix/zabbix-6.0.11.ebuild
index 4b12b01e37ea..961445bff7c3 100644
--- a/net-analyzer/zabbix/zabbix-6.0.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.11.ebuild
@@ -25,7 +25,7 @@ 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 +pcre2 +postgres proxy server snmp sqlite ssh static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? (
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
server? (
app-admin/webapp-config
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
frontend? (
@@ -147,6 +145,7 @@ pkg_setup() {
src_configure() {
local econf_args=(
+ --with-libpcre2
"$(use_enable agent)"
"$(use_enable agent2)"
"$(use_enable ipv6)"
@@ -169,13 +168,6 @@ src_configure() {
"$(use_with ssh ssh2)"
)
- if use pcre2; then
- econf_args+=( --with-libpcre2 )
- else
- # If pcre2 is not enabled, then use the old pcre library.
- econf_args+=( --with-libpcre )
- fi
-
econf ${econf_args[@]}
}
@@ -354,12 +346,6 @@ pkg_postinst() {
elog "This will convert database data for use with Node ID"
elog "and also adds a local node."
elog
-
- if ! use pcre2; then
- ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
- ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
- ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
- fi
fi
if use proxy; then
diff --git a/net-analyzer/zabbix/zabbix-6.0.12.ebuild b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
index 4b12b01e37ea..961445bff7c3 100644
--- a/net-analyzer/zabbix/zabbix-6.0.12.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
@@ -25,7 +25,7 @@ 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 +pcre2 +postgres proxy server snmp sqlite ssh static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? (
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
server? (
app-admin/webapp-config
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
frontend? (
@@ -147,6 +145,7 @@ pkg_setup() {
src_configure() {
local econf_args=(
+ --with-libpcre2
"$(use_enable agent)"
"$(use_enable agent2)"
"$(use_enable ipv6)"
@@ -169,13 +168,6 @@ src_configure() {
"$(use_with ssh ssh2)"
)
- if use pcre2; then
- econf_args+=( --with-libpcre2 )
- else
- # If pcre2 is not enabled, then use the old pcre library.
- econf_args+=( --with-libpcre )
- fi
-
econf ${econf_args[@]}
}
@@ -354,12 +346,6 @@ pkg_postinst() {
elog "This will convert database data for use with Node ID"
elog "and also adds a local node."
elog
-
- if ! use pcre2; then
- ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
- ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
- ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
- fi
fi
if use proxy; then
diff --git a/net-analyzer/zabbix/zabbix-6.2.5.ebuild b/net-analyzer/zabbix/zabbix-6.2.5.ebuild
index 4b12b01e37ea..961445bff7c3 100644
--- a/net-analyzer/zabbix/zabbix-6.2.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.2.5.ebuild
@@ -25,7 +25,7 @@ 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 +pcre2 +postgres proxy server snmp sqlite ssh static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? (
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
server? (
app-admin/webapp-config
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
frontend? (
@@ -147,6 +145,7 @@ pkg_setup() {
src_configure() {
local econf_args=(
+ --with-libpcre2
"$(use_enable agent)"
"$(use_enable agent2)"
"$(use_enable ipv6)"
@@ -169,13 +168,6 @@ src_configure() {
"$(use_with ssh ssh2)"
)
- if use pcre2; then
- econf_args+=( --with-libpcre2 )
- else
- # If pcre2 is not enabled, then use the old pcre library.
- econf_args+=( --with-libpcre )
- fi
-
econf ${econf_args[@]}
}
@@ -354,12 +346,6 @@ pkg_postinst() {
elog "This will convert database data for use with Node ID"
elog "and also adds a local node."
elog
-
- if ! use pcre2; then
- ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
- ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
- ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
- fi
fi
if use proxy; then
diff --git a/net-analyzer/zabbix/zabbix-6.2.6.ebuild b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
index 4b12b01e37ea..961445bff7c3 100644
--- a/net-analyzer/zabbix/zabbix-6.2.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
@@ -25,7 +25,7 @@ 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 +pcre2 +postgres proxy server snmp sqlite ssh static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? (
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
server? (
app-admin/webapp-config
- !pcre2? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2:= )
+ dev-libs/libpcre2:=
net-analyzer/fping[suid]
)
frontend? (
@@ -147,6 +145,7 @@ pkg_setup() {
src_configure() {
local econf_args=(
+ --with-libpcre2
"$(use_enable agent)"
"$(use_enable agent2)"
"$(use_enable ipv6)"
@@ -169,13 +168,6 @@ src_configure() {
"$(use_with ssh ssh2)"
)
- if use pcre2; then
- econf_args+=( --with-libpcre2 )
- else
- # If pcre2 is not enabled, then use the old pcre library.
- econf_args+=( --with-libpcre )
- fi
-
econf ${econf_args[@]}
}
@@ -354,12 +346,6 @@ pkg_postinst() {
elog "This will convert database data for use with Node ID"
elog "and also adds a local node."
elog
-
- if ! use pcre2; then
- ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
- ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
- ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
- fi
fi
if use proxy; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 19:16:08 +0000