From 06f04adf4b6572f79839240bdd6e0b0f389bbc08 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 23 Nov 2015 12:13:47 -0500 Subject: python-cryptography, python-cryptography-vectors: uprev Pick up many fixes and enhancements made since 0.8.1 was released. See: https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst The uprev requires an uprev of pyasn1 and also pulls in two new packages idna and ipaddress. The idna software has 3 licenses, one of which is the 'Unicode' license: http://www.unicode.org/copyright.html Signed-off-by: Mark Asselstine Signed-off-by: Martin Jansa --- meta-python/conf/layer.conf | 2 + meta-python/licenses/Unicode | 37 +++++++++++++++ .../python/python-cryptography-vectors_0.8.1.bb | 14 ------ .../python/python-cryptography-vectors_1.1.bb | 14 ++++++ .../python/python-cryptography_0.8.1.bb | 46 ------------------- .../python/python-cryptography_1.1.bb | 53 ++++++++++++++++++++++ .../recipes-devtools/python/python-idna_git.bb | 22 +++++++++ .../python/python-ipaddress_git.bb | 22 +++++++++ .../recipes-devtools/python/python-pyasn1_0.1.7.bb | 16 ------- .../recipes-devtools/python/python-pyasn1_0.1.9.bb | 16 +++++++ 10 files changed, 166 insertions(+), 76 deletions(-) create mode 100644 meta-python/licenses/Unicode delete mode 100644 meta-python/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb create mode 100644 meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb delete mode 100644 meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb create mode 100644 meta-python/recipes-devtools/python/python-cryptography_1.1.bb create mode 100644 meta-python/recipes-devtools/python/python-idna_git.bb create mode 100644 meta-python/recipes-devtools/python/python-ipaddress_git.bb delete mode 100644 meta-python/recipes-devtools/python/python-pyasn1_0.1.7.bb create mode 100644 meta-python/recipes-devtools/python/python-pyasn1_0.1.9.bb (limited to 'meta-python') diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index 55169e4fbb..d53677fef8 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -13,3 +13,5 @@ BBFILE_PRIORITY_meta-python = "7" LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core openembedded-layer" + +LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-python/licenses/Unicode b/meta-python/licenses/Unicode new file mode 100644 index 0000000000..5d2cc4a626 --- /dev/null +++ b/meta-python/licenses/Unicode @@ -0,0 +1,37 @@ +COPYRIGHT AND PERMISSION NOTICE + +Copyright 1991-2015 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in +http://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, +(b) this copyright and permission notice appear in associated +documentation, and +(c) there is clear notice in each modified Data File or in the Software +as well as in the documentation associated with the Data File(s) or +Software that the data or software has been modified. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb b/meta-python/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb deleted file mode 100644 index a9b64ed137..0000000000 --- a/meta-python/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -DEPENDS = "python-cryptography" -SRCNAME = "cryptography_vectors" - -SRC_URI = "https://pypi.python.org/packages/source/c/cryptography-vectors/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI[md5sum] = "04fcfcc61aee62e3b4beb1740cd120ac" -SRC_URI[sha256sum] = "4a69e66026bfce4b97f75e72fe262f5e8f71daddc081f6608e5b0db89e552504" - -inherit setuptools diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb b/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb new file mode 100644 index 0000000000..2150e50783 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "Test vectors for the cryptography package." +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" +DEPENDS = "python-cryptography" +SRCNAME = "cryptography_vectors" + +SRC_URI = "https://pypi.python.org/packages/source/c/cryptography-vectors/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +SRC_URI[md5sum] = "0ad422501074929c06b7edd40df41844" +SRC_URI[sha256sum] = "a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c" + +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb b/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb deleted file mode 100644 index 41e4acdb5b..0000000000 --- a/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to Python developers" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -DEPENDS += " python-cffi-native python-cffi python-enum34 python-six python-pyasn1" -SRCNAME = "cryptography" - -SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://run-ptest \ -" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI[md5sum] = "70dde78a5515abdbfd7a3d58f15689ab" -SRC_URI[sha256sum] = "f4e041bc83c1be94d87116a7aa201c378b7c6581be4d83994b2da0a84499f73b" - -inherit pypi - -RDEPENDS_${PN} = "\ - python-pyasn1\ - python-six\ - python-cffi\ - python-enum34\ - python-setuptools\ - python-pycparser\ - python-subprocess\ - python-threading\ - python-numbers\ - python-contextlib\ -" - -RDEPENDS_${PN}-ptest = "\ - ${PN}\ - python-pytest\ - python-pretend\ - python-iso8601\ - python-cryptography-vectors\ -" - -inherit ptest - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ -} diff --git a/meta-python/recipes-devtools/python/python-cryptography_1.1.bb b/meta-python/recipes-devtools/python/python-cryptography_1.1.bb new file mode 100644 index 0000000000..b3eee0309c --- /dev/null +++ b/meta-python/recipes-devtools/python/python-cryptography_1.1.bb @@ -0,0 +1,53 @@ +SUMMARY = "Provides cryptographic recipes and primitives to Python developers" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" +DEPENDS += " python-cffi-native python-cffi python-enum34 python-six python-pyasn1" +SRCNAME = "cryptography" + +SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ + file://run-ptest \ +" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +SRC_URI[md5sum] = "dd06da41535184f48f2c8e8b74dd570f" +SRC_URI[sha256sum] = "059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d" + +inherit pypi + +RDEPENDS_${PN} = "\ + python-pyasn1\ + python-six\ + python-cffi\ + python-enum34\ + python-setuptools\ + python-pycparser\ + python-subprocess\ + python-threading\ + python-numbers\ + python-contextlib\ + python-ipaddress\ + python-pyasn1\ + python-idna\ +" + +RDEPENDS_${PN}-ptest = "\ + ${PN}\ + python-pytest\ + python-pretend\ + python-iso8601\ + python-cryptography-vectors\ +" + +inherit ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ +} + +FILES_${PN}-dbg += " \ + ${libdir}/python2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ + " \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python-idna_git.bb b/meta-python/recipes-devtools/python/python-idna_git.bb new file mode 100644 index 0000000000..f5ce658cb8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-idna_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Internationalised Domain Names in Applications" +HOMEPAGE = "https://github.com/kjd/idna" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c61e6ec7ab3da6b340d8d3a89c964ef2" + +PV = "2.0" +SRCREV = "bb6e94c5b5525684d8ca010bf8ab42480c319e0a" + +SRCNAME = "idna" +SRC_URI = "git://github.com/kjd/${SRCNAME}.git" + +S = "${WORKDIR}/git" + +inherit setuptools + +DEPENDS += " \ + python-pip \ + " + +RDEPENDS_${PN} += " \ + " diff --git a/meta-python/recipes-devtools/python/python-ipaddress_git.bb b/meta-python/recipes-devtools/python/python-ipaddress_git.bb new file mode 100644 index 0000000000..3d138338ed --- /dev/null +++ b/meta-python/recipes-devtools/python/python-ipaddress_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Python 3.3+'s ipaddress for Python 2.6, 2.7, 3.2." +HOMEPAGE = "https://github.com/phihag/ipaddress" +SECTION = "devel/python" +LICENSE = "Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7f538584cc3407bf76042def7168548a" + +PV = "1.0.15" +SRCREV = "95adb9f374a1cca5efda08d20d9fc58d955d4a42" + +SRCNAME = "ipaddress" +SRC_URI = "git://github.com/phihag/${SRCNAME}.git" + +S = "${WORKDIR}/git" + +inherit setuptools + +DEPENDS += " \ + python-pip \ + " + +RDEPENDS_${PN} += " \ + " diff --git a/meta-python/recipes-devtools/python/python-pyasn1_0.1.7.bb b/meta-python/recipes-devtools/python/python-pyasn1_0.1.7.bb deleted file mode 100644 index 0fe6909734..0000000000 --- a/meta-python/recipes-devtools/python/python-pyasn1_0.1.7.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Python library implementing ASN.1 types." -HOMEPAGE = "http://pyasn1.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae098273b2cf8b4af164ac20e32bddf7" -DEPENDS = "python" - -SRC_URI = "https://pypi.python.org/packages/source/p/pyasn1/pyasn1-${PV}.tar.gz" -SRC_URI[md5sum] = "2cbd80fcd4c7b1c82180d3d76fee18c8" -SRC_URI[sha256sum] = "e4f81d53c533f6bd9526b047f047f7b101c24ab17339c1a7ad8f98b25c101eab" - -S = "${WORKDIR}/pyasn1-${PV}" - -inherit setuptools - -RDEPENDS_${PN} += "python-lang python-shell" diff --git a/meta-python/recipes-devtools/python/python-pyasn1_0.1.9.bb b/meta-python/recipes-devtools/python/python-pyasn1_0.1.9.bb new file mode 100644 index 0000000000..202e4dc0c5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyasn1_0.1.9.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Python library implementing ASN.1 types." +HOMEPAGE = "http://pyasn1.sourceforge.net/" +SECTION = "devel/python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=425e62320d430219736139b134db2fc4" +DEPENDS = "python" + +SRC_URI = "https://pypi.python.org/packages/source/p/pyasn1/pyasn1-${PV}.tar.gz" +SRC_URI[md5sum] = "f00a02a631d4016818659d1cc38d229a" +SRC_URI[sha256sum] = "853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f" + +S = "${WORKDIR}/pyasn1-${PV}" + +inherit setuptools + +RDEPENDS_${PN} += "python-lang python-shell" -- cgit 1.2.3-korg