Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2013 07:40:06 +0000 (UTC)
From:      Carlo Strub <cs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r323020 - in head: . security security/obfsproxy security/obfsproxy/files security/pyobfsproxy
Message-ID:  <201307150740.r6F7e69i091442@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cs
Date: Mon Jul 15 07:40:06 2013
New Revision: 323020
URL: http://svnweb.freebsd.org/changeset/ports/323020

Log:
  Move security/pyobfsproxy to security/obfsproxy which was the port of the
  legacy C version of obfsproxy and recently renamed upstream.

Added:
  head/security/obfsproxy/files/patch-setup.py   (contents, props changed)
  head/security/obfsproxy/pkg-plist   (contents, props changed)
Deleted:
  head/security/pyobfsproxy/
Modified:
  head/MOVED
  head/security/Makefile
  head/security/obfsproxy/Makefile
  head/security/obfsproxy/distinfo
  head/security/obfsproxy/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 15 07:23:39 2013	(r323019)
+++ head/MOVED	Mon Jul 15 07:40:06 2013	(r323020)
@@ -4434,3 +4434,4 @@ net/urtwn-firmware-kmod||2013-07-12|Remo
 benchmarks/polygraph31||2013-07-13|Has expired: Broken since March 2010
 net/avahi-qt3||2013-07-13|Depends on the expired Qt3 port
 www/xpi-gwt-dev-plugin||2013-07-15|Has expired: Requires an ancient version of Firefox to build
+security/pyobfsproxy|security/obfsproxy|2013-07-15|Rename

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Mon Jul 15 07:23:39 2013	(r323019)
+++ head/security/Makefile	Mon Jul 15 07:40:06 2013	(r323020)
@@ -806,7 +806,6 @@
     SUBDIR += py-zope.security
     SUBDIR += py-zope.securitypolicy
     SUBDIR += py-zope.session
-    SUBDIR += pyobfsproxy
     SUBDIR += qca-cyrus-sasl
     SUBDIR += qca-gnupg
     SUBDIR += qca-ossl

Modified: head/security/obfsproxy/Makefile
==============================================================================
--- head/security/obfsproxy/Makefile	Mon Jul 15 07:23:39 2013	(r323019)
+++ head/security/obfsproxy/Makefile	Mon Jul 15 07:40:06 2013	(r323020)
@@ -1,42 +1,33 @@
-# ports collection makefile for:	obfsproxy
-# Date created:				20120220
-# Whom:					Carlo Strub
-#
+# Created by: Carlo Strub
 # $FreeBSD$
 #
 
 PORTNAME=	obfsproxy
-DISTVERSION=	0.1.4
+PORTVERSION=	0.2.2
 PORTEPOCH=	1
-CATEGORIES=	security net
-MASTER_SITES=	https://archive.torproject.org/tor-package-archive/obfsproxy/ \
-		https://www.c-s.li/ports/
+CATEGORIES=	security net python
+MASTER_SITES=	http://www.c-s.li/ports/ \
+		http://schema.filez.com/distfiles/
+DISTNAME=	obfsproxy-${PORTVERSION}-${GIT_COMMIT}
 
 MAINTAINER=	cs@FreeBSD.org
-COMMENT=	Tool to obfuscate Tor traffic
+COMMENT=	Pluggable transport proxy
 
 LICENSE=	BSD
 
-BUILD_DEPENDS=	tor:${PORTSDIR}/security/tor-devel
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor-devel
-LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
-
-USE_AUTOTOOLS=	aclocal autoconf autoheader automake
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-
-ACLOCAL_ARGS=	-I m4
-AUTOCONF_ARGS=	--include=m4
-AUTOHEADER_ARGS=	--include=m4
-AUTOMAKE_ARGS=	--add-missing --copy --force-missing
-MAN1=		obfsproxy.1
-SUB_FILES=	pkg-message
-PLIST_FILES=	bin/obfsproxy
-USE_GNOME=	pkgconfig
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0:${PORTSDIR}/security/py-pyptlib \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:${PORTSDIR}/security/py-pycrypto
+
+GIT_COMMIT=	ba6098
+USE_PYTHON=	yes
+USE_TWISTED=	yes
+USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME=obfsproxy
 
-MAKE_JOBS_SAFE=	yes
+post-extract:
+	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/obfsproxy-${PORTVERSION}
 
-post-install:
-	${CAT} ${PKGMESSAGE}
+WRKSRC=${WRKDIR}/obfsproxy-${PORTVERSION}
 
 .include <bsd.port.mk>

Modified: head/security/obfsproxy/distinfo
==============================================================================
--- head/security/obfsproxy/distinfo	Mon Jul 15 07:23:39 2013	(r323019)
+++ head/security/obfsproxy/distinfo	Mon Jul 15 07:40:06 2013	(r323020)
@@ -1,2 +1,2 @@
-SHA256 (obfsproxy-0.1.4.tar.gz) = 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3
-SIZE (obfsproxy-0.1.4.tar.gz) = 217518
+SHA256 (obfsproxy-0.2.2-ba6098.tar.gz) = 6d529fd983efd8e2f41a5ca491622a2e2c0c0a805361917f7ccc65dd3a19d8c6
+SIZE (obfsproxy-0.2.2-ba6098.tar.gz) = 61711

Added: head/security/obfsproxy/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/obfsproxy/files/patch-setup.py	Mon Jul 15 07:40:06 2013	(r323020)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2013-07-14 19:01:36.000000000 +0000
++++ setup.py	2013-07-14 19:02:02.000000000 +0000
+@@ -31,7 +31,7 @@
+     install_requires = [
+         'setuptools',
+         'PyCrypto',
+-        'Twisted',
++        'Twisted_Core',
+         'argparse',
+         'pyptlib'
+         ],

Modified: head/security/obfsproxy/pkg-descr
==============================================================================
--- head/security/obfsproxy/pkg-descr	Mon Jul 15 07:23:39 2013	(r323019)
+++ head/security/obfsproxy/pkg-descr	Mon Jul 15 07:40:06 2013	(r323020)
@@ -1,6 +1,3 @@
-obfsproxy is a tool that attempts to circumvent censorship, by transforming the
-Tor traffic between the client and the bridge. This way, censors, who usually
-monitor traffic between the client and the bridge, will see innocent-looking
-transformed traffic instead of the actual Tor traffic.
+Obfsproxy is a pluggable transport proxy written in Python.
 
 WWW: https://www.torproject.org/projects/obfsproxy.html.en

Added: head/security/obfsproxy/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/obfsproxy/pkg-plist	Mon Jul 15 07:40:06 2013	(r323020)
@@ -0,0 +1,112 @@
+bin/obfsproxy
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/_version.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/_version.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/_version.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/aes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/aes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/aes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/heartbeat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/heartbeat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/heartbeat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/hmac_sha256.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/hmac_sha256.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/hmac_sha256.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/log.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/log.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/log.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/rand.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/rand.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/rand.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/serialize.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/serialize.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common/serialize.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/client.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/client.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/client.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/server.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/server.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed/server.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/buffer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/buffer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/buffer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/extended_orport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/extended_orport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/extended_orport.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/launch_transport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/launch_transport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/launch_transport.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/network.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/network.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/network.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/socks.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/socks.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network/socks.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/pyobfsproxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/pyobfsproxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/pyobfsproxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_aes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_aes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_aes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_buffer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_buffer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_buffer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/tester.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/tester.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/tester.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_socks.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_socks.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test/test_socks.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/b64.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/b64.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/b64.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/dummy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/dummy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/dummy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs2.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs2.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs2.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3_dh.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3_dh.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/obfs3_dh.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/transports.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/transports.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports/transports.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/transports
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/test
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/network
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/managed
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy/common
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/obfsproxy
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307150740.r6F7e69i091442>