cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix autoconf check which used SSLv3_method; results in assert failure in

Browse Source 
some ssl interception modes
This commit is contained in:
sthen 2015-11-04 15:39:55 +00:00
parent 0070b79455
commit 2a41ed34cd
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/squid/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.173 2015/11/02 17:21:55 sthen Exp $
# $OpenBSD: Makefile,v 1.174 2015/11/04 15:39:55 sthen Exp $
COMMENT-main= WWW and FTP proxy cache and accelerator
COMMENT-ldap= LDAP authentication/ACL support for Squid
COMMENT-ntlm= NTLM authentication/ACL support for Squid
V= 3.5.11
REVISION-main= 0
DISTNAME= squid-$V
EXTRACT_SUFX= .tar.xz
PKGNAME-main= squid-$V
@ -36,7 +37,8 @@ MODGCC4_ARCHS= *
MODGCC4_LANGS= c c++
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/cfgaux
CONFIGURE_ARGS= --disable-strict-error-checking \

21
www/squid/patches/patch-acinclude_lib-checks_m4 Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-acinclude_lib-checks_m4,v 1.1 2015/11/04 15:39:55 sthen Exp $
--- acinclude/lib-checks.m4.orig Wed Nov 4 15:17:13 2015
+++ acinclude/lib-checks.m4 Wed Nov 4 15:17:21 2015
@@ -93,7 +93,7 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
],
[
SSLeay_add_ssl_algorithms();
- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
+ SSL_CTX *sslContext = SSL_CTX_new(SSLv23_method());
SSL *ssl = SSL_new(sslContext);
X509* cert = SSL_get_certificate(ssl);
return 0;
@@ -120,7 +120,7 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
],
[
SSLeay_add_ssl_algorithms();
- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
+ SSL_CTX *sslContext = SSL_CTX_new(SSLv23_method());
X509 ***pCert = (X509 ***)sslContext->cert;
X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1;
if (sslCtxCert != NULL)