* [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/
@ 2024-08-11 16:19 Michael Zavertkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael Zavertkin @ 2024-08-11 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 7fd2e3c9f69b8f26701393f6a5bc5d681813c530
Author: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
AuthorDate: Sun Aug 11 16:18:19 2024 +0000
Commit: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
CommitDate: Sun Aug 11 16:18:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7fd2e3c9
net-proxy/byedpi: respect LDFLAGS and die for sed
Closes: https://bugs.gentoo.org/937762
Signed-off-by: Michael Zavertkin <misha.zavertkin <AT> mail.ru>
net-proxy/byedpi/byedpi-0.12.ebuild | 8 +++++---
net-proxy/byedpi/byedpi-9999.ebuild | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/net-proxy/byedpi/byedpi-0.12.ebuild b/net-proxy/byedpi/byedpi-0.12.ebuild
index d78b1e46f..1d0769125 100644
--- a/net-proxy/byedpi/byedpi-0.12.ebuild
+++ b/net-proxy/byedpi/byedpi-0.12.ebuild
@@ -14,11 +14,13 @@ KEYWORDS="~amd64"
src_compile() {
tc-export CC
- export CFLAGS
- sed -i 's/ -O.\b/ /' Makefile
+ export CFLAGS LDFLAGS
+ sed -i 's/ -O.\b/ /' Makefile || die
+ # respect LDFLAGS
+ sed -i 's/$(CFLAGS) /$(CFLAGS) $(LDFLAGS) /' Makefile || die
# 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
+ sed -i 's/inline bool check_port/static inline bool check_port/' extend.c || die
default
}
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index 03efb727c..aedab7b2d 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
src_compile() {
tc-export CC
export CFLAGS LDFLAGS
- sed -i 's/ -O.\b/ /' Makefile
+ sed -i 's/ -O.\b/ /' Makefile || die
default
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/
@ 2024-09-18 10:51 Michael Zavertkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael Zavertkin @ 2024-09-18 10:51 UTC (permalink / raw
To: gentoo-commits
commit: b8256380fcce4b7bebf7d181a781362dc0d1768b
Author: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
AuthorDate: Wed Sep 18 10:50:56 2024 +0000
Commit: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
CommitDate: Wed Sep 18 10:50:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8256380
net-proxy/byedpi: add 0.14.1
Signed-off-by: Michael Zavertkin <misha.zavertkin <AT> mail.ru>
net-proxy/byedpi/Manifest | 1 +
net-proxy/byedpi/{byedpi-9999.ebuild => byedpi-0.14.1.ebuild} | 11 +++--------
net-proxy/byedpi/byedpi-9999.ebuild | 11 +++--------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest
index df7081a7f..be19f306d 100644
--- a/net-proxy/byedpi/Manifest
+++ b/net-proxy/byedpi/Manifest
@@ -1,2 +1,3 @@
DIST byedpi-0.12.tar.gz 33283 BLAKE2B da1d9bbc80c868fb16c4f6e24c3fe00d5d03d5bb0a6d71dac16999b652e81fc9c2a5f0f57e350260b9295d953cb0c3fe316440279dd26b09ee895bf81771cc2b SHA512 9f15afc821b53bd1fba71ab9a37640c8f35f22efcfc6cd079800f9abd4286232fb29850aebe9168e54396f912362e012448940d32471bfe0586600fcd2591e22
DIST byedpi-0.13.tar.gz 35108 BLAKE2B 502202e8ed76942522d551b41b9057e9dd617c8b67029c00c7c2be391907b9c853f4ebc678eff32d122bf4546375dc8839edab8bc3d7c031859fae7e10ce807c SHA512 4c9c692fc2d7f328bb9bec823aed2d733adfecf03953e1e669fa4fc55aaa6234e86a768abc690c876a47c58e374fa909e8132794adabd2f24081abb8fa7ba2d6
+DIST byedpi-0.14.1.tar.gz 37004 BLAKE2B c14af6c2e01bf5d8c1539b5417ca2bf7cdfd501f4f1927dd7d1f643db1b2c7e26cd4bd8e3f66d885903b9349fa10f802e44039f0fc08b28143ec382a64e096b1 SHA512 5ff1d5ce03b0c824a60272130b47ba5d8ded74fdace7000780b1fff014a33cd9e42778f006d903a0dee4ec204561cd025b4788aa9bbd55b39c72d64736d6309e
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-0.14.1.ebuild
similarity index 66%
copy from net-proxy/byedpi/byedpi-9999.ebuild
copy to net-proxy/byedpi/byedpi-0.14.1.ebuild
index 9151a2144..fe55fa6f6 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-0.14.1.ebuild
@@ -8,13 +8,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
+SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
LICENSE="MIT"
SLOT="0"
@@ -36,5 +31,5 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
- systemd_dounit "${FILESDIR}"/byedpi.service
+ systemd_dounit dist/linux/byedpi.service
}
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index 9151a2144..3d771b14a 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -8,13 +8,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
+inherit git-r3
+EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
LICENSE="MIT"
SLOT="0"
@@ -36,5 +31,5 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
- systemd_dounit "${FILESDIR}"/byedpi.service
+ systemd_dounit dist/linux/byedpi.service
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/
@ 2024-10-10 22:22 Anna Vyalkova
0 siblings, 0 replies; 5+ messages in thread
From: Anna Vyalkova @ 2024-10-10 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 2faf7ff6d7048c2cbf9989e1e66dd186f49130fc
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Oct 10 22:20:57 2024 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Oct 10 22:22:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2faf7ff6
net-proxy/byedpi: fix VariableOrderWrong
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-proxy/byedpi/byedpi-0.14.1.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net-proxy/byedpi/byedpi-0.14.1.ebuild b/net-proxy/byedpi/byedpi-0.14.1.ebuild
index 749bd26c4..5c706bdf4 100644
--- a/net-proxy/byedpi/byedpi-0.14.1.ebuild
+++ b/net-proxy/byedpi/byedpi-0.14.1.ebuild
@@ -7,12 +7,11 @@ inherit systemd toolchain-funcs
DESCRIPTION="Bypass DPI SOCKS proxy"
HOMEPAGE="https://github.com/hufrea/byedpi/"
-
SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
LICENSE="MIT"
SLOT="0"
+KEYWORDS="~amd64"
src_prepare() {
default
@@ -31,7 +30,5 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
-# Replace distributed service file with working one
-# systemd_dounit dist/linux/byedpi.service
systemd_dounit "${FILESDIR}/${PN}.service"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/
@ 2024-10-29 22:43 Anna Vyalkova
0 siblings, 0 replies; 5+ messages in thread
From: Anna Vyalkova @ 2024-10-29 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 54fc7649dd7659c5a85e939623cc295d9e6bce4c
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Oct 29 22:35:19 2024 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Oct 29 22:36:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=54fc7649
net-proxy/byedpi: add 0.15, drop old
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-proxy/byedpi/Manifest | 3 +-
net-proxy/byedpi/byedpi-0.12.ebuild | 32 ----------------------
.../{byedpi-0.13.ebuild => byedpi-0.15.ebuild} | 12 ++------
3 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest
index be19f306d..adfc51ec3 100644
--- a/net-proxy/byedpi/Manifest
+++ b/net-proxy/byedpi/Manifest
@@ -1,3 +1,2 @@
-DIST byedpi-0.12.tar.gz 33283 BLAKE2B da1d9bbc80c868fb16c4f6e24c3fe00d5d03d5bb0a6d71dac16999b652e81fc9c2a5f0f57e350260b9295d953cb0c3fe316440279dd26b09ee895bf81771cc2b SHA512 9f15afc821b53bd1fba71ab9a37640c8f35f22efcfc6cd079800f9abd4286232fb29850aebe9168e54396f912362e012448940d32471bfe0586600fcd2591e22
-DIST byedpi-0.13.tar.gz 35108 BLAKE2B 502202e8ed76942522d551b41b9057e9dd617c8b67029c00c7c2be391907b9c853f4ebc678eff32d122bf4546375dc8839edab8bc3d7c031859fae7e10ce807c SHA512 4c9c692fc2d7f328bb9bec823aed2d733adfecf03953e1e669fa4fc55aaa6234e86a768abc690c876a47c58e374fa909e8132794adabd2f24081abb8fa7ba2d6
DIST byedpi-0.14.1.tar.gz 37004 BLAKE2B c14af6c2e01bf5d8c1539b5417ca2bf7cdfd501f4f1927dd7d1f643db1b2c7e26cd4bd8e3f66d885903b9349fa10f802e44039f0fc08b28143ec382a64e096b1 SHA512 5ff1d5ce03b0c824a60272130b47ba5d8ded74fdace7000780b1fff014a33cd9e42778f006d903a0dee4ec204561cd025b4788aa9bbd55b39c72d64736d6309e
+DIST byedpi-0.15.tar.gz 38376 BLAKE2B adceb3106c16d8aefe2040d8f12d9118107b23d2eac57f4a295f7800b655e889e6507f8800d1f0cc46e1365df2c987c764c68f6ab3df9a0dee3a226746e195c7 SHA512 bf6e7e4047263eb0e436b05ca40244439a232cd2b81d45ad7aad12b1f76e5796e4e5c913534599650b23d148bc2f07e98d2a2637db95106de014b303edbd1a38
diff --git a/net-proxy/byedpi/byedpi-0.12.ebuild b/net-proxy/byedpi/byedpi-0.12.ebuild
deleted file mode 100644
index 1d0769125..000000000
--- a/net-proxy/byedpi/byedpi-0.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 LDFLAGS
- sed -i 's/ -O.\b/ /' Makefile || die
- # respect LDFLAGS
- sed -i 's/$(CFLAGS) /$(CFLAGS) $(LDFLAGS) /' Makefile || die
- # 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 || die
-
- default
-}
-
-src_install() {
- dobin ciadpi
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
diff --git a/net-proxy/byedpi/byedpi-0.13.ebuild b/net-proxy/byedpi/byedpi-0.15.ebuild
similarity index 66%
rename from net-proxy/byedpi/byedpi-0.13.ebuild
rename to net-proxy/byedpi/byedpi-0.15.ebuild
index 9151a2144..5c706bdf4 100644
--- a/net-proxy/byedpi/byedpi-0.13.ebuild
+++ b/net-proxy/byedpi/byedpi-0.15.ebuild
@@ -7,17 +7,11 @@ 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
+SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
+KEYWORDS="~amd64"
src_prepare() {
default
@@ -36,5 +30,5 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
- systemd_dounit "${FILESDIR}"/byedpi.service
+ systemd_dounit "${FILESDIR}/${PN}.service"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/
@ 2024-10-30 16:39 Michael Zavertkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael Zavertkin @ 2024-10-30 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 79a4aa190a9841b1658d480bd95e6974e664de66
Author: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
AuthorDate: Wed Oct 30 16:36:33 2024 +0000
Commit: Michael Zavertkin <misha.zavertkin <AT> mail <DOT> ru>
CommitDate: Wed Oct 30 16:39:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=79a4aa19
net-proxy/byedpi: use shipped .service
Signed-off-by: Michael Zavertkin <misha.zavertkin <AT> mail.ru>
net-proxy/byedpi/byedpi-0.15.ebuild | 5 ++++-
net-proxy/byedpi/byedpi-9999.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net-proxy/byedpi/byedpi-0.15.ebuild b/net-proxy/byedpi/byedpi-0.15.ebuild
index 5c706bdf4..14668c55c 100644
--- a/net-proxy/byedpi/byedpi-0.15.ebuild
+++ b/net-proxy/byedpi/byedpi-0.15.ebuild
@@ -30,5 +30,8 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
- systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dounit "dist/linux/${PN}.service"
+
+ insinto /etc
+ newins "dist/linux/${PN}.conf" "${PN}.conf"
}
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index 31a7b0aa5..a6a5b9045 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -31,7 +31,8 @@ src_install() {
newinitd "${FILESDIR}"/byedpi.initd byedpi
newconfd "${FILESDIR}"/byedpi.confd byedpi
-# Replace distributed service file with working one
-# systemd_dounit dist/linux/byedpi.service
- systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dounit "dist/linux/${PN}.service"
+
+ insinto /etc
+ newins "dist/linux/${PN}.conf" "${PN}.conf"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-30 16:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-29 22:43 [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/ Anna Vyalkova
-- strict thread matches above, loose matches on Subject: below --
2024-10-30 16:39 Michael Zavertkin
2024-10-10 22:22 Anna Vyalkova
2024-09-18 10:51 Michael Zavertkin
2024-08-11 16:19 Michael Zavertkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox