diff options
| author | marino <marino@FreeBSD.org> | 2016-09-11 23:57:56 +0000 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2016-09-11 23:57:56 +0000 |
| commit | 341111ce189e07dda815ec19b1cad36c865da7c4 (patch) | |
| tree | f081910214dd424e2e1ba59894aaaecbde4344ab | |
| parent | 7155924d960a46897230d8e7a0c7d3ec37f2c4c7 (diff) | |
| download | FreeBSD-ports-341111ce189e07dda815ec19b1cad36c865da7c4.zip FreeBSD-ports-341111ce189e07dda815ec19b1cad36c865da7c4.tar.gz | |
security/broccoli: Document SSL requirement and handle no SSLv3 (LibreSSL)
Approved by: SSL blanket
| -rw-r--r-- | security/broccoli/Makefile | 3 | ||||
| -rw-r--r-- | security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile index 38906f4..e641cce9 100644 --- a/security/broccoli/Makefile +++ b/security/broccoli/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libGeoIP.so:net/GeoIP EXTRACT_AFTER_ARGS= ${DISTNAME}/aux/broccoli -USES= cmake:outsource +USES= cmake:outsource ssl USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/aux/broccoli @@ -32,6 +32,7 @@ PLIST_SUB+= CLEANUP_PREFIX="@comment " .endif CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc +CFLAGS+= -I${OPENSSLINC} OPTIONS_DEFINE= DEBUG PYTHON RUBY OPTIONS_SUB= diff --git a/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c b/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c new file mode 100644 index 0000000..c6c0b45 --- /dev/null +++ b/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c @@ -0,0 +1,14 @@ +--- aux/broccoli/src/bro_openssl.c.orig 2015-09-06 19:43:23 UTC ++++ aux/broccoli/src/bro_openssl.c +@@ -302,7 +302,11 @@ __bro_openssl_init(void) + * to set up an SSL connection now and abort if this fails in any way. + */ + ++#ifndef OPENSSL_NO_SSL3 + if (! (ctx = SSL_CTX_new(SSLv3_method()))) ++#else ++ if (! (ctx = SSL_CTX_new(SSLv23_method()))) ++#endif + D_RETURN_(FALSE); + + /* We expect things to be stored in PEM format, which means that we |
