From owner-svn-ports-head@freebsd.org Tue Mar 27 07:07:17 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB1D4F56A33; Tue, 27 Mar 2018 07:07:17 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5288B7275D; Tue, 27 Mar 2018 07:07:17 +0000 (UTC) (envelope-from glewis@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 34BBD18B0C; Tue, 27 Mar 2018 07:07:17 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2R77Hed040572; Tue, 27 Mar 2018 07:07:17 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2R77G1N040570; Tue, 27 Mar 2018 07:07:16 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201803270707.w2R77G1N040570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Tue, 27 Mar 2018 07:07:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465666 - head/archivers/libarchive/files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: head/archivers/libarchive/files X-SVN-Commit-Revision: 465666 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.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 07:07:18 -0000 Author: glewis Date: Tue Mar 27 07:07:16 2018 New Revision: 465666 URL: https://svnweb.freebsd.org/changeset/ports/465666 Log: . Fix the build with libressl-devel PR: 226853 Submitted by: Piotr Kubaj Added: head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h (contents, props changed) Modified: head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h Modified: head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h ============================================================================== --- head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h Tue Mar 27 07:06:39 2018 (r465665) +++ head/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h Tue Mar 27 07:07:16 2018 (r465666) @@ -1,11 +1,12 @@ ---- libarchive/archive_openssl_evp_private.h.orig Sun Jan 29 06:06:27 2017 -+++ libarchive/archive_openssl_evp_private.h Fri Mar 10 12:53:43 2017 -@@ -28,7 +28,7 @@ +--- libarchive/archive_openssl_evp_private.h.orig 2017-01-29 05:06:27 UTC ++++ libarchive/archive_openssl_evp_private.h +@@ -28,7 +28,8 @@ #include #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) #include /* malloc, free */ #include /* memset */ static inline EVP_MD_CTX *EVP_MD_CTX_new(void) Added: head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/libarchive/files/patch-libarchive_openssl_hmac_private.h Tue Mar 27 07:07:16 2018 (r465666) @@ -0,0 +1,12 @@ +--- libarchive/archive_openssl_hmac_private.h.orig 2018-03-22 20:47:12 UTC ++++ libarchive/archive_openssl_hmac_private.h +@@ -28,7 +28,8 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #include /* malloc, free */ + #include /* memset */ + static inline HMAC_CTX *HMAC_CTX_new(void)