public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: net-proxy/byedpi/, net-proxy/byedpi/files/
@ 2024-08-10 20:34 Lucio Sauer
  0 siblings, 0 replies; 3+ messages in thread
From: Lucio Sauer @ 2024-08-10 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     42992f2982ef856a1d8a17e3dd76831d2cb2e70b
Author:     Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
AuthorDate: Sat Aug 10 14:00:43 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Sat Aug 10 14:01:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42992f29

net-proxy/byedpi: new package, add 0.12, 9999

Closes: https://github.com/gentoo/guru/pull/225
Signed-off-by: Michael Zavertkin <misha.zavertkin <AT> mail.ru>

 net-proxy/byedpi/Manifest             |  1 +
 net-proxy/byedpi/byedpi-0.12.ebuild   | 30 ++++++++++++++++++++++++++++++
 net-proxy/byedpi/byedpi-9999.ebuild   | 26 ++++++++++++++++++++++++++
 net-proxy/byedpi/files/byedpi.service | 10 ++++++++++
 net-proxy/byedpi/metadata.xml         | 11 +++++++++++
 5 files changed, 78 insertions(+)

diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest
new file mode 100644
index 000000000..663329128
--- /dev/null
+++ b/net-proxy/byedpi/Manifest
@@ -0,0 +1 @@
+DIST byedpi-0.12.tar.gz 33283 BLAKE2B da1d9bbc80c868fb16c4f6e24c3fe00d5d03d5bb0a6d71dac16999b652e81fc9c2a5f0f57e350260b9295d953cb0c3fe316440279dd26b09ee895bf81771cc2b SHA512 9f15afc821b53bd1fba71ab9a37640c8f35f22efcfc6cd079800f9abd4286232fb29850aebe9168e54396f912362e012448940d32471bfe0586600fcd2591e22

diff --git a/net-proxy/byedpi/byedpi-0.12.ebuild b/net-proxy/byedpi/byedpi-0.12.ebuild
new file mode 100644
index 000000000..d78b1e46f
--- /dev/null
+++ b/net-proxy/byedpi/byedpi-0.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Bypass DPI SOCKS proxy"
+HOMEPAGE="https://github.com/hufrea/byedpi/"
+SRC_URI="https://github.com/hufrea/byedpi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	tc-export CC
+	export CFLAGS
+	sed -i 's/ -O.\b/ /' Makefile
+	# workaround for compiling without -O2
+	# https://github.com/hufrea/byedpi/commit/3fee8d5aed122f34ec13637f5f4b1502d13cc923
+	sed -i 's/inline bool check_port/static inline bool check_port/' extend.c
+
+	default
+}
+
+src_install() {
+	dobin ciadpi
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+

diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
new file mode 100644
index 000000000..03efb727c
--- /dev/null
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit git-r3 systemd toolchain-funcs
+
+DESCRIPTION="Bypass DPI SOCKS proxy"
+HOMEPAGE="https://github.com/hufrea/byedpi/"
+EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_compile() {
+	tc-export CC
+	export CFLAGS LDFLAGS
+	sed -i 's/ -O.\b/ /' Makefile
+
+	default
+}
+
+src_install() {
+	dobin ciadpi
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+

diff --git a/net-proxy/byedpi/files/byedpi.service b/net-proxy/byedpi/files/byedpi.service
new file mode 100644
index 000000000..8f8063711
--- /dev/null
+++ b/net-proxy/byedpi/files/byedpi.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bypass DPI SOCKS proxy
+Documentation=https://github.com/hufrea/byedpi/blob/main/readme.txt
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/ciadpi --disorder 1 --auto=torst --tlsrec 1+s
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-proxy/byedpi/metadata.xml b/net-proxy/byedpi/metadata.xml
new file mode 100644
index 000000000..23e292b1f
--- /dev/null
+++ b/net-proxy/byedpi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>misha.zavertkin@mail.ru</email>
+		<name>Misha Zavertkin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hufrea/byedpi</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-proxy/byedpi/, net-proxy/byedpi/files/
@ 2024-08-23 17:00 David Roman
  0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-08-23 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     47168855f8d0abba636127074aa8b5bdd54e34f2
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Fri Aug 23 05:42:42 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Aug 23 05:42:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47168855

net-proxy/byedpi: add 0.13, sync live

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-proxy/byedpi/Manifest           |  1 +
 net-proxy/byedpi/byedpi-0.13.ebuild | 40 +++++++++++++++++++++++++++++++++++++
 net-proxy/byedpi/byedpi-9999.ebuild | 30 ++++++++++++++++++++--------
 net-proxy/byedpi/files/byedpi.confd |  8 ++++++++
 net-proxy/byedpi/files/byedpi.initd | 19 ++++++++++++++++++
 5 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest
index 663329128..df7081a7f 100644
--- a/net-proxy/byedpi/Manifest
+++ b/net-proxy/byedpi/Manifest
@@ -1 +1,2 @@
 DIST byedpi-0.12.tar.gz 33283 BLAKE2B da1d9bbc80c868fb16c4f6e24c3fe00d5d03d5bb0a6d71dac16999b652e81fc9c2a5f0f57e350260b9295d953cb0c3fe316440279dd26b09ee895bf81771cc2b SHA512 9f15afc821b53bd1fba71ab9a37640c8f35f22efcfc6cd079800f9abd4286232fb29850aebe9168e54396f912362e012448940d32471bfe0586600fcd2591e22
+DIST byedpi-0.13.tar.gz 35108 BLAKE2B 502202e8ed76942522d551b41b9057e9dd617c8b67029c00c7c2be391907b9c853f4ebc678eff32d122bf4546375dc8839edab8bc3d7c031859fae7e10ce807c SHA512 4c9c692fc2d7f328bb9bec823aed2d733adfecf03953e1e669fa4fc55aaa6234e86a768abc690c876a47c58e374fa909e8132794adabd2f24081abb8fa7ba2d6

diff --git a/net-proxy/byedpi/byedpi-0.13.ebuild b/net-proxy/byedpi/byedpi-0.13.ebuild
new file mode 100644
index 000000000..9151a2144
--- /dev/null
+++ b/net-proxy/byedpi/byedpi-0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Bypass DPI SOCKS proxy"
+HOMEPAGE="https://github.com/hufrea/byedpi/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+else
+	SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# respect optimization level
+	sed -i 's/ -O.\b/ /' Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ciadpi
+	einstalldocs
+
+	newinitd "${FILESDIR}"/byedpi.initd byedpi
+	newconfd "${FILESDIR}"/byedpi.confd byedpi
+	systemd_dounit "${FILESDIR}"/byedpi.service
+}

diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index aedab7b2d..9151a2144 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -2,25 +2,39 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit git-r3 systemd toolchain-funcs
+
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Bypass DPI SOCKS proxy"
 HOMEPAGE="https://github.com/hufrea/byedpi/"
-EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+else
+	SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="MIT"
 SLOT="0"
 
-src_compile() {
-	tc-export CC
-	export CFLAGS LDFLAGS
+src_prepare() {
+	default
+
+	# respect optimization level
 	sed -i 's/ -O.\b/ /' Makefile || die
+}
 
-	default
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin ciadpi
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
+	einstalldocs
 
+	newinitd "${FILESDIR}"/byedpi.initd byedpi
+	newconfd "${FILESDIR}"/byedpi.confd byedpi
+	systemd_dounit "${FILESDIR}"/byedpi.service
+}

diff --git a/net-proxy/byedpi/files/byedpi.confd b/net-proxy/byedpi/files/byedpi.confd
new file mode 100644
index 000000000..e25b7a426
--- /dev/null
+++ b/net-proxy/byedpi/files/byedpi.confd
@@ -0,0 +1,8 @@
+# IP address SOCKS proxy will listen on
+#BYEDPI_BIND_IP="0.0.0.0"
+
+# Port number SOCKS proxy will listen on
+#BYEDPI_BIND_PORT=1080
+
+# Additional command-line options for ciadpi
+#BYEDPI_OPTS="--disorder 1 --auto=torst --tlsrec 1+s"

diff --git a/net-proxy/byedpi/files/byedpi.initd b/net-proxy/byedpi/files/byedpi.initd
new file mode 100644
index 000000000..979beea39
--- /dev/null
+++ b/net-proxy/byedpi/files/byedpi.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# shellcheck shell=sh
+#
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: "${BYEDPI_BIND_IP:=0.0.0.0}"
+: "${BYEDPI_BIND_PORT:=1080}"
+: "${BYEDPI_OPTS:=--disorder 1 --auto=torst --tlsrec 1+s}"
+
+command="/usr/bin/ciadpi"
+command_args="--ip ${BYEDPI_BIND_IP} --port ${BYEDPI_BIND_PORT} ${BYEDPI_OPTS}"
+command_user="nobody:nobody"
+command_background=1
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+		need net
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-proxy/byedpi/, net-proxy/byedpi/files/
@ 2024-09-20 19:26 David Roman
  0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-09-20 19:26 UTC (permalink / raw
  To: gentoo-commits

commit:     acf26468529791fe2d93b858314ce581d7c12383
Author:     Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
AuthorDate: Thu Sep 19 17:02:49 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Sep 19 17:02:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=acf26468

net-proxy/byedpi: fix current DPI bypass

Signed-off-by: Michael Zavertkin <misha.zavertkin <AT> mail.ru>

 net-proxy/byedpi/byedpi-0.14.1.ebuild | 4 +++-
 net-proxy/byedpi/byedpi-9999.ebuild   | 4 +++-
 net-proxy/byedpi/files/byedpi.confd   | 2 +-
 net-proxy/byedpi/files/byedpi.initd   | 2 +-
 net-proxy/byedpi/files/byedpi.service | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/net-proxy/byedpi/byedpi-0.14.1.ebuild b/net-proxy/byedpi/byedpi-0.14.1.ebuild
index fe55fa6f6..749bd26c4 100644
--- a/net-proxy/byedpi/byedpi-0.14.1.ebuild
+++ b/net-proxy/byedpi/byedpi-0.14.1.ebuild
@@ -31,5 +31,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/byedpi.initd byedpi
 	newconfd "${FILESDIR}"/byedpi.confd byedpi
-	systemd_dounit dist/linux/byedpi.service
+# Replace distributed service file with working one
+#	systemd_dounit dist/linux/byedpi.service
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }

diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index 3d771b14a..31a7b0aa5 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -31,5 +31,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/byedpi.initd byedpi
 	newconfd "${FILESDIR}"/byedpi.confd byedpi
-	systemd_dounit dist/linux/byedpi.service
+# Replace distributed service file with working one
+#	systemd_dounit dist/linux/byedpi.service
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }

diff --git a/net-proxy/byedpi/files/byedpi.confd b/net-proxy/byedpi/files/byedpi.confd
index e25b7a426..1b7b31864 100644
--- a/net-proxy/byedpi/files/byedpi.confd
+++ b/net-proxy/byedpi/files/byedpi.confd
@@ -5,4 +5,4 @@
 #BYEDPI_BIND_PORT=1080
 
 # Additional command-line options for ciadpi
-#BYEDPI_OPTS="--disorder 1 --auto=torst --tlsrec 1+s"
+#BYEDPI_OPTS="--disorder 5 --auto=torst --tlsrec 6+s"

diff --git a/net-proxy/byedpi/files/byedpi.initd b/net-proxy/byedpi/files/byedpi.initd
index 979beea39..58c86a4cb 100644
--- a/net-proxy/byedpi/files/byedpi.initd
+++ b/net-proxy/byedpi/files/byedpi.initd
@@ -6,7 +6,7 @@
 
 : "${BYEDPI_BIND_IP:=0.0.0.0}"
 : "${BYEDPI_BIND_PORT:=1080}"
-: "${BYEDPI_OPTS:=--disorder 1 --auto=torst --tlsrec 1+s}"
+: "${BYEDPI_OPTS:=--disorder 5 --auto=torst --tlsrec 6+s}"
 
 command="/usr/bin/ciadpi"
 command_args="--ip ${BYEDPI_BIND_IP} --port ${BYEDPI_BIND_PORT} ${BYEDPI_OPTS}"

diff --git a/net-proxy/byedpi/files/byedpi.service b/net-proxy/byedpi/files/byedpi.service
index 8f8063711..13f956d86 100644
--- a/net-proxy/byedpi/files/byedpi.service
+++ b/net-proxy/byedpi/files/byedpi.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/hufrea/byedpi/blob/main/readme.txt
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/ciadpi --disorder 1 --auto=torst --tlsrec 1+s
+ExecStart=/usr/bin/ciadpi --disorder 5 --auto=torst --tlsrec 6+s
 
 [Install]
 WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-09-20 19:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-20 19:26 [gentoo-commits] repo/proj/guru:master commit in: net-proxy/byedpi/, net-proxy/byedpi/files/ David Roman
  -- strict thread matches above, loose matches on Subject: below --
2024-08-23 17:00 David Roman
2024-08-10 20:34 Lucio Sauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox