gentoo auto-resync : 08:05:2024 - 00:00:57

7 files changed, 20 insertions, 52 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cc521804cddb..b9ae93bed57d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 7b62fd4255b1..ee32ecc1774a 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,5 @@
-AUX netdata-1.44.0-dbengine.patch 1703 BLAKE2B 50af2960a6bf44361a5d9a0bd916c6909874211e170bd986794d901503e841fc3dd7ff1cbb5d2d97a86506b84d0bdc1a1199e3da6615d6f3e94486fba53eac31 SHA512 5b223f522bb25f5ace9e1622cd7d23526343c5499dccf10ea2353524d089134742b5cdf11c7f2f813844b0a96b8f469c485cccb282f49bd07e097108da2f085c
+AUX netdata-1.45.3-dbengine.patch 464 BLAKE2B 93c9fb255d83fc81efa91de5a03f8e1bcd50de1a833d3ef9f27ca48d7354145af3fa0302064bdbdd461e83b32f52ef8e1e7d93c871cc79e0d7f1a959d26e9dc7 SHA512 dd792d2c64529f2847ce923051e9e33a355aefff34966efef9ef2e89de30287bcf24dd58e721739a857f55add7fb3de65a32ff4c6ab0bc40c98474f29eedb57a
 DIST netdata-1.45.3.tar.gz 74876663 BLAKE2B 2e181daea72b9f03c74bc8f8a4dac81f0915a080295b914486d8aa732742099a7758795386b27576693723e1990455d0d869ed21150a41ebae030714ee339ca9 SHA512 5d293949632caa8660632247460d08300123c1375e1f24f759ebe16fc40a7e35afe04f948bf431819076f82d9fff315d45a42db582636e89b351b167d7e64498
-EBUILD netdata-1.45.3.ebuild 4330 BLAKE2B f5ab535f2c5123de9a75e2456a84a57470d6e2980618d4552e898912245986ef1db79738d7ff5b1c572013539e11228bf4f7d75b6cc82bc04a36a74077a7d930 SHA512 95b61beaac0758a412c88af158f72bb89e1bf130e081c80bfbf337a95089bafc84a65685490356ffe997dcad742f13b1a10bbcb8d6d2f5da144d094920c6e05e
+EBUILD netdata-1.45.3.ebuild 4377 BLAKE2B 9ea71270e30308e91cb25c5d23ed13bce72f00278a6300669438e5e53120c217e7f0fd6b7e8a15abcb994b9d9ac72ebe3e8731d9eb95c5423bd4ca53f9ffe162 SHA512 09f63cfb4477bbe80eb378893813b461695e33fbed2b382c0a61ded8da429ded9d7c814bd9227074225eae8a9d0938b5ca5c6546f378356de482fa61316cb6cf
 EBUILD netdata-9999.ebuild 4330 BLAKE2B f5ab535f2c5123de9a75e2456a84a57470d6e2980618d4552e898912245986ef1db79738d7ff5b1c572013539e11228bf4f7d75b6cc82bc04a36a74077a7d930 SHA512 95b61beaac0758a412c88af158f72bb89e1bf130e081c80bfbf337a95089bafc84a65685490356ffe997dcad742f13b1a10bbcb8d6d2f5da144d094920c6e05e
 MISC metadata.xml 1512 BLAKE2B 321d3c1be16a0fd3c64d89f96c510d68ea82fca12730183d2724f7a0f30fdcb94c2be2749a6f9651ae7effdf7c250e977f95cf03c865a20e03e136456429c2b3 SHA512 4bd5583efd1fee4a0f221708fedf6dcf424639852842c8ba1089a2303a57ae58ccfd302fc5fcbfdada65a56efa8c7c949b95eedde0133a770ef68ca6688bbefd
diff --git a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch
deleted file mode 100644
index 3119094f64bc..000000000000
--- a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ee6c0bcb7f0bfe6440dd7c4c52dca87486abc181 Mon Sep 17 00:00:00 2001
-From: Stelios Fragkakis <52996999+stelfrag@users.noreply.github.com>
-Date: Wed, 20 Dec 2023 21:54:17 +0200
-Subject: [PATCH] Fix compilation error when using --disable-dbengine
-
----
- daemon/global_statistics.c | 2 ++
- daemon/main.c              | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/daemon/global_statistics.c b/daemon/global_statistics.c
-index 8392a3c88e08d..6e286b18a7220 100644
---- a/daemon/global_statistics.c
-+++ b/daemon/global_statistics.c
-@@ -857,6 +857,7 @@ static void global_statistics_charts(void) {
- 
-     // ----------------------------------------------------------------
- 
-+#ifdef ENABLE_DBENGINE
-     if (tier_page_type[0] == PAGE_GORILLA_METRICS)
-     {
-         static RRDSET *st_tier0_gorilla_pages = NULL;
-@@ -918,6 +919,7 @@ static void global_statistics_charts(void) {
- 
-         rrdset_done(st_tier0_compression_info);
-     }
-+#endif
- }
- 
- // ----------------------------------------------------------------------------
-diff --git a/daemon/main.c b/daemon/main.c
-index fc15f0c9dfc52..7c7452c4aa055 100644
---- a/daemon/main.c
-+++ b/daemon/main.c
-@@ -1502,11 +1502,11 @@ int main(int argc, char **argv) {
- #ifdef ENABLE_DBENGINE
-                         char* createdataset_string = "createdataset=";
-                         char* stresstest_string = "stresstest=";
--#endif
- 
-                         if(strcmp(optarg, "pgd-tests") == 0) {
-                             return pgd_test(argc, argv);
-                         }
-+#endif
- 
-                         if(strcmp(optarg, "sqlite-meta-recover") == 0) {
-                             sql_init_database(DB_CHECK_RECOVER, 0);
diff --git a/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch b/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch
new file mode 100644
index 000000000000..66392c9b7203
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch
@@ -0,0 +1,13 @@
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -1520,8 +1520,9 @@
+ 
+                             // set defaults for dbegnine unittest
+                             config_set(CONFIG_SECTION_DB, "dbengine page type", "gorilla");
++#ifdef ENABLE_DBENGINE
+                             default_rrdeng_disk_quota_mb = default_multidb_disk_quota_mb = 256;
+-
++#endif
+                             if (sqlite_library_init())
+                                 return 1;
+ 
diff --git a/net-analyzer/netdata/netdata-1.45.3.ebuild b/net-analyzer/netdata/netdata-1.45.3.ebuild
index 0d57f53917bc..e7d91907df53 100644
--- a/net-analyzer/netdata/netdata-1.45.3.ebuild
+++ b/net-analyzer/netdata/netdata-1.45.3.ebuild
@@ -83,6 +83,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-dbengine.patch" )
+
 FILECAPS=(
 	'cap_dac_read_search,cap_sys_ptrace+ep'
 	'usr/libexec/netdata/plugins.d/apps.plugin'
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index 798d4ada4a4a..5a0a67484bf9 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,3 +1,3 @@
 DIST snortalog_v2.4.3.tar 1324032 BLAKE2B dae81fe861c7d85ce5fce63ffe773cccb8b643654a861e1b9cc91db22e5683c4a5d2c83ee6a1895386777c600b004978f91e3ed8a333397139bfe6f9644a79ce SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06
-EBUILD snortalog-2.4.3-r1.ebuild 1552 BLAKE2B 464b9276a173de2be490da6dfd6a039c6a13bd250e4306977b84983ed8126eb7eceb8cc72288c5ebce439ba94013e2287e7d56e6b9d69ab9e7baf08394729b30 SHA512 a1ef4a92bdf7806ef534ffc6cbe0e7500c313d13819f04ed28ccfb78792bb8c7f353c86af237e41f46003c7d3ee59591ff7c573fe8022726b04e6f33b43dcb1e
+EBUILD snortalog-2.4.3-r2.ebuild 1620 BLAKE2B 2378e3f2a22bd6351f483af5df867ccb03ae8ebfa5a9eb474a058b3c1cf9fc60223b724ce4113cfa2a47317d2852cf9b35903dfd64e152888448fcffa79a16a3 SHA512 0e6c81ce15b7e610007bcf57d641185c334897dc419d17ad703df76bc76e4404c55a0a7d1736b17e2d34dcffb0efd9daf172d67859a9e469bbf378a00bb55b6d
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild
index 960612b2f88f..2063d0ad5aa0 100644
--- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="tk"
 
 RDEPEND="
-	dev-lang/perl[ithreads]
+	|| ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] )
 	dev-perl/GDGraph
 	dev-perl/HTML-HTMLDoc
 	virtual/perl-DB_File