rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'upgrade/mycroft' into develop

This commit is contained in:
Peter Steenbergen 2019-09-08 12:51:20 +02:00
parent a7e4688f80 ed71c55793
commit bfcaa9a189
24 changed files with 150 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot-external/configs/mycroftos_rpi3_defconfig
View File

@ -99,8 +99,8 @@ BR2_PACKAGE_PYTHON3_SQLITE=y
BR2_PACKAGE_PYTHON3_XZ=y
BR2_PACKAGE_PYTHON_ALSAAUDIO=y
BR2_PACKAGE_PYTHON_ARROW=y
BR2_PACKAGE_PYTHON_CFFI=y
BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y
BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
BR2_PACKAGE_PYTHON_DAEMONIZE=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_LXML=y
@ -114,6 +114,7 @@ BR2_PACKAGE_PYTHON_PYCRYPTO=y
BR2_PACKAGE_PYTHON_PYJWT=y
BR2_PACKAGE_PYTHON_PYTZ=y
BR2_PACKAGE_PYTHON_PYUSB=y
BR2_PACKAGE_PYTHON_PYYAML=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SPIDEV=y
BR2_PACKAGE_PYTHON_TEXTTABLE=y
@ -135,7 +136,6 @@ BR2_PACKAGE_LIBCONFIG=y
BR2_PACKAGE_LIBNFS=y
BR2_PACKAGE_BCM2835=y
BR2_PACKAGE_WIRINGPI=y
BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_LIBMPEG2=y
BR2_PACKAGE_LIBMPEG2_BINS=y
BR2_PACKAGE_LIBTHEORA=y

2
buildroot-external/package/python-adapt-parser/python-adapt-parser.hash
View File

@ -1,3 +1,3 @@
# md5, sha256 from https://pypi.org/pypi/adapt-parser/json
md5 f415b363a15c3077a9624280a5bc2d37 adapt-parser-0.3.0.tar.gz
sha256 9445c9be4fcf3c519d1fbc605ea289349e11c2eb581db72242b61d12cc4d337f adapt-parser-0.3.0.tar.gz
sha256 028de80f603c62d4a8652549ea126423cc12695c9e578574b8932010ca32a33e adapt-parser-0.3.3.tar.gz

4
buildroot-external/package/python-adapt-parser/python-adapt-parser.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_ADAPT_PARSER_VERSION = 0.3.0
PYTHON_ADAPT_PARSER_VERSION = 0.3.3
PYTHON_ADAPT_PARSER_SOURCE = adapt-parser-$(PYTHON_ADAPT_PARSER_VERSION).tar.gz
PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/36/a4/3ef82c754a8fb079a98d0adb66be1e3dc7a42d6faafdf1f106924a48c352
PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/d7/be/be6417e4b6c099dfdcfec8c512de1c1e11ba446e6c81f405bd313fc2d6b4
PYTHON_ADAPT_PARSER_SETUP_TYPE = setuptools
$(eval $(python-package))

2
buildroot-external/package/python-gtts/python-gtts.hash
View File

@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/gTTS/json
md5 a74588d23840f07badb195bda8138b2d gTTS-2.0.1.tar.gz
sha256 c85ca77ad71181209068d7437275bd35182f38cfef5a2dd7b8fcd4ba1b78ec1a gTTS-2.0.1.tar.gz
sha256 a6d4cf039da2797de8af2da7c1f0ce700ac0b48601ce6c11a02b337fd6bdcf57 gTTS-2.0.3.tar.gz
sha256 124dfc447056cc622989319ebb553d56cfd5c197c345cee3397b675a6da84f58 gTTS-1.1.7.tar.gz
# Locally computed sha256 checksums
sha256 d762ddea99fa1eddb0a03d040a97e4e1404f432f7c70d4b49d391858230a22aa LICENSE

4
buildroot-external/package/python-gtts/python-gtts.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_GTTS_VERSION = 2.0.1
PYTHON_GTTS_VERSION = 2.0.3
PYTHON_GTTS_SOURCE = gTTS-$(PYTHON_GTTS_VERSION).tar.gz
PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/52/6e/ae8bd869f7166ab541721e9af7b31d7e54901ce96622620e23e2ae141055
PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/e6/37/f55346a736278f0eb0ae9f7edee1a61028735ef0010db68a2e6fcd0ece56
PYTHON_GTTS_SETUP_TYPE = setuptools
PYTHON_GTTS_LICENSE = MIT
PYTHON_GTTS_LICENSE_FILES = LICENSE

1
buildroot-external/package/python-msk/python-msk.hash
View File

@ -2,3 +2,4 @@
md5 1460094aeffac634008ba1dd12348c3b msk-0.3.11.tar.gz
sha256 d5c157a60eecba4c3b07de89e43e85dec366b5ecdd3677f7e73c0c4cddf01b74 msk-0.3.11.tar.gz
sha256 8e5a1fb7afa22977a9d6ee0835ac52420b74324c1d2088286aacc485a521e573 msk-0.3.12.tar.gz
sha256 55be86ff2cd0087016759f2b15b40861cda2a8d8a8d0c669fdacdf32a77a10da msk-0.3.13.tar.gz

4
buildroot-external/package/python-msk/python-msk.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_MSK_VERSION = 0.3.12
PYTHON_MSK_VERSION = 0.3.13
PYTHON_MSK_SOURCE = msk-$(PYTHON_MSK_VERSION).tar.gz
PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/34/91/fad24465ad7d07184d2b7e965415f62acf90e5488cfd3fec56c89430f01b
PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/28/51/8d2193b8f1471178149cdbcc1830b086e978f99598208cae2ba2741b2979
PYTHON_MSK_SETUP_TYPE = setuptools
$(eval $(python-package))

2
buildroot-external/package/python-msm/python-msm.hash
View File

@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/msm/json
md5 fe54a2aecd6751bef66fdcd27ffd3cdc msm-0.5.19.tar.gz
sha256 0f67b73e277a73ff4c97ecdf0aa6e10b1202bc09d2666f69170f9aa20653c573 msm-0.5.19.tar.gz
sha256 5d58fadc96d8d0c7b5290875d5ba1859333f372c2069c14881aa2b32e5e0e37d msm-0.6.3.tar.gz
sha256 955204cb293a83e9cc5d3af9a7d0db69d5bba9215e4bf4337d26bf4b635fd78a msm-0.7.9.tar.gz
# Locally computed sha256 checksums
sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE

4
buildroot-external/package/python-msm/python-msm.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_MSM_VERSION = 0.6.3
PYTHON_MSM_VERSION = 0.7.9
PYTHON_MSM_SOURCE = msm-$(PYTHON_MSM_VERSION).tar.gz
PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/8d/07/7fd52f9c7690925d48fffea97ec594beee797a75afd1e082ffe7b90dd341
PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/46/e7/cd1c3771ecf644d95ef7c3ce7b53eeccccac1ad57c3ca3211f70ad02be29
PYTHON_MSM_SETUP_TYPE = setuptools
PYTHON_MSM_LICENSE = Apache-2.0
PYTHON_MSM_LICENSE_FILES = LICENSE

35
buildroot-external/package/python-mycroft/0001-Bump-python-tornado-and-python-dateutil-versions-as-.patch Normal file
View File

@ -0,0 +1,35 @@
From 6f5b4940d26bc3d3413cd750f3e7e17c5e9e5db7 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 4 Sep 2019 16:01:39 +0200
Subject: [PATCH 1/1] Bump python-tornado and python-dateutil versions as
requirements
---
requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 11f08860cc..661dfcbe03 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ gTTS-token==1.1.3
PyAudio==0.2.11
pyee==5.0.0
SpeechRecognition==3.8.1
-tornado==4.5.3
+tornado==5.1.1
websocket-client==0.54.0
requests-futures==0.9.5
pyalsaaudio==0.8.2
@@ -16,7 +16,7 @@ psutil==5.2.1
pocketsphinx==0.1.0
inflection==0.3.1
pillow==4.1.1
-python-dateutil==2.6.0
+python-dateutil==2.7.5
pychromecast==3.2.2
python-vlc==1.1.2
pulsectl==17.7.4
--
2.11.0

26
buildroot-external/package/python-mycroft/0002-Bump-python-tornado-requirement-to-5.1.1.patch
View File

@ -1,26 +0,0 @@
From 9fbd29b3c0442191706468fdd14270749e358211 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 25 Jan 2019 13:04:53 +0100
Subject: [PATCH 1/1] Bump python-tornado requirement to 5.1.1 This because
4.5.3 does not compile on the host with Python 3.7
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 94ffe987e8..5fe21dfa80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ gTTS-token==1.1.3
PyAudio==0.2.11
pyee==1.0.1
SpeechRecognition==3.8.1
-tornado==4.5.3
+tornado==5.1.1
websocket-client==0.32.0
requests-futures==0.9.5
pyalsaaudio==0.8.2
--
2.11.0

25
buildroot-external/package/python-mycroft/0003-Bump-python-dateutil-requirement-to-2.7.5.patch
View File

@ -1,25 +0,0 @@
From e5c877740c298fc07fcbadd29ca00c02cfb49ca5 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 29 Jan 2019 10:25:42 +0100
Subject: [PATCH 1/1] Bump python-dateutil requirement to 2.7.5
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 5fe21dfa80..7f481ccb93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ psutil==5.2.1
pocketsphinx==0.1.0
inflection==0.3.1
pillow==4.1.1
-python-dateutil==2.6.0
+python-dateutil==2.7.5
pychromecast==0.7.7
python-vlc==1.1.2
pulsectl==17.7.4
--
2.11.0

9
buildroot-external/package/python-mycroft/python-mycroft.hash
View File

@ -1,8 +1 @@
sha256 90255931a864a4abe30f28c470009cf798dc72221cab16ba41712d80b19e28e4 python-mycroft-v18.8.1.tar.gz
sha256 af18bd9ee1c6e3bbc6b424af39b352179d05fc337d04573eadba37b01f7105f6 python-mycroft-v18.8.2.tar.gz
sha256 25c583e40e888a99ea6fb0817960952bc26dcf8facf87f77f3363ac0c3c3b9d9 python-mycroft-v18.8.3.tar.gz
sha256 42950284980d415d5cf75c91ad1e59080770cf82a12dc294f106b97fdf8c65c0 python-mycroft-v18.8.4.tar.gz
sha256 35d6c2d6155ea9b1887b296164a8ee7f1abf8e58b192a4829aaa59a7592909fa python-mycroft-v18.8.5.tar.gz
sha256 14d936dea78379a58c80b2d8268be87e5e89b3147a6f48fa85c6db4c37dc8b56 python-mycroft-v18.8.10.tar.gz
sha256 f3a4dcfbf4690df6a885cab40c7069d67b61e8cd5d81f85cf892dd38b3902aff python-mycroft-v18.8.11.tar.gz
sha256 b7ddc81be63310c28bc5da1e39745429941311362364dc44b67e3bc69139bb94 python-mycroft-v18.8.12.tar.gz
sha256 be610c54770cd3faaca2ec57f8b7a8078cf659b8c408c47c25157ba3607b10a8 python-mycroft-v19.2.14.tar.gz

2
buildroot-external/package/python-mycroft/python-mycroft.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = v18.8.12
PYTHON_MYCROFT_VERSION = v19.2.14
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE

1
buildroot-external/package/python-padaos/python-padaos.hash
View File

@ -3,3 +3,4 @@ sha256 06fb231807f1c82d6fe8014e81d8a97124219fe6bcbccc020d445ca22d437146 padaos-
md5 5dbb47982c859449f06decde6d240bd9 padaos-0.1.7.tar.gz
sha256 0703a5fec01a5b40038e90a32c39ac4c2c59b2a91b9bd1624408f017a2f61db3 padaos-0.1.7.tar.gz
sha256 287310c7299a1c3ea2d0f8193caf83944d297a30a131b298bc29379acc46714e padaos-0.1.8.tar.gz
sha256 47be66fed43f35b5347722aa45ee3c2df64ea1718cf805b2f1da81ed2c98ee83 padaos-0.1.9.tar.gz

4
buildroot-external/package/python-padaos/python-padaos.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_PADAOS_VERSION = 0.1.8
PYTHON_PADAOS_VERSION = 0.1.9
PYTHON_PADAOS_SOURCE = padaos-$(PYTHON_PADAOS_VERSION).tar.gz
PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/1b/5a/8b9053ef320f958b52c8881e0a8147faea5dd87e0fbf26958b7069ab7f76
PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/5d/d9/f1e366c164c551c79e988c43fa282aea6e671d7842e6f70164ae09ad6376
PYTHON_PADAOS_SETUP_TYPE = setuptools
$(eval $(python-package))

4
buildroot-external/package/python-padatious/python-padatious.hash
View File

@ -1,3 +1,3 @@
# md5, sha256 from https://pypi.org/pypi/padatious/json
md5 6e9d8b85814090a1c3c39774ef24124e padatious-0.4.5.tar.gz
sha256 81cefa5c3baf5fe8e3c6987216c1c438eff59f2026bce8ae6302871c7edbd69b padatious-0.4.5.tar.gz
md5 cf7bbc745f6689d53f0646d8747f744b padatious-0.4.6.tar.gz
sha256 03bebbe81ebf67526b7e7300cfb8fa5ad2f30ed0aa71e4e54e6e8ed292ff9883 padatious-0.4.6.tar.gz

4
buildroot-external/package/python-padatious/python-padatious.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_PADATIOUS_VERSION = 0.4.5
PYTHON_PADATIOUS_VERSION = 0.4.6
PYTHON_PADATIOUS_SOURCE = padatious-$(PYTHON_PADATIOUS_VERSION).tar.gz
PYTHON_PADATIOUS_SITE = https://files.pythonhosted.org/packages/00/ca/5d2262ec5ca90afa94706b78c770de9f48298d3048cd65dc0ad79ffcfb10
PYTHON_PADATIOUS_SITE = https://files.pythonhosted.org/packages/1f/37/0022764d88b1aacb7f42a9e3ba5250b10212d8b6cf6223c58e639d669a6c
PYTHON_PADATIOUS_SETUP_TYPE = setuptools
$(eval $(python-package))

2
buildroot-external/package/python-pychromecast/python-pychromecast.hash
View File

@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/pychromecast/json
sha256 addc87ecb769c6883756081e0e775d6cac0b45b6698419d7419c589ff7f55244 PyChromecast-0.7.7.tar.gz
sha256 0bb643d9a4daf64cc8ab55ee130a9dd743d372a89f4343e4101a32b3641b10ba PyChromecast-3.2.3.tar.gz
md5 4449701d330e33b8694aa7582662958c PyChromecast-2.3.0.tar.gz
sha256 f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38 PyChromecast-2.3.0.tar.gz
# Locally computed sha256 checksums

4
buildroot-external/package/python-pychromecast/python-pychromecast.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_PYCHROMECAST_VERSION = 0.7.7
PYTHON_PYCHROMECAST_VERSION = 3.2.3
PYTHON_PYCHROMECAST_SOURCE = PyChromecast-$(PYTHON_PYCHROMECAST_VERSION).tar.gz
PYTHON_PYCHROMECAST_SITE = https://files.pythonhosted.org/packages/cf/07/9a95c424e080f4b4e3b0b58cc91e67b03ce67e7f1a4f204e886d2838665f
PYTHON_PYCHROMECAST_SITE = https://files.pythonhosted.org/packages/ec/94/c5fa90465f9a4f8266d4feefc3f39f3a5caa1f342825f298c638cc582ebf
PYTHON_PYCHROMECAST_SETUP_TYPE = setuptools
PYTHON_PYCHROMECAST_LICENSE = MIT
PYTHON_PYCHROMECAST_LICENSE_FILES = LICENSE

4
buildroot-external/package/python-pyee/python-pyee.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_PYEE_VERSION = 1.0.1
PYTHON_PYEE_VERSION = 5.0.0
PYTHON_PYEE_SOURCE = pyee-$(PYTHON_PYEE_VERSION).tar.gz
PYTHON_PYEE_SITE = https://files.pythonhosted.org/packages/0b/94/6820b8b1a21ce4d6a1c807342ac35cf4d5fd89b94b3f12e10de3c34d5507
PYTHON_PYEE_SITE = https://files.pythonhosted.org/packages/c6/35/b37e4ffbf46063c883675e028e38e2a24b67433fd587f188e2a5005d9329
PYTHON_PYEE_SETUP_TYPE = distutils
PYTHON_PYEE_LICENSE = MIT

16
buildroot-patches/0011-Downgrade-python-websocket-client-to-0.32.0.patch → buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch
View File

@ -1,7 +1,7 @@
From c892ecacb1d15bf3a4abf8b581b0ed885481b3cc Mon Sep 17 00:00:00 2001
From cc13c52d8a7c8816b093688421b45dab0c620be6 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 29 Oct 2018 14:45:31 +0100
Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.32.0
Date: Sat, 7 Sep 2019 17:03:17 +0200
Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0
---
package/python-websocket-client/python-websocket-client.hash | 1 +
@ -9,16 +9,16 @@ Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.32.0
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash
index 3672ca074b..3d95213b55 100644
index 3672ca074b..70ea66a652 100644
--- a/package/python-websocket-client/python-websocket-client.hash
+++ b/package/python-websocket-client/python-websocket-client.hash
@@ -2,3 +2,4 @@
md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz
sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz
sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE
+sha256 cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040 websocket_client-0.32.0.tar.gz
+sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz
diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk
index 58c8407db3..40789b5056 100644
index 58c8407db3..e07f9c5a6a 100644
--- a/package/python-websocket-client/python-websocket-client.mk
+++ b/package/python-websocket-client/python-websocket-client.mk
@@ -4,11 +4,12 @@
@ -26,10 +26,10 @@ index 58c8407db3..40789b5056 100644
################################################################################
-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0
+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.32.0
+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0
PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz
-PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27
+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/f4/06/5552e64fee863aa9decbb4e46dccc05fe730a36f49f0d6427398837297da
+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b
PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools
PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+
PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE

41
buildroot-patches/0019-Downgrade-python-cryptography-to-2.6.1.patch Normal file
View File

@ -0,0 +1,41 @@
From 05f3feff391df968b07e35298a4bc1df252a4434 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sat, 7 Sep 2019 12:57:13 +0200
Subject: [PATCH 1/1] Downgrade python-cryptography to 2.6.1
---
package/python-cryptography/python-cryptography.hash | 2 +-
package/python-cryptography/python-cryptography.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash
index 36da21c9c1..20374ed86b 100644
--- a/package/python-cryptography/python-cryptography.hash
+++ b/package/python-cryptography/python-cryptography.hash
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/cryptography/json
md5 2b5e8269c43c9b9ab54fc8c75ba3c7ac cryptography-2.3.1.tar.gz
-sha256 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 cryptography-2.3.1.tar.gz
+sha256 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 cryptography-2.6.1.tar.gz
# Locally computed sha256 checksums
sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 91b680b2be..2c96a7c35a 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_CRYPTOGRAPHY_VERSION = 2.3.1
+PYTHON_CRYPTOGRAPHY_VERSION = 2.6.1
PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef6385754a98f3cad9b59bedf3a8e8b14988be4
+PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449
PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
--
2.11.0

38
buildroot-patches/0020-Downgrade-python-pyyaml-to-3.13.patch Normal file
View File

@ -0,0 +1,38 @@
From 9e3aab58da51794b97336c3f1a8988b5c5aed7c1 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sat, 7 Sep 2019 15:06:40 +0200
Subject: [PATCH 1/1] Downgrade python-pyyaml to 3.13
---
package/python-pyyaml/python-pyyaml.hash | 2 +-
package/python-pyyaml/python-pyyaml.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index 256742feb6..6b79caae31 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,3 +1,3 @@
# md5, sha256 from https://pypi.python.org/pypi/pyyaml/json
md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz
-sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz
+sha256 3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf PyYAML-3.13.tar.gz
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index b73b4356a0..521c3a6921 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYYAML_VERSION = 4.2b4
+PYTHON_PYYAML_VERSION = 3.13
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769
PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
--
2.11.0