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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7BAA13933E for ; Tue, 13 Jul 2021 20:57:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 344F7E0DC4; Tue, 13 Jul 2021 20:57:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B0F3E0D9A for ; Tue, 13 Jul 2021 20:57:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89644342D09 for ; Tue, 13 Jul 2021 20:57:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9F3B7DB for ; Tue, 13 Jul 2021 20:57:29 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1626209706.b122ea72d22b0aea7fa0b0ede97f3adb2f9eb41f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/redsocks/files/, net-proxy/redsocks/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/redsocks/files/redsocks.init-r2 net-proxy/redsocks/redsocks-0.5-r2.ebuild net-proxy/redsocks/redsocks-9999.ebuild X-VCS-Directories: net-proxy/redsocks/ net-proxy/redsocks/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: b122ea72d22b0aea7fa0b0ede97f3adb2f9eb41f X-VCS-Branch: master Date: Tue, 13 Jul 2021 20:57:29 +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: 0b71f314-8aca-4a4a-9e99-414fb27ef37c X-Archives-Hash: 0fe7b007c5db18e50c6c0d363b4460d9 commit: b122ea72d22b0aea7fa0b0ede97f3adb2f9eb41f Author: Conrad Kostecki gentoo org> AuthorDate: Tue Jul 13 19:19:15 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jul 13 20:55:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b122ea72 net-proxy/redsocks: migrate to GLEP 81 Bug: https://bugs.gentoo.org/781470 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> net-proxy/redsocks/files/redsocks.init-r2 | 45 ++++++++++++++++++++++ ...redsocks-9999.ebuild => redsocks-0.5-r2.ebuild} | 24 ++++++------ net-proxy/redsocks/redsocks-9999.ebuild | 24 ++++++------ 3 files changed, 67 insertions(+), 26 deletions(-) diff --git a/net-proxy/redsocks/files/redsocks.init-r2 b/net-proxy/redsocks/files/redsocks.init-r2 new file mode 100644 index 00000000000..8ea9998a5da --- /dev/null +++ b/net-proxy/redsocks/files/redsocks.init-r2 @@ -0,0 +1,45 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=${REDSOCKS_BINARY:=/usr/sbin/redsocks} +: ${REDSOCKS_CONFIG:=/etc/redsocks.conf} +pidfile=${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid} +command_args="-p ${pidfile} -c ${REDSOCKS_CONFIG}" + +extra_commands="checkconfig" +extra_started_commands="reload" + +depend() { + need localmount + use dns +} + +checkconfig() { + if [ ! -f "${REDSOCKS_CONFIG}" ] ; then + eerror "No ${REDSOCKS_CONFIG} file exists!" + return 1 + fi + + "${command}" -t -c ${REDSOCKS_CONFIG} || return 1 + + checkpath -d -o "redsocks:redsocks" -q "/run/redsocks" +} + +start_pre() { + checkconfig || return 1 +} + +stop_pre() { + if [ "${RC_CMD}" = "restart" ] ; then + checkconfig || return 1 + fi +} + +reload() { + checkconfig || return 1 + + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-0.5-r2.ebuild similarity index 70% copy from net-proxy/redsocks/redsocks-9999.ebuild copy to net-proxy/redsocks/redsocks-0.5-r2.ebuild index 187dcecd68a..5a182c79906 100644 --- a/net-proxy/redsocks/redsocks-9999.ebuild +++ b/net-proxy/redsocks/redsocks-0.5-r2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/"${PN}"-release-"${PV}" KEYWORDS="~amd64 ~x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI="https://github.com/darkk/${PN}.git" fi -inherit systemd toolchain-funcs user ${GIT_ECLASS} +inherit systemd toolchain-funcs ${GIT_ECLASS} DESCRIPTION="Transparent redirector of any TCP connection to proxy" HOMEPAGE="http://darkk.net.ru/redsocks/" @@ -21,15 +22,12 @@ IUSE="doc" RESTRICT="test" DEPEND="dev-libs/libevent:0=" -RDEPEND="${DEPEND} - net-firewall/iptables" - -[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}" - -pkg_setup() { - enewgroup redsocks - enewuser redsocks -1 -1 /run/redsocks redsocks -} +RDEPEND=" + ${DEPEND} + acct-group/redsocks + acct-user/redsocks + net-firewall/iptables +" src_compile() { CC="$(tc-getCC)" emake @@ -42,7 +40,7 @@ src_install() { insinto /etc newins debian/redsocks.conf redsocks.conf - newinitd "${FILESDIR}"/redsocks.init redsocks + newinitd "${FILESDIR}"/redsocks.init-r2 redsocks newconfd "${FILESDIR}"/redsocks.conf redsocks systemd_dounit "${FILESDIR}"/redsocks.service diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-9999.ebuild index 187dcecd68a..5a182c79906 100644 --- a/net-proxy/redsocks/redsocks-9999.ebuild +++ b/net-proxy/redsocks/redsocks-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/"${PN}"-release-"${PV}" KEYWORDS="~amd64 ~x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI="https://github.com/darkk/${PN}.git" fi -inherit systemd toolchain-funcs user ${GIT_ECLASS} +inherit systemd toolchain-funcs ${GIT_ECLASS} DESCRIPTION="Transparent redirector of any TCP connection to proxy" HOMEPAGE="http://darkk.net.ru/redsocks/" @@ -21,15 +22,12 @@ IUSE="doc" RESTRICT="test" DEPEND="dev-libs/libevent:0=" -RDEPEND="${DEPEND} - net-firewall/iptables" - -[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}" - -pkg_setup() { - enewgroup redsocks - enewuser redsocks -1 -1 /run/redsocks redsocks -} +RDEPEND=" + ${DEPEND} + acct-group/redsocks + acct-user/redsocks + net-firewall/iptables +" src_compile() { CC="$(tc-getCC)" emake @@ -42,7 +40,7 @@ src_install() { insinto /etc newins debian/redsocks.conf redsocks.conf - newinitd "${FILESDIR}"/redsocks.init redsocks + newinitd "${FILESDIR}"/redsocks.init-r2 redsocks newconfd "${FILESDIR}"/redsocks.conf redsocks systemd_dounit "${FILESDIR}"/redsocks.service