public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/
@ 2022-07-10 22:51 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-07-10 22:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7d22d15778eea9a548dff0e680a9530f374354e6
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Jul  5 23:13:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 22:49:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d22d157

net-analyzer/flow-tools: Remove LibreSSL patch

This also fixes the build with libressl-3.5.x from the gentoo overlay.

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26240
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../flow-tools/files/flow-tools-0.68.5.1-openssl11.patch  | 15 ---------------
 1 file changed, 15 deletions(-)

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 <openssl/ssl.h>
- #include <openssl/evp.h>
- #undef free_func
-+
-+/* fixup LibreSSL OpenSSL version numbering */
-+#include <openssl/opensslv.h>
-+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-+#undef OPENSSL_VERSION_NUMBER
-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
-+#endif
-+
- #endif /* HAVE_OPENSSL */
- 
- #include <sys/time.h>
 @@ -2040,11 +2048,13 @@
  
  


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-10 22:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-10 22:51 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox