Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Mar 2018 07:35:25 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r463377 - in head: . security security/obfsproxy security/py-obfsproxy-tor security/py-obfsproxy-tor/files
Message-ID:  <201803020735.w227ZP2h013685@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Fri Mar  2 07:35:25 2018
New Revision: 463377
URL: https://svnweb.freebsd.org/changeset/ports/463377

Log:
  security/obfsproxy: Unbreak; Rename to security/py-obfsproxy-tor
  
  Port changes:
  * Unbreak: removed unnecessary lines in setup.py that were failing
  * Changed MASTER_SITES to CHEESESHOP
  * Added PKGNAMEPREFIX as every python port should have
  * Added PKGNAMESUFFIX=-tor to easily identify as being for Tor
  * Added LICENSE_FILE
  * Deleted pkg-plist
  * Added USE_PYTHON=autoplist instead of pkg-plist
  * Added USE_PYTHON=noflavors (an app)
  * Added NO_ARCH
  * Updated WWW
  
  Approved by:	tcberner (mentor, implicit)
  Approved by:	portmgr (port compliance, infrastructure)

Added:
  head/security/py-obfsproxy-tor/
     - copied from r463376, head/security/obfsproxy/
Deleted:
  head/security/obfsproxy/
  head/security/py-obfsproxy-tor/pkg-plist
Modified:
  head/MOVED
  head/security/Makefile
  head/security/py-obfsproxy-tor/Makefile
  head/security/py-obfsproxy-tor/distinfo
  head/security/py-obfsproxy-tor/files/patch-setup.py
  head/security/py-obfsproxy-tor/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/MOVED	Fri Mar  2 07:35:25 2018	(r463377)
@@ -10141,3 +10141,4 @@ devel/rubygem-progressbar09||2018-02-28|Has expired: O
 sysutils/rubygem-bosh_cli||2018-02-28|Has expired: Use net/bosh-cli (CLI v2) instead
 www/rubygem-gon-rails4||2018-02-28|Has expired: It is actually www/rubygem-gon with PKGNAMESUFFIX
 science/veusz|science/py-veusz|2018-03-01|Rename to match our py- port naming
+security/obfsproxy|security/py-obfsproxy-tor|2018-03-01|Rename to match our py- port naming

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/security/Makefile	Fri Mar  2 07:35:25 2018	(r463377)
@@ -432,7 +432,6 @@
     SUBDIR += oath-toolkit
     SUBDIR += obfs4proxy-tor
     SUBDIR += obfsclient
-    SUBDIR += obfsproxy
     SUBDIR += ocaml-cryptgps
     SUBDIR += ocaml-cryptokit
     SUBDIR += ocaml-ssl
@@ -945,6 +944,7 @@
     SUBDIR += py-mnemonic
     SUBDIR += py-oauth2client
     SUBDIR += py-oauthlib
+    SUBDIR += py-obfsproxy-tor
     SUBDIR += py-onetime
     SUBDIR += py-openssl
     SUBDIR += py-paramiko

Modified: head/security/py-obfsproxy-tor/Makefile
==============================================================================
--- head/security/obfsproxy/Makefile	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/security/py-obfsproxy-tor/Makefile	Fri Mar  2 07:35:25 2018	(r463377)
@@ -6,23 +6,26 @@ PORTVERSION=	0.2.13
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security net python
-MASTER_SITES=	http://www.c-s.li/ports/
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-tor
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Pluggable transport proxy
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to configure
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
-
 USES=		python:2.7
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils autoplist noflavors
 SUB_FILES=	pkg-message
-PYDISTUTILS_PKGNAME=obfsproxy
+NO_ARCH=	yes
+
+PYDISTUTILS_PKGNAME=	obfsproxy
 
 .include <bsd.port.mk>

Modified: head/security/py-obfsproxy-tor/distinfo
==============================================================================
--- head/security/obfsproxy/distinfo	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/security/py-obfsproxy-tor/distinfo	Fri Mar  2 07:35:25 2018	(r463377)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1519975368
 SHA256 (obfsproxy-0.2.13.tar.gz) = c29582f2f5b0316cbc7184e0529a5b246dfeeabd4e6c4dcb05b800256d6c9dd6
 SIZE (obfsproxy-0.2.13.tar.gz) = 95813

Modified: head/security/py-obfsproxy-tor/files/patch-setup.py
==============================================================================
--- head/security/obfsproxy/files/patch-setup.py	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/security/py-obfsproxy-tor/files/patch-setup.py	Fri Mar  2 07:35:25 2018	(r463377)
@@ -1,4 +1,4 @@
---- setup.py.orig	2017-11-03 11:21:18 UTC
+--- setup.py.orig	2014-12-31 15:34:31 UTC
 +++ setup.py
 @@ -31,12 +31,14 @@ setup(
      install_requires = [
@@ -11,8 +11,8 @@
          'pyyaml'
          ],
  
-+    if sys.version_info < (2, 7):
-+        install_requires.append('argparse')
++    #if sys.version_info < (2, 7):
++    #    install_requires.append('argparse')
 +
      extras_require = {
          'SOCKS': ["txsocksx"]

Modified: head/security/py-obfsproxy-tor/pkg-descr
==============================================================================
--- head/security/obfsproxy/pkg-descr	Fri Mar  2 06:58:57 2018	(r463376)
+++ head/security/py-obfsproxy-tor/pkg-descr	Fri Mar  2 07:35:25 2018	(r463377)
@@ -1,3 +1,3 @@
 Obfsproxy is a pluggable transport proxy written in Python.
 
-WWW: https://www.torproject.org/projects/obfsproxy.html.en
+WWW: https://www.torproject.org/docs/pluggable-transports



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