From b46b9834b3fbf80b22ccc12e95f660512cd0fa75 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Jul 2022 01:28:44 +0100 Subject: gentoo auto-resync : 11:07:2022 - 01:28:44 --- net-analyzer/Manifest.gz | Bin 45033 -> 45033 bytes net-analyzer/flow-tools/Manifest | 2 +- .../files/flow-tools-0.68.5.1-openssl11.patch | 15 --------------- 3 files changed, 1 insertion(+), 16 deletions(-) (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index a89b87dc6778..edadb9591ada 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index fce75796e094..06b9b1388d70 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,5 +1,5 @@ AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B f15d1d6fc60b9ba916ccefa44f30b683d93931770a3113b533b51a52146f63e56fe0db864a03a5df0fc1ecd5a58e464944c5df28cd929556d6615617f3b975d2 SHA512 ec26e4ea284e0b2aff3a73b6b76e0a87c336dbe81d0492db3b7809de17103c47d220d2d20bc9fce853bb10e7b11c35dd6943b6cb1ef305bd8ffe147bc7bec18c -AUX flow-tools-0.68.5.1-openssl11.patch 1039 BLAKE2B 2787119195c98ad92260b282b60fbb2bfb56d09a0ae7c999238d61d3b1e25dfb7e02590f8f78910e5b85111899db72f7d3bb3ce96c6c357f7ab4e6b01a67f109 SHA512 03a48e6e297d701b04259bf354b5a032ed660d99fb6941054f8d02f215681561a152ed10411bc0fa93b27be223b874316f989dff779aac458db87b0118947590 +AUX flow-tools-0.68.5.1-openssl11.patch 652 BLAKE2B 41adab4b06643c29d2ca844039475f0257d704c9ca708e81d5a8e6e7762fb413b69cfaf4a5b77bb35dc3ee10944c78a8e9733f38a4d0fd26981469f9c8831d1a SHA512 81f4a1d2c14d4392aa1e5badcb685cd3b93d58740ce6c45812ebf1ae05908ff75e33701fdfab901169070af36c125fb664bc9c26e901d12ee7ec30116eb11e8a AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d AUX flow-tools-0.68.6-mysql.patch 479 BLAKE2B 9c22f8aae5bc57c2d86e88d69bfcac438e8d1fc2f5d6bb4fe61612e3042709d46edc0e1a4159b54bf98e153ae1e0acf08b06b317b4029a9605933dfef41d40f7 SHA512 fbdbcf7a716375a70a6677d35aa81f0f07fbf67d3de7ace72cc4b0b548d5b7fed32d0f0f4420672a88ec60ea2f72e109f9c3a3903cd66be7dbec85fa445dd9ec AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d1d18403fbd0bb95ec3a58faf04e164d97e6eefe4c1b2f526ed96ce44b7a410cd6e3efb0c3b98e15b3b0 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch index 686d40ab8079..cbbddcaae68d 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch @@ -1,20 +1,5 @@ --- a/lib/ftxlate.c +++ b/lib/ftxlate.c -@@ -34,6 +34,14 @@ - #include - #include - #undef free_func -+ -+/* fixup LibreSSL OpenSSL version numbering */ -+#include -+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) -+#undef OPENSSL_VERSION_NUMBER -+#define OPENSSL_VERSION_NUMBER 0x1000107fL -+#endif -+ - #endif /* HAVE_OPENSSL */ - - #include @@ -2040,11 +2048,13 @@ -- cgit v1.2.3