libzip: upgraded package to upstream
Upgraded dev-libs/libzip to version 1.8.0 on amd64, arm
BUG=b:219396290
TEST=Passed CQ
Change-Id: I3aec218df3f5a52a9cc05cdaa7c9989c10a67978
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3461114
Reviewed-by: Daniil Lunev <dlunev@chromium.org>
Tested-by: Liam Flaherty <liamflaherty@google.com>
Commit-Queue: Liam Flaherty <liamflaherty@google.com>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 6f8f0a9..38df180 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1 +1 @@
-DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
+DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
deleted file mode 100644
index bebe380..0000000
--- a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
-Date: Wed, 15 Jul 2020 12:16:16 +0200
-Subject: [PATCH] Include limits.h for INT_MAX
-
----
- lib/zip_crypto_openssl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c
-index 1cb00479..60f92758 100644
---- a/lib/zip_crypto_openssl.c
-+++ b/lib/zip_crypto_openssl.c
-@@ -38,6 +38,7 @@
- #include "zip_crypto.h"
-
- #include <openssl/rand.h>
-+#include <limits.h>
-
- #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
- #define USE_OPENSSL_1_0_API
-
-From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Wed, 15 Jul 2020 12:38:07 +0200
-Subject: [PATCH] Include limits.h for INT_MAX.
-
----
- lib/zip_crypto_mbedtls.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c
-index c348ad2a..7063c6b6 100644
---- a/lib/zip_crypto_mbedtls.c
-+++ b/lib/zip_crypto_mbedtls.c
-@@ -41,6 +41,7 @@
- #include <mbedtls/entropy.h>
- #include <mbedtls/pkcs5.h>
-
-+#include <limits.h>
-
- _zip_crypto_aes_t *
- _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) {
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
similarity index 85%
rename from dev-libs/libzip/libzip-1.7.3-r1.ebuild
rename to dev-libs/libzip/libzip-1.8.0.ebuild
index 5d80554..592262c 100644
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@
LICENSE="BSD"
SLOT="0/5"
KEYWORDS="*"
-IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
REQUIRED_USE="test? ( tools )"
RESTRICT="!test? ( test )"
@@ -28,17 +28,12 @@
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
- !mbedtls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ !mbedtls? ( dev-libs/openssl:0= )
)
)
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326
-
pkg_setup() {
# Upstream doesn't support building dynamic & static
# simultaneously: https://github.com/nih-at/libzip/issues/76
@@ -107,7 +102,11 @@
}
src_test() {
- [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+ run_tests() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+ }
+
+ multibuild_foreach_variant run_tests
}
src_install() {
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 577bd42..e8ddaca 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
