From owner-svn-ports-all@freebsd.org Sat Jun 10 21:17:09 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3CD7BF68B9; Sat, 10 Jun 2017 21:17:09 +0000 (UTC) (envelope-from brnrd@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 mx1.freebsd.org (Postfix) with ESMTPS id AEE2B33EC; Sat, 10 Jun 2017 21:17:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5ALH8Lt082438; Sat, 10 Jun 2017 21:17:08 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5ALH89U082437; Sat, 10 Jun 2017 21:17:08 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201706102117.v5ALH89U082437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 10 Jun 2017 21:17:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443120 - head/net/freeradius3/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jun 2017 21:17:10 -0000 Author: brnrd Date: Sat Jun 10 21:17:08 2017 New Revision: 443120 URL: https://svnweb.freebsd.org/changeset/ports/443120 Log: net/freeradius3: Fix build issue with LibreSSL - Add patch from upstream [1] [1] https://github.com/FreeRADIUS/freeradius-server/commit/e104c051b4f741dafd771d343e2a0d2ae0159ca0 PR: 218225 Submitted by: dewayne@heuristicsystems.com.au Approved by: zi (maintainer) Modified: head/net/freeradius3/files/patch-src__main__tls.c Modified: head/net/freeradius3/files/patch-src__main__tls.c ============================================================================== --- head/net/freeradius3/files/patch-src__main__tls.c Sat Jun 10 21:12:57 2017 (r443119) +++ head/net/freeradius3/files/patch-src__main__tls.c Sat Jun 10 21:17:08 2017 (r443120) @@ -1,8 +1,8 @@ ---- ./src/main/tls.c.orig 2014-08-04 08:03:48.000000000 -0400 -+++ ./src/main/tls.c 2014-08-04 08:04:14.000000000 -0400 -@@ -63,8 +63,8 @@ - static libssl_defect_t libssl_defects[] = - { +--- src/main/tls.c.orig 2017-03-06 13:58:04 UTC ++++ src/main/tls.c +@@ -107,8 +107,8 @@ static libssl_defect_t libssl_defects[] + .comment = "For more information see https://www.openssl.org/news/secadv/20160922.txt" + }, { - .low = 0x010001000, /* 1.0.1 */ - .high = 0x01000106f, /* 1.0.1f */ @@ -11,3 +11,12 @@ .id = "CVE-2014-0160", .name = "Heartbleed", .comment = "For more information see http://heartbleed.com" +@@ -2131,7 +2131,7 @@ int cbtls_verify(int ok, X509_STORE_CTX + } + + if (lookup == 0) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ext_list = X509_get0_extensions(client_cert); + #else + X509_CINF *client_inf;