The gpgme-tool binary is licensed GPL-3.0-or-later. Split it out into
its own package that can be opted out of.
(From OE-Core rev: bbcd56bace90f4a148960a7108dc8d0e6c364903)
Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Now that bitbake supports the use of inherit_defer, switch all conditional
(variable based) inherits to use this instead. This leads to more a more
deterministic user experience since there is no longer an immediate expansion
and later changes to the variables in question (e.g. a bbappend) are
accounted for.
This patch tries to ensure the behaviour before/after remains as unchanged
as it reasonably can, e.g. by always inherting populate_sdk_base. native
and nativesdk continue to need to be inherited last, hence being used
with inherit_defer in a handful of very specific cases.
(From OE-Core rev: 451363438d38bd4552d5bcec4a92332f5819a5d4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
============
* Preserve more specific existing failure code.
* qt: Start dirmngr with gpgconf to avoid multiple instances.
* qt: On Windows, use UTF-8 when logging the error text.
* qt: Remove left-over partial files more persistently.
* qt: Use a temporary file name when creating signed or encrypted
archives.
* qt: Build Qt 6 bindings with -fPIC if requested or Qt 6 was built with
this flag.
0001-autogen.sh-remove-unknown-in-version.patch0001-pkgconfig.patch
0001-pkgconfig.patch
0001-use-closefrom-on-linux-and-glibc-2.34.patch
0003-Correctly-install-python-modules.patch
0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
0006-fix-build-path-issue.patch
0008-do-not-auto-check-var-PYTHON.patch
refreshed for 1.23.2
(From OE-Core rev: 178dab3a479729aa0980a40846a81f5f3da8d709)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The only consumer in oe-core was dnf, and latest dnf releases no longer
use it. There are no consumers in meta-oe.
gpgme's python support is generally a pain to support, and lags
behind upstream python versions. It was enabled in
commit fc6c81da79
Author: Mark Hatle <mark.hatle@windriver.com>
Date: Tue Mar 7 12:54:33 2017 -0600
gpgme: Fix issue building for the target
which wasn't prompted by any consumer requiring python,
but rather to correct build errors in absence of specific
configuration passed in.
(From OE-Core rev: 6d82ce8c16e724d5bba088b3a3d05c1690e47862)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
==========
* w32: Change gpgme-w32-spawn to use Unicode arguments.
* Support GPGME_ENCRYPT_ALWAYS_TRUST also for S/MIME.
* New keylist mode GPGME_KEYLIST_MODE_WITH_V5FPR.
* New key capability flags has_*.
* gpgme-tool: Support use of Windows HANDLE.
* qt: Support refreshing keys via WKD.
* qt: Handle cancel in changeexpiryjob.
(From OE-Core rev: 213a7948f832f3a37d025f5fb32f80722e50b95e)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop patch and --disable-lang-python-test option (upstream fixed the issue).
(From OE-Core rev: b82836dd4bcfe017c66b26c44430f6aa7671e7ce)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The python3-gpg's version is now '1.18.0-unknown'. Such version
has been treated as invalid for setuptools >=66.0.0. The error
message is as below:
pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown'
(package: gpg)
Fix this issue by removing the '-unknown' suffix.
(From OE-Core rev: 3a8bf81c5fb6111eab9784192754271efc85ee5c)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Inheriting setuptools3-base adds a runtime dependency on Python.
This change makes inheriting setuptools3-base optional. If one does not want
a runtime dependency on Python, they can remove python from LANGUAGES.
Additionally, as Python 2 has been EOL for nearly 3 years now, all Python 2 related parts have been taken out.
(From OE-Core rev: 1e2381d870b81813d3e9841fc207ac1cfa388386)
Signed-off-by: David Bagonyi <david.bagonyi@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.
(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The following patches refreshed for 1.17.0
0001-pkgconfig.patch
0001-use-closefrom-on-linux-and-glibc-2.34.patch
Changelog:
=========
qt: Fix build for older Qt versions.
(From OE-Core rev: fac45ef439c6156873d2076083d5b3e43015b7e2)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
What was distutils-common-base has been merged into setuptools3-base,
since we no longer need to support python2 and python3.
[YOCTO #14610]
(From OE-Core rev: 4ca72e4e04841571ee42a838ec14f6b519c54c1e)
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since oe-core 543e39ad "bitbake.conf: handle cmake -dev files packaging
with default rules" (June 2018) there's no need for recipes to add
${libdir}/cmake or ${datadir}/cmake to FILES_${PN}-dev themselves.
(From OE-Core rev: e6f62b8e639a79626d95568c070a410c24bce25e)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fix error:
file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32
part of diff:
-#if 64
+#if 0
#ifndef _FILE_OFFSET_BITS
-#error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see the section "Largefile support (LFS)" in the GPGME manual.
#else
-#if (_FILE_OFFSET_BITS) != (64)
-#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#if (_FILE_OFFSET_BITS) != (0)
+#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 0, please see the section "Largefile support (LFS)" in the GPGME manual.
#endif
#endif
#endif
LFS support is enabled by default, and this header is generated during
build according to current configure
(From OE-Core rev: bd056f9c4c22740a4f7ede00c758a21037eae5ca)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Revert gpgrt-config support which oe-core does not support it
- Rebase 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
and 0001-pkgconfig.patch
- Tweak LANGUAGES, since upstream auto check the version of python rather
than specify option
[ff6ff61 python: Auto-check for all installed python versions.]
License-update: SPDX identifiers site and formats
[8d91c0f Add SPDX identifiers to most source files]
"s/LGPL-2.1+/LGPL-2.1-or-later/"
"s#https://www.gnu.org/licenses#https://gnu.org/licenses#"
(From OE-Core rev: 991d374edd6fc66400dad0c54f007bfaaa46e47a)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rebase 0007-qt-python-Add-variables-to-tests.patch
Rework 0007-qt-python-Add-variables-to-tests.patch -> 0007-python-Add-variables-to-tests.patch
Drop newly added option --disable-lang-qt-test which is merged to --disable-gpg-test by
upstream commit [26820ba qt: Respect --disable-gpg-test for tests]
(From OE-Core rev: 9457163b2c4982a64814c6b38c292d7bc61ff643)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
its building a module therefore its important to provide correct cross
build environment, distutils3-base automatically inherits python3native
this is seen when using clang where it tried to link with gcc since the
environment falls back to builtin LDSHARED variable
(From OE-Core rev: 8bfb54edc6fafda2301aece91ec6b55905e2a418)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While multilib, the local m4/python.m4 incorrectly assigned
am_cv_python_pyexecdir and am_cv_python_pythondir which caused
the following error enabled:
...
ERROR: gpgme-1.9.0-r0 do_package: QA Issue: gpgme: Files/directories
were installed but not shipped in any package:
/usr/lib/python3.5/site-packages/gpg-1.9.0-py3.5.egg-info
...
(From OE-Core rev: f5c7e236582028638a26a5855d5e7ba0b55bb8f0)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Existing patch was actually doing the wrong thing and
sometimes removing a linking flag (-lgpgme) that should be present.
Instead, gpgme-config actually has internal logic to remove /usr/lib from the output,
which works only in non-multilib setups, so it is adjusted to include all possible
/usr/lib* and /lib* directories.
(From OE-Core rev: 84cb611079b7cf78b9921c78978943fa4adae1c7)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are a number of reasons that importing a module could cause output on
stderr that isn't a fatal error (compatibilty problems with inputrc, or encoding
warnings) so backport a patch from autoconf-archive to only check the exit code
instead of asserting that stderr is empty.
[ YOCTO #11231 ]
(From OE-Core rev: ebfd79ae6e5954253c3bb0886d476be480b24de8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building the C++ bindings for native requires a host C++ compiler with
C++11 support. Since these bindings are currently not needed, we can
disable them and thus avoid increasing the requirement for the host C++
compiler.
(From OE-Core rev: 052547561f3b2c13d357da87061716c6eb968fb9)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gpgme failed when configuring since you can only configure for one python
system at a time (via the inherits). So we need to have a PACKAGECONFIG
that defines which one [or neither] you want to use.
The prior pkgconfig patch introduced the usage of the variable PKG_CONFIG,
which is not defined anywhere. Define this.
When building the python module, we can not call gpg-error-config, so we
need to find an alternative way of finding the information the setup.py.in
requires. (In this case, it's easy to just use the environment
STAGING_INCDIR.)
(From OE-Core rev: 839d6f124c2761194c868cf5597e1aa96571e1ca)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Drop gpgme.pc, it is duplicated with pkgconfig.patch
- Rebase pkgconfig.patch to 1.8.0
- Split cmake config to ${PN}-dev
- Update LIC_FILES_CHKSUM, because copytright year changed.
- The libgpgme-pthread is obsolete by upstream;
- Add package libgpgcpp;
TODO: Do not remove gpgme-pthread.pc from pkgconfig.patch,
the upstream explains:
git://git.gnupg.org/gpgme.git
commit 09b64554328445e99a8cc78fc34ea49c2ea2e7f9
------------------------------
libgpgme-pthread is removed but gpgme-config still supports
--thread=pthread for compatibility with find scripts.
------------------------------
(From OE-Core rev: 62b91f655977bdf2faaf53443c47785738c1d0f6)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
https version seems more reliable and in an informal test fetching
all gnupg recipes now takes <20% of the time it used to.
Define GNUPG_MIRROR in bitbake.conf so future tweaks to this are
easier. Replace some slower mirrors with the official ftp site
and another from gnupg.org mirror list.
Set UPSTREAM_CHECK_URI in all recipes that need it to
"https://gnupg.org/download/index.html" as the directory listings
are not up-to-date.
(From OE-Core rev: dfc9178e2f2b6873ca497d981e308e00d15280b5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Configure looks for error_t in errno.h and musl does not define error_t
if its not defined then configure emits a definition to be used, now we
also use standalone argp implementation from glibc on musl based systems
which defines this in argp.h as well so now we have it defined twice
and errors like
|
/a/builder/mnt/build-oe/tmp-musl/sysroots/raspberrypi2/usr/include/argp.h:40:13:
error: cannot combine with previous 'int' declaration specifier
| typedef int error_t;
| ^
| ../config.h:257:17: note: expanded from macro 'error_t'
| #define error_t int
| ^
| 1 error generated.
are seen. argp.h definition is conditional on __error_t_defined which is
true here so lets define it on musl
(From OE-Core rev: 29e1edcba39a21057ba5862eef4e79c177e7ef62)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License checksum changed because of text layout change.
(From OE-Core rev: 5afb75e552573dda6770c59b5eed2d1be0bb26f7)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.
(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Update pkgconfig.patch
* Remove gpgme-fix-CVE-2014-3564.patch since it is a backport patch
* The license checksum of src/gpgme.h.in is changed because it added the
year 2014, the conten are the same.
* Remove --without-gpgsm --with-g13 --with-gpgconf --with-gpg from
EXTRA_OECONF, it doesn't have these options any more, and the values will
checked located at runtime.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pkg-config is less error prone than -config files so switch to
using it (we already do for most of the rest of the gpg stack).
(From OE-Core rev: 046c7fd45fcf0c9226f76d51425978264930653b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patrick Wicki
Richard Purdie
Wang Mingyu
Alexander Kanavin
Khem Raj
Chen Qi
David Bagonyi
Tim Orling
Ross Burton
Wang Mingyu
zangrc
Changqing Li
Yuan Chao
Hongxu Jia
Alex Kiernan
Alexander Kanavin
Ross Burton
Peter Kjellerstedt
Mark Hatle
Jussi Kukkonen
Robert Yang
Kai Kang