From 0b832a429ecd6081aa9faa0eb262303b019d87ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Mar 2025 01:48:35 +0000 Subject: gentoo auto-resync : 09:03:2025 - 01:48:35 --- net-analyzer/nfdump/Manifest | 6 ++++-- net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch | 14 ++++++++++++++ .../nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch | 21 +++++++++++++++++++++ net-analyzer/nfdump/nfdump-1.7.4.ebuild | 4 +++- net-analyzer/nfdump/nfdump-1.7.5.ebuild | 4 ++-- 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch create mode 100644 net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch (limited to 'net-analyzer/nfdump') diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index f3d07addadfa..a40136375d67 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,12 +1,14 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4 +AUX nfdump-1.7.2-musl.patch 304 BLAKE2B 6c28588f9975b50c30951c05be98bbf88f10465cd3a87c82c0f72e6e3bb80d2ae38d4ce5b49ca9bfa45b4322dda15515fca7f49c343ff5c329acaec768baca96 SHA512 9584849a618df34fb49aa92904fa774ce6c705d413221ff4bd721fd4a50be5ddc9c8b00e7fa0606d17e96c1a547ffcb535b8e310ffd3bad2b5621e001f8cc38b +AUX nfdump-1.7.2-nfreplay-gcc14.patch 461 BLAKE2B e2fec62e0125510c63af5c6193325f908e038e6e1e17cd04f00d8a6f257fd4ad0710c90bac96f4c5bb92dd1b7189f944664bfcc406d70a8798d9ead73073ad6e SHA512 539ff98897d6365363538f8a5440f7431b95bd15baeeb3ad08ddf9cf521cef989b7ab799185e9cf3c1cf9744febbb74fea4a654b9c549fa784da498c856732de AUX nfdump-1.7.4-rrdtool-gcc14.patch 4958 BLAKE2B 403c485af06fdd8a6ba3b51dff67da01ed692aa1a726bbc484132f3b06fa4b02b9df9f6eff5a86d76274feb66c541b9650a94da686fdd327babdbba240b30046 SHA512 6d097ada7def8721f2a443b3f7a288b91fd687333c1bba49f494e63ca16b3702ceede599df76016f33eb4930ab9ef5834c18299cbd699effe9c6bfc19890d2ae AUX nfdump.service 365 BLAKE2B aae0d69b77b01e822430585988c148c0a497123b9a90421b8a3fda5c716b9022063aec9af1d3e6c302ba64d9b57421a3e5224eb6662374ac8277661543e1b076 SHA512 41eba6c45230957bb29c9d3325f5188c10a3123fe8580bf5da843757031ff930cede410ddb337c0899f70010d2b4937ab8a57831f395c80f40fc101e8f158a3c DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003 DIST nfdump-1.7.4.tar.gz 756319 BLAKE2B 441fb5d3fcb4b83bfc42861eac67bf96ac7c7d6a44afd47c4e16615b22261e1628a1bffc645071817eb9085857ca3a3b632fd265dc897cf9af8fce2999f86787 SHA512 be65aeee9b982b30633102b3ca0f84eab280ca4fda4544be458a2387d051e62517127a2625bbc4329a844550a613df67f5015cc5a90a8e4b6a8c65d045650ee2 DIST nfdump-1.7.5.tar.gz 835261 BLAKE2B 60b92395c7c3ccdd7b7d5a1b05bc2b69aeef872a40eb32cad76b99f6fd9e5960c1433812063ee7135f23f13031d5cde08ed60918bbb8688448515eabc97fc79e SHA512 80223a5bb28ccedd955bee94771284e845bbd76520cefb70f7c87bad2fb209885ae170fc710f03edabe06c61f4776c3789493358187cb3273bd4217ebcbbe1dd EBUILD nfdump-1.7.2.ebuild 1764 BLAKE2B 2926473aa8b71c4e1cc515174410fc8b67b5d82034e9c971a7c0d67172f3d03b933062fe91568c84fea23ef1c3a7519782ba69c460b09254ba090cd1f6bb55e1 SHA512 2d833098bfb8722079e54e29bb6448c7fe7657012d68e86099721d851f2bbd6570488499b93e73e45c558ead6a2e73ca5c892ba509e305bedc868ccfe5e7cbf9 -EBUILD nfdump-1.7.4.ebuild 2108 BLAKE2B 5f09a5053d3e81e916038b9f18ac6a4fba10ca187841fe128a7f0469abb8e8ddea8d4078039269466580cfeaaf4f3e5d49b6775b7dea4b1b7af6689d4cd000a2 SHA512 03822f965843fe221176d267591bb1b67e2d4d4ce31872c00172124f0908bcff22c7b540129ed308bbdd52812b2226fcbc276d23d4618e9d0ced740279841adb -EBUILD nfdump-1.7.5.ebuild 2137 BLAKE2B 221c432780c0802794d893c7c4ec917fe3d6f05675ab83e57dc158fdf90d6c1242b512567a4ac5330eb5f0066494e905a9027837d3ba4c9c23da23ad2834c045 SHA512 7099af71a38be8601f6586beaecc408890602dc5fbd24bfc7216631285b0a3e810456ade159664f16d729aeb6472a65cdaa5cc34f3a2d2cf84711b99377f378a +EBUILD nfdump-1.7.4.ebuild 2194 BLAKE2B 1c8becad600be330204863186d08743d78107ad91ae81222139b13f51018944da379c8f1e3efcefc3acbc9df173aa633eb031abcda9f4b6eb607a3017d9898e0 SHA512 26cf117472010fff73d080c371dd5e2f77cecd86afafe3dabc4e65c5a23c0752f1bc67c6c40679842d9fee68129280c08e931decd9381ffbff67d9436c0a2c5b +EBUILD nfdump-1.7.5.ebuild 2136 BLAKE2B f3b6446c7c23ccf2595a51cc192b6cadd7160cb45aaf445e8e325e940061b6bce25ea906c1aaf6f72951ac41b4908f90e30a9751474abd5298c55843ea53ef2d SHA512 61f6827efc4603d7fd9c9157e206be0dd8b06ccdbddf985fd5f370a41a2b902710d8a401cb040a5f0cb7a5b89d23d7b7f19a65adf09e492a481b2dd3e7295f6d MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd diff --git a/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch b/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch new file mode 100644 index 000000000000..7e1d4ae12d3a --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch @@ -0,0 +1,14 @@ +Backport patch from 1.7.5. + +https://github.com/phaag/nfdump/commit/925dd28f7e08e00479a2906d0343e6fa75a6a783 + +--- a/src/lib/daemon.c ++++ b/src/lib/daemon.c +@@ -41,6 +41,7 @@ + #include + // some linux are picky + #define __USE_GNU ++#define _GNU_SOURCE + #include + + #include "util.h" diff --git a/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch b/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch new file mode 100644 index 000000000000..76fba5e0c2fe --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch @@ -0,0 +1,21 @@ + +https://github.com/phaag/nfdump/commit/0b2796b52e1793b6e2eba29baf7f456217372965 + +From: Peter Haag +Date: Tue, 20 Aug 2024 21:00:18 +0200 +Subject: [PATCH] Make gcc-14 happy + +--- a/src/nfreplay/nfreplay.c ++++ b/src/nfreplay/nfreplay.c +@@ -74,9 +74,11 @@ + #ifdef HAVE___FPURGE + #define FPURGE __fpurge + #endif ++#ifndef FPURGE + #ifdef HAVE_FPURGE + #define FPURGE fpurge + #endif ++#endif + + /* Local Variables */ + static int verbose = 0; diff --git a/net-analyzer/nfdump/nfdump-1.7.4.ebuild b/net-analyzer/nfdump/nfdump-1.7.4.ebuild index 25ed77c194fe..1bad6fd5a1f5 100644 --- a/net-analyzer/nfdump/nfdump-1.7.4.ebuild +++ b/net-analyzer/nfdump/nfdump-1.7.4.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 @@ -45,6 +45,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${PN}-1.7.2-musl.patch + "${FILESDIR}"/${PN}-1.7.2-nfreplay-gcc14.patch "${FILESDIR}"/${PN}-1.7.4-rrdtool-gcc14.patch ) diff --git a/net-analyzer/nfdump/nfdump-1.7.5.ebuild b/net-analyzer/nfdump/nfdump-1.7.5.ebuild index 547fac45f4ec..659290aa4b2b 100644 --- a/net-analyzer/nfdump/nfdump-1.7.5.ebuild +++ b/net-analyzer/nfdump/nfdump-1.7.5.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow zstd" REQUIRED_USE="?? ( jnat nsel )" -- cgit v1.2.3