commit: 8b7df2f326454e53249c81445d0df081d15d8f88
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Sat Jan 7 17:14:20 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 22:27:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7df2f3
net-proxy/obfsproxy: remove unused patches/init files
.../files/obfsproxy-0.2.8-remove-argparse.patch | 11 ----
net-proxy/obfsproxy/files/obfsproxy.confd | 45 -----------------
net-proxy/obfsproxy/files/obfsproxy.initd | 58 ----------------------
3 files changed, 114 deletions(-)
diff --git a/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch
b/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch
deleted file mode 100644
index 9c50516..00000000
--- a/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur obfsproxy-0.2.8.orig/setup.py obfsproxy-0.2.8/setup.py
---- obfsproxy-0.2.8.orig/setup.py 2014-03-27 13:24:39.000000000 -0400
-+++ obfsproxy-0.2.8/setup.py 2014-03-29 15:10:05.063283282 -0400
-@@ -32,7 +32,6 @@
- 'setuptools',
- 'PyCrypto',
- 'Twisted',
-- 'argparse',
- 'pyptlib >= 0.0.5',
- 'pyyaml'
- ],
diff --git a/net-proxy/obfsproxy/files/obfsproxy.confd
b/net-proxy/obfsproxy/files/obfsproxy.confd
deleted file mode 100644
index f86d648..00000000
--- a/net-proxy/obfsproxy/files/obfsproxy.confd
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# protocols ofbsproxy will obfuscate = obfs2 | dummy
-PROTOCOL="obfs2"
-
-#options for PROTOCOLE="dummy"
-# dummy <mode> <listen_address> [<target_address>]
-# mode ~ server|client|socks
-# listen_address, target_address ~ host:port
-# target_address is required for server and client mode, and forbidden for
socks mode.
-# Examples:
-# obfsproxy dummy socks 127.0.0.1:5000
-# obfsproxy dummy client 127.0.0.1:5000 192.168.1.99:11253
-# obfsproxy dummy server 192.168.1.99:11253 127.0.0.1:9005
-
-#MODE="socks"
-#LISTEN="127.0.0.1:5000"
-#TARGET="127.0.0.1:9005"
-
-
-#options for PROTOCOL="obfs2"
-# obfs2 [obfs2_args] obfs2_opts
-# 'obfs2_opts':
-# mode ~ server|client|socks
-# listen address ~ host:port
-# 'obfs2_args':
-# Destination Address ~ --dest=host:port
-# Shared Secret ~ --shared-secret=<secret>
-# Example:
-# obfsproxy obfs2 --dest=127.0.0.1:666 --shared-secret=himitsu server
127.0.0.1:1026
-
-MODE="server"
-DESTINATION="127.0.0.1:666"
-SECRET="changeme"
-LISTEN="127.0.0.1:1026"
-
-#Logging
-# --log-file=<file> ~ set logfile
-# --log-min-severity=warn|notice|info|debug ~ set minimum logging severity
(default: notice)
-# --no-log ~ disable logging
-# --no-safe-logging ~ disable safe (scrubbed address) logging
-
-LOGGING="--log-file=/var/log/obfsproxy.log --log-min-severity=warn"
diff --git a/net-proxy/obfsproxy/files/obfsproxy.initd
b/net-proxy/obfsproxy/files/obfsproxy.initd
deleted file mode 100644
index 70e9295..00000000
--- a/net-proxy/obfsproxy/files/obfsproxy.initd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PIDFILE="/var/run/obfsproxy.pid"
-DAEMON="/usr/bin/obfsproxy"
-
-depend() {
- need net
-}
-
-checkconfig() {
- [[ "x${PROTOCOL}" = "x" ]] \
- && eerror "PROTOCOL not given" && return 1
- [[ "x${MODE}" = "x" ]] \
- && eerror "MODE not given" && return 1
- if [ ${PROTOCOL} = "dummy" ] ; then
- [[ "x${LISTEN}" = "x" ]] \
- && eerror "No listen address was given" && return 1
- [[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ]] \
- && eerror "MODE=server but no target address was given"
&& return 1
- [[ "x${MODE}" = "xsocks" && "x${TARGET}" != "x" ]] \
- && eerror "MODE=sock but a target address was given" &&
return 1
- CMDLINE="${LOGGING} ${PROTOCOL} ${MODE} ${LISTEN} ${TARGET}"
- elif [ ${PROTOCOL} = "obfs2" ] ; then
- [[ "x${MODE}" = "xsocks" && "x${DESTINATION}" != "x" ]] \
- && eerror "MODE=sock but a destination address was
given" && return 1
- [[ "x${LISTEN}" = "x" ]] \
- && eerror "LISTEN host:port was not given" && return 1
- [[ "x${DESTINATION}" != "x" ]] \
- && DESTINATION="--dest=${DESTINATION}"
- [[ "x${SECRET}" != "x" ]] \
- && SECRET="--shared-secret=${SECRET}"
- CMDLINE="${LOGGING} ${PROTOCOL} ${DESTINATION} ${SECRET}
${MODE} ${LISTEN}"
- else
- eerror "Unknown protocol ${PROTOCOL}"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting obfsproxy server"
- start-stop-daemon --start \
- --background --make-pidfile --pidfile ${PIDFILE} \
- --exec ${DAEMON} -- ${CMDLINE}
- eend $?
-}
-
-stop() {
- ebegin "Stopping obfsproxy server"
- start-stop-daemon --stop \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON}
- eend $?
-}
