Update some ports to use OpenSSL 3.

Zilliqa · Sep 10, 2023 · da19faa · da19faa
1 parent 287b72f
commit da19faa
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 29 deletions.
diff --git a/vcpkg-registry/ports/cryptoutils/vcpkg.json b/vcpkg-registry/ports/cryptoutils/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptoutils",
-  "version": "8.3.0",
-  "port-version": 1,
+  "version": "9.3",
+  "port-version": 0,
   "description": "CryptoUtils",
   "homepage": "https://github.com/Zilliqa/cryptoutils",
   "dependencies": [
@@ -12,7 +12,8 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "openssl"
   ]
 }
 
diff --git a/vcpkg-registry/ports/schnorr/fix-compiler-flags.patch b/vcpkg-registry/ports/schnorr/fix-compiler-flags.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2791bb1..450905d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,12 +47,6 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-system-dev, libboost-test-dev, libssl
+ set(CPACK_PACKAGE_CONTACT "[email protected]")
+ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Members of [email protected]")
+
+-# compiler and linker options
+-
+-add_compile_options(-Wall)
+-add_compile_options(-Werror)
+-add_compile_options(-Wextra)
+-
+ if (THREAD_SANITIZER AND ADDRESS_SANITIZER)
+     message(FATAL_ERROR "Cannot use ThreadSanitizer (THREAD_SANITIZER=ON) and AddressSanitizer (ADDRESS_SANITIZER=ON) at the same time")
+ endif()
diff --git a/vcpkg-registry/ports/schnorr/portfile.cmake b/vcpkg-registry/ports/schnorr/portfile.cmake
@@ -4,23 +4,19 @@ vcpkg_from_github(
     REF c54f4cadc88234d58bfdf83a4d7348444ea7845d #v8.2.0
     SHA512 7f445c407fd1049ab41ad580b91263698af405b6015ec4a33715a40e488459afb5f2a8f06e6db9759b18b4f9ba443e2da746408821931ccd31e4caf4101048a7
     HEAD_REF master
+    PATCHES
+      fix-compiler-flags.patch
 )
 
-if (UNIX AND NOT APPLE)
-  vcpkg_cmake_configure(
-      SOURCE_PATH ${SOURCE_PATH}
-      OPTIONS
-        -DCMAKE_CXX_FLAGS=-Wno-dev
-        -DCMAKE_C_FLAGS=-Wno-dev
-  )
-else()
-  vcpkg_cmake_configure(
-      SOURCE_PATH ${SOURCE_PATH}
-  )
-endif()
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+      -DCMAKE_CXX_STANDARD=20
+      -DCMAKE_CXX_FLAGS="-Wall -Werror -Wextra -Wno-dev -Wno-deprecated-declarations"
+      -DCMAKE_C_FLAGS="-Wall -Werror -Wextra -Wno-dev -Wno-deprecated-declarations"
+)
 
 vcpkg_cmake_install()
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/vcpkg-registry/ports/schnorr/vcpkg.json b/vcpkg-registry/ports/schnorr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "schnorr",
-  "version": "8.2.0",
+  "version": "9.3",
   "port-version": 0,
   "description": "Schnorr",
   "homepage": "https://github.com/Zilliqa/schnorr",
@@ -12,6 +12,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "boost-algorithm",
+    "boost-functional",
+    "boost-test",
+    "openssl"
   ]
 }
diff --git a/vcpkg-registry/versions/baseline.json b/vcpkg-registry/versions/baseline.json
@@ -1,6 +1,6 @@
 {
   "default": {
-    "schnorr": { "baseline": "8.2.0", "port-version": 0 },
-    "cryptoutils": { "baseline": "8.3.0", "port-version": 1 }
+    "schnorr": { "baseline": "9.3", "port-version": 0 },
+    "cryptoutils": { "baseline": "9.3", "port-version": 0 }
   }
 }
diff --git a/vcpkg-registry/versions/c-/cryptoutils.json b/vcpkg-registry/versions/c-/cryptoutils.json
@@ -2,8 +2,8 @@
   "versions": [
     {
       "path": "$/ports/cryptoutils",
-      "version": "8.3.0",
-      "port-version": 1
+      "version": "9.3",
+      "port-version": 0
     }
   ]
 }

diff --git a/vcpkg-registry/versions/s-/schnorr.json b/vcpkg-registry/versions/s-/schnorr.json
@@ -2,7 +2,7 @@
   "versions": [
     {
       "path": "$/ports/schnorr",
-      "version": "8.2.0",
+      "version": "9.3",
       "port-version": 0
     }
   ]

diff --git a/vcpkg.json b/vcpkg.json
@@ -18,17 +18,13 @@
       "name": "jsoncpp",
       "version-string": "1.8.1-1"
     },
-    {
-      "name": "openssl",
-      "version-string": "1.1.1n"
-    },
     {
       "name": "schnorr",
-      "version": "8.2.0"
+      "version": "9.3"
     },
     {
       "name": "cryptoutils",
-      "version": "8.3.0#1"
+      "version": "9.3"
     }
   ]
 }