<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6493f5e855c527c5be4e950e61a3158a729dcaa5">https://github.com/macports/macports-ports/commit/6493f5e855c527c5be4e950e61a3158a729dcaa5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6493f5e855c minizip-ng: update 3.0.6->3.0.10 & add test variant (#18591)
</span>6493f5e855c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6493f5e855c527c5be4e950e61a3158a729dcaa5
</span>Author: MarcusCalhoun-Lopez <MarcusCalhoun-Lopez@users.noreply.github.com>
AuthorDate: Wed May 31 08:05:06 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> minizip-ng: update 3.0.6->3.0.10 & add test variant (#18591)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Testing requires an additional port (gtest), so disable by default
</span>---
archivers/minizip-ng/Portfile | 30 ++++--
archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch | 113 ---------------------
2 files changed, 20 insertions(+), 123 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip-ng/Portfile b/archivers/minizip-ng/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98a6ce3dee3..d4c160bfaf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/minizip-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup zlib-ng minizip-ng 3.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup zlib-ng minizip-ng 3.0.10
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 06007b0773c0b181cf3c84b8daf285b33badbad9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 383fa1bdc28c482828a8a8db53f758dbd44291b641182724fda5df5b59cce543 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 642138
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ff4eacff2097b9dbbd6a1061773831510cb4cd54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d4a549731d8c7074e421dbab6d8b8ad0a93067752fe767c464f0f40fa5f0a80d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 771145
</span>
categories archivers
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ license zlib
</span>
description fork of zlib's minizip zip file manipulation library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${name} is a ${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is a {*}${description}.
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,9 @@ depends_lib port:bzip2 \
</span> port:xz \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args -DBUILD_SHARED_LIBS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMZ_BUILD_TEST=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMZ_BUILD_UNIT_TEST=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_TEST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_UNIT_TEST=OFF \
</span> -DMZ_BZIP2=ON \
-DMZ_FETCH_LIBS=OFF \
-DMZ_ICONV=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,4 +68,16 @@ if {${os.platform} eq "darwin" && ${os.major} >= 15} {
</span> -DMZ_ZLIB=OFF -DMZ_ZLIB=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if gtest not found, test/CMakeLists.txt helpfully downloads a copy and builds it regardless of MZ_FETCH_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_TEST=OFF -DMZ_BUILD_TEST=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMZ_BUILD_UNIT_TEST=OFF -DMZ_BUILD_UNIT_TEST=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # duplicate ${test.dir}/Makefile with DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd DYLD_LIBRARY_PATH=${cmake.build_dir} ctest --force-new-ctest-process
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch b/archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f01b94c199..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/minizip-ng/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,113 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Set DYLD_LIBRARY_PATH so the test runner can find and use the library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-that was just built.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2022-04-27 13:16:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-05-07 04:18:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -804,6 +804,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME test_cmd COMMAND test_cmd WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(test_cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function(create_compress_tests EXTRA_NAME EXTRA_ARGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MZ_DECOMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -843,30 +845,44 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -o ${EXTRA_ARGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result.zip test.c test.h empty.txt random.bin uniform.bin fuzz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-zip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-list-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -l ${EXTRA_ARGS} result.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-list-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MZ_COMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-append-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -a ${EXTRA_ARGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result.zip single.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-append-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MZ_COMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-append-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-append-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-erase-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -o -e result.zip test.c test.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-erase-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MZ_COMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ${COMPRESS_METHOD_NAME}-erase-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(${COMPRESS_METHOD_NAME}-erase-unzip-${EXTRA_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -893,30 +909,40 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz/unzip_fuzzer_seed_corpus/tiny.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(unzip-tiny
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MZ_BZIP2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME unzip-bzip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz/unzip_fuzzer_seed_corpus/bzip2.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(unzip-bzip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MZ_LZMA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME unzip-lzma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz/unzip_fuzzer_seed_corpus/lzma.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(unzip-lzma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MZ_PKCRYPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME unzip-pkcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out -p test123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz/unzip_fuzzer_seed_corpus/encrypted_pkcrypt.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(unzip-pkcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MZ_WZAES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME unzip-wzaes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out -p test123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz/unzip_fuzzer_seed_corpus/encrypted_wzaes.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(unzip-wzaes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MZ_COMPRESS_ONLY AND NOT MZ_DECOMPRESS_ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -924,9 +950,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minigzip_cmd random.bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(NAME ungz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND minigzip_cmd -x -d out random.bin.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_tests_properties(ungz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROPERTIES ENVIRONMENT DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$ENV{DYLD_LIBRARY_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>