Browse Source

Merge pull request #16533 from neheb/1

libzip: fix compilation without SSL
lilik-openwrt-22.03
Michael Heimpold 3 years ago
committed by GitHub
parent
commit
71cce2838c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
  1. +1
    -1
      libs/libzip/Makefile
  2. +13
    -0
      libs/libzip/patches/010-nossl.patch

+ 1
- 1
libs/libzip/Makefile View 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/


+ 13
- 0
libs/libzip/patches/010-nossl.patch View File

@ -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);

Loading…
Cancel
Save