Maintenance update to 3.3.2.

libarchive no longer builds with lzo2 support.  This was already lost
accidentally in the previous update.
This commit is contained in:
naddy
2017-07-13 19:31:14 +00:00
parent e90aedb2ca
commit 2d618326f6
4 changed files with 11 additions and 23 deletions
+4 -5
View File
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2017/03/10 20:07:24 naddy Exp $
# $OpenBSD: Makefile,v 1.35 2017/07/13 19:31:14 naddy Exp $
COMMENT= multi-format archive and compression library
DISTNAME= libarchive-3.3.1
SHARED_LIBS= archive 10.0 # 16.1
DISTNAME= libarchive-3.3.2
SHARED_LIBS= archive 10.1 # 16.2
CATEGORIES= archivers
HOMEPAGE= https://www.libarchive.org/
@@ -14,10 +14,9 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= https://www.libarchive.org/downloads/
WANTLIB= bz2 c crypto expat iconv lz4 lzma lzo2 pthread z
WANTLIB= bz2 c crypto expat iconv lz4 lzma pthread z
LIB_DEPENDS= archivers/bzip2 \
archivers/lz4 \
archivers/lzo2 \
archivers/xz \
converters/libiconv
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (libarchive-3.3.1.tar.gz) = Kcpb0WJMpaAHqlfhYIAmKrQ3nb+Hl/XFL36nSjsEJOc=
SIZE (libarchive-3.3.1.tar.gz) = 6219943
SHA256 (libarchive-3.3.2.tar.gz) = 7S29aVR5KywFTM+OxLMwpUuFkEqAzvR3ocdGQ92voM4=
SIZE (libarchive-3.3.2.tar.gz) = 6236562
+5 -4
View File
@@ -1,11 +1,12 @@
$OpenBSD: patch-configure,v 1.4 2017/03/10 20:07:24 naddy Exp $
$OpenBSD: patch-configure,v 1.5 2017/07/13 19:31:14 naddy Exp $
Skip libc crypto tests. If these succeed, the libcrypto tests for
additional functions will never be run.
--- configure.orig Sat Feb 25 19:18:30 2017
+++ configure Fri Mar 10 12:53:43 2017
@@ -18493,7 +18493,7 @@ fi
Index: configure
--- configure.orig
+++ configure
@@ -19027,7 +19027,7 @@ fi
case "$host_os" in
@@ -1,12 +0,0 @@
$OpenBSD: patch-libarchive_archive_openssl_hmac_private_h,v 1.1 2017/03/10 20:07:24 naddy Exp $
--- libarchive/archive_openssl_hmac_private.h.orig Sun Jan 29 06:06:27 2017
+++ libarchive/archive_openssl_hmac_private.h Fri Mar 10 12:53:43 2017
@@ -28,7 +28,7 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)