Date: Mon, 1 Oct 2018 18:31:40 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481048 - in head/www/squid: . files Message-ID: <201810011831.w91IVeh0011233@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Oct 1 18:31:40 2018 New Revision: 481048 URL: https://svnweb.freebsd.org/changeset/ports/481048 Log: www/squid: update 4.1 -> 4.3 - fix build with LibreSSL PR: 231442 Submitted by: timp87@gmail.com (maintainer), takefu@airport.fm Relnotes: http://www.squid-cache.org/Versions/v4/changesets/ Added: head/www/squid/files/patch-src_ssl_bio.cc (contents, props changed) Modified: head/www/squid/Makefile head/www/squid/distinfo head/www/squid/pkg-plist Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Mon Oct 1 18:01:22 2018 (r481047) +++ head/www/squid/Makefile Mon Oct 1 18:31:40 2018 (r481048) @@ -1,16 +1,14 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.1 -PORTREVISION= 2 +PORTVERSION= 4.3 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ http://www1.at.squid-cache.org/Versions/v4/ \ http://www.eu.squid-cache.org/Versions/v4/ \ http://www1.jp.squid-cache.org/Versions/v4/ -#DIST_SUBDIR= squid${PORTVERSION:R} -DIST_SUBDIR= squid${PORTVERSION} +DIST_SUBDIR= squid${PORTVERSION:R} PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -218,6 +216,7 @@ CONFIGURE_ARGS= --with-default-user=squid \ --with-pidfile=/var/run/squid/squid.pid \ --with-swapdir=/var/squid/cache \ --without-gnutls \ + --with-included-ltdl \ --enable-auth \ --enable-zph-qos \ --enable-build-info \ Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Mon Oct 1 18:01:22 2018 (r481047) +++ head/www/squid/distinfo Mon Oct 1 18:31:40 2018 (r481048) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522445865 -SHA256 (squid4.1/squid-4.1.tar.xz) = b61e486fe1ba1f5c918a48d5ae3929d3f604e347c3c7dceb1105a9f0e5ee9eb5 -SIZE (squid4.1/squid-4.1.tar.xz) = 2425892 +TIMESTAMP = 1537243691 +SHA256 (squid4/squid-4.3.tar.xz) = 322612ef0544828f6c673a25124b32364fb41ef5e2847e21c89480b5546a4c7c +SIZE (squid4/squid-4.3.tar.xz) = 2435880 Added: head/www/squid/files/patch-src_ssl_bio.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid/files/patch-src_ssl_bio.cc Mon Oct 1 18:31:40 2018 (r481048) @@ -0,0 +1,14 @@ +--- src/ssl/bio.cc.orig 2018-06-21 15:26:17 UTC ++++ src/ssl/bio.cc +@@ -76,7 +76,11 @@ Ssl::Bio::Create(const int fd, Security: + BIO_meth_set_create(SquidMethods, squid_bio_create); + BIO_meth_set_destroy(SquidMethods, squid_bio_destroy); + } ++#if defined(LIBRESSL_VERSION_NUMBER) ++ BIO_METHOD *useMethod = SquidMethods; ++#elif !defined(LIBRESSL_VERSION_NUMBER) + const BIO_METHOD *useMethod = SquidMethods; ++#endif + #else + BIO_METHOD *useMethod = &SquidMethods; + #endif Modified: head/www/squid/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Mon Oct 1 18:01:22 2018 (r481047) +++ head/www/squid/pkg-plist Mon Oct 1 18:31:40 2018 (r481048) @@ -62,6 +62,10 @@ %%ETCDIR%%/errors/ar-sa %%ETCDIR%%/errors/ar-sy %%ETCDIR%%/errors/ar-tn +%%ETCDIR%%/errors/ca-es +%%ETCDIR%%/errors/en-cn +%%ETCDIR%%/errors/es-xl +%%ETCDIR%%/errors/pt-xl %%ETCDIR%%/errors/ar-ye %%ETCDIR%%/errors/ar/ERR_ACCESS_DENIED %%ETCDIR%%/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810011831.w91IVeh0011233>