Received: by mail.netbsd.org (Postfix, from userid 605) id B982384DD7; Mon, 1 Oct 2018 00:37:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F141184DD6 for ; Mon, 1 Oct 2018 00:37:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2obFM47A0_14 for ; Mon, 1 Oct 2018 00:37:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 443D784C78 for ; Mon, 1 Oct 2018 00:37:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 39CA9FBEE; Mon, 1 Oct 2018 00:37:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1538354271138360" MIME-Version: 1.0 Date: Mon, 1 Oct 2018 00:37:51 +0000 From: "Sevan Janiyan" Subject: CVS commit: pkgsrc/archivers/libarchive/files/libarchive To: pkgsrc-changes@NetBSD.org Reply-To: sevan@netbsd.org X-Mailer: log_accum Message-Id: <20181001003751.39CA9FBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1538354271138360 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sevan Date: Mon Oct 1 00:37:51 UTC 2018 Modified Files: pkgsrc/archivers/libarchive/files/libarchive: archive_openssl_hmac_private.h Log Message: Fix build with LibreSSL 2.7 https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852 To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1538354271138360 Content-Disposition: inline Content-Length: 890 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.1.1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.2 --- pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h:1.1.1.2 Tue Aug 1 22:21:17 2017 +++ pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h Mon Oct 1 00:37:51 2018 @@ -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 < 0x20700000L) #include /* malloc, free */ #include /* memset */ static inline HMAC_CTX *HMAC_CTX_new(void) --_----------=_1538354271138360--