Re: [oe] [meta-oe][PATCH] gitpkgv: ensure that we close our opened files
Ignore this, just noticed the fix is already on master-next. On Fri, Jun 3, 2016 at 11:36 AM, Christopher Larsonwrote: > From: Christopher Larson > > Avoids warnings like this with python3: > > WARNING: > .../meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/ > smbnetfs_git.bb: :94: ResourceWarning: unclosed file > <_io.TextIOWrapper > name='.../build/downloads/git2/smbnetfs.git.sourceforge.net.gitroot.smbnetfs.smbnetfs/oe-gitpkgv_ace1c519d4' > mode='r' encoding='UTF-8'> > > Signed-off-by: Christopher Larson > --- > meta-oe/classes/gitpkgv.bbclass | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/classes/gitpkgv.bbclass > b/meta-oe/classes/gitpkgv.bbclass > index 1cba00c..4866fac 100644 > --- a/meta-oe/classes/gitpkgv.bbclass > +++ b/meta-oe/classes/gitpkgv.bbclass > @@ -87,11 +87,13 @@ def get_git_pkgv(d, use_tags): > > if commits != "": > oe.path.remove(rev_file, recurse=False) > -open(rev_file, "w").write("%d\n" % int(commits)) > +with open(rev_file, "w") as f: > +f.write("%d\n" % int(commits)) > else: > commits = "0" > else: > -commits = open(rev_file, "r").readline(128).strip() > +with open(rev_file, "r") as f: > +commits = f.readline(128).strip() > > if use_tags: > try: > -- > 2.8.0 > > -- Christopher Larson kergoth at gmail dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gitpkgv: ensure that we close our opened files
From: Christopher LarsonAvoids warnings like this with python3: WARNING: .../meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb: :94: ResourceWarning: unclosed file <_io.TextIOWrapper name='.../build/downloads/git2/smbnetfs.git.sourceforge.net.gitroot.smbnetfs.smbnetfs/oe-gitpkgv_ace1c519d4' mode='r' encoding='UTF-8'> Signed-off-by: Christopher Larson --- meta-oe/classes/gitpkgv.bbclass | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 1cba00c..4866fac 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -87,11 +87,13 @@ def get_git_pkgv(d, use_tags): if commits != "": oe.path.remove(rev_file, recurse=False) -open(rev_file, "w").write("%d\n" % int(commits)) +with open(rev_file, "w") as f: +f.write("%d\n" % int(commits)) else: commits = "0" else: -commits = open(rev_file, "r").readline(128).strip() +with open(rev_file, "r") as f: +commits = f.readline(128).strip() if use_tags: try: -- 2.8.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 1/2] nginx: update stable version to 1.10.1
* Resolves CVE-2016-4450 Signed-off-by: Derek Straka--- meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb | 6 -- meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb deleted file mode 100644 index 53cce00..000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" - -SRC_URI[md5sum] = "c184c873d2798c5ba92be95ed1209c02" -SRC_URI[sha256sum] = "8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb new file mode 100644 index 000..c5392c7 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "088292d9caf6059ef328aa7dda332e44" +SRC_URI[sha256sum] = "1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 2/2] nginx: update to version 1.11.1
* Resolves CVE-2016-4450 Signed-off-by: Derek Straka--- .../recipes-httpd/nginx/{nginx_1.9.15.bb => nginx_1.11.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-webserver/recipes-httpd/nginx/{nginx_1.9.15.bb => nginx_1.11.1.bb} (64%) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.11.1.bb similarity index 64% rename from meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb rename to meta-webserver/recipes-httpd/nginx/nginx_1.11.1.bb index abbec53..eade7ed 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.11.1.bb @@ -6,5 +6,5 @@ DEFAULT_PREFERENCE = "-1" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" -SRC_URI[md5sum] = "13cd38e9da3789035750dd45882c4a26" -SRC_URI[sha256sum] = "cc89b277cc03f403c0b746d60aa5943cdecf59ae48278f8cb7e2df0cbdb6dac3" +SRC_URI[md5sum] = "0f3900165b11c417854535f3538913cb" +SRC_URI[sha256sum] = "5d8dd0197e3ffeb427729c045382182fb28db8e045c635221b2e0e6722821ad0" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCHv4 3/3] python-tornado: add missing python2 runtime deps
Tornado 4.3 needs backports_abc and singledispatch backport modules at runtime to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 Signed-off-by: S. Lockwood-Childs--- meta-python/recipes-devtools/python/python-tornado_4.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-tornado_4.3.bb b/meta-python/recipes-devtools/python/python-tornado_4.3.bb index 55a48b8..d30f88f 100644 --- a/meta-python/recipes-devtools/python/python-tornado_4.3.bb +++ b/meta-python/recipes-devtools/python/python-tornado_4.3.bb @@ -1,3 +1,3 @@ inherit pypi setuptools require python-tornado.inc -RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl" +RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl ${PYTHON_PN}-backports-abc ${PYTHON_PN}-singledispatch" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][PATCHv4 1/3] python-backports-abc: initial recipe for version 0.4
On 06/03/2016 08:10 AM, S. Lockwood-Childs wrote: This package backports Python 3.4 collections.abc to earlier Python versions. It is being added as one of the two missing backport modules that Tornado 4.3 needs in order to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named backports_abc Signed-off-by: S. Lockwood-ChildsBeautiful log message :-) --- .../python/python-backports-abc_0.4.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-backports-abc_0.4.bb diff --git a/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb new file mode 100644 index 000..6a4d267 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "collections.abc from Python 3.4" +DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +# pypi package doesn't have valid entry for license +SRC_URI += "https://raw.githubusercontent.com/cython/backports_abc/master/LICENSE;name=license; + +SRC_URI[md5sum] = "0b65a216ce9dc9c1a7e20a729dd7c05b" +SRC_URI[sha256sum] = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5" +SRC_URI[license.md5sum] = "dd98d01d471fac8d8dbdd975229dba03" +SRC_URI[license.sha256sum] = "0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca" + + + +PYPI_PACKAGE = "backports_abc" +inherit pypi setuptools -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCHv4 2/3] python-singledispatch: initial recipe for version 3.4.0.3
This package backports functools.singledispatch from Python 3.4 to earlier Python versions. It is being added as one of the two missing backport modules that Tornado 4.3 needs in order to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named singledispatch Signed-off-by: S. Lockwood-Childs--- .../python/python-singledispatch_3.4.0.3.bb | 13 + 1 file changed, 13 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb diff --git a/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb new file mode 100644 index 000..87f46e5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "functools.singledispatch from Python 3.4" +DESCRIPTION = "PEP 443 proposed to expose a mechanism in the functools standard library module \ +in Python 3.4 that provides a simple form of generic programming known as single-dispatch \ +generic functions. This library is a backport of this functionality to Python 2.6 - 3.3" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=ee3cd67264adc7eb07981f3644dc17dc" + +SRC_URI[md5sum] = "af2fc6a3d6cc5a02d0bf54d909785fcb" +SRC_URI[sha256sum] = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c" + +PYPI_PACKAGE = "singledispatch" +inherit pypi setuptools -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCHv4 1/3] python-backports-abc: initial recipe for version 0.4
This package backports Python 3.4 collections.abc to earlier Python versions. It is being added as one of the two missing backport modules that Tornado 4.3 needs in order to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named backports_abc Signed-off-by: S. Lockwood-Childs--- .../python/python-backports-abc_0.4.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-backports-abc_0.4.bb diff --git a/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb new file mode 100644 index 000..6a4d267 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "collections.abc from Python 3.4" +DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +# pypi package doesn't have valid entry for license +SRC_URI += "https://raw.githubusercontent.com/cython/backports_abc/master/LICENSE;name=license; + +SRC_URI[md5sum] = "0b65a216ce9dc9c1a7e20a729dd7c05b" +SRC_URI[sha256sum] = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5" +SRC_URI[license.md5sum] = "dd98d01d471fac8d8dbdd975229dba03" +SRC_URI[license.sha256sum] = "0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca" + + + +PYPI_PACKAGE = "backports_abc" +inherit pypi setuptools -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCHv4 0/3] Tornado 4.3 is missing python2 RDEPENDS
Tornado 4.3 needs a couple more backport modules to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named singledispatch ImportError: No module named backports_abc S. Lockwood-Childs (3): python-backports-abc: initial recipe for version 0.4 python-singledispatch: initial recipe for version 3.4.0.3 python-tornado: add missing python2 runtime deps .../python/python-backports-abc_0.4.bb | 18 ++ .../python/python-singledispatch_3.4.0.3.bb| 13 + .../recipes-devtools/python/python-tornado_4.3.bb | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python-backports-abc_0.4.bb create mode 100644 meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel