package/libzip: bump to version 1.8.0
- Drop patches (already in version) - Add zstd optional dependency https://libzip.org/news/release-1.8.0.html Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine
Yann E. MORIN
parent
d38b72bcd7
commit
6990000654
|
|
@ -1,103 +0,0 @@
|
|||
From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Klausner <tk@giga.or.at>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
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()
|
||||
|
|
@ -1,27 +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
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591]
|
||||
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
|
||||
---
|
||||
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
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue