From owner-svn-ports-head@freebsd.org  Tue Mar 30 17:12:58 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 522BD57DA4B;
 Tue, 30 Mar 2021 17:12:58 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4F8wxk17pTz50y5;
 Tue, 30 Mar 2021 17:12:58 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1941B2323;
 Tue, 30 Mar 2021 17:12:58 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12UHCv5t029239;
 Tue, 30 Mar 2021 17:12:57 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12UHCvZj029238;
 Tue, 30 Mar 2021 17:12:57 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202103301712.12UHCvZj029238@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 30 Mar 2021 17:12:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r569564 - head/www/squid3/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/www/squid3/files
X-SVN-Commit-Revision: 569564
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Mar 2021 17:12:58 -0000

Author: danfe
Date: Tue Mar 30 17:12:57 2021
New Revision: 569564
URL: https://svnweb.freebsd.org/changeset/ports/569564

Log:
  Unbreak the build on FreeBSD 11 which still has old OpenSSL in the base.
  
  Pointy hat to:	danfe

Modified:
  head/www/squid3/files/patch-src_ssl_support.cc

Modified: head/www/squid3/files/patch-src_ssl_support.cc
==============================================================================
--- head/www/squid3/files/patch-src_ssl_support.cc	Tue Mar 30 16:26:38 2021	(r569563)
+++ head/www/squid3/files/patch-src_ssl_support.cc	Tue Mar 30 17:12:57 2021	(r569564)
@@ -1,11 +1,15 @@
 --- src/ssl/support.cc.orig	2018-07-15 20:46:55 UTC
 +++ src/ssl/support.cc
-@@ -2159,7 +2159,7 @@ remove_session_cb(SSL_CTX *, SSL_SESSION *sessionID)
+@@ -2159,7 +2159,11 @@ remove_session_cb(SSL_CTX *, SSL_SESSION *sessionID)
  }
  
  static SSL_SESSION *
 -get_session_cb(SSL *, unsigned char *sessionID, int len, int *copy)
-+get_session_cb(SSL *, const unsigned char *sessionID, int len, int *copy)
++get_session_cb(SSL *,
++#ifdef LIBRESSL_VERSION_NUMBER
++  const
++#endif
++  unsigned char *sessionID, int len, int *copy)
  {
      if (!SslSessionCache)
          return NULL;