diff --git a/www/flexget/Makefile b/www/flexget/Makefile index c3b99e0f9d0d7..beb2a809d3738 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,8 +1,11 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.140 +PORTVERSION= 3.1.141 CATEGORIES= www +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 1565bf2b2c79.patch:-p1 # https://github.com/Flexget/Flexget/issues/3205 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Multipurpose automation tool for all of your media @@ -20,16 +23,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.3.10:databases/py-sqlalchemy ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.4.7:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}progressbar>=2.5:misc/py-progressbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}guessit>=3.2.0:multimedia/py-guessit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.2:textproc/py-feedparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=9.0.0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${PY_FLAVOR} \ @@ -37,7 +38,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.3.10:databases/py-sqlalchemy ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flask-restx>=0.5.0:www/py-flask-restx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flask-restx>=0.5.1:www/py-flask-restx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ diff --git a/www/flexget/distinfo b/www/flexget/distinfo index d453523a033c9..b9948bd41ea14 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1634570444 -SHA256 (flexget-Flexget-v3.1.140_GH0.tar.gz) = 150ce3f6777f6a2b4ce155bed055201b08f1f4ef1014c6549dca7e210fb7dc12 -SIZE (flexget-Flexget-v3.1.140_GH0.tar.gz) = 7347152 +TIMESTAMP = 1634743187 +SHA256 (flexget-Flexget-v3.1.141_GH0.tar.gz) = 75319729896950847e422d650011020a484d5b2968d1dc259fab61f000a7cc6a +SIZE (flexget-Flexget-v3.1.141_GH0.tar.gz) = 7344928 +SHA256 (1565bf2b2c79.patch) = c7e4acff2741ddc8233841dae28ec2e3287f40948178e971835119d4a6ba3512 +SIZE (1565bf2b2c79.patch) = 5567 diff --git a/www/flexget/files/patch-requirements.txt b/www/flexget/files/patch-requirements.txt index 7d009ab85e9d1..7812bbbd2c9d1 100644 --- a/www/flexget/files/patch-requirements.txt +++ b/www/flexget/files/patch-requirements.txt @@ -1,30 +1,31 @@ ---- requirements.txt.orig 2021-08-10 15:20:13 UTC +--- requirements.txt.orig 2021-10-20 15:19:47 UTC +++ requirements.txt -@@ -12,22 +12,22 @@ jinja2~=3.0 - requests>=2.20.0 - python-dateutil - jsonschema>=2.0 +@@ -1,10 +1,10 @@ + apscheduler>=3.2.0 + beautifulsoup4>=4.5 # Beautifulsoup 4.5+ is required to support different versions of html5lib + feedparser>=6.0.2 -guessit==3.2.0 +guessit>=3.2.0 - rebulk>=2.0.0 - apscheduler>=3.2.0 - terminaltables>=3.1.0 - colorclass>=2.2.0 + html5lib>=0.11 + jinja2~=3.0 +-jsonschema>=2.0, <4.0 # jsonschema 4.0 requires python 3.7+ We can switch to that when we drop 3.6 support ++jsonschema>=2.0 loguru>=0.4.1 + more-itertools + psutil>=5.8.0 +@@ -18,12 +18,12 @@ rich>=9.0.0 + rpyc~=5.0 + sqlalchemy >=1.3.10, <1.999 # WebUI Requirements -cherrypy>=18.0.0 +cherrypy>=3.7.0 - flask>=0.7 - flask-restful>=0.3.3 --flask-restx==0.5.0 -+flask-restx>=0.5.0 flask-compress>=1.2.1 - flask-login>=0.4.0 flask-cors>=2.1.2 + flask-login>=0.4.0 + flask-restful>=0.3.3 +-flask-restx==0.5.1 ++flask-restx>=0.5.1 + flask>=0.7 pyparsing>=2.4.7 -zxcvbn-python --progressbar==2.5 +zxcvbn -+progressbar>=2.5 - more-itertools - psutil>=5.8.0