diff --git a/archivers/minizip-ng/Makefile b/archivers/minizip-ng/Makefile index 6aeac3d4a9dd..49bcae4871b7 100644 --- a/archivers/minizip-ng/Makefile +++ b/archivers/minizip-ng/Makefile @@ -1,31 +1,43 @@ PORTNAME= minizip-ng -DISTVERSION= 4.1.0 +DISTVERSION= 4.1.1 CATEGORIES= archivers MAINTAINER= vvd@FreeBSD.org COMMENT= Fork of the popular minizip found in the zlib distribution WWW= https://github.com/zlib-ng/minizip-ng LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libz-ng.so:archivers/zlib-ng \ libzstd.so:archivers/zstd USES= cmake:testing iconv pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= zlib-ng +# CMakeList.txt: clone_repo(ppmd https://github.com/ip7z/7zip "26.00") +7ZIP_VER= 26.00 +GH_TUPLE= ip7z:7zip:${7ZIP_VER}:7zip/third_party/ppmd USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include/ \ -DMZ_LIB_SUFFIX=-ng CMAKE_ON= BUILD_SHARED_LIBS CMAKE_DISABLE_FIND_PACKAGE_ZLIB CMAKE_TESTING_ON= MZ_BUILD_TEST MZ_BUILD_UNIT_TEST -PLIST_SUB+= VERSION="${DISTVERSION}" +EXTRACT_AFTER_ARGS= --exclude 7zip-${7ZIP_VER}/[ABD-Z]* \ + --exclude 7zip-${7ZIP_VER}/C/7z[A-SUW-Za-z.]* \ + --exclude 7zip-${7ZIP_VER}/C/7zVersion.rc \ + --exclude 7zip-${7ZIP_VER}/C/[ABD-OQ-Za-z]* \ + --exclude 7zip-${7ZIP_VER}/C/CpuArch.c \ + --exclude 7zip-${7ZIP_VER}/C/Ppmd7* \ + --exclude 7zip-${7ZIP_VER}/CPP \ + --no-same-owner --no-same-permissions + +PLIST_SUB= VERSION="${DISTVERSION}" post-install: ${INSTALL_DATA} ${FILESDIR}/mz_compat.h \ ${STAGEDIR}${PREFIX}/include/minizip-ng/ .include diff --git a/archivers/minizip-ng/distinfo b/archivers/minizip-ng/distinfo index 23ed43ba2005..968dc037d4d9 100644 --- a/archivers/minizip-ng/distinfo +++ b/archivers/minizip-ng/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1769234567 -SHA256 (zlib-ng-minizip-ng-4.1.0_GH0.tar.gz) = 85417229bb0cd56403e811c316150eea1a3643346d9cec7512ddb7ea291b06f2 -SIZE (zlib-ng-minizip-ng-4.1.0_GH0.tar.gz) = 601158 +TIMESTAMP = 1777070707 +SHA256 (zlib-ng-minizip-ng-4.1.1_GH0.tar.gz) = ecc1a514f9e455cb627a768e1219369c576a761bc04196941590906c8b622d7e +SIZE (zlib-ng-minizip-ng-4.1.1_GH0.tar.gz) = 609450 +SHA256 (ip7z-7zip-26.00_GH0.tar.gz) = 07eafed75d661282d402dc2a3edf17e1dbb36fb813f4fbf5a2bad4f6b722aed5 +SIZE (ip7z-7zip-26.00_GH0.tar.gz) = 2226105 diff --git a/archivers/minizip-ng/files/patch-CMakeLists.txt b/archivers/minizip-ng/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b605463884ef --- /dev/null +++ b/archivers/minizip-ng/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2026-04-23 04:10:20 UTC ++++ CMakeLists.txt +@@ -381,6 +381,7 @@ if(MZ_PPMD) + ${PPMD_SOURCE_DIR}/C/Precomp.h) + + add_library(ppmd STATIC ${PPMD_SRC} ${PPMD_HDR}) ++ target_compile_options(ppmd PRIVATE -fPIC) + + list(APPEND MINIZIP_DEP ppmd) + list(APPEND MINIZIP_INC ${PPMD_SOURCE_DIR}) diff --git a/archivers/minizip-ng/files/patch-mz__strm__os__posix.c b/archivers/minizip-ng/files/patch-mz__strm__os__posix.c deleted file mode 100644 index e37fa5962e39..000000000000 --- a/archivers/minizip-ng/files/patch-mz__strm__os__posix.c +++ /dev/null @@ -1,12 +0,0 @@ ---- mz_strm_os_posix.c.orig 2026-01-21 21:52:59 UTC -+++ mz_strm_os_posix.c -@@ -21,6 +21,9 @@ - #include - #include // open, close, ... - #include // O_NOFOLLOW, ... -+#ifdef __FreeBSD__ -+#include -+#endif - - /***************************************************************************/ - diff --git a/archivers/minizip-ng/pkg-descr b/archivers/minizip-ng/pkg-descr index 3f4e12400ff0..4faab0246161 100644 --- a/archivers/minizip-ng/pkg-descr +++ b/archivers/minizip-ng/pkg-descr @@ -1,12 +1,28 @@ Minizip was originally developed in 1998. It was first included in the zlib distribution as an additional code contribution starting in zlib 1.1.2. Since that time, it has been continually improved upon and contributed to by many people. - +Features: + Creating and extracting zip archives. + Adding and removing entries from zip archives. + Read and write raw zip entry data. + Reading and writing zip archives from memory. -+ Zlib, BZIP2, LZMA, and ZSTD compression methods. ++ Support for large files with ZIP64 extension. ++ Zlib, BZIP2, LZMA, PPMD, XZ and ZSTD compression methods. + Password protection through Traditional PKWARE and WinZIP AES encryption. + Buffered streaming for improved I/O performance. ++ NTFS timestamp support for UTC last modified, last accessed, and creation + dates. ++ Disk split support for splitting zip archives into multiple files. ++ Preservation of file attributes across file systems. ++ Follow and store symbolic links. ++ Unicode filename support through UTF-8 encoding. ++ Legacy character encoding support CP437, CP932, CP936, CP950. ++ Turn off compilation of compression, decompression, or encryption. ++ Windows (Win32 & WinRT), macOS and Linux platform support. ++ Streaming interface for easy implementation of additional platforms. ++ Support for Apple's compression library ZLIB and XZ implementations. ++ Zero out local file header information. ++ Zip/unzip of central directory to reduce size. ++ Recover the central directory if it is corrupt or missing. ++ Example minizip and minigzip command line tools. diff --git a/archivers/minizip-ng/pkg-plist b/archivers/minizip-ng/pkg-plist index 66e20f59f8fb..a5d91599d73e 100644 --- a/archivers/minizip-ng/pkg-plist +++ b/archivers/minizip-ng/pkg-plist @@ -1,28 +1,30 @@ include/minizip-ng/ioapi.h include/minizip-ng/mz.h include/minizip-ng/mz_compat.h include/minizip-ng/mz_crypt.h include/minizip-ng/mz_os.h include/minizip-ng/mz_strm.h include/minizip-ng/mz_strm_buf.h include/minizip-ng/mz_strm_bzip.h include/minizip-ng/mz_strm_lzma.h include/minizip-ng/mz_strm_mem.h include/minizip-ng/mz_strm_os.h include/minizip-ng/mz_strm_pkcrypt.h +include/minizip-ng/mz_strm_ppmd.h include/minizip-ng/mz_strm_split.h include/minizip-ng/mz_strm_wzaes.h include/minizip-ng/mz_strm_zlib.h include/minizip-ng/mz_strm_zstd.h include/minizip-ng/mz_zip.h include/minizip-ng/mz_zip_rw.h include/minizip-ng/unzip.h include/minizip-ng/zip.h lib/cmake/minizip-ng/minizip-ng-config-version.cmake lib/cmake/minizip-ng/minizip-ng-config.cmake lib/cmake/minizip-ng/minizip-ng-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/minizip-ng/minizip-ng.cmake lib/libminizip-ng.so lib/libminizip-ng.so.1 lib/libminizip-ng.so.%%VERSION%% +lib/libppmd.a libdata/pkgconfig/minizip-ng.pc