net-vpn/candy: version bump to 5.3 and clean patches

Signed-off-by: Xin Yang <yangmame@icloud.com>
Signed-off-by: David Roman <davidroman96@gmail.com>

4 files changed, 2 insertions, 143 deletions

diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
index 8691142b7..bb4dcc22a 100644
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1 +1 @@
-DIST candy-4.1.tar.gz 43205 BLAKE2B c999099302690f759bfb877fdd9213e7b4d5a2cce649936913a3c6a40e79a72149a1dc971649ff9773fd0bfc1d56c1a8b97edffeaa724c2656bb846ee26827d9 SHA512 f019de51cec3942b854d7ffd35f9f7a669a26a967e78383bab6c5f2c58fca02f40e8fe9f502bd6e395623f917f2ccc6c8a2f05b96d4f164de4f018f763913cda
+DIST candy-5.3.tar.gz 48212 BLAKE2B 599b9ab1629f291b791bff51fc9059ed41228389d4c52d880b5efd40c31849906c5122da555fcfa5be3fb0b7c1ec6f3ce4c0f1a62e050ea00891bd89309873a4 SHA512 943f6ab211ba737dc706b2a7c09c50f1b6a00276d4ac937ed0c04df7d40078d41a0b71f0a132e8a1b532d0ec21e78fffc696d7d75b8398201456f64b920f4c86
diff --git a/net-vpn/candy/candy-4.1.ebuild b/net-vpn/candy/candy-5.3.ebuild
index 4067f7cd8..ebaa4a53e 100644
--- a/net-vpn/candy/candy-4.1.ebuild
+++ b/net-vpn/candy/candy-5.3.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~amd64"
 DEPEND="
 	dev-libs/uriparser
 	dev-libs/libconfig
-	net-libs/ixwebsocket[ws]
+	dev-libs/poco
 	dev-libs/openssl
-	sys-libs/zlib
 	dev-libs/libfmt
 	dev-libs/spdlog
 "
diff --git a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
deleted file mode 100644
index 445d5ad08..000000000
--- a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 317538a145784eb28b530a7969e941dc047cbf06 Mon Sep 17 00:00:00 2001
-From: lanthora <lanthora@outlook.com>
-Date: Wed, 21 Feb 2024 06:20:29 +0000
-Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E7=B3=BB?=
- =?UTF-8?q?=E7=BB=9F=E7=9A=84=20ixwebsocket?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CMakeLists.txt | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2da4334..160cfa1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,9 +20,13 @@ pkg_check_modules(
-     liburiparser
- )
- 
-+pkg_check_modules(IXWEBSOCKET ixwebsocket)
-+
- find_library(ARGP_LIB argp)
- 
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake)
-+if (NOT IXWEBSOCKET_FOUND)
-+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake)
-+endif()
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/wintun.cmake)
-@@ -30,7 +34,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- endif()
- 
- include_directories(${DEPENDENCIES_INCLUDEDIR})
--include_directories(${ixwebsocket_SOURCE_DIR})
-+
-+if (IXWEBSOCKET_FOUND)
-+    include_directories(${IXWEBSOCKET_INCLUDEDIR})
-+else()
-+    include_directories(${ixwebsocket_SOURCE_DIR})
-+endif()
- 
- add_subdirectory(${SOURCE}/core)
- add_subdirectory(${SOURCE}/websocket)
-@@ -43,7 +52,12 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE websocket)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE tun)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE peer)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE utility)
--target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket)
-+
-+if (IXWEBSOCKET_FOUND)
-+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${IXWEBSOCKET_LIBRARIES})
-+else()
-+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket)
-+endif()
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE iphlpapi)
diff --git a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch b/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch
deleted file mode 100644
index c0e0121f1..000000000
--- a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From de8f5a3109ee3bdc472fbc7fcb1572aaad0b8cb9 Mon Sep 17 00:00:00 2001
-From: lanthora <lanthora@outlook.com>
-Date: Thu, 29 Feb 2024 05:16:53 +0000
-Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=89=88?=
- =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CMakeLists.txt   | 10 ++++++----
- src/main/main.cc | 13 +++++++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ebf2c0..dffc31d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,10 +1,12 @@
- cmake_minimum_required(VERSION 3.18.4)
- 
--project(candy CXX)
-+project(candy LANGUAGES CXX VERSION 4.0)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
--set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -fsanitize=address")
--set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
-+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
-+
-+add_compile_definitions(VERSION="${CMAKE_PROJECT_VERSION}")
- 
- include_directories(${CMAKE_SOURCE_DIR}/src)
- 
-diff --git a/src/main/main.cc b/src/main/main.cc
-index 286d24d..65cdc4f 100644
---- a/src/main/main.cc
-+++ b/src/main/main.cc
-@@ -21,6 +21,10 @@
- 
- #include <argp.h>
- 
-+#ifndef VERSION
-+#define VERSION "unknown"
-+#endif
-+
- namespace {
- 
- struct arguments {
-@@ -54,6 +58,7 @@ struct argp_option options[] = {
-     {"config", 'c', "PATH", 0, "Configuration file path"},
-     {"discovery", OPT_DISCOVERY_INTERVAL, "SECONDS", 0, "Active discovery broadcast interval"},
-     {"route", 'r', "COST", 0, "Cost of routing"},
-+    {"version", 'v', 0, 0, "Show version"},
-     {"no-timestamp", OPT_NO_TIMESTAMP, 0, 0, "Log does not show time"},
-     {"debug", OPT_LOG_LEVEL_DEBUG, 0, 0, "Show debug level logs"},
-     {"auto-restart", OPT_AUTO_RESTART, 0, 0, "Automatic restart"},
-@@ -72,6 +77,11 @@ int setLogLevelDebug() {
-     return 0;
- }
- 
-+void showVersion() {
-+    std::cout << VERSION << std::endl;
-+    exit(0);
-+}
-+
- bool needShowUsage(struct arguments *arguments, struct argp_state *state) {
-     if (state->arg_num > 0)
-         return true;
-@@ -141,6 +151,9 @@ int parseOption(int key, char *arg, struct argp_state *state) {
-     case 'c':
-         parseConfigFile(arguments, arg);
-         break;
-+    case 'v':
-+        showVersion();
-+        break;
-     case OPT_NO_TIMESTAMP:
-         disableLogTimestamp();
-         break;