diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
commit | 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch) | |
tree | dd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/python-oauthlib | |
parent | 57dcad243e6daefefbe21109e1fc97272053a7a0 (diff) | |
parent | 787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff) | |
download | buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip |
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.
A few conflicts had to be resolved:
- In the DEVELOPERS file, because Fabrice Fontaine was added as a
developer for libupnp in master, and for libupnp18 in
next. Resolution is simple: add him for both.
- linux/Config.in, because we updated the 4.13.x release used by
default in master, while we moved to 4.14 in next. Resolution: use
4.14.
- package/libupnp/libupnp.hash: a hash for the license file was added
in master, while the package was bumped into next. Resolution: keep
the hash for the license file, and keep the hash for the newest
version of libupnp.
- package/linux-headers/Config.in.host: default version of the kernel
headers for 4.13 was bumped to the latest 4.13.x in master, but was
changed to 4.14 in next. Resolution: use 4.14.
- package/samba4/: samba was bumped to 4.6.11 in master for security
reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python-oauthlib')
-rw-r--r-- | package/python-oauthlib/Config.in | 7 | ||||
-rw-r--r-- | package/python-oauthlib/python-oauthlib.hash | 4 | ||||
-rw-r--r-- | package/python-oauthlib/python-oauthlib.mk | 14 |
3 files changed, 25 insertions, 0 deletions
diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in new file mode 100644 index 0000000000..982272cff4 --- /dev/null +++ b/package/python-oauthlib/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_OAUTHLIB + bool "python-oauthlib" + help + A generic, spec-compliant, thorough implementation of the OAuth + request-signing logic. + + https://github.com/idan/oauthlib diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash new file mode 100644 index 0000000000..f8e1324244 --- /dev/null +++ b/package/python-oauthlib/python-oauthlib.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/oauthlib/json, sha256 locally computed +md5 277a9a966cc8c72e492b4eeb41332445 oauthlib-2.0.6.tar.gz +sha256 ce57b501e906ff4f614e71c36a3ab9eacbb96d35c24d1970d2539bbc3ec70ce1 oauthlib-2.0.6.tar.gz +sha256 9e1ae8725f5815738dadb6cbb09f450453d94e07c7b5efaee864f546a6209a95 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk new file mode 100644 index 0000000000..ab39800247 --- /dev/null +++ b/package/python-oauthlib/python-oauthlib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-oauthlib +# +################################################################################ + +PYTHON_OAUTHLIB_VERSION = 2.0.6 +PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz +PYTHON_OAUTHLIB_SITE = https://pypi.python.org/packages/a5/8a/212e9b47fb54be109f3ff0684165bb38c51117f34e175c379fce5c7df754 +PYTHON_OAUTHLIB_SETUP_TYPE = setuptools +PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause +PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE + +$(eval $(python-package)) |