diff options
Diffstat (limited to 'meta/recipes-support/gpgme')
12 files changed, 392 insertions, 213 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch new file mode 100644 index 0000000000..8ed39280ca --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -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 diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch new file mode 100644 index 0000000000..6d67e6d6c9 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch @@ -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 diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 176723cd16..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From 6492c952d61bb93a8bf8200c093d7e491456aa5a Mon Sep 17 00:00:00 2001 +From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Fri, 29 Jun 2018 14:35:41 +0800 -Subject: [PATCH 1/7] pkgconfig +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. @@ -11,51 +11,50 @@ RP 2015/4/17 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Rebase to 1.11.1 - +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 | 114 ++++-------------------------------------------- - src/gpgme.pc.in | 15 +++++++ - 5 files changed, 42 insertions(+), 107 deletions(-) + 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 - create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index af569ac..865bd10 100644 +index ae4c7da..df892c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -895,6 +895,7 @@ AC_CONFIG_FILES(Makefile src/Makefile - src/versioninfo.rc +@@ -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.pc src/gpgme-pthread.pc) ++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) - AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index 1394c02..8451c3a 100644 +index ca70950..bda5498 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -19,12 +19,14 @@ +@@ -20,11 +20,11 @@ ## Process this file with automake to produce Makefile.in - EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ -- gpgme.h.in versioninfo.rc.in gpgme.def -+ gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = gpgme.pc gpgme-glib.pc ++pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc - bin_SCRIPTS = gpgme-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpgme.m4 - nodist_include_HEADERS = gpgme.h -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - - bin_PROGRAMS = gpgme-tool gpgme-json + 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 @@ -78,10 +77,10 @@ index 0000000..074bbf6 +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 6c2be44..d8a75cb 100644 +index 8cc2898..0ff550e 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script +@@ -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], @@ -90,7 +89,7 @@ index 6c2be44..d8a75cb 100644 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/'` -@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], min_gpgme_version="$tmp" fi @@ -129,7 +128,7 @@ index 6c2be44..d8a75cb 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], fi fi if test $ok = yes; then @@ -149,44 +148,45 @@ index 6c2be44..d8a75cb 100644 ]) dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS +@@ -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_REQUIRE([_AM_PATH_GPGME_CONFIG])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/'` -@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -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 -- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then -- req_major=`echo $min_gpgme_version | \ +- req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpgme_version | \ +- req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- req_micro=`echo $min_gpgme_version | \ +- req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- if test "$gpgme_version_major" -gt "$req_major"; then +- if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes -- else +- 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 +- 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 - fi - fi + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) @@ -194,17 +194,21 @@ index 6c2be44..d8a75cb 100644 # 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` +- 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 -@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ fi fi if test $ok = yes; then -- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` -- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` +- 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 @@ -219,7 +223,7 @@ index 6c2be44..d8a75cb 100644 ]) -@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], min_gpgme_version="$tmp" fi @@ -258,7 +262,7 @@ index 6c2be44..d8a75cb 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -277,27 +281,15 @@ index 6c2be44..d8a75cb 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -new file mode 100644 -index 0000000..b69539f ---- /dev/null +index 9ddef5c..932645b 100644 +--- a/src/gpgme.pc.in +++ b/src/gpgme.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. -+Version: @VERSION@ -+Libs: -L${libdir} -lgpgme +@@ -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} -+Requires: libassuan gpg-error -\ No newline at end of file --- -2.7.4 - ++Libs: -L${libdir} -lgpgme + URL: https://www.gnupg.org/software/gpgme/index.html diff --git a/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch new file mode 100644 index 0000000000..be58c42128 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch @@ -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[]; diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch new file mode 100644 index 0000000000..3d05808d63 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch @@ -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 */ diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index 0d0d0c67b5..0d2692912f 100644 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,7 +1,7 @@ -From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001 +From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 17 Oct 2018 23:32:19 +0800 -Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used +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 @@ -11,43 +11,26 @@ Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Rebase to 1.12.0 +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - lang/python/setup.py.in | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) + 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 65a4be0..11b8413 100755 +index 6f36861..1d9058b 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -30,7 +30,6 @@ import subprocess - import sys - - # Out-of-tree build of the gpg bindings. --gpg_error_config = ["gpg-error-config"] - gpgme_config_flags = ["--thread=pthread"] - gpgme_config = ["gpgme-config"] + gpgme_config_flags - gpgme_h = "" -@@ -181,16 +180,8 @@ class BuildExtFirstHack(build): - shutil.copy2(source_name, sink_name) +@@ -169,9 +169,8 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): -- -- try: -- subprocess.check_call( -- gpg_error_config + ['--version'], stdout=devnull) -- except: -- sys.exit("Could not find gpg-error-config. " + -- "Please install the libgpg-error development package.") -- + +- ge_cflags='@GPG_ERROR_CFLAGS@' gpg_error_content = self._read_header( -- "gpg-error.h", getconfig("cflags", config=gpg_error_config)) +- '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' *(.*) = .*') --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index de1689ec05..204fe5934d 100644 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,7 +1,7 @@ -From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 +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 3/7] Correctly install python modules +Subject: [PATCH] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -12,15 +12,16 @@ 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 6988faf..36c6f7b 100644 +index 68b98e8..bbb9111 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -93,6 +93,7 @@ install-exec-local: +@@ -97,6 +97,7 @@ install-exec-local: --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ --prefix "$(DESTDIR)$(prefix)" \ @@ -28,6 +29,3 @@ index 6988faf..36c6f7b 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 50bf21463f..7fe0c9538a 100644 --- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 Mon Sep 17 00:00:00 2001 +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 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -9,15 +9,16 @@ 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 a4d152e..8342865 100644 +index 56b98f8..e96f3c3 100644 --- a/src/gpgme-config.in +++ b/src/gpgme-config.in -@@ -154,7 +154,7 @@ while test $# -gt 0; do +@@ -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 @@ -26,6 +27,3 @@ index a4d152e..8342865 100644 skip=yes ;; -L*|-l*) --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 1471184d67..8d48db2feb 100644 --- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,7 +1,7 @@ -From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001 +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 6/7] fix build path issue +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 @@ -12,15 +12,16 @@ 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 36c6f7b..ce9a108 100644 +index bbb9111..cee499e 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -92,8 +92,9 @@ install-exec-local: +@@ -96,8 +96,9 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ @@ -32,6 +33,3 @@ index 36c6f7b..ce9a108 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch deleted file mode 100644 index af9ddbf24b..0000000000 --- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 317cdf60165d760572a26db317e3d6edb159b04e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 17 Oct 2018 23:41:09 +0800 -Subject: [PATCH 7/7] python: Add variables to tests - -* configure.ac, lang/python/Makefile.am: - New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 5 +++++ - lang/python/Makefile.am | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 865bd10..035555a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -535,6 +535,11 @@ AC_ARG_ENABLE(g13-test, - run_g13_test=$enableval) - AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") - -+run_lang_python_test="yes" -+AC_ARG_ENABLE(lang-python-test, -+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]), -+ run_lang_python_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index ce9a108..0c8cfdc 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -25,7 +25,10 @@ EXTRA_DIST = \ - doc \ - src - -+if RUN_LANG_PYTHON_TESTS - SUBDIRS = . tests -+endif -+ - - .PHONY: prepare - prepare: copystamp --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch new file mode 100644 index 0000000000..a11621ed64 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -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 diff --git a/meta/recipes-support/gpgme/gpgme_1.12.0.bb b/meta/recipes-support/gpgme/gpgme_1.23.2.bb index b46c5fc271..55f164e4a9 100644 --- a/meta/recipes-support/gpgme/gpgme_1.12.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.23.2.bb @@ -3,38 +3,46 @@ DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to G HOMEPAGE = "http://www.gnupg.org/gpgme.html" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" -LICENSE = "GPLv2+ & LGPLv2.1+" +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=4d6319e587fd944adfe61a41a8f15b36 \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" + 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://0007-python-Add-variables-to-tests.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[md5sum] = "902fca3a94907efe4e929b2ade545a7c" -SRC_URI[sha256sum] = "b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8" +SRC_URI[sha256sum] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224" -DEPENDS = "libgpg-error libassuan" -RDEPENDS_${PN}-cpp += "libstdc++" +PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" -RDEPENDS_python2-gpg += "python-unixadmin" -RDEPENDS_python3-gpg += "python3-unixadmin" +DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" +RDEPENDS:${PN}-cpp += "libstdc++" -BINCONFIG = "${bindir}/gpgme-config" +RDEPENDS:python3-gpg += "python3-unixadmin" -# Note select python2 or python3, but you can't select both at the same time -PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python2] = ",,python swig-native," -PACKAGECONFIG[python3] = ",,python3 swig-native," +RRECOMMENDS:${PN} += "${PN}-tool" + +BINCONFIG = "${bindir}/gpgme-config" # Default in configure.ac: "cl cpp python qt" # Supported: "cl cpp python python2 python3 qt" @@ -43,43 +51,42 @@ PACKAGECONFIG[python3] = ",,python3 swig-native," # 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" +DEFAULT_LANGUAGES:class-target = "cpp" LANGUAGES ?= "${DEFAULT_LANGUAGES}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" -PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" -PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" +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 \ - --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header +inherit_defer ${PYTHON_INHERIT} python3native export PKG_CONFIG='pkg-config' BBCLASSEXTEND = "native nativesdk" -PACKAGES =+ "${PN}-cpp" -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" +PACKAGES =+ "${PN}-cpp ${PN}-tool python3-gpg" -FILES_${PN}-cpp = "${libdir}/libgpgmepp.so.*" -FILES_python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/* \ - ${libdir}/cmake/* \ -" +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 " -do_configure_prepend () { +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 +} |