From cca9289e34b108034e09dd08e7efdb1a8a41a0c8 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 27 Dec 2021 21:20:19 +0800 Subject: gnupg: upgrade 2.3.3 -> 2.3.4 refresh relocate.patch Chanlog: ======== Bugs fixed for this release gpg: New option --min-rsa-length. [rG5f39db70c0] gpg: New option --forbid-gen-key. [rGc397ba3ac0] gpg: New option --override-compliance-check. [T5655] gpgconf: New command --show-configs. [rGa0fb78ee0f] agent,dirmngr,keyboxd: New option --steal-socket. [rGb0079ab39d,rGdd708f60d5] gpg: Fix printing of binary notations. [T5667] gpg: Remove stale ultimately trusted keys from the trustdb. [T5685,T5742] gpg: Fix indentation of --print-mds and --print-md sha512. [T5679] gpg: Emit gpg 2.2 compatible Ed25519 signature. [T5331] gpgsm: Detect circular chains in --list-chain. [rG74c5b35062] dirmngr: Make reading resolv.conf more robust. [T5657] dirmngr: Ask keyservers to provide the key fingerprints. [T5741] gpgconf: Allow changing gpg's deprecated keyserver option. [T5462] gpg-wks-server: Fix created file permissions. [rG60be00b033] scd: Support longer data for ssh-agent authentication with openpgp cards. [T5682] scd: Modify DEVINFO behavior to support looping forever. [T5359] Support gpgconf.ctl for NetBSD and Solaris. [T5656,T5671] Silence "Garbled console data" warning under Windows in most cases. [rGe293da3b21] Silence warning about the rootdir under Unices w/o a mounted /proc file system. [T5656] Fix possible build problems about missing include files. [T5592] (From OE-Core rev: 66e06fd409c27f212f41b69a01416cea41a198cd) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg/relocate.patch | 22 +++---- meta/recipes-support/gnupg/gnupg_2.3.3.bb | 85 ------------------------- meta/recipes-support/gnupg/gnupg_2.3.4.bb | 85 +++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 97 deletions(-) delete mode 100644 meta/recipes-support/gnupg/gnupg_2.3.3.bb create mode 100644 meta/recipes-support/gnupg/gnupg_2.3.4.bb diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 53679bf1d9..74f48e9582 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 766d37fe9acd9fdaaff9c094635e06b50c5902d7 Mon Sep 17 00:00:00 2001 +From 1e34e1d477f843c0ee2f1a3fddc20201f0233e81 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -8,15 +8,16 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin + --- common/homedir.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 455c188..55049db 100644 +index 174d961..f4c25fb 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1155,7 +1155,7 @@ gnupg_socketdir (void) +@@ -1161,7 +1161,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -25,7 +26,7 @@ index 455c188..55049db 100644 gpgrt_annotate_leaked_object (name); } -@@ -1187,7 +1187,7 @@ gnupg_sysconfdir (void) +@@ -1193,7 +1193,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -34,7 +35,7 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1223,7 +1223,7 @@ gnupg_bindir (void) +@@ -1229,7 +1229,7 @@ gnupg_bindir (void) return name; } else @@ -43,7 +44,7 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1250,7 +1250,7 @@ gnupg_libexecdir (void) +@@ -1256,7 +1256,7 @@ gnupg_libexecdir (void) return name; } else @@ -52,7 +53,7 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1280,7 +1280,7 @@ gnupg_libdir (void) +@@ -1286,7 +1286,7 @@ gnupg_libdir (void) return name; } else @@ -61,7 +62,7 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1311,7 +1311,7 @@ gnupg_datadir (void) +@@ -1317,7 +1317,7 @@ gnupg_datadir (void) return name; } else @@ -70,7 +71,7 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1343,7 +1343,7 @@ gnupg_localedir (void) +@@ -1349,7 +1349,7 @@ gnupg_localedir (void) return name; } else @@ -79,6 +80,3 @@ index 455c188..55049db 100644 #endif /*!HAVE_W32_SYSTEM*/ } --- -2.20.1 - diff --git a/meta/recipes-support/gnupg/gnupg_2.3.3.bb b/meta/recipes-support/gnupg/gnupg_2.3.3.bb deleted file mode 100644 index 5614ac6473..0000000000 --- a/meta/recipes-support/gnupg/gnupg_2.3.3.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" -DESCRIPTION = "A complete and free implementation of the OpenPGP standard \ -as defined by RFC4880 (also known as PGP). GnuPG allows you to encrypt \ -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" -LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ - file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" - -DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" - -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 \ - " -SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ - file://relocate.patch" -SRC_URI:append:class-nativesdk = " file://relocate.patch" - -SRC_URI[sha256sum] = "5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937" - -EXTRA_OECONF = "--disable-ldap \ - --disable-ccid-driver \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-bzip2=${STAGING_LIBDIR}/.. \ - --with-readline=${STAGING_LIBDIR}/.. \ - --with-mailprog=${sbindir}/sendmail \ - --enable-gpg-is-gpg2 \ - " - -# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) -PACKAGES =+ "${PN}-gpg" -FILES:${PN}-gpg = " \ - ${bindir}/gpg \ - ${bindir}/gpg2 \ - ${bindir}/gpg-agent \ -" - -# Normal package (gnupg) should depend on minimal package (gnupg-gpg) -# to ensure all tools are included. This is done only in non-native -# builds. Native builds don't have sub-packages, so appending RDEPENDS -# in this case breaks recipe parsing. -RDEPENDS:${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" - -RRECOMMENDS:${PN} = "pinentry" - -do_configure:prepend () { - # Else these could be used in prefernce to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 - rm -f ${S}/m4/ksba.m4 - rm -f ${S}/m4/libgcrypt.m4 -} - -do_install:append() { - ln -sf gpg2 ${D}${bindir}/gpg - ln -sf gpgv2 ${D}${bindir}/gpgv -} - -do_install:append:class-native() { - create_wrappers ${STAGING_BINDIR_NATIVE} -} - -do_install:append:class-nativesdk() { - create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} -} - -create_wrappers() { - for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do - create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 - done -} - -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" -PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gnupg/gnupg_2.3.4.bb b/meta/recipes-support/gnupg/gnupg_2.3.4.bb new file mode 100644 index 0000000000..7faaffbc27 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg_2.3.4.bb @@ -0,0 +1,85 @@ +SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" +DESCRIPTION = "A complete and free implementation of the OpenPGP standard \ +as defined by RFC4880 (also known as PGP). GnuPG allows you to encrypt \ +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" +LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ + file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" + +DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" + +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 \ + " +SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ + file://relocate.patch" +SRC_URI:append:class-nativesdk = " file://relocate.patch" + +SRC_URI[sha256sum] = "f3468ecafb1d7f9ad7b51fd1db7aebf17ceb89d2efa8a05cf2f39b4d405402ae" + +EXTRA_OECONF = "--disable-ldap \ + --disable-ccid-driver \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-bzip2=${STAGING_LIBDIR}/.. \ + --with-readline=${STAGING_LIBDIR}/.. \ + --with-mailprog=${sbindir}/sendmail \ + --enable-gpg-is-gpg2 \ + " + +# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) +PACKAGES =+ "${PN}-gpg" +FILES:${PN}-gpg = " \ + ${bindir}/gpg \ + ${bindir}/gpg2 \ + ${bindir}/gpg-agent \ +" + +# Normal package (gnupg) should depend on minimal package (gnupg-gpg) +# to ensure all tools are included. This is done only in non-native +# builds. Native builds don't have sub-packages, so appending RDEPENDS +# in this case breaks recipe parsing. +RDEPENDS:${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" + +RRECOMMENDS:${PN} = "pinentry" + +do_configure:prepend () { + # Else these could be used in prefernce to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 + rm -f ${S}/m4/libassuan.m4 + rm -f ${S}/m4/ksba.m4 + rm -f ${S}/m4/libgcrypt.m4 +} + +do_install:append() { + ln -sf gpg2 ${D}${bindir}/gpg + ln -sf gpgv2 ${D}${bindir}/gpgv +} + +do_install:append:class-native() { + create_wrappers ${STAGING_BINDIR_NATIVE} +} + +do_install:append:class-nativesdk() { + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} +} + +create_wrappers() { + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 + done +} + +PACKAGECONFIG ??= "gnutls" +PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" +PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf