From dfe8639c50db73ca1c76fa1c695609ca54176c0c Mon Sep 17 00:00:00 2001 From: kenmays Date: Sun, 31 Jan 2021 10:29:49 -0800 Subject: [PATCH] gnupg: bump to 2.2.27 (#5632) --- app-crypt/gnupg/gnupg-1.4.23.recipe | 4 +- ...nupg-2.2.21.recipe => gnupg-2.2.27.recipe} | 37 +++++++++++++------ ...-2.2.21.patchset => gnupg-2.2.27.patchset} | 18 ++++----- 3 files changed, 37 insertions(+), 22 deletions(-) rename app-crypt/gnupg/{gnupg-2.2.21.recipe => gnupg-2.2.27.recipe} (79%) rename app-crypt/gnupg/patches/{gnupg-2.2.21.patchset => gnupg-2.2.27.patchset} (81%) diff --git a/app-crypt/gnupg/gnupg-1.4.23.recipe b/app-crypt/gnupg/gnupg-1.4.23.recipe index d519afc80..c632f984f 100644 --- a/app-crypt/gnupg/gnupg-1.4.23.recipe +++ b/app-crypt/gnupg/gnupg-1.4.23.recipe @@ -8,12 +8,12 @@ other applications." HOMEPAGE="https://gnupg.org/" COPYRIGHT="1998-2018 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" CHECKSUM_SHA256="c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba" PATCHES="gnupg-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2" PROVIDES=" gnupg = $portVersion diff --git a/app-crypt/gnupg/gnupg-2.2.21.recipe b/app-crypt/gnupg/gnupg-2.2.27.recipe similarity index 79% rename from app-crypt/gnupg/gnupg-2.2.21.recipe rename to app-crypt/gnupg/gnupg-2.2.27.recipe index e72d28264..1ba53d9f3 100644 --- a/app-crypt/gnupg/gnupg-2.2.21.recipe +++ b/app-crypt/gnupg/gnupg-2.2.27.recipe @@ -6,9 +6,24 @@ well as access modules for all kinds of public key directories. GnuPG, also \ known as GPG, is a command line tool with features for easy integration with \ other applications." HOMEPAGE="https://gnupg.org/" -COPYRIGHT="1998-2018 Free Software Foundation, Inc. - 2000, Dimitrios Souflis - 2008, 2009, 2010, 2012-2016 William Ahern" +COPYRIGHT="1997-2019 Werner Koch + 1994-2021 Free Software Foundation, Inc. + 2003-2021 g10 Code GmbH + 2002 Klarälvdalens Datakonsult AB + 1995-1997, 2000-2007 Ulrich Drepper + 1994 X Consortium + 1998 by The Internet Society + 1998-2004 The OpenLDAP Foundation + 1998-2004 Kurt D. Zeilenga + 1998-2004 Net Boolean Incorporated + 2001-2004 IBM Corporation + 1999-2003 Howard Y.H. Chu + 1999-2003 Symas Corporation + 1998-2003 Hallvard B. Furuseth + 1992-1996 Regents of the University of Michigan + 2000 Dimitrios Souflis + 2008-2010,2012-2016 William Ahern + 2017 Bundesamt für Sicherheit in der Informationstechnik" LICENSE="CC0 v1.0 GNU GPL v2 GNU GPL v3 @@ -16,10 +31,10 @@ LICENSE="CC0 v1.0 GNU LGPL v3" REVISION="1" SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec" +CHECKSUM_SHA256="34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399" PATCHES="gnupg-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -39,6 +54,7 @@ PROVIDES=" cmd:gpgparsemail$secondaryArchSuffix cmd:gpgscm$secondaryArchSuffix cmd:gpgsm$secondaryArchSuffix + cmd:gpgsplit$secondaryArchSuffix cmd:gpgtar$secondaryArchSuffix cmd:gpgv$secondaryArchSuffix cmd:kbxutil$secondaryArchSuffix @@ -87,12 +103,14 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoconf + cmd:aclocal + cmd:autoreconf cmd:automake cmd:awk cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:perl cmd:pinentry$secondaryArchSuffix @@ -107,7 +125,7 @@ TEST_REQUIRES=" BUILD() { - ./autogen.sh + autoreconf -vfi runConfigure ./configure \ --libexecdir=$libDir/gnupg \ --enable-wks-tools \ @@ -127,9 +145,6 @@ INSTALL() TEST() { - # FAIL: tests/openpgp/{tofu,trust-pgp-[123],gpgconf}.scm - HOME="$sourceDir"/home - mkdir -p "$HOME" - export HOME + # FAIL: t-timestuff, t-gettime make check } diff --git a/app-crypt/gnupg/patches/gnupg-2.2.21.patchset b/app-crypt/gnupg/patches/gnupg-2.2.27.patchset similarity index 81% rename from app-crypt/gnupg/patches/gnupg-2.2.21.patchset rename to app-crypt/gnupg/patches/gnupg-2.2.27.patchset index 9c499ffc7..284d00b16 100644 --- a/app-crypt/gnupg/patches/gnupg-2.2.21.patchset +++ b/app-crypt/gnupg/patches/gnupg-2.2.27.patchset @@ -1,14 +1,14 @@ -From 91a5f692cadcd200f06c8be18b6d404a22daea66 Mon Sep 17 00:00:00 2001 +From 1b7d94138cd9492b4bfda28fad7129bcac6355fc Mon Sep 17 00:00:00 2001 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com> Date: Tue, 14 Jul 2020 13:55:34 -0600 Subject: Fix detection of libnetwork diff --git a/configure.ac b/configure.ac -index 1d05d39..1e7f9b3 100644 +index 7a2d410..0c9cf73 100644 --- a/configure.ac +++ b/configure.ac -@@ -1057,11 +1057,9 @@ AC_MSG_NOTICE([checking for networking options]) +@@ -1085,11 +1085,9 @@ AC_MSG_NOTICE([checking for networking options]) # ELF runtime link paths), then link will fail and LDAP support won't # be detected. # @@ -23,7 +23,7 @@ index 1d05d39..1e7f9b3 100644 # # Check standard resolver functions. -@@ -1074,8 +1072,8 @@ if test "$build_dirmngr" = "yes"; then +@@ -1102,8 +1100,8 @@ if test "$build_dirmngr" = "yes"; then # the dirmngr option --standard-resolver. # the double underscore thing is a glibc-ism? @@ -35,20 +35,20 @@ index 1d05d39..1e7f9b3 100644 AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no)) -- -2.27.0 +2.30.0 -From 23caf740f3e35510bca78f473abe9c6875cc7c0e Mon Sep 17 00:00:00 2001 +From 0f99ded0e89ffb11d07584259ee6367949e0967e Mon Sep 17 00:00:00 2001 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com> Date: Tue, 14 Jul 2020 13:59:24 -0600 Subject: Add settings path for Haiku diff --git a/configure.ac b/configure.ac -index 1e7f9b3..8454a4d 100644 +index 0c9cf73..6f53cb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -504,6 +504,8 @@ AH_BOTTOM([ +@@ -503,6 +503,8 @@ AH_BOTTOM([ # endif #elif defined(__VMS) #define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg" @@ -58,5 +58,5 @@ index 1e7f9b3..8454a4d 100644 #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg" #endif -- -2.27.0 +2.30.0