gnupg 2.5.22

common/shlibs

@@ -691,7 +691,7 @@ libtalloc.so.2 talloc-2.0.1_1
 libpytalloc-util.so.2 libpytalloc-util-2.3.1_2
 libmount.so.1 libmount-2.18_1
 libdconf.so.1 dconf-0.13.90_1
-libassuan.so.0 libassuan-2.0.1_1
+libassuan.so.9 libassuan-3.0.2_1
 libgpgme.so.45 libgpgme-2.0.0_1
 libgpgmepp.so.7 gpgmepp-2.0.0_1
 libqgpgme.so.15 gpgmeqt-1.18.0_1

srcpkgs/ecryptfs-utils/template

@@ -1,7 +1,7 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui

srcpkgs/eid-mw/template

@@ -1,7 +1,7 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=5.1.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel libassuan-devel autoconf-archive"

srcpkgs/gnupg/patches/0002-Revert-gpg-Merge-rfc4880bis-features-into-gnupg.patch

@@ -1,52 +1,47 @@
-From 810bc3c40fd262533f20e77a043b35583deeaa6e Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Tue, 7 Feb 2023 10:14:34 +0100
-Subject: [PATCH 2/2] Revert "gpg: Merge --rfc4880bis features into --gnupg"
+From 4583f4fe2e11b3dd070066628c3f16776cc74f72 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Mon, 31 Oct 2022 16:14:18 +0100
+Subject: [PATCH GnuPG] gpg: Merge --rfc4880bis features into --gnupg
 
-This reverts commit 4583f4fe2e11b3dd070066628c3f16776cc74f72
+* g10/gpg.c (oRFC4880bis): Remove.
+(opts): Make --rfc4880bis a Noop.
+(compliance_options): Make rfc4880bis to gnupg.
+(set_compliance_option): Remove rfc4880bis stuff.
+(main): Ditto.  Note that this now activates the --mimemode option.
+* g10/keygen.c (keygen_set_std_prefs): Remove rfc4880bis protection.
+(keygen_upd_std_prefs): Always announce support for v5 keys.
+(read_parameter_file): Activate the v4 and v5 keywords.
+--
 
-see:
-https://lore.kernel.org/distributions/F30D6590-3E0C-4865-A944-7DE118A619CF@gentoo.org/
-
-this reverts to the pre-2.4 default of key generation. the new one is
-(apparently) not compatible with a potential future specification, and
-generates incompatible keys by default.
-
-once this is figured out, find a better solution than this
----
- g10/gpg.c    | 35 ++++++++++++++++++++++++++++++++---
- g10/keygen.c | 30 ++++++++++++++++++------------
- 2 files changed, 50 insertions(+), 15 deletions(-)
-
-diff --git a/g10/gpg.c b/g10/gpg.c
-index 2ae3750a9..06b762ff7 100644
---- a/g10/gpg.c
-+++ b/g10/gpg.c
-@@ -249,6 +249,7 @@ enum cmd_and_opt_values
+Index: gnupg-2.5.14/g10/gpg.c
+===================================================================
+--- gnupg-2.5.14.orig/g10/gpg.c
++++ gnupg-2.5.14/g10/gpg.c
+@@ -256,6 +256,7 @@ enum cmd_and_opt_values
      oGnuPG,
      oRFC2440,
      oRFC4880,
 +    oRFC4880bis,
      oOpenPGP,
      oPGP7,
      oPGP8,
-@@ -638,6 +639,7 @@ static gpgrt_opt_t opts[] = {
+@@ -660,6 +661,7 @@ static gpgrt_opt_t opts[] = {
    ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"),
    ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
    ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
 +  ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"),
    ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
    ARGPARSE_s_n (oPGP7, "pgp6", "@"),
    ARGPARSE_s_n (oPGP7, "pgp7", "@"),
-@@ -983,7 +985,6 @@ static gpgrt_opt_t opts[] = {
+@@ -1016,7 +1018,6 @@ static gpgrt_opt_t opts[] = {
    ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"),
    ARGPARSE_s_s (oNoop, "aead-algo", "@"),
    ARGPARSE_s_s (oNoop, "personal-aead-preferences","@"),
 -  ARGPARSE_s_n (oNoop, "rfc4880bis", "@"),
    ARGPARSE_s_n (oNoop, "override-compliance-check", "@"),
 
 
-@@ -2232,7 +2233,7 @@ static struct gnupg_compliance_option compliance_options[] =
+@@ -2282,7 +2283,7 @@ static struct gnupg_compliance_option co
    {
      { "gnupg",      oGnuPG },
      { "openpgp",    oOpenPGP },
@@ -55,7 +50,7 @@ index 2ae3750a9..06b762ff7 100644
      { "rfc4880",    oRFC4880 },
      { "rfc2440",    oRFC2440 },
      { "pgp6",       oPGP7 },
-@@ -2248,8 +2249,28 @@ static struct gnupg_compliance_option compliance_options[] =
+@@ -2298,8 +2299,29 @@ static struct gnupg_compliance_option co
  static void
  set_compliance_option (enum cmd_and_opt_values option)
  {
@@ -81,34 +76,27 @@ index 2ae3750a9..06b762ff7 100644
 +      opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
 +      opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
 +      break;
-     case oOpenPGP:
-     case oRFC4880:
-       /* This is effectively the same as RFC2440, but with
-@@ -2293,6 +2314,7 @@ set_compliance_option (enum cmd_and_opt_values option)
-     case oPGP8:  opt.compliance = CO_PGP8;  break;
++
      case oGnuPG:
+       /* set up default options affected by policy compliance: */
        opt.compliance = CO_GNUPG;
+@@ -2318,6 +2340,7 @@ set_compliance_option (enum cmd_and_opt_
+       opt.s2k_digest_algo = 0;
+       opt.s2k_cipher_algo = DEFAULT_CIPHER_ALGO;
+       opt.flags.allow_old_cipher_algos = 0;
 +      opt.flags.rfc4880bis = 1;
        break;
 
-     case oDE_VS:
-@@ -2495,6 +2517,7 @@ main (int argc, char **argv)
-     opt.emit_version = 0;
-     opt.weak_digests = NULL;
-     opt.compliance = CO_GNUPG;
-+    opt.flags.rfc4880bis = 1;
-
-     /* Check special options given on the command line.  */
-     orig_argc = argc;
-@@ -3041,6 +3064,7 @@ main (int argc, char **argv)
+     case oOpenPGP:
+@@ -3110,6 +3133,7 @@ main (int argc, char **argv)
            case oOpenPGP:
            case oRFC2440:
            case oRFC4880:
 +          case oRFC4880bis:
            case oPGP7:
            case oPGP8:
            case oGnuPG:
-@@ -3883,6 +3907,11 @@ main (int argc, char **argv)
+@@ -4025,6 +4049,11 @@ main (int argc, char **argv)
      if( may_coredump && !opt.quiet )
  	log_info(_("WARNING: program may create a core file!\n"));
 
@@ -120,7 +108,7 @@ index 2ae3750a9..06b762ff7 100644
      if (eyes_only) {
        if (opt.set_filename)
  	  log_info(_("WARNING: %s overrides %s\n"),
-@@ -4099,7 +4128,7 @@ main (int argc, char **argv)
+@@ -4247,7 +4276,7 @@ main (int argc, char **argv)
      /* Check our chosen algorithms against the list of legal
         algorithms. */
 
@@ -129,20 +117,20 @@ index 2ae3750a9..06b762ff7 100644
        {
  	const char *badalg=NULL;
  	preftype_t badtype=PREFTYPE_NONE;
-diff --git a/g10/keygen.c b/g10/keygen.c
-index d5099dbb9..58bc9caba 100644
---- a/g10/keygen.c
-+++ b/g10/keygen.c
-@@ -404,7 +404,7 @@ keygen_set_std_prefs (const char *string,int personal)
- 	      strcat(dummy_string,"S7 ");
- 	    strcat(dummy_string,"S2 "); /* 3DES */
+Index: gnupg-2.5.14/g10/keygen.c
+===================================================================
+--- gnupg-2.5.14.orig/g10/keygen.c
++++ gnupg-2.5.14/g10/keygen.c
+@@ -492,7 +492,7 @@ keygen_set_std_prefs (const char *string
+ 	    if ( !openpgp_cipher_test_algo (CIPHER_ALGO_3DES) )
+               strcat(dummy_string,"S2 "); /* 3DES - RFC4880 default. */
 
 -            if (!openpgp_aead_test_algo (AEAD_ALGO_OCB))
-+            if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
++        if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
  	      strcat(dummy_string,"A2 ");
 
              if (personal)
-@@ -889,7 +889,7 @@ keygen_upd_std_prefs (PKT_signature *sig, void *opaque)
+@@ -999,7 +999,7 @@ keygen_upd_std_prefs (PKT_signature *sig
    /* Make sure that the MDC feature flag is set if needed.  */
    add_feature_mdc (sig,mdc_available);
    add_feature_aead (sig, aead_available);
@@ -151,7 +139,7 @@ index d5099dbb9..58bc9caba 100644
    add_keyserver_modify (sig,ks_modify);
    keygen_add_keyserver_url(sig,NULL);
 
-@@ -3382,7 +3382,10 @@ parse_key_parameter_part (ctrl_t ctrl,
+@@ -4150,7 +4150,10 @@ parse_key_parameter_part (ctrl_t ctrl,
                  }
              }
            else if (!ascii_strcasecmp (s, "v5"))
@@ -163,7 +151,7 @@ index d5099dbb9..58bc9caba 100644
            else if (!ascii_strcasecmp (s, "v4"))
              keyversion = 4;
            else
-@@ -3641,7 +3644,7 @@ parse_key_parameter_part (ctrl_t ctrl,
+@@ -4411,7 +4414,7 @@ parse_key_parameter_part (ctrl_t ctrl,
   *   ecdsa := Use algorithm ECDSA.
   *   eddsa := Use algorithm EdDSA.
   *   ecdh  := Use algorithm ECDH.
@@ -172,7 +160,7 @@ index d5099dbb9..58bc9caba 100644
   *
   * There are several defaults and fallbacks depending on the
   * algorithm.  PART can be used to select which part of STRING is
-@@ -4513,9 +4516,9 @@ read_parameter_file (ctrl_t ctrl, const char *fname )
+@@ -5388,9 +5391,9 @@ read_parameter_file (ctrl_t ctrl, const
  	    }
  	}
 
@@ -185,9 +173,9 @@ index d5099dbb9..58bc9caba 100644
          else
            {
              r = xmalloc_clear( sizeof *r + strlen( value ) );
-@@ -4610,11 +4613,14 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
-       para = r;
-     }
+@@ -5485,11 +5488,14 @@ quickgen_set_para (struct para_data_s *p
+   r->next = para;
+   para = r;
 
 -  r = xmalloc_clear (sizeof *r + 20);
 -  r->key = for_subkey? pSUBVERSION : pVERSION;
@@ -205,6 +193,3 @@ index d5099dbb9..58bc9caba 100644
 
    if (keytime)
      {
--- 
-2.41.0
-

srcpkgs/gnupg/template

@@ -1,7 +1,7 @@
 # Template file for 'gnupg'
 # minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
 pkgname=gnupg
-version=2.4.9
+version=2.5.22
 revision=1
 # We're building outside of the source tree, because upstream told us to:
 # https://dev.gnupg.org/T6313#166339
@@ -12,9 +12,10 @@ configure_args="$(vopt_enable ldap)
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr
- --enable-all-tests"
+ --enable-all-tests
+ --enable-gnupg-builddir-envvar"
 configure_script="../configure"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext libgpg-error"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-devel libgpg-error-devel tpm2-tss-devel"
@@ -23,9 +24,9 @@ short_desc="GNU Privacy Guard (2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
-distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
 changelog="https://dev.gnupg.org/source/gnupg/browse/master/NEWS?view=raw"
-checksum=dd17ab2e9a04fd79d39d853f599cbc852062ddb9ab52a4ddeb4176fd8b302964
+distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
+checksum=96e27b020ad26510388e06f5f07f3f70a4ed8916ee995f1b72b7a024e6d9d87e
 make_check_pre='env TESTFLAGS="--parallel=${XBPS_MAKEJOBS}"'
 build_options="ldap"
 build_options_default="ldap"

srcpkgs/gpa/template

@@ -1,7 +1,7 @@
 # Template file for 'gpa'
 pkgname=gpa
 version=0.11.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config gettext glib-devel"
 makedepends="gpgme-devel gtk+3-devel libglib-devel libassuan-devel libgpg-error-devel"

srcpkgs/gpgme/template

@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="python3"
 configure_args="--enable-fd-passing

srcpkgs/kleopatra/template

@@ -2,7 +2,7 @@
 # group=kde-gear
 pkgname=kleopatra
 version=26.08.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins

srcpkgs/libassuan/template

@@ -1,6 +1,6 @@
 # Template file for 'libassuan'
 pkgname=libassuan
-version=2.5.7
+version=3.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
-checksum=0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76
+checksum=d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6
 
 libassuan-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

srcpkgs/pinentry-bemenu/template

@@ -1,7 +1,7 @@
 # Template file for 'pinentry-bemenu'
 pkgname=pinentry-bemenu
 version=0.14.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libgpg-error-devel libassuan-devel bemenu-devel popt-devel"

srcpkgs/pinentry-dmenu/template

@@ -1,7 +1,7 @@
 # Template file for 'pinentry-dmenu'
 pkgname=pinentry-dmenu
 version=0.2.3
-revision=3
+revision=4
 build_style=gnu-makefile
 makedepends="libXft-devel freetype-devel libconfig-devel
  libXinerama-devel libgpg-error-devel libassuan-devel

srcpkgs/pinentry-gtk/template

@@ -5,7 +5,7 @@ _desc="PIN or passphrase entry dialogs for GnuPG"
 
 pkgname=pinentry-gtk
 version=1.3.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-libcap --enable-fallback-curses
  --disable-pinentry-curses --disable-pinentry-tty

srcpkgs/pinentry/template

@@ -3,7 +3,7 @@
 # NOTE: it's splitted this way to avoid cyclic dependencies.
 pkgname=pinentry
 version=1.3.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-libcap --enable-pinentry-tty
  --enable-pinentry-curses --enable-fallback-curses