[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 66f38b2cd49e9131ddb3dbb3d5e4a4e65dd5bdfa Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 8 06:23:12 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 8 06:23:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f38b2c dev-libs/libzip: Drop 1.7.3-r1 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - .../libzip/files/libzip-1.7.3-missing-header.patch | 43 dev-libs/libzip/libzip-1.7.3-r1.ebuild | 116 - 3 files changed, 160 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index cfd516e3bb7..38df1804412 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +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 bebe3802841..000 --- 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?= -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 -+#include - - #if OPENSSL_VERSION_NUMBER < 0x101fL || defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_0_API - -From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -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 - #include - -+#include - - _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.7.3-r1.ebuild deleted file mode 100644 index 4d7fa7066ed..000 --- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake multibuild flag-o-matic - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="https://nih.at/libzip/; -SRC_URI="https://www.nih.at/libzip/${P}.tar.xz; - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" -REQUIRED_USE="test? ( tools )" - -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2:= ) - lzma? ( app-arch/xz-utils ) - ssl? ( - gnutls? ( - dev-libs/nettle:0= - >=net-libs/gnutls-3.6.5:= - ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:= ) - !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 - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_configure() { - append-lfs-flags - myconfigure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF # nothing is installed - -DENABLE_COMMONCRYPTO=OFF # not in tree - -DENABLE_BZIP2=$(usex bzip2) - -DENABLE_LZMA=$(usex lzma) - ) - if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then - mycmakeargs+=( - -DBUILD_DOC=OFF -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 143dda37b357fa949abd681742f465d8cb5f981e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 9 23:20:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 9 23:20:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143dda37 dev-libs/libzip: Drop 1.5.2-r2 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 - dev-libs/libzip/libzip-1.5.2-r2.ebuild | 109 --- 3 files changed, 133 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 0056bff2e49..1f8806b1803 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch deleted file mode 100644 index 564cc9b79f1..000 --- a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 2 Apr 2019 15:26:06 +0200 -Subject: [PATCH] mbedtls: link against the correct library - -Inspired by https://github.com/nih-at/libzip/pull/88 - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f252b3f7..f8eb16eeb 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ ELSE() - ENDIF() - IF(ENABLE_MBEDTLS) - FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) -- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) -+ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) - ELSE() - SET(MBEDTLS_LIBRARIES FALSE) - ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild deleted file mode 100644 index 7f74994f024..000 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake multibuild - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="https://nih.at/libzip/; -SRC_URI="https://www.nih.at/libzip/${P}.tar.xz; - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - ssl? ( - gnutls? ( - dev-libs/nettle:0= - >=net-libs/gnutls-3.6.5:= - ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:= ) - !mbedtls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 - -pkg_setup() { - # Upstream doesn't support building dynamic & static - # simultaneously: https://github.com/nih-at/libzip/issues/76 - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF # nothing is installed - -DENABLE_COMMONCRYPTO=OFF # not in tree - -DENABLE_BZIP2=$(usex bzip2) - ) - if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then - mycmakeargs+=( - -DBUILD_DOC=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TOOLS=OFF - ) - else - mycmakeargs+=( - -DBUILD_DOC=$(usex doc) - -DBUILD_REGRESS=$(usex test) - ) - fi - - if use ssl; then - if use gnutls; then - mycmakeargs+=( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 9865b0a57872b76b34b9e1b8e6f13913924af100 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 26 00:53:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 26 13:03:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9865b0a5 dev-libs/libzip: Drop 1.5.1 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.5.1-bzip2.patch | 53 -- dev-libs/libzip/files/libzip-1.5.1-options.patch | 50 - dev-libs/libzip/libzip-1.5.1.ebuild | 90 4 files changed, 194 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 713cf88635c..ba1849f0064 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch deleted file mode 100644 index 9b70eaca8e8..000 --- a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Fri, 7 Sep 2018 23:12:36 +0200 -Subject: [PATCH] Add an option to disable bzip2 support - -The explicit switch is still on by default, but this way it's possible -to explicitly disable bzip2 support even if bzip2 is available on the -system. - -This is useful if bzip2 is not needed, but would automatically lead to -an unwanted dependency. - CMakeLists.txt | 19 +++ - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73a34855..879e0f21 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,7 @@ PROJECT(libzip C) - OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) -+OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON) - - OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) - OPTION(BUILD_REGRESS "Build regression tests" ON) -@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2") - ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - --FIND_PACKAGE(BZip2) --IF(BZIP2_FOUND) -- SET (HAVE_LIBBZ2 1) -+IF(ENABLE_BZIP2) -+ FIND_PACKAGE(BZip2) -+ IF(BZIP2_FOUND) -+SET (HAVE_LIBBZ2 1) - -- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -- SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) --ELSE() -- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") --ENDIF(BZIP2_FOUND) -+INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -+SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) -+ ELSE() -+MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") -+ ENDIF(BZIP2_FOUND) -+ENDIF(ENABLE_BZIP2) - - IF (COMMONCRYPTO_FOUND) - SET (HAVE_CRYPTO 1) diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch deleted file mode 100644 index 0cca187d90a..000 --- a/dev-libs/libzip/files/libzip-1.5.1-options.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001 -From: Florian Delizy -Date: Tue, 7 Aug 2018 22:09:32 +0800 -Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC - options (default ON) - - CMakeLists.txt | 18 ++ - 1 file changed, 18 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69e6548e..def25607 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) - -+OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) -+OPTION(BUILD_REGRESS "Build regression tests" ON) -+OPTION(BUILD_EXAMPLES "Build examples" ON) -+OPTION(BUILD_DOC "Build documentation" ON) -+ - INCLUDE(CheckFunctionExists) - INCLUDE(CheckIncludeFiles) - INCLUDE(CheckSymbolExists) -@@ -234,10 +239,23 @@ ENABLE_TESTING() - - # Targets - ADD_SUBDIRECTORY(lib) -+ -+IF(BUILD_DOC) -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 8d4451669c00abbdc582b73a3e4664ece5ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 4 00:09:05 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 4 00:09:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d445166 dev-libs/libzip: Fix USE mbedtls Closes: https://bugs.gentoo.org/680820 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 +++ dev-libs/libzip/libzip-1.5.2-r1.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch new file mode 100644 index 000..564cc9b79f1 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch @@ -0,0 +1,23 @@ +From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Tue, 2 Apr 2019 15:26:06 +0200 +Subject: [PATCH] mbedtls: link against the correct library + +Inspired by https://github.com/nih-at/libzip/pull/88 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f252b3f7..f8eb16eeb 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -42,7 +42,7 @@ ELSE() + ENDIF() + IF(ENABLE_MBEDTLS) + FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) +- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) ++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) + ELSE() + SET(MBEDTLS_LIBRARIES FALSE) + ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild index 795775cb0b0..814a668c430 100644 --- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -30,6 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 34e6aee94f736c0493e3bffa6abcd261e08a207c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 9 20:55:40 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 9 20:57:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e6aee9 dev-libs/libzip: 1.5.1 version bump for testing Thanks-to: Hung-Te Lin gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10846 Closes: https://bugs.gentoo.org/675560 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 + dev-libs/libzip/files/libzip-1.5.1-bzip2.patch | 53 ++ dev-libs/libzip/files/libzip-1.5.1-options.patch | 50 + dev-libs/libzip/libzip-1.5.1.ebuild | 89 4 files changed, 193 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index c0eb5a5ea60..396290996fd 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 +DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch new file mode 100644 index 000..9b70eaca8e8 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch @@ -0,0 +1,53 @@ +From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Fri, 7 Sep 2018 23:12:36 +0200 +Subject: [PATCH] Add an option to disable bzip2 support + +The explicit switch is still on by default, but this way it's possible +to explicitly disable bzip2 support even if bzip2 is available on the +system. + +This is useful if bzip2 is not needed, but would automatically lead to +an unwanted dependency. +--- + CMakeLists.txt | 19 +++ + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73a34855..879e0f21 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -10,6 +10,7 @@ PROJECT(libzip C) + OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) + OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) + OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) ++OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON) + + OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) + OPTION(BUILD_REGRESS "Build regression tests" ON) +@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") + MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2") + ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") + +-FIND_PACKAGE(BZip2) +-IF(BZIP2_FOUND) +- SET (HAVE_LIBBZ2 1) ++IF(ENABLE_BZIP2) ++ FIND_PACKAGE(BZip2) ++ IF(BZIP2_FOUND) ++SET (HAVE_LIBBZ2 1) + +- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) +- SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) +-ELSE() +- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") +-ENDIF(BZIP2_FOUND) ++INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) ++SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) ++ ELSE() ++MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") ++ ENDIF(BZIP2_FOUND) ++ENDIF(ENABLE_BZIP2) + + IF (COMMONCRYPTO_FOUND) + SET (HAVE_CRYPTO 1) diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch new file mode 100644 index 000..0cca187d90a --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.1-options.patch @@ -0,0 +1,50 @@ +From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001 +From: Florian Delizy +Date: Tue, 7 Aug 2018 22:09:32 +0800 +Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC + options (default ON) + +--- + CMakeLists.txt | 18 ++ + 1 file changed, 18 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69e6548e..def25607 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) + OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) + OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) + ++OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) ++OPTION(BUILD_REGRESS "Build regression tests" ON) ++OPTION(BUILD_EXAMPLES "Build examples" ON) ++OPTION(BUILD_DOC "Build documentation" ON) ++ + INCLUDE(CheckFunctionExists) +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: b4a9cb3e5493b414c2d671e6e5c1e8bcf084915c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 23 23:25:22 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 23 23:25:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a9cb3e dev-libs/libzip: Security cleanup, bug #629574 Package-Manager: Portage-2.3.12, Repoman-2.3.3 dev-libs/libzip/Manifest | 1 - .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch | 37 --- .../libzip/files/libzip-1.2.0-CVE-2017-14107.patch | 27 -- dev-libs/libzip/libzip-1.2.0-r1.ebuild | 40 - dev-libs/libzip/libzip-1.2.0-r2.ebuild | 41 -- dev-libs/libzip/libzip-1.2.0.ebuild| 39 6 files changed, 185 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 4fd8d312a19..9206b63f7b6 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 DIST libzip-1.3.0.tar.xz 955876 SHA256 aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373 SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 WHIRLPOOL eca44e4c7e3a09d90f7a9c694de01c97fdc97ce7989bd8ccf9acb8e33e10145f6860c4dd5bb282d2ab0a708d9ddb6b7ecde88bf5276365179057c02f534e182d diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch deleted file mode 100644 index 26236510fee..000 --- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner-Date: Mon, 14 Aug 2017 10:55:44 +0200 -Subject: [PATCH] Fix double free(). - -Found by Brian 'geeknik' Carpenter using AFL. - THANKS | 1 + - lib/zip_dirent.c | 3 --- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/THANKS b/THANKS -index be0cca9..a80ee1d 100644 a/THANKS -+++ b/THANKS -@@ -12,6 +12,7 @@ BALATON Zoltan - Benjamin Gilbert - Boaz Stolk - Bogdan -+Brian 'geeknik' Carpenter - Chris Nehren - Coverity - Dane Springmeyer -diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c -index a369900..e5a7cc9 100644 a/lib/zip_dirent.c -+++ b/lib/zip_dirent.c -@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo - } - - if (!_zip_dirent_process_winzip_aes(zde, error)) { -- if (!from_buffer) { -- _zip_buffer_free(buffer); -- } - return -1; - } - diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch deleted file mode 100644 index 3d1f9a0aabc..000 --- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9b46957ec98d85a572e9ef98301247f39338a3b5 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 29 Aug 2017 10:25:03 +0200 -Subject: [PATCH] Make eocd checks more consistent between zip and zip64 cases. - - lib/zip_open.c | 7 ++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/zip_open.c b/lib/zip_open.c -index 3bd593b..9d3a4cb 100644 a/lib/zip_open.c -+++ b/lib/zip_open.c -@@ -847,7 +847,12 @@ _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offse - zip_error_set(error, ZIP_ER_SEEK, EFBIG); - return NULL; - } --if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) { -+if (offset+size > buf_offset + eocd_offset) { -+ /* cdir spans past EOCD record */ -+ zip_error_set(error, ZIP_ER_INCONS, 0); -+ return NULL; -+} -+if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) { - zip_error_set(error, ZIP_ER_INCONS, 0); - return NULL; - } diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild deleted file mode 100644 index 61f933dcd36..000 --- a/dev-libs/libzip/libzip-1.2.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Library for manipulating zip
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 4a5d00d9e8560f59744c42729ae5c122b58de6f4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 3 18:57:20 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 4 18:14:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5d00d9 dev-libs/libzip: Drop old Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-0.11.2-headers.patch | 12 -- dev-libs/libzip/libzip-1.0.1.ebuild | 28 --- 3 files changed, 41 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 7165799d5b8..91b982835ed 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 diff --git a/dev-libs/libzip/files/libzip-0.11.2-headers.patch b/dev-libs/libzip/files/libzip-0.11.2-headers.patch deleted file mode 100644 index 6b327722ac6..000 --- a/dev-libs/libzip/files/libzip-0.11.2-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ lib/Makefile.am -+++ lib/Makefile.am -@@ -3,8 +3,7 @@ - - lib_LTLIBRARIES = libzip.la - noinst_HEADERS = zipint.h --include_HEADERS = zip.h --nodist_libinclude_HEADERS = zipconf.h -+include_HEADERS = zip.h zipconf.h - - # also update CMakeLists.txt when changing version - libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.0.1.ebuild b/dev-libs/libzip/libzip-1.0.1.ebuild deleted file mode 100644 index de7c63b9f2e..000 --- a/dev-libs/libzip/libzip-1.0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="http://www.nih.at/libzip/; -SRC_URI="http://www.nih.at/libzip/${P}.tar.xz; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="hppa" -IUSE="static-libs" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/xz-utils -" - -DOCS=( AUTHORS NEWS README THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-0.11.2-headers.patch" -)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 932ed165fe0f93b1c0a1e72d5d4f14c558110c37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 30 19:46:14 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 30 20:45:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932ed165 dev-libs/libzip: Drop old Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.1.3-headers.patch | 12 dev-libs/libzip/libzip-1.1.3.ebuild | 24 3 files changed, 37 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 8261429ac91..7165799d5b8 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 -DIST libzip-1.1.3.tar.xz 460128 SHA256 729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee SHA512 a3be13a98ab28d5a2c3729ba6b01891c1fdbee724e6827d208a8d33dad7108a57c82108409f8073002a4fddae97490bdbe7697dccb70ac9601ee862d4271f138 WHIRLPOOL ab3434f08542ba34a11b628f451b8e1133230237a9b6f25dc57454950ba57d01ad3cec3f4cc7b076f07eff12457044e273bbbfcf8df0c8f32e074fdcafe8b817 DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 diff --git a/dev-libs/libzip/files/libzip-1.1.3-headers.patch b/dev-libs/libzip/files/libzip-1.1.3-headers.patch deleted file mode 100644 index a210754fb97..000 --- a/dev-libs/libzip/files/libzip-1.1.3-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -3,8 +3,7 @@ - - lib_LTLIBRARIES = libzip.la - noinst_HEADERS = zipint.h --include_HEADERS = zip.h --nodist_libinclude_HEADERS = zipconf.h -+include_HEADERS = zip.h zipconf.h - - # also update CMakeLists.txt when changing version - libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.1.3.ebuild b/dev-libs/libzip/libzip-1.1.3.ebuild deleted file mode 100644 index a2dbcb8fc9e..000 --- a/dev-libs/libzip/libzip-1.1.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="http://www.nih.at/libzip/; -SRC_URI="http://www.nih.at/libzip/${P}.tar.xz; - -LICENSE="BSD" -SLOT="0/4" -KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="static-libs" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/xz-utils -" - -DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-1.1.3-headers.patch" -)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 9a609ec75673220be26e8ca4f8f7164cf3262aa2 Author: A. Wilcox Wilcox-Tech com> AuthorDate: Sat Feb 25 22:47:58 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 17 18:46:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a609ec7 dev-libs/libzip: Use fts-standalone on musl libc Gentoo-bug: 610936 Package-Manager: portage-2.3.1 dev-libs/libzip/files/libzip-1.1.3-fts.patch | 11 + dev-libs/libzip/libzip-1.1.3-r1.ebuild | 35 2 files changed, 46 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.1.3-fts.patch b/dev-libs/libzip/files/libzip-1.1.3-fts.patch new file mode 100644 index 000..bd9bf232c0a --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.1.3-fts.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2016-05-28 10:35:31.0 +0100 b/configure.ac 2017-02-25 23:34:22.309684397 +0100 +@@ -65,6 +65,8 @@ + AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname]) + fi + ++AC_SEARCH_LIBS(fts_open, fts) ++ + AC_CACHE_CHECK([whether we are building for a Win32 host], [ac_cv_win32_host], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifdef _WIN32 + choke me diff --git a/dev-libs/libzip/libzip-1.1.3-r1.ebuild b/dev-libs/libzip/libzip-1.1.3-r1.ebuild new file mode 100644 index 000..ecc3aa63760 --- /dev/null +++ b/dev-libs/libzip/libzip-1.1.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Library for manipulating zip archives" +HOMEPAGE="http://www.nih.at/libzip/; +SRC_URI="http://www.nih.at/libzip/${P}.tar.xz; + +LICENSE="BSD" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +RDEPEND=" + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone ) +" +DEPEND="${RDEPEND} + app-arch/xz-utils +" + +DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) + +PATCHES=( + "${FILESDIR}/${PN}-1.1.3-headers.patch" + "${FILESDIR}/${PN}-1.1.3-fts.patch" +) + +src_prepare() { + default + eautoreconf +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 9724f460fdd4ffe597cd9675ec964518172f6651 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 16 21:59:25 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 17 18:46:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9724f460 dev-libs/libzip: 1.2.0 version bump Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/libzip/Manifest | 1 + .../{libzip-1.1.3-fts.patch => libzip-1.2.0-fts.patch} | 0 dev-libs/libzip/files/libzip-1.2.0-headers.patch | 12 .../libzip/{libzip-1.1.3-r1.ebuild => libzip-1.2.0.ebuild} | 14 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 6aaa97920c3..8261429ac91 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 DIST libzip-1.1.3.tar.xz 460128 SHA256 729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee SHA512 a3be13a98ab28d5a2c3729ba6b01891c1fdbee724e6827d208a8d33dad7108a57c82108409f8073002a4fddae97490bdbe7697dccb70ac9601ee862d4271f138 WHIRLPOOL ab3434f08542ba34a11b628f451b8e1133230237a9b6f25dc57454950ba57d01ad3cec3f4cc7b076f07eff12457044e273bbbfcf8df0c8f32e074fdcafe8b817 +DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 diff --git a/dev-libs/libzip/files/libzip-1.1.3-fts.patch b/dev-libs/libzip/files/libzip-1.2.0-fts.patch similarity index 100% rename from dev-libs/libzip/files/libzip-1.1.3-fts.patch rename to dev-libs/libzip/files/libzip-1.2.0-fts.patch diff --git a/dev-libs/libzip/files/libzip-1.2.0-headers.patch b/dev-libs/libzip/files/libzip-1.2.0-headers.patch new file mode 100644 index 000..f1a6d5d0819 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.2.0-headers.patch @@ -0,0 +1,12 @@ +--- a/lib/Makefile.am b/lib/Makefile.am +@@ -3,8 +3,7 @@ + + lib_LTLIBRARIES = libzip.la + noinst_HEADERS = zipint.h gladman-fcrypt.h +-include_HEADERS = zip.h +-nodist_libinclude_HEADERS = zipconf.h ++include_HEADERS = zip.h zipconf.h + + # also update CMakeLists.txt when changing version + libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.1.3-r1.ebuild b/dev-libs/libzip/libzip-1.2.0.ebuild similarity index 74% rename from dev-libs/libzip/libzip-1.1.3-r1.ebuild rename to dev-libs/libzip/libzip-1.2.0.ebuild index ecc3aa63760..574096ebb16 100644 --- a/dev-libs/libzip/libzip-1.1.3-r1.ebuild +++ b/dev-libs/libzip/libzip-1.2.0.ebuild @@ -18,18 +18,22 @@ RDEPEND=" sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) " -DEPEND="${RDEPEND} - app-arch/xz-utils -" +DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) PATCHES=( - "${FILESDIR}/${PN}-1.1.3-headers.patch" - "${FILESDIR}/${PN}-1.1.3-fts.patch" + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-fts.patch" ) src_prepare() { default eautoreconf } + +src_install() { + default + use static-libs || rm "${D}"/usr/lib64/libzip.a || die + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 57ff6077ce4f1fe425cc0b0a3745ef16139a24ce Author: Chris Reffett gentoo org> AuthorDate: Tue May 31 20:59:24 2016 + Commit: Chris Reffett gentoo org> CommitDate: Tue May 31 21:00:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ff6077 dev-libs/libzip: Version bump, go to EAPI 6 Package-Manager: portage-2.3.0_rc1 dev-libs/libzip/Manifest | 1 + dev-libs/libzip/files/libzip-1.1.3-headers.patch | 12 dev-libs/libzip/libzip-1.1.3.ebuild | 25 3 files changed, 38 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 471a599..5efd174 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,4 @@ DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 DIST libzip-1.1.1.tar.xz 458864 SHA256 69e690f567e172d8f69b58ca237b61a690eaa1c5aa2293e1a2a446496bdf14c1 SHA512 24f6d3026986bbc3b9633ed78bb38e13d468cf9be307871db4fa11cc37218eaf2b2019d49882ec57ce773922e5ab2383472715bd438662db83fcb4ba9c01ce69 WHIRLPOOL 65e8c41b3369edc705a1ac3f1411849d44888611754e8737a9efecb7b5bb34b5d556bd226c274875b0cba4e8a4a3b370ec30b49d6fe5175510c377d57379 DIST libzip-1.1.2.tar.xz 457140 SHA256 a921b45b5d840e998ff2544197eba4c3593dccb8ad0ee938630c2227c2c59fb3 SHA512 5f34fdb2d3066e61e53c7356fbb7f4ecb83fc5990ad658106dd0e46e5455ed3d370a06c27b0f8c5b0ca52c573ff1c605a8744660756853e1e6b12b3bd3898bd8 WHIRLPOOL 88a8ae534216efa797cc9841063a117488c0181ddc66bc2c0741c96afc3440b6c4c6e9fb009647c161d2f4df0e4d29cdea4ea03e55590127d291c77c6dd79d06 +DIST libzip-1.1.3.tar.xz 460128 SHA256 729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee SHA512 a3be13a98ab28d5a2c3729ba6b01891c1fdbee724e6827d208a8d33dad7108a57c82108409f8073002a4fddae97490bdbe7697dccb70ac9601ee862d4271f138 WHIRLPOOL ab3434f08542ba34a11b628f451b8e1133230237a9b6f25dc57454950ba57d01ad3cec3f4cc7b076f07eff12457044e273bbbfcf8df0c8f32e074fdcafe8b817 diff --git a/dev-libs/libzip/files/libzip-1.1.3-headers.patch b/dev-libs/libzip/files/libzip-1.1.3-headers.patch new file mode 100644 index 000..a210754 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.1.3-headers.patch @@ -0,0 +1,12 @@ +--- a/lib/Makefile.am b/lib/Makefile.am +@@ -3,8 +3,7 @@ + + lib_LTLIBRARIES = libzip.la + noinst_HEADERS = zipint.h +-include_HEADERS = zip.h +-nodist_libinclude_HEADERS = zipconf.h ++include_HEADERS = zip.h zipconf.h + + # also update CMakeLists.txt when changing version + libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.1.3.ebuild b/dev-libs/libzip/libzip-1.1.3.ebuild new file mode 100644 index 000..3b76b31 --- /dev/null +++ b/dev-libs/libzip/libzip-1.1.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Library for manipulating zip archives" +HOMEPAGE="http://www.nih.at/libzip/; +SRC_URI="http://www.nih.at/libzip/${P}.tar.xz; + +LICENSE="BSD" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND} + app-arch/xz-utils +" + +DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) + +PATCHES=( + "${FILESDIR}/${PN}-1.1.3-headers.patch" +)