public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-01-19  4:01 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-01-19  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     8b0f45b688a14e08cd048e962a4d4807d3604e11
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 03:59:41 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 04:00:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8b0f45b6

net-proxy/obfsproxy: add initrd scripts, bug #452348

---
 net-proxy/obfsproxy/Manifest                  |   25 +++++++++
 net-proxy/obfsproxy/files/obfsproxy.confd     |   45 +++++++++++++++++
 net-proxy/obfsproxy/files/obfsproxy.initrd    |   35 +++++++++++++
 net-proxy/obfsproxy/metadata.xml              |   11 ++++
 net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild |   66 +++++++++++++++++++++++++
 5 files changed, 182 insertions(+), 0 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
new file mode 100644
index 0000000..1a05c67
--- /dev/null
+++ b/net-proxy/obfsproxy/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX obfsproxy.confd 1483 SHA256 df00fef80b4ca403dd91e7327f61ec6ece9139dde08e453493776a826a26b583 SHA512 138a6d1181ddacd73a0176c182e0a79a7a87b65200b24e9f2648183700144a6788bff1d277d9ca211b6a4e16faf44833affeb6facf931ee907ea65de70f5ea6d WHIRLPOOL ee08e9fe3695aa7a21624fa5f99d110dbc84db1a0724fb5d39cc768b6cad7655e30f9325308744368c90ac203b0d790bbf3e3c87b2390aa49ed94411728b146d
+AUX obfsproxy.initrd 1067 SHA256 666498e69db5079faed44e8719929c0f41497be6e575e19adc24191859cca278 SHA512 510401d2f2ac593001700656ad8e0a6a81cce28e53816388830cb9754b51416a7c9a092728a8567640865e87117f7bf69de6c38c6e8d837ea93ede2ad258c24f WHIRLPOOL 7b15f1d5e81e95845e491e6cc8e95e6e60047b84a13412d76bae3e723a7e2d2df056aec2eabf0d23642a596985a1b020e3a56e82e60bbedc196b1ef900bd5012
+DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
+EBUILD obfsproxy-0.1.4-r1.ebuild 1984 SHA256 e05c4284623206925065368e5eff6721a64e2bfb7d9f2f92d511e5eec6f858fb SHA512 f2a2050eca8c6042cce245e827277e03b9cf69bb1984e803221922559c2a798a832dc290c4a496e73f9d35698178c91a0d545d74210bdeb0e6522e0970cbb4a5 WHIRLPOOL a6a6fa3384beba87988967881e49603cab9bb060cc1e072b10804f1b931c1fa2aa41d2d4bea79b04248f626fb7d342497bbef829ffbc636a6ae0a5e2f90acdef
+MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ+hotAAoJEJOE+m71LUu62osP/21gseTYf95mowGXCX6y7W4p
+iU8ABJKMqes2htN0Is/ShVtJqNYWpGX9RyAYDNERdPjouVtHdm+DO0f8xmY04Y41
+7l/0sbZUKadLiAp4F5WMMhaTsvgKbaIaWfX+nBsSZ8U62VPCR5Y276V1Fi1euzxv
+zn8Hnuy92P8ySKMYuQDrtQRcBQLNW5hWyswJ2g6g97O3QfRSXBdwz0jMuWECjKsk
+T8M4+pdVD80SobbcphmrNn5VmF0kWK2Mp3OkaZy0TtXsDUpmVKl22KnqrFVX9zTe
+Ncftdu8ByjfePQfkst7cTqoJqnVzuF5LnOenMxcWHFP4qBgSyW5wv6eIAi3ZdYqq
+4DGlhJ/23p05sNISaCRtR7Srir3s0SUwP74Eqw2k+9LK7xHY8n8vDk75PhmATNgK
+Li2fpOgTKl13uQE2Hx89SmO2m7gpdSfu1rh678lIxw0RA1/ZAM1PgO43idDy8aMw
+eM1R8cf+5er8I0VcoKUXsSF63RMtBauGtafRl9aJXNAYKsyZLltvUOLnUMl+Nfio
+U2yLfpngb8l3PLQYQPYc1eWFPKX5hT2D32SGWlM+eFrub6t1Vmm0QKgcRuThqXe1
+JP1o5pUUXua2LolH13og9LAMYWeiIg63kHcZyzxHh4DfgPu5v9cRAcvcO6/mWPkI
+ZaedbhQAFxu+KzWasc2V
+=zzoZ
+-----END PGP SIGNATURE-----

diff --git a/net-proxy/obfsproxy/files/obfsproxy.confd b/net-proxy/obfsproxy/files/obfsproxy.confd
new file mode 100644
index 0000000..30e8fa9
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy.confd
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/files/obfsproxy.confd,v 1.0 2013/01/17 23:52:23 blueness Exp $
+
+# 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="socks"
+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.initrd b/net-proxy/obfsproxy/files/obfsproxy.initrd
new file mode 100644
index 0000000..2e67745
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy.initrd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PIDFILE="/var/run/obfsproxy.pid"
+DAEMON="/usr/bin/obfsproxy"
+
+depend() {
+	need net
+}
+
+start() {
+	[ "x${MODE}" = "x" ] && eerror "MODE not given"
+	if [ ${PROTOCOL} = "dummy" ] ; then
+		[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ] && eerror "MODE=server but no target was given"
+		[ "x${MODE}" = "xsocks"  && "x${TARGET}" != "x" ] && eerror "MODE=sock but a target was given"
+		CMDLINE="${MODE} ${LISTEN} ${TARGET} ${LOGGING}"
+	elif [ ${PROTOCOL} = "obfs2" ] ; then
+		[ "x${LISTEN}" = "x" ] && eerror "LISTEN host:port is not given"
+		[ "x${DESTINATION}" != "x" ] && DESTINATION="--dest=${DESTINATION}"
+		[ "x${SECRET}" != "x" ] && SECRET="--shared-secret=${SECRET}"
+		CMDLINE="${DESTINATION} ${SECRET} ${MODE} ${LISTEN} ${LOGGING}"
+	else
+		eerror "Unknown protocol ${PROTOCOL}"
+	fi
+
+	start-stop-daemon --start --pidfile "${PIDFILE}" --exec "${DAEMON}"
+
+	eend $?
+}
+
+stop() {
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+}

diff --git a/net-proxy/obfsproxy/metadata.xml b/net-proxy/obfsproxy/metadata.xml
new file mode 100644
index 0000000..959210f
--- /dev/null
+++ b/net-proxy/obfsproxy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name='daemon'>Run obfsproxy as a standalone daemon</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild b/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild
new file mode 100644
index 0000000..eafdbcb
--- /dev/null
+++ b/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild,v 1.7 2013/01/17 23:52:23 blueness Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tor-compliant pluggable transports proxy to obfuscate tor traffic"
+HOMEPAGE="https://www.torproject.org/projects/obfsproxy.html"
+SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="daemon"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s:^AR = ar:AR = $(tc-getAR):" Makefile.in || die
+}
+
+src_install() {
+	if use daemon; then
+		newconfd "${FILESDIR}"/obfsproxy.confd tor
+		newinitd "${FILESDIR}"/obfsproxy.initd tor
+	fi
+
+	emake DESTDIR="${D}" install
+	dodoc README ChangeLog
+	dodoc -r doc/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
+	einfo
+	einfo " ORPort 5001"
+	einfo " BridgeRelay 1"
+	einfo " ExitPolicy reject *:*"
+	einfo " ServerTransportPlugin obfs2 exec /usr/bin/${PN} --managed"
+	einfo
+	einfo "Change your ORPort to whatever value you use.  When you start tor,"
+	einfo "you should see a message similar to the following in its logs:"
+	einfo
+	einfo " Registered server transport 'obfs2' at '0.0.0.0:33578'"
+	einfo
+	einfo "Note the port number, 33578 in this case, and report it, along with"
+	einfo "your IP address, to your bridge clients."
+	einfo
+	einfo
+	einfo "To run ${PN} with a tor client, add the following to your torrc file:"
+	einfo
+	einfo " SocksPort 5000"
+	einfo " UseBridges 1"
+	einfo " Bridge obfs2 <IP>:<port>"
+	einfo " ClientTransportPlugin obfs2 exec /usr/bin/${PN} --managed"
+	einfo
+	einfo "Change your SocksPort to whatever value you use.  Also, replace the"
+	einfo "<IP>:<port> pair with the values you received from the tor obfs bridge."
+	einfo
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-01-19  4:09 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-01-19  4:09 UTC (permalink / raw
  To: gentoo-commits

commit:     9c9de9b33aa034ef9bdc9e9729f9857ab578827a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 04:08:11 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 04:09:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9c9de9b3

net-proxy/obfsproxy-0.1.4-r1

---
 net-proxy/obfsproxy/Manifest                       |   28 ++++++++++----------
 .../files/{obfsproxy.initrd => obfsproxy.initd}    |    0
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index 1a05c67..7d38d8e 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 AUX obfsproxy.confd 1483 SHA256 df00fef80b4ca403dd91e7327f61ec6ece9139dde08e453493776a826a26b583 SHA512 138a6d1181ddacd73a0176c182e0a79a7a87b65200b24e9f2648183700144a6788bff1d277d9ca211b6a4e16faf44833affeb6facf931ee907ea65de70f5ea6d WHIRLPOOL ee08e9fe3695aa7a21624fa5f99d110dbc84db1a0724fb5d39cc768b6cad7655e30f9325308744368c90ac203b0d790bbf3e3c87b2390aa49ed94411728b146d
-AUX obfsproxy.initrd 1067 SHA256 666498e69db5079faed44e8719929c0f41497be6e575e19adc24191859cca278 SHA512 510401d2f2ac593001700656ad8e0a6a81cce28e53816388830cb9754b51416a7c9a092728a8567640865e87117f7bf69de6c38c6e8d837ea93ede2ad258c24f WHIRLPOOL 7b15f1d5e81e95845e491e6cc8e95e6e60047b84a13412d76bae3e723a7e2d2df056aec2eabf0d23642a596985a1b020e3a56e82e60bbedc196b1ef900bd5012
+AUX obfsproxy.initd 1067 SHA256 666498e69db5079faed44e8719929c0f41497be6e575e19adc24191859cca278 SHA512 510401d2f2ac593001700656ad8e0a6a81cce28e53816388830cb9754b51416a7c9a092728a8567640865e87117f7bf69de6c38c6e8d837ea93ede2ad258c24f WHIRLPOOL 7b15f1d5e81e95845e491e6cc8e95e6e60047b84a13412d76bae3e723a7e2d2df056aec2eabf0d23642a596985a1b020e3a56e82e60bbedc196b1ef900bd5012
 DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
 EBUILD obfsproxy-0.1.4-r1.ebuild 1984 SHA256 e05c4284623206925065368e5eff6721a64e2bfb7d9f2f92d511e5eec6f858fb SHA512 f2a2050eca8c6042cce245e827277e03b9cf69bb1984e803221922559c2a798a832dc290c4a496e73f9d35698178c91a0d545d74210bdeb0e6522e0970cbb4a5 WHIRLPOOL a6a6fa3384beba87988967881e49603cab9bb060cc1e072b10804f1b931c1fa2aa41d2d4bea79b04248f626fb7d342497bbef829ffbc636a6ae0a5e2f90acdef
 MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ+hotAAoJEJOE+m71LUu62osP/21gseTYf95mowGXCX6y7W4p
-iU8ABJKMqes2htN0Is/ShVtJqNYWpGX9RyAYDNERdPjouVtHdm+DO0f8xmY04Y41
-7l/0sbZUKadLiAp4F5WMMhaTsvgKbaIaWfX+nBsSZ8U62VPCR5Y276V1Fi1euzxv
-zn8Hnuy92P8ySKMYuQDrtQRcBQLNW5hWyswJ2g6g97O3QfRSXBdwz0jMuWECjKsk
-T8M4+pdVD80SobbcphmrNn5VmF0kWK2Mp3OkaZy0TtXsDUpmVKl22KnqrFVX9zTe
-Ncftdu8ByjfePQfkst7cTqoJqnVzuF5LnOenMxcWHFP4qBgSyW5wv6eIAi3ZdYqq
-4DGlhJ/23p05sNISaCRtR7Srir3s0SUwP74Eqw2k+9LK7xHY8n8vDk75PhmATNgK
-Li2fpOgTKl13uQE2Hx89SmO2m7gpdSfu1rh678lIxw0RA1/ZAM1PgO43idDy8aMw
-eM1R8cf+5er8I0VcoKUXsSF63RMtBauGtafRl9aJXNAYKsyZLltvUOLnUMl+Nfio
-U2yLfpngb8l3PLQYQPYc1eWFPKX5hT2D32SGWlM+eFrub6t1Vmm0QKgcRuThqXe1
-JP1o5pUUXua2LolH13og9LAMYWeiIg63kHcZyzxHh4DfgPu5v9cRAcvcO6/mWPkI
-ZaedbhQAFxu+KzWasc2V
-=zzoZ
+iQIcBAEBCAAGBQJQ+hxiAAoJEJOE+m71LUu67xIQAI0oGxHNb9vuW+ybxF0oEOTJ
+0LH58QQ8Js9QXouuezeiSDsGPpOO+LAazL2t7mSyuryXIjsu1Iti8fBSfCQv5GlO
+D7s0IcYYzNHvLDGNzLdLG24vkbz8xzDMjYZaeC9w+lctds3OEb98aBMcOEtBR7U/
+13TYfTp/fQ/gNfdStKi5w7OzsAQrrX8bnT6/yz7gFmZPs6WrrVY7tqQiZqUEQWS2
+RdTJD9+uFEr363rHYfR9FXlSZgNVxb4uToZXpT2LGpdRfqBICgGyL5e+SYLNZT2p
+njNoZv1DSso9NSbU5bGiFBK+kk7H5mQCETR+2pwMoqsSTuxK1HoD+bVihCP6tjtP
+l03aFLd6mSrQSKcWN32NlNJ9dlyDhvIrjhN5Jnol4F3erplkeRSa+0NmCjn39xNv
+6VrD7yr7zkr6VGrww82f3fN49QdvmuBjrYL7X33Qwtp5cAUQF+SC1e1A+QXQ6dcH
+NpRvqlxpUHCvQM4E/e3tX/nvLY+breq5TIHapnlZpLkSFHC9TzyMp6ZcOl4kkyAC
+8Vr/BALIm6ftnOqMYmA+ybZStGY1YvU/7oAdrYRwOzptekaIkRHeELKDJeSQp7Cc
+jYwZkXznlSqw4INaIxjqf3U+/2JSyXxZAuLQnZTVTKRUafA+QDoPMqF8b9TpHw0Q
++tOzYOuDlaAq3rmmPgL0
+=pa7J
 -----END PGP SIGNATURE-----

diff --git a/net-proxy/obfsproxy/files/obfsproxy.initrd b/net-proxy/obfsproxy/files/obfsproxy.initd
similarity index 100%
rename from net-proxy/obfsproxy/files/obfsproxy.initrd
rename to net-proxy/obfsproxy/files/obfsproxy.initd


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-01-19 15:40 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-01-19 15:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d8126236fd21f72b5b9ce11534063caf816e267e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 15:38:18 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 15:40:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=d8126236

net-proxy/obfsproxy: clean up initd logic

---
 net-proxy/obfsproxy/Manifest              |    2 +-
 net-proxy/obfsproxy/files/obfsproxy.initd |   37 +++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index 3929383..bddca0d 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -1,5 +1,5 @@
 AUX obfsproxy.confd 1484 SHA256 3b35bcdcaaeb869ecb2cc10b73c79c1728cc805607b067e521899168ee609815 SHA512 02a1a726b1fb716ecdac31f2401d8746b7779ac65b9bd4d71b4c82037895d9b57d2e98a7793a4d960a78a7c5ae472a111ac1fb6cb48a2ac78dac501d0043a53d WHIRLPOOL dbb8a2cabef07671e8c2a444a10439617c0cd03f42be4128852f67358f4d5287ebf88535d04246cf117257272c0198e678cf3131f8c7fe272f35ea7f61a1678d
-AUX obfsproxy.initd 1214 SHA256 7ae764a295884ec00ad97eee1f2cbd89a92bf49c4fbf415499ed80a69086bf8c SHA512 836d6ed69ca34eb683eccfdcc43b6b6dff97173cc2ae00e72cff7e721618d9b6cee4615c996915689aa6699758a31e53d540c2d4a99336c526800d09853052e4 WHIRLPOOL 748c3c9dc188b4b9839cc3281b9c63b1f769faef208b954b457d7682c9689d82a2a45b34eba3fd5de744bc8adb395cecd9dcced3269b16de77ef83b1a1721a8d
+AUX obfsproxy.initd 1620 SHA256 5a2c90e986a8074ee785507a149978b753447e42096e375ace18c524e7110e45 SHA512 b7b5e29ededa870aa36e0298a85fa2d835f4ca73256bc1dd7253f989fe1007745b0f2950ffa22f8738047596996fe815c0f9a737b64d47ad89c1ee106e5a9125 WHIRLPOOL 52905d14d66300cd293ebd38c88ca1432c4fc65df2f1d543d2bb6dc118bbb4036536e22fb4ac17ec6a0c4e3b7989b098f149ba9155a584f58163475e04f50f03
 DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
 EBUILD obfsproxy-0.1.4-r1.ebuild 1996 SHA256 c2c7e7d492d43685f8ae76f7b687b481e3909954ec3c275607ae0f424ff40e74 SHA512 9d0931cd2a1467576acf837788cb9a2babc9aa1eae9faa2b91a4e8052caf77ceba3e590f93a0283c088c3202f7785a0a61db0fe4595db0b085cdd6a3d90515ea WHIRLPOOL 8304e77b770a44eb895d12731f8a686a53990b616ea6aecbf11ccec1da2de1bdf6c06420cf8097281d741305889985453e760cba5b03d2156a014f5139da63e8
 MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c

diff --git a/net-proxy/obfsproxy/files/obfsproxy.initd b/net-proxy/obfsproxy/files/obfsproxy.initd
index 887a7c8..75dfc05 100644
--- a/net-proxy/obfsproxy/files/obfsproxy.initd
+++ b/net-proxy/obfsproxy/files/obfsproxy.initd
@@ -10,28 +10,45 @@ depend() {
 	need net
 }
 
-start() {
-	[ "x${MODE}" = "x" ] && eerror "MODE not given"
+checkconfig() {
+	[[ "x${PROTOCOL}" = "x" ]] \
+		&& eerror "PROTOCOL not given" && return 1
+	[[ "x${MODE}" = "x" ]] \
+		&& eerror "MODE not given" && return 1
 	if [ ${PROTOCOL} = "dummy" ] ; then
-		[[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ]] && eerror "MODE=server but no target was given"
-		[[ "x${MODE}" = "xsocks"  && "x${TARGET}" != "x" ]] && eerror "MODE=sock but a target was given"
+		[[ "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 was given"
-		[[ "x${LISTEN}" = "x" ]] && eerror "LISTEN host:port is not given"
-		[[ "x${DESTINATION}" != "x" ]] && DESTINATION="--dest=${DESTINATION}"
-		[[ "x${SECRET}" != "x" ]] && SECRET="--shared-secret=${SECRET}"
+		[[ "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
+}
 
-	ewarn ${CMDLINE}
+start() {
+	checkconfig || return 1
+	ebegin "Starting obfsproxy server"
 	start-stop-daemon -b --start --exec ${DAEMON} -- ${CMDLINE}
-
 	eend $?
 }
 
 stop() {
+	ebegin "Stopping obfsproxy server"
 	start-stop-daemon --stop --exec ${DAEMON}
+	eend $?
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-01-19 15:51 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-01-19 15:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f5d4f652b7486aefbc9da68291fd8f6cb4cc6278
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 15:51:22 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 15:51:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=f5d4f652

net-proxy/obfsproxy: add pidfile

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA

---
 net-proxy/obfsproxy/Manifest              |   22 +++++++++++++++++++++-
 net-proxy/obfsproxy/files/obfsproxy.initd |    8 ++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index bddca0d..c6ab390 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX obfsproxy.confd 1484 SHA256 3b35bcdcaaeb869ecb2cc10b73c79c1728cc805607b067e521899168ee609815 SHA512 02a1a726b1fb716ecdac31f2401d8746b7779ac65b9bd4d71b4c82037895d9b57d2e98a7793a4d960a78a7c5ae472a111ac1fb6cb48a2ac78dac501d0043a53d WHIRLPOOL dbb8a2cabef07671e8c2a444a10439617c0cd03f42be4128852f67358f4d5287ebf88535d04246cf117257272c0198e678cf3131f8c7fe272f35ea7f61a1678d
-AUX obfsproxy.initd 1620 SHA256 5a2c90e986a8074ee785507a149978b753447e42096e375ace18c524e7110e45 SHA512 b7b5e29ededa870aa36e0298a85fa2d835f4ca73256bc1dd7253f989fe1007745b0f2950ffa22f8738047596996fe815c0f9a737b64d47ad89c1ee106e5a9125 WHIRLPOOL 52905d14d66300cd293ebd38c88ca1432c4fc65df2f1d543d2bb6dc118bbb4036536e22fb4ac17ec6a0c4e3b7989b098f149ba9155a584f58163475e04f50f03
+AUX obfsproxy.initd 1703 SHA256 fa762c06ffa74d9998dc0948911368d7ecb6dde1faeb3f8e508f29166718fda4 SHA512 21661ac35da90f140a9ea1ec1fad5e7a3c42426db73b857be4f3e2976acc8228f7451d6432494e07d7c0f8beb4aa5e5baed7796005f4f39303b1859452e65f3b WHIRLPOOL 29525941feb5c02bf38f1d89d73c786d79f380d15cd104493ea069bc84023c5be3b0d3db3fec5a3affe7e47f9dd98fdec740af36335048e16d1f4fcae221a21b
 DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
 EBUILD obfsproxy-0.1.4-r1.ebuild 1996 SHA256 c2c7e7d492d43685f8ae76f7b687b481e3909954ec3c275607ae0f424ff40e74 SHA512 9d0931cd2a1467576acf837788cb9a2babc9aa1eae9faa2b91a4e8052caf77ceba3e590f93a0283c088c3202f7785a0a61db0fe4595db0b085cdd6a3d90515ea WHIRLPOOL 8304e77b770a44eb895d12731f8a686a53990b616ea6aecbf11ccec1da2de1bdf6c06420cf8097281d741305889985453e760cba5b03d2156a014f5139da63e8
 MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ+sD6AAoJEJOE+m71LUu6tpUP/2+MJ8sBJ1JXJic9Akfx83Ux
+x8vbQ0NEyFSqDktQ3Mn1Sf3YPeCzPhFodzcDR01eDp1rF9hQJHP5tH3iRZ1LUd5R
+JIOYLhINN25Y8sg/ztYwN6C///4JZnQJhVVbTToWOjxc20QBYkPhYWB1fMD5TboR
+Yq6gwIUzAu3vcmP2Z7bhuSZexIUy5xKgn/UYq28oznWOjjPohUgE0rNSH3usYuyB
+eHAFQ5b+52It16Jbd/aNnUtFp0JRF+UEOLcliprGB5+txH2bSJ0PhU1V3DDRLUTU
+droXvy7pKiHPjqczOma5FKzQlbYMfP4AkDygmar1OpqF9sfdcTZ5pbgEZ4HchM6t
+RMLr+5Z5gCdgVmZsFPP7R2DonoBgaBSN5dBRFTL47J+seNVdgVYV6UVwrRzfvc5G
+OAxC4eIoVsPWkRHIzGne0jWxI3+8AIGa6I3+jMrc1Uev1uFUTeaEsH3J9SIX8pu1
+QFk/ao0Org+ca0g1TveCESt3seMmLWtmKapKFDo76SPJ0iCoBQfyDn0HcHpJT+yW
+ka0fJCokKqNp4c0H/gTWZicVJpwCcLxm+SoYiiUARSfTqQfT5IAWSR4oi5HgVl1c
+WY5ldDWy4aLvR4KkaFbEZRvMbk+gIW/A/lByIiLME9qt5PsCLEnkSJ7G1xpAs+gw
+uKJfKbwVAXBnS1pdgt/x
+=WRu9
+-----END PGP SIGNATURE-----

diff --git a/net-proxy/obfsproxy/files/obfsproxy.initd b/net-proxy/obfsproxy/files/obfsproxy.initd
index 75dfc05..3809355 100644
--- a/net-proxy/obfsproxy/files/obfsproxy.initd
+++ b/net-proxy/obfsproxy/files/obfsproxy.initd
@@ -43,12 +43,16 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting obfsproxy server"
-	start-stop-daemon -b --start --exec ${DAEMON} -- ${CMDLINE}
+	start-stop-daemon --start \
+		--background --make-pidfile --pidfile ${PIDFILE} \
+		--exec ${DAEMON} -- ${CMDLINE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping obfsproxy server"
-	start-stop-daemon --stop --exec ${DAEMON}
+	start-stop-daemon --stop \
+		--pidfile ${PIDFILE} \
+		--exec ${DAEMON}
 	eend $?
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-10-06 11:39 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-10-06 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     54a16ce06802dd417473d6923cd7132b4164d2b2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 11:40:34 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 11:40:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=54a16ce0

net-proxy/obfsproxy: add standalone daemon initd scripts

Package-Manager: portage-2.2.1
Manifest-Sign-Key: 0xF52D4BBA

---
 net-proxy/obfsproxy/Manifest               |  6 ++--
 net-proxy/obfsproxy/files/obfsproxy.confd  | 45 +++++++++++++++++++++++
 net-proxy/obfsproxy/files/obfsproxy.initd  | 58 ++++++++++++++++++++++++++++++
 net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild | 34 +++++++++++++++++-
 net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild | 34 +++++++++++++++++-
 5 files changed, 173 insertions(+), 4 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index 31aed1b..8d63441 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -1,5 +1,7 @@
+AUX obfsproxy.confd 1494 SHA256 a370791b7bf021fffe83c257642f623368c28d02946e3865194bfa22f8279b95 SHA512 722224e227cbedecae1e769a2d1198a397d7096daea8c6b7b2f0aff92396a1ec4b83e1037dff31d99fe98812be220461d6e479966131975c7e2b80bb82b19093 WHIRLPOOL f85c83be1bd54451248a29040815afc9e9b46be780d6a73e0a307accaf94685bfeebad28ac69ff284f2f21fd9b565a1e25e71401002ae25c90f5eef39b97e4df
+AUX obfsproxy.initd 1808 SHA256 52789c3b7ddcdb7221111a2498e15721d611918765e405e7354b9303ef8858bb SHA512 640c91ec243b6115c050a5752cc62fe4bbfeddfa7a45fb806dceeb08b4cc230890bc1f96269adcddfe49c43ca0d143ab4a735fce65068a608ba6d2af10a7d973 WHIRLPOOL f84b6fc41eabac25bf3d2eb3f7a42e91ee94f7aa69e189a3d4fdc592b1ffde3f3428a42fa22a4cd76275574a539266afc65d65e932d1b633a8f6b39b7397b51a
 DIST obfsproxy-0.2.3.tar.gz 50020 SHA256 a0be3f2f0934f6114363e375cdce39d36b7e72ddb63d8f16b21c1c8cedc11cc9 SHA512 22c72c9d41a19f9b5887d4ac4ab2c7467b141e85eb1eea3ca85e52cc909e43abd783f5d1327b642a6ea211eafdc94917ca7ed3b936c3396d8cfe9a7bf178d067 WHIRLPOOL 161cf0ec7456029e8b947ab0007484ee7b97a0ac879e15eb0a8b141095e7831de7cfcb5adc4c137dae634304e5401b84a04a46b3b436c38f2305048e88eeee1d
 DIST obfsproxy-0.2.4.tar.gz 50979 SHA256 b0f34860cb7c9a1e6eedc95c3b3549baf67e90e4c32036bb9c4c015370734e43 SHA512 65708747c653613e2b2950c4d12643a449970da8026b43cf7bb38d1a94a195bcd41e30a34777ba844007794a5cd6e9d5df17b10cbd89048b310c7ee506069bb0 WHIRLPOOL 8d000fdf233340e6fc7777a96985db019e0a02816ec588efe77cf9d28728dc0f32ab945a50df71f17a92d9b25c5aa5d734795940a8ac8dcc4a4f76c7ec1f0c1b
-EBUILD obfsproxy-0.2.3.ebuild 607 SHA256 5b3af0be861adb27dbeb977b238fa3a9124c797874516f6810a2be0a4cb6b511 SHA512 10f495d37726a2185b70b20eda64c6e4c03c9ecac8d78f107fff9a040d3993475e3d8d5dab5af8ea37cb185206d9931e7f506bb4c8f00a5813696b235b29abca WHIRLPOOL 3e46d54b8ed9b085286cec9fcf05a8cb52b678c251edfc7d0e679c4c7ede43d7afd10c779a63f11683a6e0af7ec20f37fdd938f8a7a6263bf963ffc578ccabc5
-EBUILD obfsproxy-0.2.4.ebuild 607 SHA256 5b3af0be861adb27dbeb977b238fa3a9124c797874516f6810a2be0a4cb6b511 SHA512 10f495d37726a2185b70b20eda64c6e4c03c9ecac8d78f107fff9a040d3993475e3d8d5dab5af8ea37cb185206d9931e7f506bb4c8f00a5813696b235b29abca WHIRLPOOL 3e46d54b8ed9b085286cec9fcf05a8cb52b678c251edfc7d0e679c4c7ede43d7afd10c779a63f11683a6e0af7ec20f37fdd938f8a7a6263bf963ffc578ccabc5
+EBUILD obfsproxy-0.2.3.ebuild 1806 SHA256 e55179e775452c469c00ce82fe6345eb48d30c64d8164f3c898c21e3a072e39a SHA512 0e4c643c130cd5729e10b925a50c2227086121ca0681d67749b9dabaa95ac6f91061381624794bf96b9f67ca24cf2f8abd64581d027f4c5c267533b28f50ab37 WHIRLPOOL bb899652beacf895197faac43f0742ebd1deddccfb5f9f662a55b4314514d7eb0db377e7f0b94c5358d45e6cc141280b2809fc13ed677b19a6ef25e1dde72fc3
+EBUILD obfsproxy-0.2.4.ebuild 1806 SHA256 e55179e775452c469c00ce82fe6345eb48d30c64d8164f3c898c21e3a072e39a SHA512 0e4c643c130cd5729e10b925a50c2227086121ca0681d67749b9dabaa95ac6f91061381624794bf96b9f67ca24cf2f8abd64581d027f4c5c267533b28f50ab37 WHIRLPOOL bb899652beacf895197faac43f0742ebd1deddccfb5f9f662a55b4314514d7eb0db377e7f0b94c5358d45e6cc141280b2809fc13ed677b19a6ef25e1dde72fc3
 MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c

diff --git a/net-proxy/obfsproxy/files/obfsproxy.confd b/net-proxy/obfsproxy/files/obfsproxy.confd
new file mode 100644
index 0000000..e75aa93
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy.confd
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/files/obfsproxy.confd,v 1.1 2013/01/19 16:00:49 blueness Exp $
+
+# 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
new file mode 100644
index 0000000..19e3dd3
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy.initd
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/files/obfsproxy.initd,v 1.1 2013/01/19 16:00:49 blueness Exp $
+
+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 $?
+}

diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild
index 97c4128..02ee94e 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild
@@ -14,8 +14,40 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="daemon"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
 
 RDEPEND="dev-python/pyptlib"
+
+src_install() {
+	distutils-r1_src_install
+	if use daemon; then
+		newconfd "${FILESDIR}"/obfsproxy.confd obfsproxy
+		newinitd "${FILESDIR}"/obfsproxy.initd obfsproxy
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
+	einfo
+	einfo " SocksPort 0"
+	einfo " ORPort 443 # or some other port if you already run a webserver/skype"
+	einfo " BridgeRelay 1"
+	einfo " ExitPolicy reject *:*"
+	einfo " Nickname CHANGEME_1"
+	einfo " ContactInfo CHANGEME_2"
+	einfo " ServerTransportPlugin obfs2,obfs3 exec /usr/bin/${PN} managed"
+	einfo
+	einfo "Obviously, change CHANGEME_1 and CHANGEME_2 to appropriate values.  When you"
+	einfo "start tor, you should see a message similar to the following in its logs:"
+	einfo
+	einfo " Oct 05 20:00:41.000 [notice] Registered server transport 'obfs2' at '0.0.0.0:26821"
+	einfo " Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172"
+	einfo
+	einfo "Note the port numbers, 26821 and 40172 in this case, and report it, along with"
+	einfo "your IP address, to your bridge clients.  If you are behind a NAT firewall, you"
+	einfo "you need to do port forwarding on those ports."
+	einfo
+}

diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
index 97c4128..02ee94e 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
@@ -14,8 +14,40 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="daemon"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
 
 RDEPEND="dev-python/pyptlib"
+
+src_install() {
+	distutils-r1_src_install
+	if use daemon; then
+		newconfd "${FILESDIR}"/obfsproxy.confd obfsproxy
+		newinitd "${FILESDIR}"/obfsproxy.initd obfsproxy
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
+	einfo
+	einfo " SocksPort 0"
+	einfo " ORPort 443 # or some other port if you already run a webserver/skype"
+	einfo " BridgeRelay 1"
+	einfo " ExitPolicy reject *:*"
+	einfo " Nickname CHANGEME_1"
+	einfo " ContactInfo CHANGEME_2"
+	einfo " ServerTransportPlugin obfs2,obfs3 exec /usr/bin/${PN} managed"
+	einfo
+	einfo "Obviously, change CHANGEME_1 and CHANGEME_2 to appropriate values.  When you"
+	einfo "start tor, you should see a message similar to the following in its logs:"
+	einfo
+	einfo " Oct 05 20:00:41.000 [notice] Registered server transport 'obfs2' at '0.0.0.0:26821"
+	einfo " Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172"
+	einfo
+	einfo "Note the port numbers, 26821 and 40172 in this case, and report it, along with"
+	einfo "your IP address, to your bridge clients.  If you are behind a NAT firewall, you"
+	einfo "you need to do port forwarding on those ports."
+	einfo
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/
@ 2013-10-06 14:42 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2013-10-06 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     6b5bc19415fd71cbd9c650dad3a0a16e2c90efdc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 14:43:01 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 14:43:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6b5bc194

net-proxy/obfsproxy: fix requirements

Package-Manager: portage-2.2.1
Manifest-Sign-Key: 0xF52D4BBA

---
 net-proxy/obfsproxy/Manifest                       |  9 ++--
 .../files/obfsproxy-remove-argparse.patch          | 11 ++++
 net-proxy/obfsproxy/files/obfsproxy.confd          | 45 -----------------
 net-proxy/obfsproxy/files/obfsproxy.initd          | 58 ----------------------
 net-proxy/obfsproxy/metadata.xml                   |  3 --
 net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild         | 53 --------------------
 net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild         | 16 ++----
 7 files changed, 19 insertions(+), 176 deletions(-)

diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index 8d63441..3e3f829 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -1,7 +1,4 @@
-AUX obfsproxy.confd 1494 SHA256 a370791b7bf021fffe83c257642f623368c28d02946e3865194bfa22f8279b95 SHA512 722224e227cbedecae1e769a2d1198a397d7096daea8c6b7b2f0aff92396a1ec4b83e1037dff31d99fe98812be220461d6e479966131975c7e2b80bb82b19093 WHIRLPOOL f85c83be1bd54451248a29040815afc9e9b46be780d6a73e0a307accaf94685bfeebad28ac69ff284f2f21fd9b565a1e25e71401002ae25c90f5eef39b97e4df
-AUX obfsproxy.initd 1808 SHA256 52789c3b7ddcdb7221111a2498e15721d611918765e405e7354b9303ef8858bb SHA512 640c91ec243b6115c050a5752cc62fe4bbfeddfa7a45fb806dceeb08b4cc230890bc1f96269adcddfe49c43ca0d143ab4a735fce65068a608ba6d2af10a7d973 WHIRLPOOL f84b6fc41eabac25bf3d2eb3f7a42e91ee94f7aa69e189a3d4fdc592b1ffde3f3428a42fa22a4cd76275574a539266afc65d65e932d1b633a8f6b39b7397b51a
-DIST obfsproxy-0.2.3.tar.gz 50020 SHA256 a0be3f2f0934f6114363e375cdce39d36b7e72ddb63d8f16b21c1c8cedc11cc9 SHA512 22c72c9d41a19f9b5887d4ac4ab2c7467b141e85eb1eea3ca85e52cc909e43abd783f5d1327b642a6ea211eafdc94917ca7ed3b936c3396d8cfe9a7bf178d067 WHIRLPOOL 161cf0ec7456029e8b947ab0007484ee7b97a0ac879e15eb0a8b141095e7831de7cfcb5adc4c137dae634304e5401b84a04a46b3b436c38f2305048e88eeee1d
+AUX obfsproxy-remove-argparse.patch 347 SHA256 fdc991625d620c07d8d842d9f8d4e5d7b2106202da15633d2215774a95c34bd2 SHA512 bad5c62454fb1ab43db5c7afa2f4a78b525575952cadb4af7af3dd7f18321238e44528795cf4b5ccb95d3377cdb7e04752ed897c88482566ef12b186ab26e710 WHIRLPOOL 539fe80f2441b47633f107123cbfda091252417bafa1e3c3633e305fa8f0e598b51cd7727c32c73bf9dc774b85b5edf6aabbd15a16cdd0cf33f8dfa63e29077b
 DIST obfsproxy-0.2.4.tar.gz 50979 SHA256 b0f34860cb7c9a1e6eedc95c3b3549baf67e90e4c32036bb9c4c015370734e43 SHA512 65708747c653613e2b2950c4d12643a449970da8026b43cf7bb38d1a94a195bcd41e30a34777ba844007794a5cd6e9d5df17b10cbd89048b310c7ee506069bb0 WHIRLPOOL 8d000fdf233340e6fc7777a96985db019e0a02816ec588efe77cf9d28728dc0f32ab945a50df71f17a92d9b25c5aa5d734795940a8ac8dcc4a4f76c7ec1f0c1b
-EBUILD obfsproxy-0.2.3.ebuild 1806 SHA256 e55179e775452c469c00ce82fe6345eb48d30c64d8164f3c898c21e3a072e39a SHA512 0e4c643c130cd5729e10b925a50c2227086121ca0681d67749b9dabaa95ac6f91061381624794bf96b9f67ca24cf2f8abd64581d027f4c5c267533b28f50ab37 WHIRLPOOL bb899652beacf895197faac43f0742ebd1deddccfb5f9f662a55b4314514d7eb0db377e7f0b94c5358d45e6cc141280b2809fc13ed677b19a6ef25e1dde72fc3
-EBUILD obfsproxy-0.2.4.ebuild 1806 SHA256 e55179e775452c469c00ce82fe6345eb48d30c64d8164f3c898c21e3a072e39a SHA512 0e4c643c130cd5729e10b925a50c2227086121ca0681d67749b9dabaa95ac6f91061381624794bf96b9f67ca24cf2f8abd64581d027f4c5c267533b28f50ab37 WHIRLPOOL bb899652beacf895197faac43f0742ebd1deddccfb5f9f662a55b4314514d7eb0db377e7f0b94c5358d45e6cc141280b2809fc13ed677b19a6ef25e1dde72fc3
-MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
+EBUILD obfsproxy-0.2.4.ebuild 1679 SHA256 12a00018f04cd8a6a0cc2009f186adeab6bee6ffe3925246a1faf24fce0f5494 SHA512 7ab7fcbd951b2619481a4291bab6a7c65a01e51be33e505fa57c74720e5d7fec99a30b799d7be1e22f1ba28086a9a1273b6b4f2ab875c35bb78e98af5496da21 WHIRLPOOL 9e933bfaf09713ae7153f67ad635588e8d46acd0bf027f48ada5ade46a8de2b17976f192ab8967f1e421451cd59e94f9426b27e7f84444f5cc9b0897589c4d66
+MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3

diff --git a/net-proxy/obfsproxy/files/obfsproxy-remove-argparse.patch b/net-proxy/obfsproxy/files/obfsproxy-remove-argparse.patch
new file mode 100644
index 0000000..94d84b3
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy-remove-argparse.patch
@@ -0,0 +1,11 @@
+diff -Naur obfsproxy-0.2.4.orig/setup.py obfsproxy-0.2.4/setup.py
+--- obfsproxy-0.2.4.orig/setup.py	2013-09-30 07:57:05.000000000 -0400
++++ obfsproxy-0.2.4/setup.py	2013-10-06 10:29:41.111364745 -0400
+@@ -32,7 +32,6 @@
+         'setuptools',
+         'PyCrypto',
+         'Twisted',
+-        'argparse',
+         'pyptlib >= 0.0.5'
+         ],
+ )

diff --git a/net-proxy/obfsproxy/files/obfsproxy.confd b/net-proxy/obfsproxy/files/obfsproxy.confd
deleted file mode 100644
index e75aa93..0000000
--- 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
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/files/obfsproxy.confd,v 1.1 2013/01/19 16:00:49 blueness Exp $
-
-# 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 19e3dd3..0000000
--- a/net-proxy/obfsproxy/files/obfsproxy.initd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/files/obfsproxy.initd,v 1.1 2013/01/19 16:00:49 blueness Exp $
-
-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 $?
-}

diff --git a/net-proxy/obfsproxy/metadata.xml b/net-proxy/obfsproxy/metadata.xml
index 959210f..1e75873 100644
--- a/net-proxy/obfsproxy/metadata.xml
+++ b/net-proxy/obfsproxy/metadata.xml
@@ -5,7 +5,4 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<use>
-		<flag name='daemon'>Run obfsproxy as a standalone daemon</flag>
-	</use>
 </pkgmetadata>

diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild
deleted file mode 100644
index 02ee94e..0000000
--- a/net-proxy/obfsproxy/obfsproxy-0.2.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yenc/yenc-0.4.0-r1.ebuild,v 1.3 2013/01/04 01:15:59 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An obfuscating proxy using Tor's pluggable transport protocol"
-HOMEPAGE="https://www.torproject.org/projects/obfsproxy.html"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="daemon"
-
-DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
-
-RDEPEND="dev-python/pyptlib"
-
-src_install() {
-	distutils-r1_src_install
-	if use daemon; then
-		newconfd "${FILESDIR}"/obfsproxy.confd obfsproxy
-		newinitd "${FILESDIR}"/obfsproxy.initd obfsproxy
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
-	einfo
-	einfo " SocksPort 0"
-	einfo " ORPort 443 # or some other port if you already run a webserver/skype"
-	einfo " BridgeRelay 1"
-	einfo " ExitPolicy reject *:*"
-	einfo " Nickname CHANGEME_1"
-	einfo " ContactInfo CHANGEME_2"
-	einfo " ServerTransportPlugin obfs2,obfs3 exec /usr/bin/${PN} managed"
-	einfo
-	einfo "Obviously, change CHANGEME_1 and CHANGEME_2 to appropriate values.  When you"
-	einfo "start tor, you should see a message similar to the following in its logs:"
-	einfo
-	einfo " Oct 05 20:00:41.000 [notice] Registered server transport 'obfs2' at '0.0.0.0:26821"
-	einfo " Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172"
-	einfo
-	einfo "Note the port numbers, 26821 and 40172 in this case, and report it, along with"
-	einfo "your IP address, to your bridge clients.  If you are behind a NAT firewall, you"
-	einfo "you need to do port forwarding on those ports."
-	einfo
-}

diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
index 02ee94e..f0da420 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.4.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-python/yenc/yenc-0.4.0-r1.ebuild,v 1.3 2013/01/04 01:15:59 floppym Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
@@ -14,19 +14,13 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="daemon"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
+PATCHES=( "${FILESDIR}"/${PN}-remove-argparse.patch )
 
-RDEPEND="dev-python/pyptlib"
-
-src_install() {
-	distutils-r1_src_install
-	if use daemon; then
-		newconfd "${FILESDIR}"/obfsproxy.confd obfsproxy
-		newinitd "${FILESDIR}"/obfsproxy.initd obfsproxy
-	fi
-}
+RDEPEND="
+	>=dev-python/pyptlib-0.0.5
+"
 
 pkg_postinst() {
 	einfo


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-06 14:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-06 14:42 [gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/, net-proxy/obfsproxy/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2013-10-06 11:39 Anthony G. Basile
2013-01-19 15:51 Anthony G. Basile
2013-01-19 15:40 Anthony G. Basile
2013-01-19  4:09 Anthony G. Basile
2013-01-19  4:01 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox