From: Rosen Penev Date: Sun, 5 Sep 2021 04:31:03 +0000 (-0700) Subject: libzip: fix compilation without SSL X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F16533%2Fhead;p=feed%2Fpackages.git libzip: fix compilation without SSL Linker error. No idea why. Signed-off-by: Rosen Penev --- diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 6d3f04a203..6ea5621471 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip PKG_VERSION:=1.8.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ diff --git a/libs/libzip/patches/010-nossl.patch b/libs/libzip/patches/010-nossl.patch new file mode 100644 index 0000000000..6a68752112 --- /dev/null +++ b/libs/libzip/patches/010-nossl.patch @@ -0,0 +1,13 @@ +--- a/lib/zipint.h ++++ b/lib/zipint.h +@@ -180,8 +180,10 @@ zip_source_t *zip_source_pkware_decode(z + zip_source_t *zip_source_pkware_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); + int zip_source_remove(zip_source_t *); + zip_int64_t zip_source_supports(zip_source_t *src); ++#ifdef HAVE_CRYPTO + zip_source_t *zip_source_winzip_aes_decode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); + zip_source_t *zip_source_winzip_aes_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); ++#endif + zip_source_t *zip_source_buffer_with_attributes(zip_t *za, const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes); + zip_source_t *zip_source_buffer_with_attributes_create(const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes, zip_error_t *error); +