aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--security/Makefile2
-rw-r--r--security/py-zxcvbn-python/distinfo3
-rw-r--r--security/py-zxcvbn/Makefile (renamed from security/py-zxcvbn-python/Makefile)4
-rw-r--r--security/py-zxcvbn/distinfo3
-rw-r--r--security/py-zxcvbn/pkg-descr (renamed from security/py-zxcvbn-python/pkg-descr)2
-rw-r--r--www/py-flexget/Makefile3
-rw-r--r--www/py-flexget/files/patch-requirements.txt6
8 files changed, 15 insertions, 9 deletions
diff --git a/MOVED b/MOVED
index f373cc199e50..1612ed86c0c4 100644
--- a/MOVED
+++ b/MOVED
@@ -10143,3 +10143,4 @@ textproc/elasticsearch-plugin-sql||2018-04-09|ElasticSearch 1.x End of Life
textproc/elasticsearch-river-rabbitmq||2018-04-09|ElasticSearch 1.x End of Life
devel/libkgapi|devel/libkgapi-kde4|2018-04-11|Make room for KDE updates
finance/libalkimia|finance/alkimia-qt4|2018-04-13|Project renamed
+security/py-zxcvbn-python|security/py-zxcvbn|2018-04-13|Renamed upstream
diff --git a/security/Makefile b/security/Makefile
index 9fb46553f2d7..e22c924ff102 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1035,7 +1035,7 @@
SUBDIR += py-zope.security
SUBDIR += py-zope.securitypolicy
SUBDIR += py-zope.session
- SUBDIR += py-zxcvbn-python
+ SUBDIR += py-zxcvbn
SUBDIR += qtkeychain
SUBDIR += quantis
SUBDIR += quantis-kmod
diff --git a/security/py-zxcvbn-python/distinfo b/security/py-zxcvbn-python/distinfo
deleted file mode 100644
index 84dcf65ac9f6..000000000000
--- a/security/py-zxcvbn-python/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1523288115
-SHA256 (zxcvbn-python-4.4.23.tar.gz) = 0d12b00efe29732f00c02b33608ac40c118f6c682a1f5f90cb8fda20864990e1
-SIZE (zxcvbn-python-4.4.23.tar.gz) = 407813
diff --git a/security/py-zxcvbn-python/Makefile b/security/py-zxcvbn/Makefile
index cb53b171b7a9..b96f9aacb7d7 100644
--- a/security/py-zxcvbn-python/Makefile
+++ b/security/py-zxcvbn/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-PORTNAME= zxcvbn-python
-PORTVERSION= 4.4.23
+PORTNAME= zxcvbn
+PORTVERSION= 4.4.25
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-zxcvbn/distinfo b/security/py-zxcvbn/distinfo
new file mode 100644
index 000000000000..f747c5a53295
--- /dev/null
+++ b/security/py-zxcvbn/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523460456
+SHA256 (zxcvbn-4.4.25.tar.gz) = 522dd6e7ac24c830f6115b82536e66a0ef6cbf046dc31693dadff503eb943a9a
+SIZE (zxcvbn-4.4.25.tar.gz) = 407788
diff --git a/security/py-zxcvbn-python/pkg-descr b/security/py-zxcvbn/pkg-descr
index 3dbd1dddeb73..6841518bb485 100644
--- a/security/py-zxcvbn-python/pkg-descr
+++ b/security/py-zxcvbn/pkg-descr
@@ -6,4 +6,4 @@ US television and movies, and other common patterns like dates,
repeats (aaa), sequences (abcd), keyboard patterns (qwertyuiop), and
l33t speak.
-WWW: https://pypi.python.org/pypi/zxcvbn-python
+WWW: https://pypi.python.org/pypi/zxcvbn
diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index 91d16285295d..081f37c89158 100644
--- a/www/py-flexget/Makefile
+++ b/www/py-flexget/Makefile
@@ -3,6 +3,7 @@
PORTNAME= flexget
PORTVERSION= 2.13.9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -27,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${F
${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}guessit>=2.1.4:multimedia/py-guessit@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zxcvbn-python>0:security/py-zxcvbn-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${FLAVOR} \
diff --git a/www/py-flexget/files/patch-requirements.txt b/www/py-flexget/files/patch-requirements.txt
index 82aa5ff2a049..25b4ef4d02a8 100644
--- a/www/py-flexget/files/patch-requirements.txt
+++ b/www/py-flexget/files/patch-requirements.txt
@@ -22,7 +22,7 @@
apscheduler>=3.2.0
terminaltables>=3.1.0
colorclass>=2.2.0
-@@ -26,7 +23,7 @@ colorclass>=2.2.0
+@@ -26,10 +23,10 @@ colorclass>=2.2.0
cherrypy>=3.7.0
flask>=0.7
flask-restful>=0.3.3
@@ -31,3 +31,7 @@
flask-compress>=1.2.1
flask-login>=0.4.0
flask-cors>=2.1.2
+ pyparsing>=2.0.3
+-zxcvbn-python
++zxcvbn
+ future>=0.15.2