Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
@@ -0,0 +1,116 @@
|
||||
From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 10 May 2019 14:18:04 +0800
|
||||
Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
|
||||
|
||||
This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83.
|
||||
|
||||
The oe-core does not support gpgrt-config, so revert it
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
src/gpgme.m4 | 54 ++++++++--------------------------------------------
|
||||
1 file changed, 8 insertions(+), 46 deletions(-)
|
||||
|
||||
diff --git a/src/gpgme.m4 b/src/gpgme.m4
|
||||
index f2906c1..8cc2898 100644
|
||||
--- a/src/gpgme.m4
|
||||
+++ b/src/gpgme.m4
|
||||
@@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
|
||||
fi
|
||||
fi
|
||||
|
||||
- use_gpgrt_config=""
|
||||
- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
- if $GPGRT_CONFIG gpgme --exists; then
|
||||
- GPGME_CONFIG="$GPGRT_CONFIG gpgme"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
|
||||
- use_gpgrt_config=yes
|
||||
- fi
|
||||
- fi
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
|
||||
- fi
|
||||
+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
|
||||
|
||||
if test "$GPGME_CONFIG" != "no" ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- gpgme_version=`$GPGME_CONFIG --version`
|
||||
- else
|
||||
- gpgme_version=`$GPGME_CONFIG --modversion`
|
||||
- fi
|
||||
+ gpgme_version=`$GPGME_CONFIG --version`
|
||||
fi
|
||||
gpgme_version_major=`echo $gpgme_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
@@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
|
||||
|
||||
AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
|
||||
[
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
|
||||
- else
|
||||
- gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
|
||||
- fi
|
||||
+ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
|
||||
if test x"$gpgme_config_host" != xnone ; then
|
||||
if test x"$gpgme_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
***
|
||||
-*** The config script "$GPGME_CONFIG" was
|
||||
+*** The config script $GPGME_CONFIG was
|
||||
*** built for $gpgme_config_host and thus may not match the
|
||||
*** used host $host.
|
||||
*** You may want to use the configure option --with-gpgme-prefix
|
||||
@@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME],
|
||||
# If we have a recent GPGME, we should also check that the
|
||||
# API is compatible.
|
||||
if test "$req_gpgme_api" -gt 0 ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- else
|
||||
- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
||||
- fi
|
||||
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
if test "$req_gpgme_api" -ne "$tmp" ; then
|
||||
ok=no
|
||||
@@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
|
||||
# If we have a recent GPGME, we should also check that the
|
||||
# API is compatible.
|
||||
if test "$req_gpgme_api" -gt 0 ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- else
|
||||
- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
||||
- fi
|
||||
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
if test "$req_gpgme_api" -ne "$tmp" ; then
|
||||
ok=no
|
||||
@@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
|
||||
- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
|
||||
- else
|
||||
- if $GPGRT_CONFIG gpgme-glib --exists; then
|
||||
- GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
|
||||
- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
|
||||
- GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
|
||||
- else
|
||||
- ok = no
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- if test $ok = yes; then
|
||||
+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
|
||||
+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
_AM_PATH_GPGME_CONFIG_HOST_CHECK
|
||||
@@ -0,0 +1,32 @@
|
||||
From acc4750ffa79a5c2ef3c95cf31ef51352a68837b Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Tue, 28 Feb 2023 13:43:51 +0800
|
||||
Subject: [PATCH] autogen.sh: remove '-unknown' in version
|
||||
|
||||
python setuptools >=66.0.0 treats '-unknown' as an invalid version.
|
||||
The error message is as below:
|
||||
pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown'
|
||||
|
||||
Remove the '-unknown' suffix to fix this issue.
|
||||
|
||||
Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html]
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
|
||||
---
|
||||
autogen.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/autogen.sh b/autogen.sh
|
||||
index 4e1665b..a55326d 100755
|
||||
--- a/autogen.sh
|
||||
+++ b/autogen.sh
|
||||
@@ -269,7 +269,7 @@ if [ "$myhost" = "find-version" ]; then
|
||||
else
|
||||
ingit=no
|
||||
beta=yes
|
||||
- tmp="-unknown"
|
||||
+ tmp=""
|
||||
rev="0000000"
|
||||
rvd="0"
|
||||
fi
|
||||
@@ -0,0 +1,295 @@
|
||||
From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Fri, 10 May 2019 14:23:55 +0800
|
||||
Subject: [PATCH] pkgconfig
|
||||
|
||||
Update gpgme to use pkgconfig instead of -config files since its
|
||||
simpler and less error prone when cross compiling.
|
||||
|
||||
Upstream-Status: Denied [Upstream not interested in pkg-config support]
|
||||
RP 2015/4/17
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
Rebase to 1.13.0
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Rebase to 1.17.0
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
src/Makefile.am | 4 +-
|
||||
src/gpgme-pthread.pc.in | 15 +++++
|
||||
src/gpgme.m4 | 119 +++-------------------------------------
|
||||
src/gpgme.pc.in | 4 +-
|
||||
5 files changed, 29 insertions(+), 114 deletions(-)
|
||||
create mode 100644 src/gpgme-pthread.pc.in
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ae4c7da..df892c9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
|
||||
src/gpgme-glib.pc
|
||||
src/gpgme.h)
|
||||
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
|
||||
+AC_CONFIG_FILES(src/gpgme-pthread.pc)
|
||||
AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
|
||||
AC_CONFIG_FILES(lang/cpp/tests/Makefile)
|
||||
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index ca70950..bda5498 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -20,11 +20,11 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
-pkgconfig_DATA = gpgme.pc gpgme-glib.pc
|
||||
+pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc
|
||||
|
||||
EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
|
||||
gpgme.h.in versioninfo.rc.in gpgme.def \
|
||||
- gpgme.pc.in gpgme-glib.pc.in
|
||||
+ gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in
|
||||
|
||||
if USE_GPGRT_CONFIG
|
||||
noinst_SCRIPTS = gpgme-config
|
||||
diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..074bbf6
|
||||
--- /dev/null
|
||||
+++ b/src/gpgme-pthread.pc.in
|
||||
@@ -0,0 +1,15 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+# API info
|
||||
+api_version=@GPGME_CONFIG_API_VERSION@
|
||||
+host=@GPGME_CONFIG_HOST@
|
||||
+
|
||||
+Name: gpgme
|
||||
+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (deprecated)
|
||||
+Version: @VERSION@
|
||||
+Libs: -L${libdir} -lgpgme -lpthread
|
||||
+Cflags: -I${includedir}
|
||||
+Requires: libassuan gpg-error
|
||||
diff --git a/src/gpgme.m4 b/src/gpgme.m4
|
||||
index 8cc2898..0ff550e 100644
|
||||
--- a/src/gpgme.m4
|
||||
+++ b/src/gpgme.m4
|
||||
@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script
|
||||
dnl is added to the gpg_config_script_warn variable.
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GPGME],
|
||||
-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
|
||||
+[
|
||||
tmp=ifelse([$1], ,1:0.4.2,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
||||
@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME],
|
||||
min_gpgme_version="$tmp"
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
|
||||
- ok=no
|
||||
- if test "$GPGME_CONFIG" != "no" ; then
|
||||
- req_major=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
- if test "$gpgme_version_major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_major" -eq "$req_major"; then
|
||||
- if test "$gpgme_version_minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_minor" -eq "$req_minor"; then
|
||||
- if test "$gpgme_version_micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no])
|
||||
if test $ok = yes; then
|
||||
# If we have a recent GPGME, we should also check that the
|
||||
# API is compatible.
|
||||
if test "$req_gpgme_api" -gt 0 ; then
|
||||
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
+ tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
if test "$req_gpgme_api" -ne "$tmp" ; then
|
||||
ok=no
|
||||
@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME],
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
- GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
|
||||
- GPGME_LIBS=`$GPGME_CONFIG --libs`
|
||||
- AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
_AM_PATH_GPGME_CONFIG_HOST_CHECK
|
||||
else
|
||||
- GPGME_CFLAGS=""
|
||||
- GPGME_LIBS=""
|
||||
- AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
- AC_SUBST(GPGME_CFLAGS)
|
||||
- AC_SUBST(GPGME_LIBS)
|
||||
])
|
||||
|
||||
dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
|
||||
@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
|
||||
dnl and GPGME_PTHREAD_LIBS.
|
||||
dnl
|
||||
-AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
|
||||
- AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl
|
||||
- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
|
||||
+AC_DEFUN([AM_PATH_GPGME_PTHREAD],
|
||||
+[
|
||||
tmp=ifelse([$1], ,1:0.4.2,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
||||
@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
|
||||
min_gpgme_version="$tmp"
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
|
||||
- ok=no
|
||||
- if test "$GPGME_CONFIG" != "no" ; then
|
||||
- req_major=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
- if test "$gpgme_version_major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_major" -eq "$req_major"; then
|
||||
- if test "$gpgme_version_minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_minor" -eq "$req_minor"; then
|
||||
- if test "$gpgme_version_micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])
|
||||
if test $ok = yes; then
|
||||
# If we have a recent GPGME, we should also check that the
|
||||
# API is compatible.
|
||||
if test "$req_gpgme_api" -gt 0 ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- else
|
||||
- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
||||
- fi
|
||||
+ tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
if test "$req_gpgme_api" -ne "$tmp" ; then
|
||||
ok=no
|
||||
@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags`
|
||||
- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs`
|
||||
- AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
_AM_PATH_GPGME_CONFIG_HOST_CHECK
|
||||
else
|
||||
- GPGME_PTHREAD_CFLAGS=""
|
||||
- GPGME_PTHREAD_LIBS=""
|
||||
- AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
- AC_SUBST(GPGME_PTHREAD_CFLAGS)
|
||||
- AC_SUBST(GPGME_PTHREAD_LIBS)
|
||||
])
|
||||
|
||||
|
||||
@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
|
||||
min_gpgme_version="$tmp"
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
|
||||
- ok=no
|
||||
- if test "$GPGME_CONFIG" != "no" ; then
|
||||
- req_major=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_gpgme_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
- if test "$gpgme_version_major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_major" -eq "$req_major"; then
|
||||
- if test "$gpgme_version_minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$gpgme_version_minor" -eq "$req_minor"; then
|
||||
- if test "$gpgme_version_micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no])
|
||||
if test $ok = yes; then
|
||||
# If we have a recent GPGME, we should also check that the
|
||||
# API is compatible.
|
||||
if test "$req_gpgme_api" -gt 0 ; then
|
||||
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
+ tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
if test "$req_gpgme_api" -ne "$tmp" ; then
|
||||
ok=no
|
||||
@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
|
||||
- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
|
||||
- AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
_AM_PATH_GPGME_CONFIG_HOST_CHECK
|
||||
else
|
||||
- GPGME_GLIB_CFLAGS=""
|
||||
- GPGME_GLIB_LIBS=""
|
||||
- AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
- AC_SUBST(GPGME_GLIB_CFLAGS)
|
||||
- AC_SUBST(GPGME_GLIB_LIBS)
|
||||
])
|
||||
diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
|
||||
index 9ddef5c..932645b 100644
|
||||
--- a/src/gpgme.pc.in
|
||||
+++ b/src/gpgme.pc.in
|
||||
@@ -9,6 +9,6 @@ Name: gpgme
|
||||
Description: GnuPG Made Easy to access GnuPG
|
||||
Requires.private: gpg-error, libassuan
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Cflags: @GPGME_CONFIG_CFLAGS@
|
||||
-Libs: @GPGME_CONFIG_LIBS@
|
||||
+Cflags: -I${includedir}
|
||||
+Libs: -L${libdir} -lgpgme
|
||||
URL: https://www.gnupg.org/software/gpgme/index.html
|
||||
@@ -0,0 +1,42 @@
|
||||
From be33cf1812b4c2a3ed85fb2532992bfb2b27b3be Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 15 Dec 2022 08:44:13 -0800
|
||||
Subject: [PATCH] posix-io.c: Use off_t instead of off64_t
|
||||
|
||||
configure.ac checks for largefile support via AC_SYS_LARGEFILE already,
|
||||
therefore use off_t and ino_t instead of 64bit variants. Musl e.g. does
|
||||
not define them without _LARGEFILE64_SOURCE and error is not seen on
|
||||
glibc because _GNU_SOURCE defines _LARGEFILE64_SOURCE
|
||||
|
||||
Fixes errors like below on 32-bit musl systems
|
||||
|
||||
../../../../../../../../workspace/sources/gpgme/src/posix-io.c:77:3: error: unknown type name 'ino64_t'; did you mean 'int64_t'?
|
||||
ino64_t d_ino;
|
||||
^~~~~~~
|
||||
int64_t
|
||||
^
|
||||
../../../../../../../../workspace/sources/gpgme/src/posix-io.c:78:3: error: unknown type name 'off64_t'; did you mean 'off_t'?
|
||||
off64_t d_off;
|
||||
^~~~~~~
|
||||
|
||||
Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2022-December/035222.html]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/posix-io.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/posix-io.c b/src/posix-io.c
|
||||
index 0d0a98b..286a626 100644
|
||||
--- a/src/posix-io.c
|
||||
+++ b/src/posix-io.c
|
||||
@@ -74,8 +74,8 @@
|
||||
* define it ourselves. */
|
||||
struct linux_dirent64
|
||||
{
|
||||
- ino64_t d_ino;
|
||||
- off64_t d_off;
|
||||
+ ino_t d_ino;
|
||||
+ off_t d_off;
|
||||
unsigned short d_reclen;
|
||||
unsigned char d_type;
|
||||
char d_name[];
|
||||
@@ -0,0 +1,28 @@
|
||||
From e1fc4b06dcb62e1c2d85ae99f39ef1a8860570e1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 15 Jul 2021 12:33:13 -0700
|
||||
Subject: [PATCH] use closefrom() on linux and glibc 2.34+
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Rebase to 1.17.0
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
|
||||
---
|
||||
src/posix-io.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/posix-io.c b/src/posix-io.c
|
||||
index a422d8f..0d0a98b 100644
|
||||
--- a/src/posix-io.c
|
||||
+++ b/src/posix-io.c
|
||||
@@ -577,7 +577,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
|
||||
if (fd_list[i].fd > fd)
|
||||
fd = fd_list[i].fd;
|
||||
fd++;
|
||||
-#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__)
|
||||
+#if defined(__sun) || defined(__FreeBSD__) || (defined(__GLIBC__) && __GNUC_PREREQ(2, 34))
|
||||
closefrom (fd);
|
||||
max_fds = fd;
|
||||
#else /*!__sun */
|
||||
@@ -0,0 +1,36 @@
|
||||
From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 10 May 2019 14:30:36 +0800
|
||||
Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used
|
||||
|
||||
gpg-error-config was modified by OE to always return an error.
|
||||
So we want to find an alternative way to retrieve whatever it
|
||||
is we need.
|
||||
|
||||
Upstream-Status: Inappropriate [changes are specific to OE]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
Rebase to 1.13.0
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
lang/python/setup.py.in | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
|
||||
index 6f36861..1d9058b 100755
|
||||
--- a/lang/python/setup.py.in
|
||||
+++ b/lang/python/setup.py.in
|
||||
@@ -169,9 +169,8 @@ class BuildExtFirstHack(build):
|
||||
|
||||
def _generate_errors_i(self):
|
||||
|
||||
- ge_cflags='@GPG_ERROR_CFLAGS@'
|
||||
gpg_error_content = self._read_header(
|
||||
- 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else [])
|
||||
+ "gpg-error.h", os.environ.get('CFLAGS').split())
|
||||
|
||||
filter_re = re.compile(r'GPG_ERR_[^ ]* =')
|
||||
rewrite_re = re.compile(r' *(.*) = .*')
|
||||
@@ -0,0 +1,31 @@
|
||||
From 8c850aa109c42d0c193bccc7af45dbc2689b23f6 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 30 Jan 2018 15:28:49 +0800
|
||||
Subject: [PATCH] Correctly install python modules
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
Rebase to 1.9.0
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
Rebase to 1.10.0
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
lang/python/Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
|
||||
index 68b98e8..bbb9111 100644
|
||||
--- a/lang/python/Makefile.am
|
||||
+++ b/lang/python/Makefile.am
|
||||
@@ -97,6 +97,7 @@ install-exec-local:
|
||||
--build-base="$$(basename "$${PYTHON}")-gpg" \
|
||||
install \
|
||||
--prefix "$(DESTDIR)$(prefix)" \
|
||||
+ --install-lib=$(DESTDIR)${pythondir} \
|
||||
--verbose ; \
|
||||
done
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From f51bf1114bee6d56a950dcc6ebb46d6138b3faed Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Wed, 16 Aug 2017 02:06:45 -0400
|
||||
Subject: [PATCH 4/7] python import
|
||||
|
||||
Don't check for output on stderr to know if an import worked, host inputrc and
|
||||
sysroot readline can cause warnings on stderr.
|
||||
|
||||
Upstream-Status: Backport (from autoconf-archive 883a2abd)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
Rebase to 1.9.0
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
m4/ax_python_devel.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
|
||||
index b990d5b..318b089 100644
|
||||
--- a/m4/ax_python_devel.m4
|
||||
+++ b/m4/ax_python_devel.m4
|
||||
@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference.
|
||||
#
|
||||
AC_MSG_CHECKING([for the distutils Python package])
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 57475742b0288b4ee53c01c59c3ab03c1ef7932e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 13 Apr 2017 16:40:27 +0300
|
||||
Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in
|
||||
output
|
||||
|
||||
The logic was not working in multilib setups which use other
|
||||
directory names than plain /lib or /usr/lib.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
src/gpgme-config.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gpgme-config.in b/src/gpgme-config.in
|
||||
index 56b98f8..e96f3c3 100644
|
||||
--- a/src/gpgme-config.in
|
||||
+++ b/src/gpgme-config.in
|
||||
@@ -157,7 +157,7 @@ while test $# -gt 0; do
|
||||
for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do
|
||||
skip=no
|
||||
case $i in
|
||||
- -L/usr/lib|-L/lib)
|
||||
+ -L/usr/lib*|-L/lib*)
|
||||
skip=yes
|
||||
;;
|
||||
-L*|-l*)
|
||||
@@ -0,0 +1,35 @@
|
||||
From 7938a5a760827aec737ea49d2f8719051abda188 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Wed, 31 Jan 2018 11:01:09 +0800
|
||||
Subject: [PATCH] fix build path issue
|
||||
|
||||
Get the "--root" directory supplied to the "install" command,
|
||||
and use it as a prefix to strip off the purported filename
|
||||
encoded in bytecode files.
|
||||
|
||||
Since --root added, we need to tweak --prefix and --install-lib
|
||||
to use relative path.
|
||||
|
||||
Upstream-Status: Submitted [gnupg-devel@gnupg.org]
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
lang/python/Makefile.am | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
|
||||
index bbb9111..cee499e 100644
|
||||
--- a/lang/python/Makefile.am
|
||||
+++ b/lang/python/Makefile.am
|
||||
@@ -96,8 +96,9 @@ install-exec-local:
|
||||
build \
|
||||
--build-base="$$(basename "$${PYTHON}")-gpg" \
|
||||
install \
|
||||
- --prefix "$(DESTDIR)$(prefix)" \
|
||||
- --install-lib=$(DESTDIR)${pythondir} \
|
||||
+ --root=${DESTDIR} \
|
||||
+ --prefix "$(prefix)" \
|
||||
+ --install-lib=${pythondir} \
|
||||
--verbose ; \
|
||||
done
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 84c389705e7742d2b68e144a5733e618441d293e Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 10 May 2019 16:19:54 +0800
|
||||
Subject: [PATCH] do not auto check var-PYTHON
|
||||
|
||||
Upstream auto check the version of python rather than specify option
|
||||
[ff6ff61 python: Auto-check for all installed python versions.]
|
||||
|
||||
In oe-core, don't check var-PYTHON, use the setting from recipe,
|
||||
only check specific python 2.7 and 3.7
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
configure.ac | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index df892c9..8c6194e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -590,9 +590,8 @@ if test "$found_py" = "1"; then
|
||||
if test "$found_py" = "1" -o "$found_py3" = "1"; then
|
||||
# Reset everything, so that we can look for another Python.
|
||||
m4_foreach([mym4pythonver],
|
||||
- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],
|
||||
- [3.11],[3.12],[all]],
|
||||
- [unset PYTHON
|
||||
+ [[2.7],[3.7]],
|
||||
+ [
|
||||
unset PYTHON_VERSION
|
||||
unset PYTHON_CPPFLAGS
|
||||
unset PYTHON_LDFLAGS
|
||||
92
sources/poky/meta/recipes-support/gpgme/gpgme_1.23.2.bb
Normal file
92
sources/poky/meta/recipes-support/gpgme/gpgme_1.23.2.bb
Normal file
@@ -0,0 +1,92 @@
|
||||
SUMMARY = "High-level GnuPG encryption/signing API"
|
||||
DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management"
|
||||
HOMEPAGE = "http://www.gnupg.org/gpgme.html"
|
||||
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
|
||||
|
||||
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later"
|
||||
LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.1-or-later"
|
||||
LICENSE:${PN}-cpp = "GPL-2.0-or-later & LGPL-2.1-or-later"
|
||||
LICENSE:${PN}-tool = "GPL-3.0-or-later"
|
||||
LICENSE:python3-gpg = "GPL-2.0-or-later & LGPL-2.1-or-later"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
|
||||
file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \
|
||||
file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d \
|
||||
file://src/gpgme-tool.c;endline=21;md5=66c5381e0e05475792e24982d15e7ce8 \
|
||||
"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
||||
SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
|
||||
file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \
|
||||
file://0001-pkgconfig.patch \
|
||||
file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \
|
||||
file://0003-Correctly-install-python-modules.patch \
|
||||
file://0004-python-import.patch \
|
||||
file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
|
||||
file://0006-fix-build-path-issue.patch \
|
||||
file://0008-do-not-auto-check-var-PYTHON.patch \
|
||||
file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
|
||||
file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
|
||||
file://0001-autogen.sh-remove-unknown-in-version.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"
|
||||
|
||||
PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"
|
||||
|
||||
DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}"
|
||||
RDEPENDS:${PN}-cpp += "libstdc++"
|
||||
|
||||
RDEPENDS:python3-gpg += "python3-unixadmin"
|
||||
|
||||
RRECOMMENDS:${PN} += "${PN}-tool"
|
||||
|
||||
BINCONFIG = "${bindir}/gpgme-config"
|
||||
|
||||
# Default in configure.ac: "cl cpp python qt"
|
||||
# Supported: "cl cpp python python2 python3 qt"
|
||||
# python says 'search and find python2 or python3'
|
||||
|
||||
# Building the C++ bindings for native requires a C++ compiler with C++11
|
||||
# support. Since these bindings are currently not needed, we can disable them.
|
||||
DEFAULT_LANGUAGES = ""
|
||||
DEFAULT_LANGUAGES:class-target = "cpp"
|
||||
LANGUAGES ?= "${DEFAULT_LANGUAGES}"
|
||||
|
||||
PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}"
|
||||
|
||||
EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
|
||||
--disable-gpgconf-test \
|
||||
--disable-gpg-test \
|
||||
--disable-gpgsm-test \
|
||||
--disable-g13-test \
|
||||
'
|
||||
|
||||
inherit autotools texinfo binconfig-disabled pkgconfig multilib_header
|
||||
inherit_defer ${PYTHON_INHERIT} python3native
|
||||
|
||||
export PKG_CONFIG='pkg-config'
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGES =+ "${PN}-cpp ${PN}-tool python3-gpg"
|
||||
|
||||
FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*"
|
||||
FILES:${PN}-tool = "${bindir}/gpgme-tool"
|
||||
FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
|
||||
|
||||
CFLAGS:append:libc-musl = " -D__error_t_defined "
|
||||
CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no"
|
||||
|
||||
do_configure:prepend () {
|
||||
# Else these could be used in preference to those in aclocal-copy
|
||||
rm -f ${S}/m4/gpg-error.m4
|
||||
rm -f ${S}/m4/libassuan.m4
|
||||
rm -f ${S}/m4/python.m4
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
oe_multilib_header gpgme.h
|
||||
}
|
||||
Reference in New Issue
Block a user