* [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/candy/, net-vpn/candy/files/
@ 2024-02-23 15:21 Remigiusz Micielski
0 siblings, 0 replies; 4+ messages in thread
From: Remigiusz Micielski @ 2024-02-23 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 151b6712419f4fea89d727a5f10e0711a14f6df3
Author: Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Fri Feb 23 01:10:27 2024 +0000
Commit: Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Fri Feb 23 15:20:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=151b6712
net-vpn/candy: new package, add 3.9.1
Closes: https://github.com/gentoo/guru/pull/140
Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>
net-vpn/candy/Manifest | 1 +
net-vpn/candy/candy-3.9.1.ebuild | 52 +++++++++++++++++++
.../files/candy-3.9.1-use-system-ixwebsocket.patch | 60 ++++++++++++++++++++++
net-vpn/candy/metadata.xml | 15 ++++++
4 files changed, 128 insertions(+)
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
new file mode 100644
index 0000000000..f87e317a79
--- /dev/null
+++ b/net-vpn/candy/Manifest
@@ -0,0 +1 @@
+DIST candy-3.9.1.tar.gz 37847 BLAKE2B af7c857a8a41f0e98bd744162be563b973e20a630fb505de91155ab9fb7a17679a2bb9f69db8c737258d1293c5d77ad96a65a2b22455512b8f97390a7368165f SHA512 aa9727c74ab7c9536331098f11a2837daa51aa58503cbf5b43536afedf5eea8d30db296f515c4689cf44c980eea5a88e06ad161836fe64d4146de4fdce9d99ac
diff --git a/net-vpn/candy/candy-3.9.1.ebuild b/net-vpn/candy/candy-3.9.1.ebuild
new file mode 100644
index 0000000000..843aa73cde
--- /dev/null
+++ b/net-vpn/candy/candy-3.9.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="Another virtual private network that supports peer-to-peer connections"
+HOMEPAGE="https://github.com/lanthora/candy"
+SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-libs/uriparser
+ dev-libs/libconfig
+ net-libs/ixwebsocket[ws]
+ dev-libs/openssl
+ sys-libs/zlib
+ dev-libs/libfmt
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/spdlog
+"
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-use-system-ixwebsocket.patch"
+ cmake_src_prepare
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ )
+ cmake_src_configure
+}
+
+src_install(){
+ cmake_src_install
+ default
+
+ insinto /etc
+ doins candy.conf
+ fperms 0644 /etc/candy.conf
+
+ systemd_dounit candy.service
+ systemd_dounit candy@.service
+}
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
new file mode 100644
index 0000000000..445d5ad080
--- /dev/null
+++ b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
@@ -0,0 +1,60 @@
+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/metadata.xml b/net-vpn/candy/metadata.xml
new file mode 100644
index 0000000000..67deff1aff
--- /dev/null
+++ b/net-vpn/candy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>yangmame@icloud.com</email>
+ <name>Xin Yang</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">lanthora/candy</remote-id>
+ <maintainer>
+ <name>lanthora</name>
+ <email>lanthora@outlook.com</email>
+ </maintainer>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/candy/, net-vpn/candy/files/
@ 2024-02-29 15:43 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-02-29 15:43 UTC (permalink / raw
To: gentoo-commits
commit: edb423f1db1df4f7ef36c155987979d7b37cbdfb
Author: Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Thu Feb 29 03:51:23 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Feb 29 15:42:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edb423f1
net-vpn/candy: new 4.0 ebuild with version and cflags env patch
Closes: https://github.com/gentoo/guru/pull/145
Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
net-vpn/candy/Manifest | 1 +
net-vpn/candy/candy-4.0.ebuild | 43 ++++++++++++
...candy-4.0-show-version-and-use-cflags-env.patch | 80 ++++++++++++++++++++++
3 files changed, 124 insertions(+)
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
index f87e317a79..ae1de07b3a 100644
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1 +1,2 @@
DIST candy-3.9.1.tar.gz 37847 BLAKE2B af7c857a8a41f0e98bd744162be563b973e20a630fb505de91155ab9fb7a17679a2bb9f69db8c737258d1293c5d77ad96a65a2b22455512b8f97390a7368165f SHA512 aa9727c74ab7c9536331098f11a2837daa51aa58503cbf5b43536afedf5eea8d30db296f515c4689cf44c980eea5a88e06ad161836fe64d4146de4fdce9d99ac
+DIST candy-4.0.tar.gz 43112 BLAKE2B 84c3fbab30dc1d40ba73e7c90a02bf6c13b9bb0de2339fe128c958242213986dc2c490c680032c98f9a3a849e237f1f22274b600e55ed94aea91d9529bf972bf SHA512 9f76ab338cec381e1421040055ba73882a32f6b2b9bebe8fbc289c1c0e418506a57698fa8e551a31a918dfbcfa668dbb6c1d82390a2496a7fe35d6a17adacd64
diff --git a/net-vpn/candy/candy-4.0.ebuild b/net-vpn/candy/candy-4.0.ebuild
new file mode 100644
index 0000000000..70b9c5a55e
--- /dev/null
+++ b/net-vpn/candy/candy-4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="Another virtual private network that supports peer-to-peer connections"
+HOMEPAGE="https://github.com/lanthora/candy"
+SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-libs/uriparser
+ dev-libs/libconfig
+ net-libs/ixwebsocket[ws]
+ dev-libs/openssl
+ sys-libs/zlib
+ dev-libs/libfmt
+ dev-libs/spdlog
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-show-version-and-use-cflags-env.patch"
+ cmake_src_prepare
+ default
+}
+
+src_install(){
+ cmake_src_install
+ default
+
+ insinto /etc
+ doins candy.conf
+ fperms 0644 /etc/candy.conf
+
+ systemd_dounit candy.service
+ systemd_dounit candy@.service
+}
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
new file mode 100644
index 0000000000..c0e0121f14
--- /dev/null
+++ b/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch
@@ -0,0 +1,80 @@
+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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/candy/, net-vpn/candy/files/
@ 2024-06-07 6:22 Xin Yang
0 siblings, 0 replies; 4+ messages in thread
From: Xin Yang @ 2024-06-07 6:22 UTC (permalink / raw
To: gentoo-commits
commit: de4104905fa163df1dfffad147f141905646ad47
Author: Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Fri Jun 7 06:21:41 2024 +0000
Commit: Xin Yang <yangmame <AT> icloud <DOT> com>
CommitDate: Fri Jun 7 06:21:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=de410490
net-vpn/candy: add openrc initd and readme
Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
net-vpn/candy/candy-5.8.7.ebuild | 5 +++++
net-vpn/candy/files/README.gentoo | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/net-vpn/candy/candy-5.8.7.ebuild b/net-vpn/candy/candy-5.8.7.ebuild
index bbf4d7c96..6da8fc22d 100644
--- a/net-vpn/candy/candy-5.8.7.ebuild
+++ b/net-vpn/candy/candy-5.8.7.ebuild
@@ -35,4 +35,9 @@ src_install(){
systemd_dounit candy.service
systemd_dounit candy@.service
+ newinitd candy.initd candy
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
}
diff --git a/net-vpn/candy/files/README.gentoo b/net-vpn/candy/files/README.gentoo
new file mode 100644
index 000000000..810d83332
--- /dev/null
+++ b/net-vpn/candy/files/README.gentoo
@@ -0,0 +1,10 @@
+Notes:
+ Running candy with multi instances
+
+ 1) Using OpenRC
+ Prepare /etc/candy.d/${foo}.cfg first
+ # ln -s /etc/init.d/candy{,.${foo}}
+ # rc-update add candy.${foo} default
+
+ 2) Using Systemd
+ # systemctl enable candy@${foo}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/candy/, net-vpn/candy/files/
@ 2024-08-23 8:12 Xin Yang
0 siblings, 0 replies; 4+ messages in thread
From: Xin Yang @ 2024-08-23 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 7016e8a91723ebec492c2026bb12bf37b9d31b13
Author: YangMame <yangmame <AT> icloud <DOT> com>
AuthorDate: Fri Aug 23 08:09:11 2024 +0000
Commit: Xin Yang <yangmame <AT> icloud <DOT> com>
CommitDate: Fri Aug 23 08:12:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7016e8a9
net-vpn/candy: treeclean, this package has been moved to the main repository
Signed-off-by: YangMame <yangmame <AT> icloud.com>
net-vpn/candy/Manifest | 1 -
net-vpn/candy/candy-5.10.3.ebuild | 43 ---------------------------------------
net-vpn/candy/files/README.gentoo | 10 ---------
net-vpn/candy/metadata.xml | 15 --------------
4 files changed, 69 deletions(-)
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
deleted file mode 100644
index 443cd6245..000000000
--- a/net-vpn/candy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST candy-5.10.3.tar.gz 115258 BLAKE2B 70d698d69fbb0a28adeb1ba515a1a1f6986c083d3a04b688bfd5b7ead98941bac46af47cd745b74928fc56466ebe3fa7d570f7ecaa1716b2eac948d9eaf52fe2 SHA512 c56ab81f599c5fbf72c509265b3fc0189a17e36b8738e536f21702585e7994c706a277d8c1dbf8b68e7f3609518fec0b4daccc0b180d375463e898bb7d41bbdc
diff --git a/net-vpn/candy/candy-5.10.3.ebuild b/net-vpn/candy/candy-5.10.3.ebuild
deleted file mode 100644
index 7617d7a9e..000000000
--- a/net-vpn/candy/candy-5.10.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd readme.gentoo-r1
-
-DESCRIPTION="A reliable, low-latency, and anti-censorship virtual private network"
-HOMEPAGE="https://github.com/lanthora/candy"
-SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips"
-
-DEPEND="
- dev-libs/poco
- dev-libs/openssl
- dev-libs/spdlog
-"
-RDEPEND="
- ${DEPEND}
- dev-libs/libfmt
-"
-
-src_install(){
- cmake_src_install
- default
-
- insinto /etc
- doins candy.cfg
- fperms 0644 /etc/candy.cfg
-
- systemd_dounit candy.service
- systemd_dounit candy@.service
- newinitd candy.initd candy
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/net-vpn/candy/files/README.gentoo b/net-vpn/candy/files/README.gentoo
deleted file mode 100644
index 810d83332..000000000
--- a/net-vpn/candy/files/README.gentoo
+++ /dev/null
@@ -1,10 +0,0 @@
-Notes:
- Running candy with multi instances
-
- 1) Using OpenRC
- Prepare /etc/candy.d/${foo}.cfg first
- # ln -s /etc/init.d/candy{,.${foo}}
- # rc-update add candy.${foo} default
-
- 2) Using Systemd
- # systemctl enable candy@${foo}
diff --git a/net-vpn/candy/metadata.xml b/net-vpn/candy/metadata.xml
deleted file mode 100644
index 67deff1af..000000000
--- a/net-vpn/candy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>yangmame@icloud.com</email>
- <name>Xin Yang</name>
- </maintainer>
- <upstream>
- <remote-id type="github">lanthora/candy</remote-id>
- <maintainer>
- <name>lanthora</name>
- <email>lanthora@outlook.com</email>
- </maintainer>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-23 8:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-23 15:21 [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/candy/, net-vpn/candy/files/ Remigiusz Micielski
-- strict thread matches above, loose matches on Subject: below --
2024-02-29 15:43 David Roman
2024-06-07 6:22 Xin Yang
2024-08-23 8:12 Xin Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox