From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAF55158042 for ; Tue, 29 Oct 2024 22:43:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 206ECE0858; Tue, 29 Oct 2024 22:43:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A543E0858 for ; Tue, 29 Oct 2024 22:43:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45851342FA2 for ; Tue, 29 Oct 2024 22:43:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DAC31DCE for ; Tue, 29 Oct 2024 22:43:07 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1730241411.54fc7649dd7659c5a85e939623cc295d9e6bce4c.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/byedpi/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-proxy/byedpi/Manifest net-proxy/byedpi/byedpi-0.12.ebuild net-proxy/byedpi/byedpi-0.13.ebuild net-proxy/byedpi/byedpi-0.15.ebuild X-VCS-Directories: net-proxy/byedpi/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 54fc7649dd7659c5a85e939623cc295d9e6bce4c X-VCS-Branch: dev Date: Tue, 29 Oct 2024 22:43:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31a80fc7-f48d-4448-a15d-8fef46d782c9 X-Archives-Hash: e6c8263b0062565ebaf3d9eeace7a897 commit: 54fc7649dd7659c5a85e939623cc295d9e6bce4c Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Oct 29 22:35:19 2024 +0000 Commit: Anna Vyalkova sysrq 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 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" }