On Fri, Jun 09, 2023 at 11:13:37PM -0400, Brad Smith wrote:
> Here is an update to minizip 4.0.0.
>
>
> https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.0
Updated diff. The comment in the Makefile is no longer true. The
tests can be re-enabled and pass fine.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/archivers/minizip/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 13 Jul 2022 19:54:47 -0000 1.6
+++ Makefile 11 Jun 2023 00:23:01 -0000
@@ -2,11 +2,11 @@ COMMENT = zip manipulation library
GH_ACCOUNT = zlib-ng
GH_PROJECT = minizip-ng
-GH_TAGNAME = 3.0.6
+GH_TAGNAME = 4.0.0
PKGNAME = minizip-${GH_TAGNAME}
-SHARED_LIBS += minizip 1.1 # 3
+SHARED_LIBS += minizip 2.0 # 4
CATEGORIES = archivers
@@ -25,9 +25,5 @@ LIB_DEPENDS = archivers/bzip2 \
archivers/xz \
archivers/zstd \
converters/libiconv
-
-# For the signing-related tests to succeed, you need to add the contents of
-# test/test.pem to /etc/ssl/cert.pem.
-NO_TEST = No
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/archivers/minizip/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 13 Jul 2022 19:54:47 -0000 1.4
+++ distinfo 9 Jun 2023 23:19:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (minizip-ng-3.0.6.tar.gz) = OD+hvcKMSCgoqKjbU/dY29RCkbZBGCck/aXfW1nM5UM=
-SIZE (minizip-ng-3.0.6.tar.gz) = 642138
+SHA256 (minizip-ng-4.0.0.tar.gz) = +QYuV23gJv1QJtZVl947BSY81NkUAMrNu+Nt+opkL/8=
+SIZE (minizip-ng-4.0.0.tar.gz) = 766989
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/archivers/minizip/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 13 Jul 2022 19:54:47 -0000 1.5
+++ patches/patch-CMakeLists_txt 11 Jun 2023 00:23:28 -0000
@@ -1,22 +1,14 @@
-install headers in include/minizip to avoid conflicts with libzip
+CMake: Fix build with OpenBSD #711
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -86,7 +86,7 @@ include(cmake/clone-repo.cmake)
-
- set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation
directory for executables")
- set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation
directory for libraries")
--set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation
directory for headers")
-+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip CACHE PATH
"Installation directory for headers")
- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation
directory for manual pages")
-
- set(STDLIB_DEF)
-@@ -442,7 +442,6 @@ endif()
-
- # Unix specific
- if(UNIX)
-- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
+@@ -455,7 +455,7 @@ if(WIN32)
+ set(MZ_LIBBSD OFF)
+ set(MZ_ICONV OFF)
+ else()
+- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
++ list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE)
list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
- if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
+ if(MZ_PKCRYPT OR MZ_WZAES)
Index: patches/patch-minizip_pc_cmakein
===================================================================
RCS file: patches/patch-minizip_pc_cmakein
diff -N patches/patch-minizip_pc_cmakein
--- patches/patch-minizip_pc_cmakein 11 Mar 2022 18:16:22 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: minizip.pc.cmakein
---- minizip.pc.cmakein.orig
-+++ minizip.pc.cmakein
-@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- sharedlibdir=@CMAKE_INSTALL_FULL_LIBDIR@
--includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/minizip
-
- Name: @PROJECT_NAME@
- Description: Minizip zip file manipulation library
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/archivers/minizip/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 18:16:22 -0000 1.5
+++ pkg/PLIST 9 Jun 2023 23:39:34 -0000
@@ -21,10 +21,9 @@ include/minizip/mz_zip_rw.h
include/minizip/unzip.h
include/minizip/zip.h
lib/cmake/
-lib/cmake/minizip/
-lib/cmake/minizip/minizip-config-version.cmake
-lib/cmake/minizip/minizip-config.cmake
-lib/cmake/minizip/minizip${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/minizip/minizip.cmake
+lib/cmake/minizip-config-version.cmake
+lib/cmake/minizip-config.cmake
+lib/cmake/minizip${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/minizip.cmake
@lib lib/libminizip.so.${LIBminizip_VERSION}
lib/pkgconfig/minizip.pc
