diff options
| author |   Brian Evans <grknight@gentoo.org> | 2019-02-14 14:48:29 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2019-02-14 14:50:49 -0500 |
| commit | 65092da067a661727d15db17bccd679d84baf10f (patch) | |
| tree | 3102c66c8528818f68ccb966e2c7282ecf34dbbd /net-analyzer/flow-tools/files | |
| parent | app-office/libreoffice-l10n: Drop 6.2.0.3 (diff) | |
| download | gentoo-65092da067a661727d15db17bccd679d84baf10f.tar.gz gentoo-65092da067a661727d15db17bccd679d84baf10f.tar.bz2 gentoo-65092da067a661727d15db17bccd679d84baf10f.zip | |
net-analyzer/flow-tools: Revbump to fix compile and mysql dependency
Non-maintainer commit.
Original ebuild and patch by Robin Johnson <robbat2@gentoo.org>
Additional change for mysql dep by me
Bug: https://bugs.gentoo.org/674032
Bug: https://bugs.gentoo.org/665940
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'net-analyzer/flow-tools/files')
| -rw-r--r-- | net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch | 47 |
1 files changed, 47 insertions, 0 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 new file mode 100644 index 000000000000..c6b17743ce91 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch @@ -0,0 +1,47 @@ +diff -Nuar --exclude '*~' flow-tools-0.68.5.1.orig/lib/ftxlate.c flow-tools-0.68.5.1/lib/ftxlate.c +--- flow-tools-0.68.5.1.orig/lib/ftxlate.c 2008-01-27 12:48:49.000000000 -0800 ++++ flow-tools-0.68.5.1/lib/ftxlate.c 2018-12-29 15:18:33.739062317 -0800 +@@ -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 @@ + + + /* init crypto */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) { + return -1; + } + + EVP_CIPHER_CTX_init(cp->cipher_ctx); ++#endif + + /* disable padding */ + if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) { +@@ -2083,10 +2093,14 @@ + { + + #ifdef HAVE_OPENSSL ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CIPHER_CTX_cleanup(cp->cipher_ctx); + + if (cp->cipher_ctx) + free (cp->cipher_ctx); ++#else ++ EVP_CIPHER_CTX_free(cp->cipher_ctx); ++#endif + #endif /* HAVE_OPENSSL */ + + return 0; |