diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2023-05-24 09:52:35 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-05-24 07:23:54 -0700 |
| commit | 07fad37c9818a9f365c1f82f6f1907cafdb1d1f6 (patch) | |
| tree | 1870794108a077e2cf18f70ad2fc88680a1c7b0b /meta-python/recipes-devtools | |
| parent | 26397c2ea3fe904cc99cd767c9e2b1c5b3840321 (diff) | |
| download | meta-openembedded-07fad37c9818a9f365c1f82f6f1907cafdb1d1f6.tar.gz | |
meta-python: remove unused patches from python2 recipes
* python2 recipes were removed in:
https://git.openembedded.org/meta-openembedded/commit/?id=05d0c5eee319055816bbea8b9dd972f723f68019
but some of the unused patch files were left behind
* meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch:
https://git.openembedded.org/meta-openembedded/diff/meta-python/recipes-devtools/python/python-pyrex_0.9.9.bb?id=05d0c5eee319055816bbea8b9dd972f723f68019
* meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch
meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch
https://git.openembedded.org/meta-openembedded/diff/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb?id=05d0c5eee319055816bbea8b9dd972f723f68019
* meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
https://git.openembedded.org/meta-openembedded/tree/meta-python/recipes-devtools/python/python-mccabe_0.4.0.bb?id=698c36f58434009844b90d7bda1ab38b5af3d62a
* meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch
meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
https://git.openembedded.org/meta-openembedded/tree/meta-python/recipes-devtools/python/python-pygpgme_0.3.bb?id=698c36f58434009844b90d7bda1ab38b5af3d62a
* meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch
https://git.openembedded.org/meta-openembedded/diff/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb?id=05d0c5eee319055816bbea8b9dd972f723f68019
* meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
https://git.openembedded.org/meta-openembedded/diff/meta-python/recipes-devtools/python/python-numeric_24.2.bb?id=05d0c5eee319055816bbea8b9dd972f723f68019
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools')
13 files changed, 0 insertions, 497 deletions
diff --git a/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch b/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch deleted file mode 100644 index dbb8407186..0000000000 --- a/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 0981eee9f0198c2045dc0eaa78a005d06fc7bfe4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Carlos Eduardo Moreira dos Santos <cems@cemshost.com.br> | ||
| 3 | Date: Tue, 28 Mar 2017 18:23:44 -0300 | ||
| 4 | Subject: [PATCH] Workaround for issue 2 [1] | ||
| 5 | |||
| 6 | [1] https://pagure.io/python-daemon/issue/2 | ||
| 7 | --- | ||
| 8 | version.py | 7 ++++--- | ||
| 9 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/version.py b/version.py | ||
| 12 | index d58422a377ee..293e2d64c2b7 100644 | ||
| 13 | --- a/version.py | ||
| 14 | +++ b/version.py | ||
| 15 | @@ -648,9 +648,10 @@ class ChangelogAwareDistribution(distutils.dist.Distribution, object): | ||
| 16 | |||
| 17 | @lru_cache(maxsize=128) | ||
| 18 | def get_version_info(self): | ||
| 19 | - changelog_path = get_changelog_path(self) | ||
| 20 | - version_info = generate_version_info_from_changelog(changelog_path) | ||
| 21 | - return version_info | ||
| 22 | + return { | ||
| 23 | + 'version': '2.1.2', | ||
| 24 | + 'maintainer': 'Ben Finney' | ||
| 25 | + } | ||
| 26 | |||
| 27 | def get_version(self): | ||
| 28 | version_info = self.get_version_info() | ||
| 29 | -- | ||
| 30 | 2.7.4 | ||
| 31 | |||
diff --git a/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch deleted file mode 100644 index 2575306bec..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | Date: Tue, 15 Nov 2011 13:16:54 +0100 | ||
| 4 | Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths | ||
| 5 | |||
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [embedded specific] | ||
| 9 | --- | ||
| 10 | setup.py | 14 +++----------- | ||
| 11 | 1 files changed, 3 insertions(+), 11 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/setup.py b/setup.py | ||
| 14 | index 5d4d53a..b1a22ec 100644 | ||
| 15 | --- a/setup.py | ||
| 16 | +++ b/setup.py | ||
| 17 | @@ -34,10 +34,10 @@ def libinclude(root): | ||
| 18 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
| 19 | |||
| 20 | TCL_ROOT = None | ||
| 21 | -JPEG_ROOT = None | ||
| 22 | -ZLIB_ROOT = None | ||
| 23 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
| 24 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
| 25 | TIFF_ROOT = None | ||
| 26 | -FREETYPE_ROOT = None | ||
| 27 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
| 28 | LCMS_ROOT = None | ||
| 29 | |||
| 30 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
| 31 | @@ -147,7 +147,6 @@ class pil_build_ext(build_ext): | ||
| 32 | add_directory(library_dirs, "/opt/local/lib") | ||
| 33 | add_directory(include_dirs, "/opt/local/include") | ||
| 34 | |||
| 35 | - add_directory(library_dirs, "/usr/local/lib") | ||
| 36 | # FIXME: check /opt/stuff directories here? | ||
| 37 | |||
| 38 | prefix = sysconfig.get_config_var("prefix") | ||
| 39 | @@ -207,13 +206,6 @@ class pil_build_ext(build_ext): | ||
| 40 | if os.path.isfile(os.path.join(tcl_dir, "tk.h")): | ||
| 41 | add_directory(include_dirs, tcl_dir) | ||
| 42 | |||
| 43 | - # standard locations | ||
| 44 | - add_directory(library_dirs, "/usr/local/lib") | ||
| 45 | - add_directory(include_dirs, "/usr/local/include") | ||
| 46 | - | ||
| 47 | - add_directory(library_dirs, "/usr/lib") | ||
| 48 | - add_directory(include_dirs, "/usr/include") | ||
| 49 | - | ||
| 50 | # | ||
| 51 | # insert new dirs *before* default libs, to avoid conflicts | ||
| 52 | # between Python PYD stub libs and real libraries | ||
| 53 | -- | ||
| 54 | 1.7.2.5 | ||
| 55 | |||
diff --git a/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch deleted file mode 100644 index 4960ed4661..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch +++ /dev/null | |||
| @@ -1,65 +0,0 @@ | |||
| 1 | At least lcms wasn't deterministicly detected from sysroot. | ||
| 2 | |||
| 3 | This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG. | ||
| 4 | |||
| 5 | Upstream-Status: Inappropriate [configuration] | ||
| 6 | |||
| 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 8 | |||
| 9 | diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py | ||
| 10 | --- Imaging-1.1.7.orig/setup.py 2013-07-22 10:17:02.081457075 +0200 | ||
| 11 | +++ Imaging-1.1.7/setup.py 2013-07-22 13:10:09.029707492 +0200 | ||
| 12 | @@ -39,6 +39,12 @@ | ||
| 13 | TIFF_ROOT = None | ||
| 14 | FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
| 15 | LCMS_ROOT = None | ||
| 16 | +TCL_ENABLED = os.getenv('TCL_ENABLED', "True") | ||
| 17 | +JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True") | ||
| 18 | +ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True") | ||
| 19 | +TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True") | ||
| 20 | +FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True") | ||
| 21 | +LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True") | ||
| 22 | |||
| 23 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
| 24 | |||
| 25 | @@ -220,22 +226,22 @@ | ||
| 26 | zlib = jpeg = tiff = freetype = tcl = tk = lcms = None | ||
| 27 | feature = feature() | ||
| 28 | |||
| 29 | - if find_include_file(self, "zlib.h"): | ||
| 30 | + if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"): | ||
| 31 | if find_library_file(self, "z"): | ||
| 32 | feature.zlib = "z" | ||
| 33 | elif sys.platform == "win32" and find_library_file(self, "zlib"): | ||
| 34 | feature.zlib = "zlib" # alternative name | ||
| 35 | |||
| 36 | - if find_include_file(self, "jpeglib.h"): | ||
| 37 | + if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"): | ||
| 38 | if find_library_file(self, "jpeg"): | ||
| 39 | feature.jpeg = "jpeg" | ||
| 40 | elif sys.platform == "win32" and find_library_file(self, "libjpeg"): | ||
| 41 | feature.jpeg = "libjpeg" # alternative name | ||
| 42 | |||
| 43 | - if find_library_file(self, "tiff"): | ||
| 44 | + if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"): | ||
| 45 | feature.tiff = "tiff" | ||
| 46 | |||
| 47 | - if find_library_file(self, "freetype"): | ||
| 48 | + if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"): | ||
| 49 | # look for freetype2 include files | ||
| 50 | freetype_version = 0 | ||
| 51 | for dir in self.compiler.include_dirs: | ||
| 52 | @@ -256,11 +262,11 @@ | ||
| 53 | if dir: | ||
| 54 | add_directory(self.compiler.include_dirs, dir, 0) | ||
| 55 | |||
| 56 | - if find_include_file(self, "lcms.h"): | ||
| 57 | + if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"): | ||
| 58 | if find_library_file(self, "lcms"): | ||
| 59 | feature.lcms = "lcms" | ||
| 60 | |||
| 61 | - if _tkinter and find_include_file(self, "tk.h"): | ||
| 62 | + if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"): | ||
| 63 | # the library names may vary somewhat (e.g. tcl84 or tcl8.4) | ||
| 64 | version = TCL_VERSION[0] + TCL_VERSION[2] | ||
| 65 | if find_library_file(self, "tcl" + version): | ||
diff --git a/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch deleted file mode 100644 index 9ecc63a0d6..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 3 | |||
| 4 | From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Andrew Stromnov <stromnov@gmail.com> | ||
| 6 | Date: Thu, 28 Nov 2013 16:58:43 +0400 | ||
| 7 | Subject: [PATCH] fix compiling with FreeType 2.5.1 | ||
| 8 | |||
| 9 | --- | ||
| 10 | _imagingft.c | 4 ++++ | ||
| 11 | 1 file changed, 4 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/_imagingft.c b/_imagingft.c | ||
| 14 | index 47d50bd..f19555b 100644 | ||
| 15 | --- a/_imagingft.c | ||
| 16 | +++ b/_imagingft.c | ||
| 17 | @@ -59,7 +59,11 @@ struct { | ||
| 18 | const char* message; | ||
| 19 | } ft_errors[] = | ||
| 20 | |||
| 21 | +#if defined(USE_FREETYPE_2_1) | ||
| 22 | +#include FT_ERRORS_H | ||
| 23 | +#else | ||
| 24 | #include <freetype/fterrors.h> | ||
| 25 | +#endif | ||
| 26 | |||
| 27 | /* -------------------------------------------------------------------- */ | ||
| 28 | /* font objects */ | ||
| 29 | -- | ||
| 30 | 1.8.5.1 | ||
diff --git a/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch b/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch deleted file mode 100644 index b01136f9ac..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | python-imaging: CVE-2016-2533 | ||
| 2 | |||
| 3 | the patch comes from: | ||
| 4 | https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-2533 | ||
| 5 | https://github.com/python-pillow/Pillow/commit/ae453aa18b66af54e7ff716f4ccb33adca60afd4#diff-8ff6909c159597e22288ad818938fd6b | ||
| 6 | |||
| 7 | PCD decoder overruns the shuffle buffer, Fixes #568 | ||
| 8 | |||
| 9 | Signed-off-by: Li Wang <li.wang@windriver.com> | ||
| 10 | --- | ||
| 11 | libImaging/PcdDecode.c | 4 ++-- | ||
| 12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/libImaging/PcdDecode.c b/libImaging/PcdDecode.c | ||
| 15 | index b6898e3..c02d005 100644 | ||
| 16 | --- a/libImaging/PcdDecode.c | ||
| 17 | +++ b/libImaging/PcdDecode.c | ||
| 18 | @@ -47,7 +47,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) | ||
| 19 | out[0] = ptr[x]; | ||
| 20 | out[1] = ptr[(x+4*state->xsize)/2]; | ||
| 21 | out[2] = ptr[(x+5*state->xsize)/2]; | ||
| 22 | - out += 4; | ||
| 23 | + out += 3; | ||
| 24 | } | ||
| 25 | |||
| 26 | state->shuffle((UINT8*) im->image[state->y], | ||
| 27 | @@ -62,7 +62,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) | ||
| 28 | out[0] = ptr[x+state->xsize]; | ||
| 29 | out[1] = ptr[(x+4*state->xsize)/2]; | ||
| 30 | out[2] = ptr[(x+5*state->xsize)/2]; | ||
| 31 | - out += 4; | ||
| 32 | + out += 3; | ||
| 33 | } | ||
| 34 | |||
| 35 | state->shuffle((UINT8*) im->image[state->y], | ||
| 36 | -- | ||
| 37 | 1.7.9.5 | ||
| 38 | |||
diff --git a/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch b/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch deleted file mode 100644 index 028a51ad59..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Avoid getting host sysroot paths in the library paths to fix issue like: | ||
| 2 | |||
| 3 | | /home/andrei/work/yocto/build-rpi-master/tmp/sysroots/x86_64-linux/usr/lib/libz.so: file not recognized: File format not recognized | ||
| 4 | |||
| 5 | Upstream-Status: Inappropriate [configuration] | ||
| 6 | |||
| 7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
| 8 | |||
| 9 | |||
| 10 | Index: Imaging-1.1.7/setup.py | ||
| 11 | =================================================================== | ||
| 12 | --- Imaging-1.1.7.orig/setup.py | ||
| 13 | +++ Imaging-1.1.7/setup.py | ||
| 14 | @@ -155,11 +155,6 @@ class pil_build_ext(build_ext): | ||
| 15 | |||
| 16 | # FIXME: check /opt/stuff directories here? | ||
| 17 | |||
| 18 | - prefix = sysconfig.get_config_var("prefix") | ||
| 19 | - if prefix: | ||
| 20 | - add_directory(library_dirs, os.path.join(prefix, "lib")) | ||
| 21 | - add_directory(include_dirs, os.path.join(prefix, "include")) | ||
| 22 | - | ||
| 23 | # | ||
| 24 | # locate tkinter libraries | ||
| 25 | |||
diff --git a/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch b/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch deleted file mode 100644 index 941bed3d73..0000000000 --- a/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 3484bdfa7adbaebcf8bb8e7d4820f64b12717932 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Fri, 29 Jul 2016 15:37:18 +0800 | ||
| 4 | Subject: [PATCH] python-mccabe: remove unnecessary setup_requires | ||
| 5 | pytest-runner | ||
| 6 | |||
| 7 | * Remove setup_requires pytest-runner as the | ||
| 8 | setup_requires pytest-runner actually is not | ||
| 9 | used for pytest which only in do_compile phase | ||
| 10 | via setup.py build | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 15 | --- | ||
| 16 | setup.py | 1 - | ||
| 17 | 1 file changed, 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/setup.py b/setup.py | ||
| 20 | index e59903d..bf2aaba 100644 | ||
| 21 | --- a/setup.py | ||
| 22 | +++ b/setup.py | ||
| 23 | @@ -33,7 +33,6 @@ setup( | ||
| 24 | license='Expat license', | ||
| 25 | py_modules=['mccabe'], | ||
| 26 | zip_safe=False, | ||
| 27 | - setup_requires=['pytest-runner'], | ||
| 28 | tests_require=['pytest'], | ||
| 29 | entry_points={ | ||
| 30 | 'flake8.extension': [ | ||
| 31 | -- | ||
| 32 | 2.8.1 | ||
| 33 | |||
diff --git a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch deleted file mode 100644 index 81ed744cbd..0000000000 --- a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 322e781c67d7a78fc2cfc3d377f50b825fc64abb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 2 Jun 2017 20:21:01 -0700 | ||
| 4 | Subject: [PATCH] it tries to define this function differently than it is | ||
| 5 | defined in sys/time.h. | ||
| 6 | |||
| 7 | Use the definition from system | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | Packages/RNG/Src/ranf.c | 3 --- | ||
| 12 | 1 file changed, 3 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/Packages/RNG/Src/ranf.c b/Packages/RNG/Src/ranf.c | ||
| 15 | index 5ca7dc5..e669fa8 100644 | ||
| 16 | --- a/Packages/RNG/Src/ranf.c | ||
| 17 | +++ b/Packages/RNG/Src/ranf.c | ||
| 18 | @@ -149,9 +149,6 @@ void Mixranf(int *s,u32 s48[2]) | ||
| 19 | #else | ||
| 20 | struct timeval tv; | ||
| 21 | struct timezone tz; | ||
| 22 | -#if !defined(__sgi) | ||
| 23 | - int gettimeofday(struct timeval *, struct timezone *); | ||
| 24 | -#endif | ||
| 25 | |||
| 26 | (void)gettimeofday(&tv,&tz); | ||
| 27 | s48[0] = (u32)tv.tv_sec; | ||
| 28 | -- | ||
| 29 | 2.13.0 | ||
| 30 | |||
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch deleted file mode 100644 index 1f31cb805e..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | From ed44474c11f577c1644910964a917a4cf701bb0f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> | ||
| 3 | Date: Tue, 26 Jan 2016 14:24:26 -0500 | ||
| 4 | Subject: [PATCH] reflect 2.1 reporting for key imports | ||
| 5 | |||
| 6 | GnuPG 2.1 changes how it reports key imports. These changes should | ||
| 7 | make the pygpgme test suite compatible with GnuPG 2.1. | ||
| 8 | |||
| 9 | See also: | ||
| 10 | https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html | ||
| 11 | |||
| 12 | Upstream-Status: Backport | ||
| 13 | |||
| 14 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> | ||
| 15 | |||
| 16 | --- | ||
| 17 | tests/test_import.py | 22 +++++++++++----------- | ||
| 18 | 1 file changed, 11 insertions(+), 11 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/tests/test_import.py b/tests/test_import.py | ||
| 21 | index 10eb816..597eb47 100644 | ||
| 22 | --- a/tests/test_import.py | ||
| 23 | +++ b/tests/test_import.py | ||
| 24 | @@ -55,7 +55,7 @@ class ImportTestCase(GpgHomeTestCase): | ||
| 25 | ctx = gpgme.Context() | ||
| 26 | with self.keyfile('key1.sec') as fp: | ||
| 27 | result = ctx.import_(fp) | ||
| 28 | - self.assertEqual(result.considered, 1) | ||
| 29 | + self.assertEqual(result.considered, 3) | ||
| 30 | self.assertEqual(result.no_user_id, 0) | ||
| 31 | self.assertEqual(result.imported, 1) | ||
| 32 | self.assertEqual(result.imported_rsa, 0) | ||
| 33 | @@ -64,18 +64,18 @@ class ImportTestCase(GpgHomeTestCase): | ||
| 34 | self.assertEqual(result.new_sub_keys, 0) | ||
| 35 | self.assertEqual(result.new_signatures, 0) | ||
| 36 | self.assertEqual(result.new_revocations, 0) | ||
| 37 | - self.assertEqual(result.secret_read, 1) | ||
| 38 | - self.assertEqual(result.secret_imported, 1) | ||
| 39 | + self.assertEqual(result.secret_read, 3) | ||
| 40 | + self.assertEqual(result.secret_imported, 2) | ||
| 41 | self.assertEqual(result.secret_unchanged, 0) | ||
| 42 | self.assertEqual(result.skipped_new_keys, 0) | ||
| 43 | self.assertEqual(result.not_imported, 0) | ||
| 44 | self.assertEqual(len(result.imports), 2) | ||
| 45 | self.assertEqual(result.imports[0], | ||
| 46 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', | ||
| 47 | - None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) | ||
| 48 | + None, gpgme.IMPORT_NEW)) | ||
| 49 | self.assertEqual(result.imports[1], | ||
| 50 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', | ||
| 51 | - None, gpgme.IMPORT_NEW)) | ||
| 52 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) | ||
| 53 | # can we get the public key? | ||
| 54 | key = ctx.get_key('E79A842DA34A1CA383F64A1546BB55F0885C65A4') | ||
| 55 | # can we get the secret key? | ||
| 56 | @@ -102,17 +102,17 @@ class ImportTestCase(GpgHomeTestCase): | ||
| 57 | fp = BytesIO(b'\n'.join(keys)) | ||
| 58 | ctx = gpgme.Context() | ||
| 59 | result = ctx.import_(fp) | ||
| 60 | - self.assertEqual(result.considered, 3) | ||
| 61 | + self.assertEqual(result.considered, 5) | ||
| 62 | self.assertEqual(result.no_user_id, 0) | ||
| 63 | self.assertEqual(result.imported, 2) | ||
| 64 | - self.assertEqual(result.imported_rsa, 1) | ||
| 65 | + self.assertEqual(result.imported_rsa, 0) | ||
| 66 | self.assertEqual(result.unchanged, 0) | ||
| 67 | self.assertEqual(result.new_user_ids, 0) | ||
| 68 | self.assertEqual(result.new_sub_keys, 0) | ||
| 69 | self.assertEqual(result.new_signatures, 1) | ||
| 70 | self.assertEqual(result.new_revocations, 0) | ||
| 71 | - self.assertEqual(result.secret_read, 1) | ||
| 72 | - self.assertEqual(result.secret_imported, 1) | ||
| 73 | + self.assertEqual(result.secret_read, 3) | ||
| 74 | + self.assertEqual(result.secret_imported, 2) | ||
| 75 | self.assertEqual(result.secret_unchanged, 0) | ||
| 76 | self.assertEqual(result.skipped_new_keys, 0) | ||
| 77 | self.assertEqual(result.not_imported, 0) | ||
| 78 | @@ -122,10 +122,10 @@ class ImportTestCase(GpgHomeTestCase): | ||
| 79 | None, gpgme.IMPORT_NEW)) | ||
| 80 | self.assertEqual(result.imports[1], | ||
| 81 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', | ||
| 82 | - None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) | ||
| 83 | + None, gpgme.IMPORT_SIG)) | ||
| 84 | self.assertEqual(result.imports[2], | ||
| 85 | ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', | ||
| 86 | - None, gpgme.IMPORT_SIG)) | ||
| 87 | + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) | ||
| 88 | self.assertEqual(result.imports[3], | ||
| 89 | ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', | ||
| 90 | None, gpgme.IMPORT_NEW)) | ||
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch deleted file mode 100644 index c18cf3feba..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | From ba0dc8273e4f83bcd2d43baa5910aae34b93048c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> | ||
| 3 | Date: Mon, 1 Feb 2016 19:25:12 -0500 | ||
| 4 | Subject: [PATCH] passphrase_cb is deprecated | ||
| 5 | |||
| 6 | https://bugs.gnupg.org/gnupg/issue767 indicates that | ||
| 7 | gpgme_set_passphrase_cb is a deprecated corner of the API and that | ||
| 8 | developers using gpgme should really rely on the gpg-agent to handle | ||
| 9 | this stuff. This should actually simplify things for most | ||
| 10 | installations -- just strip out all passphrase handling from your | ||
| 11 | application entirely, relying on gpg to figure out how to find the | ||
| 12 | agent, and relying on the agent figuring out how to prompt the user | ||
| 13 | (if necessary). | ||
| 14 | |||
| 15 | However, if a developer really wants to use the passphrase callback | ||
| 16 | approach, they'll have to use loopback pinentry. This sets up the | ||
| 17 | test suite to be able to make those tests. | ||
| 18 | |||
| 19 | Upstream-Status: Backport | ||
| 20 | |||
| 21 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> | ||
| 22 | |||
| 23 | --- | ||
| 24 | tests/util.py | 8 +++++++- | ||
| 25 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
| 26 | |||
| 27 | diff --git a/tests/util.py b/tests/util.py | ||
| 28 | index cd803c2..86892ca 100644 | ||
| 29 | --- a/tests/util.py | ||
| 30 | +++ b/tests/util.py | ||
| 31 | @@ -28,7 +28,9 @@ keydir = os.path.join(os.path.dirname(__file__), 'keys') | ||
| 32 | |||
| 33 | class GpgHomeTestCase(unittest.TestCase): | ||
| 34 | |||
| 35 | - gpg_conf_contents = '' | ||
| 36 | + gpg_conf_contents = 'pinentry-mode loopback' | ||
| 37 | + gpg_agent_conf_contents = 'allow-loopback-pinentry' | ||
| 38 | + | ||
| 39 | import_keys = [] | ||
| 40 | |||
| 41 | def keyfile(self, key): | ||
| 42 | @@ -41,6 +43,10 @@ class GpgHomeTestCase(unittest.TestCase): | ||
| 43 | fp.write(self.gpg_conf_contents.encode('UTF-8')) | ||
| 44 | fp.close() | ||
| 45 | |||
| 46 | + fp = open(os.path.join(self._gpghome, 'gpg-agent.conf'), 'wb') | ||
| 47 | + fp.write(self.gpg_agent_conf_contents.encode('UTF-8')) | ||
| 48 | + fp.close() | ||
| 49 | + | ||
| 50 | # import requested keys into the keyring | ||
| 51 | ctx = gpgme.Context() | ||
| 52 | for key in self.import_keys: | ||
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch deleted file mode 100644 index 6acb68bfe7..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> | ||
| 3 | Date: Mon, 1 Feb 2016 19:27:59 -0500 | ||
| 4 | Subject: [PATCH] handle generic error when no passphrase callback present | ||
| 5 | |||
| 6 | apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was | ||
| 7 | in loopback mode and no passphrase callback was supplied. Earlier | ||
| 8 | versions supplied ERR_BAD_PASSPHRASE. | ||
| 9 | |||
| 10 | Upstream-Status: Backport | ||
| 11 | |||
| 12 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> | ||
| 13 | |||
| 14 | --- | ||
| 15 | tests/test_passphrase.py | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/tests/test_passphrase.py b/tests/test_passphrase.py | ||
| 19 | index 0a235e9..35b3c59 100644 | ||
| 20 | --- a/tests/test_passphrase.py | ||
| 21 | +++ b/tests/test_passphrase.py | ||
| 22 | @@ -41,7 +41,7 @@ class PassphraseTestCase(GpgHomeTestCase): | ||
| 23 | new_sigs = ctx.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR) | ||
| 24 | except gpgme.GpgmeError as exc: | ||
| 25 | self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME) | ||
| 26 | - self.assertEqual(exc.args[1], gpgme.ERR_BAD_PASSPHRASE) | ||
| 27 | + self.assertEqual(exc.args[1], gpgme.ERR_GENERAL) | ||
| 28 | else: | ||
| 29 | self.fail('gpgme.GpgmeError not raised') | ||
| 30 | |||
diff --git a/meta-python/recipes-devtools/python/python-pygpgme/run-ptest b/meta-python/recipes-devtools/python/python-pygpgme/run-ptest deleted file mode 100644 index ce2abb66a5..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/run-ptest +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | GPG_AGENT_INFO= python test_all.py -v 2>&1 | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' | ||
diff --git a/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch b/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch deleted file mode 100644 index c58c3280e2..0000000000 --- a/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Index: Pyrex-0.9.8.4/Pyrex/Distutils/extension.py | ||
| 4 | =================================================================== | ||
| 5 | --- Pyrex-0.9.8.4.orig/Pyrex/Distutils/extension.py | ||
| 6 | +++ Pyrex-0.9.8.4/Pyrex/Distutils/extension.py | ||
| 7 | @@ -15,7 +15,7 @@ except ImportError: | ||
| 8 | warnings = None | ||
| 9 | |||
| 10 | class Extension(_Extension.Extension): | ||
| 11 | - _Extension.Extension.__doc__ + \ | ||
| 12 | + _Extension.Extension.__doc__ or "" + \ | ||
| 13 | """pyrex_include_dirs : [string] | ||
| 14 | list of directories to search for Pyrex header files (.pxd) (in | ||
| 15 | Unix form for portability) | ||
