From e28d11cfbbecc4398def796d5abeb082e4b1e89b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 5 Sep 2018 14:20:58 -0300 Subject: [PATCH] libarchive: update to 3.3.3. --- ...rchive_archive_openssl_hmac_private_h.patch | 15 --------------- srcpkgs/libarchive/template | 18 +++++++++--------- 2 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch diff --git a/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch b/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch deleted file mode 100644 index 362c08ecc44..00000000000 --- a/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libarchive_archive_openssl_hmac_private_h,v 1.3 2018/02/18 14:57:47 sthen Exp $ - -Index: libarchive/archive_openssl_hmac_private.h ---- libarchive/archive_openssl_hmac_private.h.orig -+++ 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) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 8f0ff4a2cbd..8a757d79261 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,27 +1,27 @@ # Template file for 'libarchive' pkgname=libarchive -version=3.3.2 -revision=5 +version=3.3.3 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) $(vopt_with expat) $(vopt_with lzo lzo2) $(vopt_with lz4) - $(vopt_with ssl openssl) --without-xml2 --without-nettle - --disable-rpath ac_cv_func_lchmod=no" + $(vopt_with ssl openssl) $(vopt_with zstd) --without-xml2 + --without-nettle --disable-rpath ac_cv_func_lchmod=no" makedepends="zlib-devel bzip2-devel liblzma-devel - $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) + $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd zstd-devel) $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " +license="BSD-2-Clause" homepage="http://www.libarchive.org/" -license="BSD" distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz" -checksum=ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce +checksum=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e # Package build options -build_options="acl expat lzo lz4 ssl" +build_options="acl expat lzo lz4 ssl zstd" # Enable acl and ssl by default. -build_options_default="acl ssl" +build_options_default="acl ssl zstd" if [ "$CHROOT_READY" ]; then hostmakedepends="automake libtool pkg-config"