From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69744C433F5 for ; Sat, 1 Jan 2022 10:14:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2D2AD60B95; Sat, 1 Jan 2022 10:14:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qbtqLU8-a09v; Sat, 1 Jan 2022 10:14:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3DB2060D96; Sat, 1 Jan 2022 10:14:17 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5FAFC1BF5A4 for ; Sat, 1 Jan 2022 10:13:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4C9DE404C5 for ; Sat, 1 Jan 2022 10:13:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=free.fr Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fGtaaH8GpFqL for ; Sat, 1 Jan 2022 10:13:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [IPv6:2a01:e0c:1:1599::14]) by smtp2.osuosl.org (Postfix) with ESMTPS id F25F84012F for ; Sat, 1 Jan 2022 10:13:52 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:b440:9a6c:7abd:86f8]) (Authenticated sender: yann.morin.1998@free.fr) by smtp5-g21.free.fr (Postfix) with ESMTPSA id 48D3E5FF13; Sat, 1 Jan 2022 11:13:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1641032031; bh=DyiNkU7439QzTC+jkRWjyezgXyBsbq7qn6vTd4GkRCA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n3fjvpn5n5R33XnI5sT9t9Pv3owY7j6rQQ6lbvXnqPwjq7OJpRk57a5KUux5cCr9P ZsgNxfb4mpBjcNzlV2ZsW5UFtioxFwSZWT0aWPIk2KoLTenca0HoN1twLRHT5aTS25 6u790NKo9H+AS/QrVNDRX4EUdZlXzTVZqxsM4wy+dS7mKjnUzwceWYCxxgHKx2QNMJ vLAATlDr/U9kQghmC46UBTD3bhtJwWRA4AB3gx7LQZZ02ZR0KuEJiEmi4mRQZYEDVJ RVPJExEAJ9O1sb0udQBO0//9H9NOrQEq3qUkfuJb6pgJYWrp1DgSi5B4KyW89/st3v 0nQv625JxZJEQ== Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Sat, 01 Jan 2022 11:13:44 +0100 Date: Sat, 1 Jan 2022 11:13:44 +0100 From: "Yann E. MORIN" To: Fabrice Fontaine Message-ID: <20220101101344.GA3390456@scaer> References: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: [Buildroot] [PATCH 1/1] package/libzip: bump to version 1.8.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fabrice, All, On 2021-12-31 00:39 +0100, Fabrice Fontaine spake thusly: > - Drop patches (already in version) > - Add zstd optional dependency > > https://libzip.org/news/release-1.8.0.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 ------------------ > .../0002-Include-limits.h-for-INT_MAX.patch | 27 ----- > package/libzip/libzip.hash | 2 +- > package/libzip/libzip.mk | 9 +- > 4 files changed, 9 insertions(+), 132 deletions(-) > delete mode 100644 package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > delete mode 100644 package/libzip/0002-Include-limits.h-for-INT_MAX.patch > > diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > deleted file mode 100644 > index 30bc201048..0000000000 > --- a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > +++ /dev/null > @@ -1,103 +0,0 @@ > -From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 > -From: Thomas Klausner > -Date: Sat, 25 Jul 2020 12:03:29 +0200 > -Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. > - > -Addresses #199 > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] > -Signed-off-by: Fabrice Fontaine > ---- > - cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ > - 1 file changed, 82 insertions(+) > - create mode 100644 cmake-compat/FindGnuTLS.cmake > - > -diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake > -new file mode 100644 > -index 00000000..819f0001 > ---- /dev/null > -+++ b/cmake-compat/FindGnuTLS.cmake > -@@ -0,0 +1,82 @@ > -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying > -+# file Copyright.txt or https://cmake.org/licensing for details. > -+ > -+#[=======================================================================[.rst: > -+FindGnuTLS > -+---------- > -+ > -+Find the GNU Transport Layer Security library (gnutls) > -+ > -+IMPORTED Targets > -+^^^^^^^^^^^^^^^^ > -+ > -+This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if > -+gnutls has been found. > -+ > -+Result Variables > -+^^^^^^^^^^^^^^^^ > -+ > -+``GNUTLS_FOUND`` > -+ System has gnutls > -+``GNUTLS_INCLUDE_DIR`` > -+ The gnutls include directory > -+``GNUTLS_LIBRARIES`` > -+ The libraries needed to use gnutls > -+``GNUTLS_DEFINITIONS`` > -+ Compiler switches required for using gnutls > -+``GNUTLS_VERSION`` > -+ version of gnutls. > -+#]=======================================================================] > -+ > -+# Note that this doesn't try to find the gnutls-extra package. > -+ > -+ > -+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) > -+ # in cache already > -+ set(gnutls_FIND_QUIETLY TRUE) > -+endif () > -+ > -+if (NOT WIN32) > -+ # try using pkg-config to get the directories and then use these values > -+ # in the find_path() and find_library() calls > -+ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful > -+ find_package(PkgConfig QUIET) > -+ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) > -+ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) > -+ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) > -+ # keep for backward compatibility > -+ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) > -+endif () > -+ > -+find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h > -+ HINTS > -+ ${PC_GNUTLS_INCLUDEDIR} > -+ ${PC_GNUTLS_INCLUDE_DIRS} > -+ ) > -+ > -+find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls > -+ HINTS > -+ ${PC_GNUTLS_LIBDIR} > -+ ${PC_GNUTLS_LIBRARY_DIRS} > -+ ) > -+ > -+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) > -+ > -+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) > -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS > -+ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR > -+ VERSION_VAR GNUTLS_VERSION_STRING) > -+ > -+if(GNUTLS_FOUND) > -+ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) > -+ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) > -+ > -+ if(NOT TARGET GnuTLS::GnuTLS) > -+ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) > -+ set_target_properties(GnuTLS::GnuTLS PROPERTIES > -+ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" > -+ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" > -+ IMPORTED_LINK_INTERFACE_LANGUAGES "C" > -+ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") > -+ endif() > -+endif() > diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > deleted file mode 100644 > index c488f05289..0000000000 > --- a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > +++ /dev/null > @@ -1,27 +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 > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] > -Signed-off-by: Paul Cercueil > ---- > - 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 < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) > - #define USE_OPENSSL_1_0_API > --- > -2.28.0 > - > diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash > index a298b9aba9..5afdfd7cb8 100644 > --- a/package/libzip/libzip.hash > +++ b/package/libzip/libzip.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz > +sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz > sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE > diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk > index 4a028f970a..6bc5c5c193 100644 > --- a/package/libzip/libzip.mk > +++ b/package/libzip/libzip.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBZIP_VERSION = 1.7.3 > +LIBZIP_VERSION = 1.8.0 > LIBZIP_SITE = https://libzip.org/download > LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz > LIBZIP_LICENSE = BSD-3-Clause > @@ -54,5 +54,12 @@ else > LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF > endif > > +ifeq ($(BR2_PACKAGE_ZSTD),y) > +LIBZIP_DEPENDENCIES += zstd > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=ON > +else > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=OFF > +endif > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot