* [gentoo-commits] repo/gentoo:master commit in: net-proxy/redsocks/, net-proxy/redsocks/files/
@ 2017-06-14 15:48 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2017-06-14 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 58ad6e14c853928499f34ee991120ee2196058e7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 15:36:41 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 15:48:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ad6e14
net-proxy/redsocks: Ship man page, init files, etc
Also move config file to /etc/redsocks.conf (there's a single file, no
need for a directory) and add a redsocks user and group.
net-proxy/redsocks/files/redsocks.conf | 15 +++++++++
net-proxy/redsocks/files/redsocks.init | 53 +++++++++++++++++++++++++++++++
net-proxy/redsocks/files/redsocks.service | 15 +++++++++
net-proxy/redsocks/metadata.xml | 15 +++++++++
net-proxy/redsocks/redsocks-0.5.ebuild | 19 ++++++++---
net-proxy/redsocks/redsocks-9999.ebuild | 19 ++++++++---
6 files changed, 128 insertions(+), 8 deletions(-)
diff --git a/net-proxy/redsocks/files/redsocks.conf b/net-proxy/redsocks/files/redsocks.conf
new file mode 100644
index 00000000000..76b2c5f893c
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.conf
@@ -0,0 +1,15 @@
+# Config file for /etc/init.d/redsocks
+
+# Path to the redsocks binary (needs to be absolute path).
+
+#REDSOCKS_BINARY="/usr/sbin/redsocks"
+
+# Path to the redsocks config (needs to be absolute path).
+
+#REDSOCKS_CONFIG="/etc/redsocks.conf"
+
+# Pid file to use (needs to be absolute path).
+
+#REDSOCKS_PIDFILE="/run/redsocks/redsocks.pid"
+
+rc_use="logger"
diff --git a/net-proxy/redsocks/files/redsocks.init b/net-proxy/redsocks/files/redsocks.init
new file mode 100644
index 00000000000..853d9b57a6b
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.init
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${REDSOCKS_BINARY:=/usr/sbin/redsocks}
+: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
+: ${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
+
+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
+
+ "${REDSOCKS_BINARY}" -t -c ${REDSOCKS_CONFIG} || return 1
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --exec "${REDSOCKS_BINARY}" \
+ -p "${REDSOCKS_PIDFILE}" -c ${REDSOCKS_CONFIG}
+ eend $?
+}
+
+stop() {
+ if [ "${RC_CMD}" = "restart" ] ; then
+ checkconfig || return 1
+ fi
+
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec "${REDSOCKS_BINARY}" \
+ -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
+ eend $?
+}
+
+reload() {
+ checkconfig || return 1
+
+ ebegin "Reloading ${SVCNAME}"
+ start-stop-daemon --signal HUP --exec "${REDSOCKS_BINARY}" \
+ -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
+ eend $?
+}
diff --git a/net-proxy/redsocks/files/redsocks.service b/net-proxy/redsocks/files/redsocks.service
new file mode 100644
index 00000000000..db0e9d6093e
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Transparent redirector of any TCP connection to proxy using your firewall
+
+[Service]
+Type=forking
+PIDFile=/run/redsocks/redsocks.pid
+User=redsocks
+ExecStartPre=/usr/sbin/redsocks -t -c /etc/redsocks.conf
+ExecStart=/usr/sbin/redsocks -c /etc/redsocks.conf \
+ -p /run/redsocks/redsocks.pid
+ExecStopPost=/bin/rm /run/redsocks/redsocks.pid
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-proxy/redsocks/metadata.xml b/net-proxy/redsocks/metadata.xml
index bf35bd06d38..8f0d16e0c22 100644
--- a/net-proxy/redsocks/metadata.xml
+++ b/net-proxy/redsocks/metadata.xml
@@ -5,6 +5,21 @@
<email>mattst88@gentoo.org</email>
<name>Matt Turner</name>
</maintainer>
+ <longdescription lang="en">
+ Redirect any TCP connection to a SOCKS or HTTPS proxy server Redsocks
+ is a daemon running on the local system, that will transparently tunnel
+ any TCP connection via a remote SOCKS4, SOCKS5 or HTTP proxy server. It
+ uses the system firewall's redirection facility to intercept TCP
+ connections, thus the redirection is system-wide, with fine-grained
+ control, and does not depend on LD_PRELOAD libraries.
+
+ Redsocks supports tunneling TCP connections and UDP packets. It has
+ authentication support for both, SOCKS and HTTP proxies.
+
+ Also included is a small DNS server returning answers with the
+ "truncated" flag set for any UDP query, forcing the resolver to use
+ TCP.
+ </longdescription>
<upstream>
<remote-id type="github">darkk/redsocks</remote-id>
</upstream>
diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5.ebuild
index 609aff1f957..984f5b196d5 100644
--- a/net-proxy/redsocks/redsocks-0.5.ebuild
+++ b/net-proxy/redsocks/redsocks-0.5.ebuild
@@ -11,7 +11,7 @@ else
EGIT_REPO_URI="git://github.com/darkk/${PN}.git"
fi
-inherit toolchain-funcs ${GIT_ECLASS}
+inherit systemd toolchain-funcs user ${GIT_ECLASS}
DESCRIPTION="Transparent redirector of any TCP connection to proxy"
HOMEPAGE="http://darkk.net.ru/redsocks/"
@@ -25,13 +25,24 @@ RDEPEND="${DEPEND}
[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
+pkg_setup() {
+ enewgroup redsocks
+ enewuser redsocks -1 -1 /run/redsocks redsocks
+}
+
src_compile() {
CC="$(tc-getCC)" emake || die "emake failed"
}
src_install() {
- dobin redsocks
+ dosbin redsocks
+ doman debian/redsocks.8
use doc && dodoc README doc/*
- insinto /etc/redsocks
- newins redsocks.conf.example redsocks.conf
+ insinto /etc
+ newins debian/redsocks.conf redsocks.conf
+
+ newinitd "${FILESDIR}"/redsocks.init 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 609aff1f957..984f5b196d5 100644
--- a/net-proxy/redsocks/redsocks-9999.ebuild
+++ b/net-proxy/redsocks/redsocks-9999.ebuild
@@ -11,7 +11,7 @@ else
EGIT_REPO_URI="git://github.com/darkk/${PN}.git"
fi
-inherit toolchain-funcs ${GIT_ECLASS}
+inherit systemd toolchain-funcs user ${GIT_ECLASS}
DESCRIPTION="Transparent redirector of any TCP connection to proxy"
HOMEPAGE="http://darkk.net.ru/redsocks/"
@@ -25,13 +25,24 @@ RDEPEND="${DEPEND}
[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
+pkg_setup() {
+ enewgroup redsocks
+ enewuser redsocks -1 -1 /run/redsocks redsocks
+}
+
src_compile() {
CC="$(tc-getCC)" emake || die "emake failed"
}
src_install() {
- dobin redsocks
+ dosbin redsocks
+ doman debian/redsocks.8
use doc && dodoc README doc/*
- insinto /etc/redsocks
- newins redsocks.conf.example redsocks.conf
+ insinto /etc
+ newins debian/redsocks.conf redsocks.conf
+
+ newinitd "${FILESDIR}"/redsocks.init redsocks
+ newconfd "${FILESDIR}"/redsocks.conf redsocks
+
+ systemd_dounit "${FILESDIR}"/redsocks.service
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/redsocks/, net-proxy/redsocks/files/
@ 2020-02-08 17:40 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-02-08 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 8d1fbcd0b68cb2af1ce4491604b7f64d3d12deb2
Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Thu Feb 6 01:19:51 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 17:40:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1fbcd0
net-proxy/redsocks: fix command args in initd
Closes: https://bugs.gentoo.org/708438
Closes: https://github.com/gentoo/gentoo/pull/14575
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-proxy/redsocks/files/redsocks.init-r1 | 43 +++++++++++++++++++++++++++
net-proxy/redsocks/redsocks-0.5-r1.ebuild | 49 +++++++++++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/net-proxy/redsocks/files/redsocks.init-r1 b/net-proxy/redsocks/files/redsocks.init-r1
new file mode 100644
index 00000000000..861054fc914
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.init-r1
@@ -0,0 +1,43 @@
+#!/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
+}
+
+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-0.5-r1.ebuild b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
new file mode 100644
index 00000000000..665f5a70002
--- /dev/null
+++ b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+ 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}
+
+DESCRIPTION="Transparent redirector of any TCP connection to proxy"
+HOMEPAGE="http://darkk.net.ru/redsocks/"
+LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
+SLOT="0"
+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
+}
+
+src_compile() {
+ CC="$(tc-getCC)" emake
+}
+
+src_install() {
+ dosbin redsocks
+ doman debian/redsocks.8
+ use doc && dodoc README doc/*
+ insinto /etc
+ newins debian/redsocks.conf redsocks.conf
+
+ newinitd "${FILESDIR}"/redsocks.init-r1 redsocks
+ newconfd "${FILESDIR}"/redsocks.conf redsocks
+
+ systemd_dounit "${FILESDIR}"/redsocks.service
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/redsocks/, net-proxy/redsocks/files/
@ 2021-07-13 20:57 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-07-13 20:57 UTC (permalink / raw
To: gentoo-commits
commit: 650918b576ae8e8297fd4f57df61cdcecf70ed22
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 19:15:33 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 20:55:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650918b5
net-proxy/redsocks: drop old version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-proxy/redsocks/files/redsocks.init | 53 ----------------------------------
net-proxy/redsocks/redsocks-0.5.ebuild | 49 -------------------------------
2 files changed, 102 deletions(-)
diff --git a/net-proxy/redsocks/files/redsocks.init b/net-proxy/redsocks/files/redsocks.init
deleted file mode 100644
index 853d9b57a6b..00000000000
--- a/net-proxy/redsocks/files/redsocks.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${REDSOCKS_BINARY:=/usr/sbin/redsocks}
-: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
-: ${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
-
-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
-
- "${REDSOCKS_BINARY}" -t -c ${REDSOCKS_CONFIG} || return 1
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec "${REDSOCKS_BINARY}" \
- -p "${REDSOCKS_PIDFILE}" -c ${REDSOCKS_CONFIG}
- eend $?
-}
-
-stop() {
- if [ "${RC_CMD}" = "restart" ] ; then
- checkconfig || return 1
- fi
-
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec "${REDSOCKS_BINARY}" \
- -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
- eend $?
-}
-
-reload() {
- checkconfig || return 1
-
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --exec "${REDSOCKS_BINARY}" \
- -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
- eend $?
-}
diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5.ebuild
deleted file mode 100644
index 187dcecd68a..00000000000
--- a/net-proxy/redsocks/redsocks-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- 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}
-
-DESCRIPTION="Transparent redirector of any TCP connection to proxy"
-HOMEPAGE="http://darkk.net.ru/redsocks/"
-LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
-SLOT="0"
-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
-}
-
-src_compile() {
- CC="$(tc-getCC)" emake
-}
-
-src_install() {
- dosbin redsocks
- doman debian/redsocks.8
- use doc && dodoc README doc/*
- insinto /etc
- newins debian/redsocks.conf redsocks.conf
-
- newinitd "${FILESDIR}"/redsocks.init redsocks
- newconfd "${FILESDIR}"/redsocks.conf redsocks
-
- systemd_dounit "${FILESDIR}"/redsocks.service
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-13 20:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-13 20:57 [gentoo-commits] repo/gentoo:master commit in: net-proxy/redsocks/, net-proxy/redsocks/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-02-08 17:40 Matt Turner
2017-06-14 15:48 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox