gentoo auto-resync : 23:11:2024 - 03:02:56

5 files changed, 94 insertions, 1 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 064fa8c9cc51..0e7c4a8ff809 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/gsocket/Manifest b/net-vpn/gsocket/Manifest
index e00226889b3a..b51201d546c7 100644
--- a/net-vpn/gsocket/Manifest
+++ b/net-vpn/gsocket/Manifest
@@ -1,5 +1,7 @@
+AUX gs-socks-proxy.service 471 BLAKE2B 54c6ef86effe2ad84070f39871b50b6cf08e9b4c1cb6b92b19d42fc8f5777af0e5f6e8d1a5e37cb67cdb9715b48bb232fe9bae2f823da63e9df4e1f768b26572 SHA512 afb38d5340ffdf72215e6d126a2c0d4261d23a9fbcfb721c16963970b86f9ae47f94344f36ff7446d798e15e273865dfa83024bb27a5d5d5465452feea4e8c25
 AUX gsocket-1.4.43-gs-init-secret.patch 5216 BLAKE2B bcbac9fb8d6466fc0c512e2c2c99f77d7ad1bc32252daceaae4af1ec59df58e9cf7871de946a8ade7b4936c6289eb22b8a4b6c0815aac34c3343d19d029b8f6f SHA512 108a76bf81b53f4c14288f5c86d8b9036a38d42f074e4f080796d4c46b9d22c4cdbb5d55ae240784a041e75577545d885763dbeaf418a1f78561d974e8243d49
 DIST gsocket-1.4.43.tar.gz 223602 BLAKE2B 92818d932f1d5eddd66a810aaecb800d0ac435d7320912fdb8e485ae7f5398dfb96b1e6c0bbc4edc651414eb912bd90e14e442db904d04aa71b236188a9bff66 SHA512 2c58182b52242f275b7597c7214f8f0b09f52d369fee66454a2b00322b9b7075af3f675c7f785ae66ed8f331351ed60a0038e997258df35a938c6b1f4a94b21c
+EBUILD gsocket-1.4.43-r1.ebuild 1394 BLAKE2B 465eb618cadc8727dc7e722ec666d8ea0d9c8a5787290c88286271c86d7042e98d81acae45d775f61537868c6862c9a1f6ff0e78ba37b1d8d654e96655859b45 SHA512 fde6decee0e4feb153e58282b5df438359d6ddbda18ec0a02300304395dbc3b498f80593d80f8f2ea5f28b0002414813fdf31c83dbaa308df7df9598188aee7d
 EBUILD gsocket-1.4.43.ebuild 1340 BLAKE2B cb1237947c43416accdfc0156822a51b585bcd1424cb3adea405ac6292ccb4d1187f1f3eef44c17092bf09f33d6e7393a016935c1d5b73df172f12ed261bca8c SHA512 01c5d5eb6a4cc3fbcc107e0bc9c41a69bec20ec841a6c978e4db202dd4cf654959a3523f38038588b3d25d9d5456357a7a53bd36cb5dfda8fe7e46efcd949815
-EBUILD gsocket-9999.ebuild 1341 BLAKE2B 6517e072a1435d68fec3eb0f99b1023abc536cb250675f4da5ffac649e3e87262ce42fd788e039a5266ec4705df31a227f3854e009f1feb7ffe3263f477f9cad SHA512 9fb510e50bdda0bf00bc76e55477c08a36a0e2efa8ce79f2ee0e98fc9bb5b9cfc4f72cc2cd9f4e02b16acf42672ec3ab1f1cc9559082d1bce197f165cf5f279c
+EBUILD gsocket-9999.ebuild 1394 BLAKE2B 465eb618cadc8727dc7e722ec666d8ea0d9c8a5787290c88286271c86d7042e98d81acae45d775f61537868c6862c9a1f6ff0e78ba37b1d8d654e96655859b45 SHA512 fde6decee0e4feb153e58282b5df438359d6ddbda18ec0a02300304395dbc3b498f80593d80f8f2ea5f28b0002414813fdf31c83dbaa308df7df9598188aee7d
 MISC metadata.xml 333 BLAKE2B 745060b3c89631d042599a634f55f2a5ba35facd04c35af16e9e4f1f27cbfe1463c68691684f2648613bcee92b8db038cdcae818ad0a7eb0aea6ffab76c6d22c SHA512 82a2ecff11354b26e1a29a6cac42830793d6487629a68534b64ba0f46d31a1151ca6e26e378af48ec5e680d9dfa8be39a72391a385da51adb7cfca26024a1fb7
diff --git a/net-vpn/gsocket/files/gs-socks-proxy.service b/net-vpn/gsocket/files/gs-socks-proxy.service
new file mode 100644
index 000000000000..ce9d180641b3
--- /dev/null
+++ b/net-vpn/gsocket/files/gs-socks-proxy.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Global Socket Socks Proxy
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Restart=always
+RestartSec=10
+RestartSteps=10
+RestartMaxDelaySec=30m
+
+DynamicUser=yes
+RuntimeDirectory=gs-socks-proxy
+
+ExecStartPre=+gs-init-secret /etc/gsocket/gs-socks-proxy-key
+ExecStartPre=+install --owner %u /etc/gsocket/gs-socks-proxy-key /run/gs-socks-proxy/key
+
+ExecStart=gs-netcat -k /run/gs-socks-proxy/key -lS
+
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild b/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild
new file mode 100644
index 000000000000..74426aaafe23
--- /dev/null
+++ b/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Allow firewalled/NATed host to establish a secure connection"
+HOMEPAGE="https://www.gsocket.io/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hackerschoice/gsocket.git"
+else
+	SRC_URI="https://github.com/hackerschoice/gsocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-libs/openssl:="
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		net-analyzer/netcat
+		net-misc/socat
+	)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	# https://github.com/hackerschoice/gsocket/pull/104
+	"${FILESDIR}"/gsocket-1.4.43-gs-init-secret.patch
+)
+
+src_prepare() {
+	default
+
+	# Patch in the correct libdir
+	sed -i \
+		"s;arrayContains \"/usr/lib\".*;DL+=(\"${EPREFIX}/usr/$(get_libdir)\");" \
+		tools/gs_funcs || die "Failed to patch libdir in gs_funcs"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable test tests)
+}
+
+src_test() {
+	cd tests || die
+
+	./run_ft_tests.sh || die
+	# Most of the "gs_tests" seem to fail (probably due the sandbox).
+	./run_gs_tests.sh 4.1 || die
+}
+
+src_install() {
+	default
+
+	systemd_dounit examples/systemd-root-shell/gs-root-shell.service
+	systemd_dounit "${FILESDIR}"/gs-socks-proxy.service
+}
diff --git a/net-vpn/gsocket/gsocket-9999.ebuild b/net-vpn/gsocket/gsocket-9999.ebuild
index 39e124344a92..74426aaafe23 100644
--- a/net-vpn/gsocket/gsocket-9999.ebuild
+++ b/net-vpn/gsocket/gsocket-9999.ebuild
@@ -64,4 +64,5 @@ src_install() {
 	default
 
 	systemd_dounit examples/systemd-root-shell/gs-root-shell.service
+	systemd_dounit "${FILESDIR}"/gs-socks-proxy.service
 }