summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnupg')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch105
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch6
-rw-r--r--meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch73
-rw-r--r--meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch28
-rw-r--r--meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch12
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch91
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.4.5.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.27.bb)36
7 files changed, 118 insertions, 233 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch b/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
deleted file mode 100644
index 5c9c022226..0000000000
--- a/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
+++ /dev/null
@@ -1,105 +0,0 @@
1From 59a3c76d4016ffc615f1c45184f4c6820061d69c Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 16 Aug 2017 11:14:12 +0800
4Subject: [PATCH 1/4] Use pkg-config to find pth instead of pth-config.
5
6Upstream-Status: Denied
7[not submitted but they've been clear they don't want a pkg-config
8dependency]
9
10RP 2014/5/22
11
12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13
14Rebase to 2.1.23
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 m4/gnupg-pth.m4 | 53 ++++++++---------------------------------------------
18 1 file changed, 8 insertions(+), 45 deletions(-)
19
20diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4
21index 6dc9e0e..5892531 100644
22--- a/m4/gnupg-pth.m4
23+++ b/m4/gnupg-pth.m4
24@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
25 # Taken and modified from the m4 macros which come with Pth.
26 AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
27 [
28- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
29 _req_version="ifelse([$1],,1.2.0,$1)"
30+ PKG_CHECK_MODULES(PTH, [pth >= $_req_version], [have_pth=yes], [have_pth=no])
31
32- AC_MSG_CHECKING(for PTH - version >= $_req_version)
33- for _var in _pth_version _req_version; do
34- eval "_val=\"\$${_var}\""
35- _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
36- _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
37- _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
38- _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
39- case $_rtype in
40- "a" ) _rtype=0 ;;
41- "b" ) _rtype=1 ;;
42- "." ) _rtype=2 ;;
43- esac
44- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \
45- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
46- eval "${_var}_hex=\"\$_hex\""
47- done
48- have_pth=no
49- if test ".$_pth_version_hex" != .; then
50- if test ".$_req_version_hex" != .; then
51- if test $_pth_version_hex -ge $_req_version_hex; then
52- have_pth=yes
53- fi
54- fi
55- fi
56 if test $have_pth = yes; then
57 AC_MSG_RESULT(yes)
58 AC_MSG_CHECKING([whether PTH installation is sane])
59@@ -51,9 +27,9 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
60 _gnupg_pth_save_cflags=$CFLAGS
61 _gnupg_pth_save_ldflags=$LDFLAGS
62 _gnupg_pth_save_libs=$LIBS
63- CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
64- LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
65- LIBS="$LIBS `$PTH_CONFIG --libs --all`"
66+ CFLAGS="$CFLAGS $PTH_CFLAGS"
67+ LDFLAGS="$LDFLAGS $PTH_LDFLAGS"
68+ LIBS="$LIBS $PTH_LIBS"
69 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
70 ],
71 [[ pth_init ();]])],
72@@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
73 # PTH_CLFAGS and PTH_LIBS are AS_SUBST.
74 #
75 AC_DEFUN([GNUPG_PATH_PTH],
76-[ AC_ARG_WITH(pth-prefix,
77- AC_HELP_STRING([--with-pth-prefix=PFX],
78- [prefix where GNU Pth is installed (optional)]),
79- pth_config_prefix="$withval", pth_config_prefix="")
80- if test x$pth_config_prefix != x ; then
81- PTH_CONFIG="$pth_config_prefix/bin/pth-config"
82- fi
83- AC_PATH_PROG(PTH_CONFIG, pth-config, no)
84+[
85 tmp=ifelse([$1], ,1.3.7,$1)
86- if test "$PTH_CONFIG" != "no"; then
87- GNUPG_PTH_VERSION_CHECK($tmp)
88- if test $have_pth = yes; then
89- PTH_CFLAGS=`$PTH_CONFIG --cflags`
90- PTH_LIBS=`$PTH_CONFIG --ldflags`
91- PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
92- AC_DEFINE(HAVE_PTH, 1,
93+ GNUPG_PTH_VERSION_CHECK($tmp)
94+ if test $have_pth = yes; then
95+ AC_DEFINE(HAVE_PTH, 1,
96 [Defined if the GNU Pth is available])
97- fi
98 fi
99 AC_SUBST(PTH_CFLAGS)
100 AC_SUBST(PTH_LIBS)
101 ])
102-
103--
1041.8.3.1
105
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index a0af2d48dc..f957f6b55e 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
1From abc5c396aaddaef2e6811362e3e0cc0da28c2b34 Mon Sep 17 00:00:00 2001 1From 6b581c43bd01f815db78a410fd3814fc5994171e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jan 2018 18:00:21 +0200 3Date: Mon, 22 Jan 2018 18:00:21 +0200
4Subject: [PATCH] configure.ac: use a custom value for the location of 4Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 64cb8c6..3fe9027 100644 17index 26d7f7b..e953c2e 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1824,7 +1824,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", 20@@ -1921,7 +1921,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
21 21
22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) 22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
23 23
diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
index 6d86e5c99b..0e58fd4c4d 100644
--- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
+++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
@@ -1,7 +1,7 @@
1From 53c2aec2e13f4e2d09be7148869c862f07dfdd4d Mon Sep 17 00:00:00 2001 1From d9048788d906774b1475c3bb1b17e22455c2add4 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Wed, 16 Aug 2017 11:16:30 +0800 3Date: Wed, 16 Aug 2017 11:16:30 +0800
4Subject: [PATCH 2/4] use pkgconfig instead of npth config 4Subject: [PATCH] use pkgconfig instead of npth config
5 5
6Upstream-Status: Inappropriate [openembedded specific] 6Upstream-Status: Inappropriate [openembedded specific]
7 7
@@ -9,29 +9,45 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
9 9
10Rebase to 2.1.23 10Rebase to 2.1.23
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
12--- 13---
13 m4/npth.m4 | 34 ++++++++-------------------------- 14 m4/npth.m4 | 53 ++++++++---------------------------------------------
14 1 file changed, 8 insertions(+), 26 deletions(-) 15 1 file changed, 8 insertions(+), 45 deletions(-)
15 16
16diff --git a/m4/npth.m4 b/m4/npth.m4 17diff --git a/m4/npth.m4 b/m4/npth.m4
17index 17c2644..15a931b 100644 18index 619ed89..0cb354d 100644
18--- a/m4/npth.m4 19--- a/m4/npth.m4
19+++ b/m4/npth.m4 20+++ b/m4/npth.m4
20@@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], 21@@ -19,25 +19,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
21 if test "x$npth_config_prefix" != x ; then 22 if test "x$npth_config_prefix" != x ; then
22 NPTH_CONFIG="$npth_config_prefix/bin/npth-config" 23 NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
23 fi 24 fi
24- AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
25+ AC_PATH_PROG(PKGCONFIG, pkg-config, no) 25+ AC_PATH_PROG(PKGCONFIG, pkg-config, no)
26 26
27- use_gpgrt_config=""
28- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
29- if $GPGRT_CONFIG npth --exists; then
30- NPTH_CONFIG="$GPGRT_CONFIG npth"
31- AC_MSG_NOTICE([Use gpgrt-config as npth-config])
32- use_gpgrt_config=yes
33- fi
34- fi
35- if test -z "$use_gpgrt_config"; then
36- AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
37- fi
38-
27- if test "$NPTH_CONFIG" != "no" ; then 39- if test "$NPTH_CONFIG" != "no" ; then
28- npth_version=`$NPTH_CONFIG --version` 40- if test -z "$use_gpgrt_config"; then
41- npth_version=`$NPTH_CONFIG --version`
42- else
43- npth_version=`$NPTH_CONFIG --modversion`
44- fi
29+ if test "$PKGCONFIG" != "no" ; then 45+ if test "$PKGCONFIG" != "no" ; then
30+ npth_version=`$PKGCONFIG --modversion npth` 46+ npth_version=`$PKGCONFIG --modversion npth`
31 fi 47 fi
32 npth_version_major=`echo $npth_version | \ 48 npth_version_major=`echo $npth_version | \
33 sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` 49 sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
34@@ -45,7 +45,7 @@ AC_DEFUN([AM_PATH_NPTH], 50@@ -62,7 +47,7 @@ AC_DEFUN([AM_PATH_NPTH],
35 51
36 AC_MSG_CHECKING(for NPTH - version >= $min_npth_version) 52 AC_MSG_CHECKING(for NPTH - version >= $min_npth_version)
37 ok=no 53 ok=no
@@ -40,7 +56,7 @@ index 17c2644..15a931b 100644
40 req_major=`echo $min_npth_version | \ 56 req_major=`echo $min_npth_version | \
41 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` 57 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
42 req_minor=`echo $min_npth_version | \ 58 req_minor=`echo $min_npth_version | \
43@@ -66,28 +66,9 @@ AC_DEFUN([AM_PATH_NPTH], 59@@ -83,32 +68,9 @@ AC_DEFUN([AM_PATH_NPTH],
44 fi 60 fi
45 if test $ok = yes; then 61 if test $ok = yes; then
46 AC_MSG_RESULT([yes ($npth_version)]) 62 AC_MSG_RESULT([yes ($npth_version)])
@@ -48,20 +64,24 @@ index 17c2644..15a931b 100644
48- AC_MSG_RESULT(no) 64- AC_MSG_RESULT(no)
49- fi 65- fi
50- if test $ok = yes; then 66- if test $ok = yes; then
51- # If we have a recent NPTH, we should also check that the 67- # If we have a recent NPTH, we should also check that the
52- # API is compatible. 68- # API is compatible.
53- if test "$req_npth_api" -gt 0 ; then 69- if test "$req_npth_api" -gt 0 ; then
70- if test -z "$use_gpgrt_config"; then
54- tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0` 71- tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0`
55- if test "$tmp" -gt 0 ; then 72- else
56- AC_MSG_CHECKING([NPTH API version]) 73- tmp=`$NPTH_CONFIG --variable=api_version 2>/dev/null || echo 0`
57- if test "$req_npth_api" -eq "$tmp" ; then 74- fi
58- AC_MSG_RESULT([okay]) 75- if test "$tmp" -gt 0 ; then
59- else 76- AC_MSG_CHECKING([NPTH API version])
60- ok=no 77- if test "$req_npth_api" -eq "$tmp" ; then
61- AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp]) 78- AC_MSG_RESULT([okay])
62- fi 79- else
80- ok=no
81- AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp])
63- fi 82- fi
64- fi 83- fi
84- fi
65- fi 85- fi
66- if test $ok = yes; then 86- if test $ok = yes; then
67- NPTH_CFLAGS=`$NPTH_CONFIG --cflags` 87- NPTH_CFLAGS=`$NPTH_CONFIG --cflags`
@@ -70,9 +90,9 @@ index 17c2644..15a931b 100644
70+ NPTH_LIBS=`$PKGCONFIG --libs npth` 90+ NPTH_LIBS=`$PKGCONFIG --libs npth`
71+ AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]]) 91+ AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]])
72 ifelse([$2], , :, [$2]) 92 ifelse([$2], , :, [$2])
73 npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none` 93 if test -z "$use_gpgrt_config"; then
74 if test x"$npth_config_host" != xnone ; then 94 npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
75@@ -103,6 +84,7 @@ AC_DEFUN([AM_PATH_NPTH], 95@@ -128,6 +90,7 @@ AC_DEFUN([AM_PATH_NPTH],
76 fi 96 fi
77 fi 97 fi
78 else 98 else
@@ -80,6 +100,3 @@ index 17c2644..15a931b 100644
80 NPTH_CFLAGS="" 100 NPTH_CFLAGS=""
81 NPTH_LIBS="" 101 NPTH_LIBS=""
82 ifelse([$3], , :, [$3]) 102 ifelse([$3], , :, [$3])
83--
841.8.3.1
85
diff --git a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
deleted file mode 100644
index a13b4d5fb5..0000000000
--- a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Wed, 16 Aug 2017 11:18:01 +0800
4Subject: [PATCH] dirmngr uses libgpg error
5
6Upstream-Status: Pending
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
9Rebase to 2.1.23
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13---
14 dirmngr/Makefile.am | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
18index 00d3c42..450d873 100644
19--- a/dirmngr/Makefile.am
20+++ b/dirmngr/Makefile.am
21@@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \
22 $(DNSLIBS) $(LIBASSUAN_LIBS) \
23 $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
24 $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
25+ $(GPG_ERROR_LIBS) \
26 $(dirmngr_robj)
27 if USE_LDAP
28 dirmngr_LDADD += $(ldaplibs)
diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
index dcd8582ca6..d664c36a1b 100644
--- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
+++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
@@ -1,7 +1,7 @@
1From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 1From 6a7f9b71d936847dcaeeac7d1b69d8299be4dd85 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Wed, 16 Aug 2017 11:23:22 +0800 3Date: Wed, 16 Aug 2017 11:23:22 +0800
4Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking 4Subject: [PATCH] autogen.sh: fix find-version for beta checking
5 5
6find-version always assumes that gnupg is beta if autogen.sh is run 6find-version always assumes that gnupg is beta if autogen.sh is run
7out of git-repo. This doesn't work for users whom just take release 7out of git-repo. This doesn't work for users whom just take release
@@ -13,15 +13,16 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13 13
14Rebase to 2.1.23 14Rebase to 2.1.23
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16
16--- 17---
17 autogen.sh | 1 - 18 autogen.sh | 1 -
18 1 file changed, 1 deletion(-) 19 1 file changed, 1 deletion(-)
19 20
20diff --git a/autogen.sh b/autogen.sh 21diff --git a/autogen.sh b/autogen.sh
21index e5ba5bf..05e0e11 100755 22index 0abf103..78753b5 100755
22--- a/autogen.sh 23--- a/autogen.sh
23+++ b/autogen.sh 24+++ b/autogen.sh
24@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then 25@@ -237,7 +237,6 @@ if [ "$myhost" = "find-version" ]; then
25 rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) 26 rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
26 else 27 else
27 ingit=no 28 ingit=no
@@ -29,6 +30,3 @@ index e5ba5bf..05e0e11 100755
29 tmp="-unknown" 30 tmp="-unknown"
30 rev="0000000" 31 rev="0000000"
31 rvd="0" 32 rvd="0"
32--
331.8.3.1
34
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 7f7812cd46..ea0252026a 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
1From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b Mon Sep 17 00:00:00 2001 1From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 19 Sep 2018 14:44:40 +0100 3Date: Wed, 19 Sep 2018 14:44:40 +0100
4Subject: [PATCH] Allow the environment to override where gnupg looks for its 4Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -7,83 +7,76 @@ Subject: [PATCH] Allow the environment to override where gnupg looks for its
7Upstream-Status: Inappropriate [OE-specific] 7Upstream-Status: Inappropriate [OE-specific]
8Signed-off-by: Ross Burton <ross.burton@intel.com> 8Signed-off-by: Ross Burton <ross.burton@intel.com>
9 9
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11
10--- 12---
11 common/homedir.c | 16 ++++++++-------- 13 common/homedir.c | 14 +++++++-------
12 1 file changed, 8 insertions(+), 8 deletions(-) 14 1 file changed, 7 insertions(+), 7 deletions(-)
13 15
14diff --git a/common/homedir.c b/common/homedir.c 16diff --git a/common/homedir.c b/common/homedir.c
15index 4b6e46e..58989b4 100644 17index 6f99f3e..f22aa9e 100644
16--- a/common/homedir.c 18--- a/common/homedir.c
17+++ b/common/homedir.c 19+++ b/common/homedir.c
18@@ -763,7 +763,7 @@ gnupg_socketdir (void) 20@@ -1284,7 +1284,7 @@ gnupg_socketdir (void)
19 if (!name) 21 if (!name)
20 { 22 {
21 unsigned int dummy; 23 unsigned int dummy;
22- name = _gnupg_socketdir_internal (0, &dummy); 24- name = _gnupg_socketdir_internal (0, &dummy);
23+ name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); 25+ name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy);
26 gpgrt_annotate_leaked_object (name);
24 } 27 }
25 28
26 return name; 29@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void)
27@@ -789,7 +789,7 @@ gnupg_sysconfdir (void) 30 if (dir)
28 } 31 return dir;
29 return name;
30 #else /*!HAVE_W32_SYSTEM*/
31- return GNUPG_SYSCONFDIR;
32+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR;
33 #endif /*!HAVE_W32_SYSTEM*/
34 }
35
36@@ -818,7 +818,7 @@ gnupg_bindir (void)
37 else 32 else
38 return rdir; 33- return GNUPG_SYSCONFDIR;
39 #else /*!HAVE_W32_SYSTEM*/ 34+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR;
40- return GNUPG_BINDIR;
41+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR;
42 #endif /*!HAVE_W32_SYSTEM*/ 35 #endif /*!HAVE_W32_SYSTEM*/
43 } 36 }
44 37
45@@ -831,7 +831,7 @@ gnupg_libexecdir (void) 38@@ -1352,7 +1352,7 @@ gnupg_bindir (void)
46 #ifdef HAVE_W32_SYSTEM 39 return name;
47 return gnupg_bindir (); 40 }
48 #else /*!HAVE_W32_SYSTEM*/ 41 else
49- return GNUPG_LIBEXECDIR; 42- return GNUPG_BINDIR;
50+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; 43+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR;
51 #endif /*!HAVE_W32_SYSTEM*/ 44 #endif /*!HAVE_W32_SYSTEM*/
52 } 45 }
53 46
54@@ -845,7 +845,7 @@ gnupg_libdir (void) 47@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void)
55 name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); 48 return name;
56 return name; 49 }
57 #else /*!HAVE_W32_SYSTEM*/ 50 else
58- return GNUPG_LIBDIR; 51- return GNUPG_LIBEXECDIR;
59+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; 52+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR;
60 #endif /*!HAVE_W32_SYSTEM*/ 53 #endif /*!HAVE_W32_SYSTEM*/
61 } 54 }
62 55
63@@ -859,7 +859,7 @@ gnupg_datadir (void) 56@@ -1409,7 +1409,7 @@ gnupg_libdir (void)
64 name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); 57 return name;
65 return name; 58 }
66 #else /*!HAVE_W32_SYSTEM*/ 59 else
67- return GNUPG_DATADIR; 60- return GNUPG_LIBDIR;
68+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; 61+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR;
69 #endif /*!HAVE_W32_SYSTEM*/ 62 #endif /*!HAVE_W32_SYSTEM*/
70 } 63 }
71 64
72@@ -875,7 +875,7 @@ gnupg_localedir (void) 65@@ -1440,7 +1440,7 @@ gnupg_datadir (void)
73 NULL); 66 return name;
74 return name; 67 }
75 #else /*!HAVE_W32_SYSTEM*/ 68 else
76- return LOCALEDIR; 69- return GNUPG_DATADIR;
77+ return getenv("LOCALEDIR") ?: LOCALEDIR; 70+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR;
78 #endif /*!HAVE_W32_SYSTEM*/ 71 #endif /*!HAVE_W32_SYSTEM*/
79 } 72 }
80 73
81@@ -943,7 +943,7 @@ gnupg_cachedir (void) 74@@ -1472,7 +1472,7 @@ gnupg_localedir (void)
75 return name;
82 } 76 }
83 return dir; 77 else
84 #else /*!HAVE_W32_SYSTEM*/ 78- return LOCALEDIR;
85- return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; 79+ return getenv("LOCALEDIR") ?: LOCALEDIR;
86+ return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
87 #endif /*!HAVE_W32_SYSTEM*/ 80 #endif /*!HAVE_W32_SYSTEM*/
88 } 81 }
89 82
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.27.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb
index 8b5fc9983a..99996968b1 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.27.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb
@@ -1,6 +1,11 @@
1SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" 1SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)"
2DESCRIPTION = "A complete and free implementation of the OpenPGP standard \
3as defined by RFC4880 (also known as PGP). GnuPG allows you to encrypt \
4and sign your data and communications; it features a versatile key \
5management system, along with access modules for all kinds of public \
6key directories."
2HOMEPAGE = "http://www.gnupg.org/" 7HOMEPAGE = "http://www.gnupg.org/"
3LICENSE = "GPLv3 & LGPLv3" 8LICENSE = "GPL-3.0-only & LGPL-3.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
5 file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" 10 file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257"
6 11
@@ -10,29 +15,31 @@ inherit autotools gettext texinfo pkgconfig
10 15
11UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 16UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
12SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 17SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \
14 file://0002-use-pkgconfig-instead-of-npth-config.patch \ 18 file://0002-use-pkgconfig-instead-of-npth-config.patch \
15 file://0003-dirmngr-uses-libgpg-error.patch \
16 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ 19 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
17 file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ 20 file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
18 " 21 "
19SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ 22SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
20 file://relocate.patch" 23 file://relocate.patch"
21SRC_URI_append_class-nativesdk = " file://relocate.patch" 24SRC_URI:append:class-nativesdk = " file://relocate.patch"
22 25
23SRC_URI[sha256sum] = "34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399" 26SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277"
24 27
25EXTRA_OECONF = "--disable-ldap \ 28EXTRA_OECONF = "--disable-ldap \
26 --disable-ccid-driver \ 29 --disable-ccid-driver \
27 --with-zlib=${STAGING_LIBDIR}/.. \ 30 --with-zlib=${STAGING_LIBDIR}/.. \
28 --with-bzip2=${STAGING_LIBDIR}/.. \ 31 --with-bzip2=${STAGING_LIBDIR}/.. \
29 --with-readline=${STAGING_LIBDIR}/.. \ 32 --with-readline=${STAGING_LIBDIR}/.. \
33 --with-mailprog=${sbindir}/sendmail \
30 --enable-gpg-is-gpg2 \ 34 --enable-gpg-is-gpg2 \
35 --disable-tests \
31 " 36 "
37# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise
38CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m"
32 39
33# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) 40# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg)
34PACKAGES =+ "${PN}-gpg" 41PACKAGES =+ "${PN}-gpg"
35FILES_${PN}-gpg = " \ 42FILES:${PN}-gpg = " \
36 ${bindir}/gpg \ 43 ${bindir}/gpg \
37 ${bindir}/gpg2 \ 44 ${bindir}/gpg2 \
38 ${bindir}/gpg-agent \ 45 ${bindir}/gpg-agent \
@@ -42,11 +49,11 @@ FILES_${PN}-gpg = " \
42# to ensure all tools are included. This is done only in non-native 49# to ensure all tools are included. This is done only in non-native
43# builds. Native builds don't have sub-packages, so appending RDEPENDS 50# builds. Native builds don't have sub-packages, so appending RDEPENDS
44# in this case breaks recipe parsing. 51# in this case breaks recipe parsing.
45RDEPENDS_${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" 52RDEPENDS:${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}"
46 53
47RRECOMMENDS_${PN} = "pinentry" 54RRECOMMENDS:${PN} = "pinentry"
48 55
49do_configure_prepend () { 56do_configure:prepend () {
50 # Else these could be used in prefernce to those in aclocal-copy 57 # Else these could be used in prefernce to those in aclocal-copy
51 rm -f ${S}/m4/gpg-error.m4 58 rm -f ${S}/m4/gpg-error.m4
52 rm -f ${S}/m4/libassuan.m4 59 rm -f ${S}/m4/libassuan.m4
@@ -54,16 +61,16 @@ do_configure_prepend () {
54 rm -f ${S}/m4/libgcrypt.m4 61 rm -f ${S}/m4/libgcrypt.m4
55} 62}
56 63
57do_install_append() { 64do_install:append() {
58 ln -sf gpg2 ${D}${bindir}/gpg 65 ln -sf gpg2 ${D}${bindir}/gpg
59 ln -sf gpgv2 ${D}${bindir}/gpgv 66 ln -sf gpgv2 ${D}${bindir}/gpgv
60} 67}
61 68
62do_install_append_class-native() { 69do_install:append:class-native() {
63 create_wrappers ${STAGING_BINDIR_NATIVE} 70 create_wrappers ${STAGING_BINDIR_NATIVE}
64} 71}
65 72
66do_install_append_class-nativesdk() { 73do_install:append:class-nativesdk() {
67 create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} 74 create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk}
68} 75}
69 76
@@ -78,3 +85,6 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls"
78PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" 85PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3"
79 86
80BBCLASSEXTEND = "native nativesdk" 87BBCLASSEXTEND = "native nativesdk"
88
89lcl_maybe_fortify:mipsarch = ""
90
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 08:51:10 +0000