libzip: fix compilation without SSL 16533/head
authorRosen Penev <rosenp@gmail.com>
Sun, 5 Sep 2021 04:31:03 +0000 (21:31 -0700)
committerRosen Penev <rosenp@gmail.com>
Mon, 6 Sep 2021 04:00:04 +0000 (21:00 -0700)
Linker error. No idea why.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
libs/libzip/Makefile
libs/libzip/patches/010-nossl.patch [new file with mode: 0644]

index 6d3f04a2031011cf328fb19fb61f6f5016be83aa..6ea562147135c51b665814542ab1440528258a5d 100644 (file)
@@ -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 (file)
index 0000000..6a68752
--- /dev/null
@@ -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);