gentoo auto-resync : 15:04:2023 - 11:48:08

4 files changed, 26 insertions, 2 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4c01fde58ce2..fc5325474ece 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 53871e2c10f2..dff5abf053dd 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,10 +1,11 @@
 AUX tcpflow-1.5.0_alpha-libcapng.patch 235 BLAKE2B dff01050c14223ecece11396e1e5b60b7a485dd5a46a1c44774442ab441ca10153bcb9bbe9dc9cf60b99b412c74e96ba32fd8b1af06d5babdfd8a60cd9442263 SHA512 0d2bd1ed7056033c94fa32deeac70e31ea35309e38e54c66f5092547559cf4c037bf2f4302deee3474839681eeba24cc4ac1068597c0ee28d48d2a10c2eea063
 AUX tcpflow-1.5.2-gentoo.patch 1479 BLAKE2B d6afa07edc4611e252cb15ec0f74b17a22a494008636e95038487bf5a32bf163442c948cca01133ebc1336a6b4c74bf724f9dafc3c15c567958c22511682b44f SHA512 445429f78a5aa7c91c774b4dddf88c6715940ecba9ce61bac9ba8e1e1f0f2c3c1ffff06d902920cd20b4679919d6b3d4d4e3ca1781fa975df5e1a14320aaa82d
+AUX tcpflow-1.6.1-gcc13.patch 645 BLAKE2B 692d3b4a98918b6e9c68ce6c7d0a7040c3a4be0600c2eda731245aaf0da875f90c20dae8cf00aa98391039a5b15be6510a67fad29be0704b85319e1f7ad5f75c SHA512 7f39102f4892c016eeb877e722a9032c6335a33634e3069a2fc74ef86d5281a76e46de58ef04ccc0fa02c9fc081683a34db958206e5d2b5841f2d77d4b3eff6e
 AUX tcpflow-1.6.1-wformat-security.patch 907 BLAKE2B b65f44d8400fc20a8dd3f6a3b4babd191af01f1a351e3d2a9333db5f25b625d56f6cc7cd50e1185847ec5076a9fadbed1e8fb9ef9dad2a6f71054aab324cbbcf SHA512 a7eed0a3e07d086df7d3cab798ac6535f5169df4db02e7c14c87ab6a109218bf04555d7cb1bb75184b95ef0461f62e5a0dc3f9dc7ea2dd94b20a43a6b1a9e736
 DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
 DIST tcpflow-1.6.1-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b
 DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c
-EBUILD tcpflow-1.6.1-r1.ebuild 1502 BLAKE2B 722e28925083fe313ba5076a768f872c84f71ccae9eeaabf064671168b5a4b3cf46d9f6018b4be7e18b48782d74d1349bb089e5b013eaf6b1744888d8f45a2a0 SHA512 da5885ab42d6581ab71aaffea28f12e169766c3113c166cbae4a835604a6bbb229a5386ac716e6d87dbbb32b3949a776f95714a5d8e0b22c376a6f818fdc8730
+EBUILD tcpflow-1.6.1-r1.ebuild 1541 BLAKE2B 9b87924c524cf79ba5d37c446e4c5b28dba4591c2df5bdf384bfef1fd2f75a7d0d646d4291832d0c35086aafa8649eee3d9e190088c282733f4768b5a44ad709 SHA512 a83c69d967c232bf323bad0b7c2da08bff759c887ee8d320e4fd55d127440b62ec4008d079da9c85d87c77191744d759811e8933a29108654956ae92477263cf
 EBUILD tcpflow-1.6.1.ebuild 1490 BLAKE2B 582097c26c2fdfbfe320a860558612b34099075f4f008c882814fc9bc799760210c9e8451f945e4f3c1b06cc779d63b5cd6d345d63fded2998e660db46a8545c SHA512 ef293c3c753fd37583c0cfeb6a8bcafc4e9f2f640950e9a8ddb2b17ce9577cec79ac1003568430ad10946a6b508aa0252b68a28ae6b668d8555934dd1189b37f
 MISC metadata.xml 361 BLAKE2B 28668976bf5eb66e6a4b4b35062eb985e18d72b27682a9de2458b4472a6b06e2b25230e20c26b98883f05ea278584b974344685449f5e18a93a21dc8ddd91054 SHA512 1cfbda2c61c3ef4bf0b7779eb845e9e3cab3c672e681bb008b1939aa2d0dddbd8a1ee6b04eda3c3c96644d9ec67cc5285ee8f1ea6ad4fb171ea990b0843eee35
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch
new file mode 100644
index 000000000000..d3b6b63920f1
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch
@@ -0,0 +1,22 @@
+https://github.com/simsong/tcpflow/pull/252
+
+From 51973125e3961569b83bd4fdde65272a3843a6a3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 15 Apr 2023 09:54:14 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+Bug: https://bugs.gentoo.org/895282
+--- a/src/netviz/plot_view.h
++++ b/src/netviz/plot_view.h
+@@ -23,6 +23,7 @@
+ #include <cairo/cairo-pdf.h>
+ #endif
+ 
++#include <cstdint>
+ #include <vector>
+ #include <string>
+ #include <math.h>
+
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
index 07306743ad75..ab313f301712 100644
--- a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
 	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
 	"${FILESDIR}"/${PN}-1.6.1-wformat-security.patch
+	"${FILESDIR}"/${PN}-1.6.1-gcc13.patch
 )
 
 src_prepare() {