diff options
Diffstat (limited to 'meta/recipes-support/gnupg')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 72 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.4.5.bb (renamed from meta/recipes-support/gnupg/gnupg_2.3.2.bb) | 11 |
6 files changed, 56 insertions, 80 deletions
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 a66a8e62b0..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 @@ -From c873c85b1ee1c35ebbba0bc80c2352c64787a5fd Mon Sep 17 00:00:00 2001 +From 6b581c43bd01f815db78a410fd3814fc5994171e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d03ea3b..a6dfa19 100644 +index 26d7f7b..e953c2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -1958,7 +1958,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1921,7 +1921,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) 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 d3790ac782..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,4 +1,4 @@ -From 15668161c351aee5f29152db2972b1648da11210 Mon Sep 17 00:00:00 2001 +From d9048788d906774b1475c3bb1b17e22455c2add4 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Wed, 16 Aug 2017 11:16:30 +0800 Subject: [PATCH] use pkgconfig instead of npth config @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/m4/npth.m4 b/m4/npth.m4 -index 06cdaee..4adda01 100644 +index 619ed89..0cb354d 100644 --- a/m4/npth.m4 +++ b/m4/npth.m4 @@ -19,25 +19,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], @@ -25,7 +25,7 @@ index 06cdaee..4adda01 100644 + AC_PATH_PROG(PKGCONFIG, pkg-config, no) - use_gpgrt_config="" -- if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG npth --exists; then - NPTH_CONFIG="$GPGRT_CONFIG npth" - AC_MSG_NOTICE([Use gpgrt-config as npth-config]) 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 b4106d3620..0000000000 --- a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9ace8f1b68ab708c44dce4c0152b975fbceb0398 Mon Sep 17 00:00:00 2001 -From: Saul Wold <sgw@linux.intel.com> -Date: Wed, 16 Aug 2017 11:18:01 +0800 -Subject: [PATCH] dirmngr uses libgpg error - -Upstream-Status: Pending -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Rebase to 2.1.23 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - dirmngr/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am -index 77ca3f5..1446775 100644 ---- a/dirmngr/Makefile.am -+++ b/dirmngr/Makefile.am -@@ -86,7 +86,7 @@ endif - dirmngr_LDADD = $(libcommonpth) \ - $(DNSLIBS) $(LIBASSUAN_LIBS) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ -- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) -+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) $(GPG_ERROR_LIBS) - if USE_LDAP - dirmngr_LDADD += $(ldaplibs) - endif 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 @@ -From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 +From 6a7f9b71d936847dcaeeac7d1b69d8299be4dd85 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> Date: Wed, 16 Aug 2017 11:23:22 +0800 -Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking +Subject: [PATCH] autogen.sh: fix find-version for beta checking find-version always assumes that gnupg is beta if autogen.sh is run out 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> Rebase to 2.1.23 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- autogen.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index e5ba5bf..05e0e11 100755 +index 0abf103..78753b5 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then +@@ -237,7 +237,6 @@ if [ "$myhost" = "find-version" ]; then rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no @@ -29,6 +30,3 @@ index e5ba5bf..05e0e11 100755 tmp="-unknown" rev="0000000" rvd="0" --- -1.8.3.1 - diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index f9f38c2876..ea0252026a 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 5a68a37ae2649e0988965cfe3a63a0142f0182a1 Mon Sep 17 00:00:00 2001 +From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -7,15 +7,17 @@ Subject: [PATCH] Allow the environment to override where gnupg looks for its Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + --- common/homedir.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 7969a2c..06b8016 100644 +index 6f99f3e..f22aa9e 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -918,7 +918,7 @@ gnupg_socketdir (void) +@@ -1284,7 +1284,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -24,57 +26,57 @@ index 7969a2c..06b8016 100644 gpgrt_annotate_leaked_object (name); } -@@ -946,7 +946,7 @@ gnupg_sysconfdir (void) - } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_SYSCONFDIR; -+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; +@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void) + if (dir) + return dir; + else +- return GNUPG_SYSCONFDIR; ++ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -978,7 +978,7 @@ gnupg_bindir (void) +@@ -1352,7 +1352,7 @@ gnupg_bindir (void) + return name; + } else - return rdir; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_BINDIR; -+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; +- return GNUPG_BINDIR; ++ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -991,7 +991,7 @@ gnupg_libexecdir (void) - #ifdef HAVE_W32_SYSTEM - return gnupg_bindir (); - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_LIBEXECDIR; -+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; +@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void) + return name; + } + else +- return GNUPG_LIBEXECDIR; ++ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1008,7 +1008,7 @@ gnupg_libdir (void) +@@ -1409,7 +1409,7 @@ gnupg_libdir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_LIBDIR; -+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; + else +- return GNUPG_LIBDIR; ++ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1026,7 +1026,7 @@ gnupg_datadir (void) +@@ -1440,7 +1440,7 @@ gnupg_datadir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_DATADIR; -+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; + else +- return GNUPG_DATADIR; ++ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1045,7 +1045,7 @@ gnupg_localedir (void) +@@ -1472,7 +1472,7 @@ gnupg_localedir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return LOCALEDIR; -+ return getenv("LOCALEDIR") ?: LOCALEDIR; + else +- return LOCALEDIR; ++ return getenv("LOCALEDIR") ?: LOCALEDIR; #endif /*!HAVE_W32_SYSTEM*/ } diff --git a/meta/recipes-support/gnupg/gnupg_2.3.2.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb index f3b277b0a8..99996968b1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.2.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb @@ -5,7 +5,7 @@ and sign your data and communications; it features a versatile key \ management system, along with access modules for all kinds of public \ key directories." HOMEPAGE = "http://www.gnupg.org/" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" @@ -16,7 +16,6 @@ inherit autotools gettext texinfo pkgconfig UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ - file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ " @@ -24,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b" +SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -33,7 +32,10 @@ EXTRA_OECONF = "--disable-ldap \ --with-readline=${STAGING_LIBDIR}/.. \ --with-mailprog=${sbindir}/sendmail \ --enable-gpg-is-gpg2 \ + --disable-tests \ " +# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise +CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m" # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) PACKAGES =+ "${PN}-gpg" @@ -83,3 +85,6 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" BBCLASSEXTEND = "native nativesdk" + +lcl_maybe_fortify:mipsarch = "" + |