diff --git a/.gitignore b/.gitignore index 6cf040b..5837f75 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ /minizip-2.10.2.tar.gz /aes-gladman-minizip-2.10.2.tar.gz /sha-gladman-minizip-2.10.2.tar.gz +/aes-gladman-minizip-2.10.6.tar.gz +/minizip-2.10.6.tar.gz +/sha-gladman-minizip-2.10.6.tar.gz diff --git a/minizip-2.10.2-BRG_FORCE_FETCH.patch b/minizip-2.10.2-BRG_FORCE_FETCH.patch index 530e011..4482437 100644 --- a/minizip-2.10.2-BRG_FORCE_FETCH.patch +++ b/minizip-2.10.2-BRG_FORCE_FETCH.patch @@ -13,23 +13,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7d45d..4f775d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,8 +31,9 @@ option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) - set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") - option(ZLIB_FORCE_FETCH "Skips find package for ZLIB" OFF) - option(ZSTD_FORCE_FETCH "Skips find package for ZSTD" OFF) +@@ -31,9 +31,10 @@ + option(MZ_BUILD_FUZZ_TEST "Builds minizip fuzzer executables" OFF) + option(MZ_CODE_COVERAGE "Builds with code coverage flags" OFF) + option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) +option(BRG_FORCE_FETCH "Clone Brian Gladman's encryption library from GIT" ON) + set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") --mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH) -+mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH BRG_FORCE_FETCH) +-mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX) ++mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX BRG_FORCE_FETCH) if(POLICY CMP0074) cmake_policy(SET CMP0074 OLD) -@@ -489,8 +490,10 @@ endif() +@@ -475,8 +476,10 @@ + message(FATAL_ERROR "AES and SHA libraries not found") + endif() - # Include Brian Gladman's crypto library - if(MZ_BRG) -- clone_repo(AES https://github.com/BrianGladman/aes) -- clone_repo(SHA https://github.com/BrianGladman/sha) +- clone_repo(aes https://github.com/BrianGladman/aes) +- clone_repo(sha https://github.com/BrianGladman/sha) + if(BRG_FORCE_FETCH) + clone_repo(AES https://github.com/BrianGladman/aes) + clone_repo(SHA https://github.com/BrianGladman/sha) @@ -37,6 +38,7 @@ index 3c7d45d..4f775d8 100644 set(BRG_AES_SRC lib/aes/brg_endian.h --- 2.26.2 +--- minizip-2.10.6/CMakeLists.txt 2020-12-29 22:16:01.000000000 +0100 ++++ blahbleh 2021-01-12 14:07:44.050770188 +0100 diff --git a/minizip-2.10.2-rename-gladmans-shared-libraries.patch b/minizip-2.10.2-rename-gladmans-shared-libraries.patch index 82f1709..59aae64 100644 --- a/minizip-2.10.2-rename-gladmans-shared-libraries.patch +++ b/minizip-2.10.2-rename-gladmans-shared-libraries.patch @@ -11,7 +11,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f775d8..b3e0649 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -521,12 +521,12 @@ if(MZ_BRG) +@@ -507,8 +507,8 @@ lib/sha/sha1.h lib/sha/sha2.h) @@ -20,6 +20,10 @@ index 4f775d8..b3e0649 100644 + add_library(aes-gladman STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) + add_library(sha-gladman STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) + # Check to see which random generation functions we have + check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM) +@@ -555,7 +555,7 @@ + list(APPEND MINIZIP_SRC mz_crypt_brg.c) list(APPEND MINIZIP_INC lib/aes lib/sha) - list(APPEND MINIZIP_DEP aes sha) @@ -27,6 +31,4 @@ index 4f775d8..b3e0649 100644 endif() # Include compatibility layer --- 2.26.2 - diff --git a/minizip.spec b/minizip.spec index ee36071..5e2f509 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.10.2 +Version: 2.10.6 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -79,6 +79,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Jan 12 2021 Patrik Novotný - 2.10.6-1 +- Rebase to upstream release 2.10.6 + * Mon Oct 26 2020 Patrik Novotný - 2.10.2-1 - Rebase to upstream release 2.10.2 diff --git a/sources b/sources index f604e2c..bfd6329 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (minizip-2.10.2.tar.gz) = ceb327315fe16fc010820f72c6ca780c9ce4769268750fbb81e4664f0c8e378272cb74fbe775bbd4211b907175f68812189a778c7d6b104523d99930763f60dd -SHA512 (aes-gladman-minizip-2.10.2.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 -SHA512 (sha-gladman-minizip-2.10.2.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36 +SHA512 (aes-gladman-minizip-2.10.6.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 +SHA512 (minizip-2.10.6.tar.gz) = 8ac8fb7325c6795379c49c1aff7e86ae06be18879e579a89c4c0c5b0726548cdfaa1afeeda06abf6be7496a8f3f2462266f976529fa75705f6ea9f89db70cac8 +SHA512 (sha-gladman-minizip-2.10.6.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36