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/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch | |
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/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch | 52 |
1 files changed, 0 insertions, 52 deletions
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: | ||