From 900c572331e3f83f58a33045bfc9780ce5ffe130 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:28:25 +0800
Subject: [PATCH] [zeromq] Fix duplicate definition of functions in zeromq and
 sodium (#32214)

* Fix duplicate definition of functions in zeromq and sodium

* version

* update license

* update version
---
 ports/zeromq/include-dir-gnutls.patch | 38 ---------------------------
 ports/zeromq/portfile.cmake           | 11 ++++----
 ports/zeromq/vcpkg.json               |  5 ++--
 versions/baseline.json                |  4 +--
 versions/z-/zeromq.json               |  5 ++++
 5 files changed, 15 insertions(+), 48 deletions(-)
 delete mode 100644 ports/zeromq/include-dir-gnutls.patch

diff --git a/ports/zeromq/include-dir-gnutls.patch b/ports/zeromq/include-dir-gnutls.patch
deleted file mode 100644
index b3a8c2b518..0000000000
--- a/ports/zeromq/include-dir-gnutls.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 124cbb7..16f0c81 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1382,6 +1382,9 @@ else()
-   if(NOT MINGW)
-     add_library(objects OBJECT ${sources})
-     set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON)
-+    if(GNUTLS_FOUND)
-+      target_include_directories(objects PRIVATE "${GNUTLS_INCLUDE_DIR}")
-+    endif()
-   endif()
- 
-   if(BUILD_SHARED)
-@@ -1469,6 +1472,7 @@ if(BUILD_SHARED)
-   target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT})
-   if(GNUTLS_FOUND)
-     target_link_libraries(libzmq ${GNUTLS_LIBRARIES})
-+    target_include_directories(libzmq PRIVATE "${GNUTLS_INCLUDE_DIR}")
-   endif()
- 
-   if(NSS3_FOUND)
-@@ -1518,6 +1522,7 @@ if(BUILD_STATIC)
-   target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT})
-   if(GNUTLS_FOUND)
-     target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES})
-+    target_include_directories(libzmq-static PRIVATE "${GNUTLS_INCLUDE_DIR}")
-   endif()
- 
-   if(LIBBSD_FOUND)
-@@ -1590,6 +1595,7 @@ if(BUILD_SHARED)
- 
-       if(GNUTLS_FOUND)
-         target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES})
-+        target_include_directories(${perf-tool} PRIVATE "${GNUTLS_INCLUDE_DIR}")
-       endif()
- 
-       if(LIBBSD_FOUND)
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 4c8cf77ba1..6d804c6d5b 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -1,11 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/libzmq
-    REF ce6d48c578a08770fb171486750300fd534d0254
-    SHA512 e204db3e40d99df2206f9537bf7dbc9bb8994174f4f9c4770dcc7a92622e6ff0e2b1be537d7fff96cfbdb0cdd0174bfd11ba60d08c4bab0ccb4db3ec25c06593
+    REF ecc63d0d3b0e1a62c90b58b1ccdb5ac16cb2400a
+    SHA512 4e8f709691d8f3f64d41cc0f0fd70fe0a676247dc88b1283fa90f41b838f5b83100ccabd18714e5638cfa66c5cec0ac67943a3559d535357ff3499de62e47069
     PATCHES 
         fix-arm.patch
-        include-dir-gnutls.patch # from https://github.com/zeromq/libzmq/pull/4533
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -43,6 +42,9 @@ vcpkg_cmake_configure(
         "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
     MAYBE_UNUSED_VARIABLES
         USE_PERF_TOOLS
+        CMAKE_REQUIRE_FIND_PACKAGE_GnuTLS
+        WITH_LIBBSD
+        WITH_TLS
 )
 
 vcpkg_cmake_install()
@@ -65,8 +67,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 # Handle copyright
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq")
 
 vcpkg_fixup_pkgconfig()
diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json
index a4cfb20711..bcafe54b03 100644
--- a/ports/zeromq/vcpkg.json
+++ b/ports/zeromq/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "zeromq",
-  "version-date": "2023-01-31",
-  "port-version": 5,
+  "version-date": "2023-06-20",
   "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products",
   "homepage": "https://github.com/zeromq/libzmq",
-  "license": "LGPL-3.0-only",
+  "license": "MPL-2.0",
   "supports": "!uwp & !xbox",
   "dependencies": [
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 87356c6cd9..870425185c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8921,8 +8921,8 @@
       "port-version": 0
     },
     "zeromq": {
-      "baseline": "2023-01-31",
-      "port-version": 5
+      "baseline": "2023-06-20",
+      "port-version": 0
     },
     "zfp": {
       "baseline": "1.0.0",
diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json
index ea48d6ae1e..7b781e8455 100644
--- a/versions/z-/zeromq.json
+++ b/versions/z-/zeromq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3deda40ff74bb4d77071cefabd7d889589452425",
+      "version-date": "2023-06-20",
+      "port-version": 0
+    },
     {
       "git-tree": "910e9e92155a96a07837641615e3356c98edec9a",
       "version-date": "2023-01-31",