Attachment #197349 for bug #231442

Lines 1-8 Link Here

(-)squid/Makefile (-2 / +2 lines)
1	# $FreeBSD: head/www/squid/Makefile 478711 2018-09-01 17:05:47Z antoine $	1	# $FreeBSD: head/www/squid/Makefile 478711 2018-09-01 17:05:47Z antoine $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.1	4	PORTVERSION= 4.2
5	PORTREVISION= 2
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
8	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \
Lines 218-223 Link Here
218	--with-pidfile=/var/run/squid/squid.pid \	217	--with-pidfile=/var/run/squid/squid.pid \
219	--with-swapdir=/var/squid/cache \	218	--with-swapdir=/var/squid/cache \
220	--without-gnutls \	219	--without-gnutls \
		220	--with-included-ltdl \
221	--enable-auth \	221	--enable-auth \
222	--enable-zph-qos \	222	--enable-zph-qos \
223	--enable-build-info \	223	--enable-build-info \

Lines 1-3 Link Here

(-)squid/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1522445865	1	TIMESTAMP = 1537243691
2	SHA256 (squid4.1/squid-4.1.tar.xz) = b61e486fe1ba1f5c918a48d5ae3929d3f604e347c3c7dceb1105a9f0e5ee9eb5	2	SHA256 (squid4.2/squid-4.2.tar.xz) = 994807762c59991b32449caf29418fd0ec9d2329746b18eb19bd930b6806d208
3	SIZE (squid4.1/squid-4.1.tar.xz) = 2425892	3	SIZE (squid4.2/squid-4.2.tar.xz) = 2426856




--- 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

Return to bug 231442

Line 0 Link Here

(-)squid/files/patch-src_ssl_bio.cc (+14 lines)
	1	--- src/ssl/bio.cc.orig 2018-06-21 15:26:17 UTC
	2	+++ src/ssl/bio.cc
	3	@@ -76,7 +76,11 @@ Ssl::Bio::Create(const int fd, Security:
	4	BIO_meth_set_create(SquidMethods, squid_bio_create);
	5	BIO_meth_set_destroy(SquidMethods, squid_bio_destroy);
	6	}
	7	+#if defined(LIBRESSL_VERSION_NUMBER)
	8	+ BIO_METHOD *useMethod = SquidMethods;
	9	+#elif !defined(LIBRESSL_VERSION_NUMBER)
	10	const BIO_METHOD *useMethod = SquidMethods;
	11	+#endif
	12	#else
	13	BIO_METHOD *useMethod = &SquidMethods;
	14	#endif