Update to 1.101.

PR:		235139
Submitted by:	bofh
Approved by:	ler (mentor, implicit)
This commit is contained in:
Craig Leres 2019-02-02 21:22:58 +00:00
parent 4eb9f04b73
commit 7ef95f7e6f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=491991
3 changed files with 10 additions and 9 deletions

View File

@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= broccoli
PORTVERSION= 1.97
PORTREVISION= 1
PORTVERSION= 1.101
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= https://www.bro.org/downloads/release/
DISTNAME= bro-2.4.1
MASTER_SITES= https://www.zeek.org/downloads/
DISTNAME= bro-2.6.1
MAINTAINER= leres@FreeBSD.org
COMMENT= Bro Client Communications Library

View File

@ -1,2 +1,3 @@
SHA256 (bro-2.4.1.tar.gz) = d8b99673a5024630f6bae820c4f8c3ca9029f1167f9e5729c914c66e1fc7c8f6
SIZE (bro-2.4.1.tar.gz) = 15010455
TIMESTAMP = 1548186823
SHA256 (bro-2.6.1.tar.gz) = d9718b83fdae0c76eea5254a4b9470304c4d1d3778687de9a4fe0b5dffea521b
SIZE (bro-2.6.1.tar.gz) = 28432762

View File

@ -1,13 +1,14 @@
--- aux/broccoli/src/bro_openssl.c.orig 2015-09-06 19:43:23 UTC
--- aux/broccoli/src/bro_openssl.c.orig 2018-12-19 16:36:18 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.
*/
- if (! (ctx = SSL_CTX_new(SSLv23_method())))
+#ifndef OPENSSL_NO_SSL3
if (! (ctx = SSL_CTX_new(SSLv3_method())))
+ if (! (ctx = SSL_CTX_new(SSLv3_method())))
+#else
+ if (! (ctx = SSL_CTX_new(SSLv23_method())))
+ if (! (ctx = SSL_CTX_new(SSLv23_method())))
+#endif
D_RETURN_(FALSE);