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

update to squid-3.5.3, upstream have rolled in patches to build with libressl

Browse Source
This commit is contained in:
sthen 2015-04-03 19:23:27 +00:00
parent 0cc14b8c68
commit bae64ff4c6
5 changed files with 9 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
www/squid/snapshot/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.26 2015/03/14 21:07:04 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2015/04/03 19:23:27 sthen Exp $
V= 3.5.2
V= 3.5.3
# needs c++11. other parts for gcc MODULES are in ../Makefile.inc.
MODGCC_ARCHS= *
@ -12,7 +12,7 @@ MODGCC_ARCHS= *
#MODCLANG_ARCHS= *
#MODCLANG_LANGS= c++
EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota session \
EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota \
unix_group wbinfo_group # kerberos_ldap_group (sasl/gssapi)
CONFIGURE_ARGS= --disable-strict-error-checking \
@ -23,19 +23,6 @@ LIB_DEPENDS+= security/gnutls
MODULES+= devel/gettext
WANTLIB+= ffi gmp gnutls hogweed p11-kit tasn1 z
AUTOCONF_VERSION?= 2.69
AUTOMAKE_VERSION?= 1.14
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
# for stable version, replace with setting ac_cv_path_CPPUNITCONFIG=false
BUILD_DEPENDS+= devel/cppunit
post-patch:
cd ${WRKSRC}; \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
LOCALBASE=${LOCALBASE} ./bootstrap.sh
.include <bsd.port.mk>

4
www/squid/snapshot/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (squid-3.5.2.tar.xz) = WvLhbyeUZvn7icL+9sCbaCSn4+eZbJ8cK8Fufa3ddR8=
SIZE (squid-3.5.2.tar.xz) = 2282116
SHA256 (squid-3.5.3.tar.xz) = c+xloIOEo+yTzMF+ie96BroiGBZVGUby8FHMc2wpgcA=
SIZE (squid-3.5.3.tar.xz) = 2283580

12
www/squid/snapshot/patches/patch-configure_ac
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.8 2015/01/06 22:51:55 sthen Exp $
--- configure.ac.orig Sun Dec 21 05:15:31 2014
+++ configure.ac Tue Jan 6 22:32:47 2015
@@ -426,7 +426,7 @@ dnl Check for atomic operations support in the compile
dnl
AC_MSG_CHECKING([for GNU atomic operations support])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- int n = 0;
+ long long n = 0;
]],[[
__sync_add_and_fetch(&n, 10); // n becomes 10
__sync_fetch_and_add(&n, 20); // n becomes 30

8
www/squid/snapshot/patches/patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in,v 1.2 2015/01/06 22:51:55 sthen Exp $
--- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in.orig Sun Dec 21 05:11:48 2014
+++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in Tue Jan 6 22:32:47 2015
@@ -137,14 +137,14 @@ sub check {
$OpenBSD: patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in,v 1.3 2015/04/03 19:23:27 sthen Exp $
--- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in.orig Sat Mar 28 10:58:05 2015
+++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in Tue Mar 31 10:58:08 2015
@@ -146,14 +146,14 @@ sub check {
@tmpuser = split(/\@/, $user);
$user = "$tmpuser[1]\\$tmpuser[0]";
}

39
www/squid/snapshot/patches/patch-src_ssl_bio_cc
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-src_ssl_bio_cc,v 1.1 2015/02/06 16:30:17 sthen Exp $
--- src/ssl/bio.cc.orig Fri Feb 6 15:36:07 2015
+++ src/ssl/bio.cc Fri Feb 6 15:47:15 2015
@@ -151,7 +151,10 @@ Ssl::Bio::stateChanged(const SSL *ssl, int where, int
bool
Ssl::ClientBio::isClientHello(int state)
{
- return (state == SSL2_ST_GET_CLIENT_HELLO_A ||
+ return (
+#ifdef SSL2_ST_GET_CLIENT_HELLO_A
+ state == SSL2_ST_GET_CLIENT_HELLO_A ||
+#endif
state == SSL3_ST_SR_CLNT_HELLO_A ||
state == SSL23_ST_SR_CLNT_HELLO_A ||
state == SSL23_ST_SR_CLNT_HELLO_B ||
@@ -325,7 +328,11 @@ adjustSSL(SSL *ssl, Ssl::Bio::sslFeatures &features)
// If the client supports compression but our context does not support
// we can not adjust.
+#ifdef OPENSSL_NO_COMP
+ if (features.compressMethod) {
+#else
if (features.compressMethod && ssl->ctx->comp_methods == NULL) {
+#endif
debugs(83, 5, "Client Hello Data supports compression, but we do not!");
return false;
}
@@ -669,9 +676,11 @@ Ssl::Bio::sslFeatures::get(const SSL *ssl)
debugs(83, 7, "SNI server name: " << serverName);
#endif
+#ifndef OPENSSL_NO_COMP
if (ssl->session->compress_meth)
compressMethod = ssl->session->compress_meth;
else if (sslVersion >= 3) //if it is 3 or newer version then compression is disabled
+#endif
compressMethod = 0;
debugs(83, 7, "SSL compression: " << compressMethod);