Re: [PR PATCH] [Updated] [RFC] gnupg update to version 2

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages gnupg-update-to-version-2
https://github.com/void-linux/void-packages/pull/28217

[RFC] gnupg update to version 2


A patch file from https://github.com/void-linux/void-packages/pull/28217.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-update-to-version-2-28217.patch --]
[-- Type: text/x-diff, Size: 29081 bytes --]

From b36e12efc74caa114e43fe051dad7f483947de70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:24:01 +0700
Subject: [PATCH 01/26] gnupg2: provides /usr/bin/gpg

---
 srcpkgs/gnupg2/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
index 8cd59ff07a5..975cd1bcfe7 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg2/template
@@ -1,10 +1,10 @@
 # Template file for 'gnupg2'
 pkgname=gnupg2
 version=2.2.27
-revision=1
+revision=2
 wrksrc="gnupg-${version}"
 build_style=gnu-configure
-configure_args="--enable-gpg-is-gpg2 $(vopt_enable ldap)
+configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
@@ -21,6 +21,7 @@ distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
 checksum=34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399
 build_options="ldap"
 build_options_default="ldap"
+conflicts="gnupg<=1.4.23_3"
 
 post_patch() {
 	# On at least aarch64, configure sets this even though it doesn't exist
@@ -29,13 +30,12 @@ post_patch() {
 }
 
 post_install() {
-	# remove conflicts with gnupg 1.
-	mv ${DESTDIR}/usr/share/man/man7/gnupg.7 ${DESTDIR}/usr/share/man/man7/gnupg2.7
-
 	vmkdir usr/share/examples
 	mv ${DESTDIR}/usr/share/doc/gnupg/examples ${DESTDIR}/usr/share/examples/gnupg2
 
 	mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+
+	ln -s gpg $DESTDIR/usr/bin/gpg2
 }
 
 gnupg2-scdaemon_package() {

From 79981005900df68e6ecb19b62777bb15021f5e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 22:57:29 +0700
Subject: [PATCH 02/26] gnupg: rename binary to gpg1

---
 srcpkgs/gnupg/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 80d96da518c..378e447cdfd 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg'
 pkgname=gnupg
 version=1.4.23
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-threads=posix --enable-noexecstack gnupg_cv_regex_broken=no"
 makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel libusb-compat-devel"
@@ -21,4 +21,10 @@ post_extract() {
 }
 post_install() {
 	rm ${DESTDIR}/usr/bin/gpgsplit
+	mv ${DESTDIR}/usr/bin/gpg ${DESTDIR}/usr/bin/gpg1
+	mv ${DESTDIR}/usr/bin/gpgv ${DESTDIR}/usr/bin/gpgv1
+	mv ${DESTDIR}/usr/share/man/man1/gpg.1 \
+		${DESTDIR}/usr/share/man/man1/gpg1.1
+	mv ${DESTDIR}/usr/share/man/man1/gpgv.1 \
+		${DESTDIR}/usr/share/man/man1/gpgv1.1
 }

From 94f9c53921a6c6e7f8ac0ec71d21feedaf5e2d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:27:07 +0700
Subject: [PATCH 03/26] notmuch: do_check: remove gpg2 hack

---
 srcpkgs/notmuch/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d96cd07da6a..cf518fa20f7 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -2,9 +2,9 @@
 pkgname=notmuch
 version=0.31.3
 revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo gnupg2"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi python3-setuptools"
 depends="gmime3>=3.2.7"
 checkdepends="python3-pytest mdocml dtach gdb tar xz"
 short_desc="Thread-based email index, search, and tagging"
@@ -47,9 +47,6 @@ do_build() {
 }
 
 do_check() {
-	mkdir -p fake-bin
-	ln -sf /usr/bin/gpg2 fake-bin/gpg
-	PATH=$PWD/fake-bin:$PATH
 	cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
 		test/test-databases
 	case "$XBPS_TARGET_LIBC" in

From b64deb7a73878f66c0deaec0c2a65da786c0a160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:25:29 +0700
Subject: [PATCH 04/26] blackbox: depends on gnupg2

---
 srcpkgs/blackbox/INSTALL.msg | 2 --
 srcpkgs/blackbox/template    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/blackbox/INSTALL.msg

diff --git a/srcpkgs/blackbox/INSTALL.msg b/srcpkgs/blackbox/INSTALL.msg
deleted file mode 100644
index 36cb62d8275..00000000000
--- a/srcpkgs/blackbox/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-blackbox requires GnuGP 1 or 2, install gnupg or gnupg2.
-Needs environment variable GPG=gpg2 if used with GnuPG 2.
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index e0d94abf4a5..ab263b74b77 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,8 +1,8 @@
 # Template file for 'blackbox'
 pkgname=blackbox
 version=1.20181219
-revision=2
-depends="bash"
+revision=3
+depends="bash gnupg2"
 short_desc="Safely store secrets in Git/Mercurial/Subversion"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"

From 07e65724e8266da476325093c26e4cf47f72571d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:26:24 +0700
Subject: [PATCH 05/26] pacman: our gpg is gpg2

---
 srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
 srcpkgs/pacman/template               |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 srcpkgs/pacman/patches/gpg2gpg2.patch

diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch
deleted file mode 100644
index ba668e1f2ed..00000000000
--- a/srcpkgs/pacman/patches/gpg2gpg2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-gpg to gpg2:
-Arch's "gnupg" package is this distro's "gnupg2"
-This patches all references to the gpg command to use
-gpg2 instead.
-
-diff -Naur pacman-5.2.1.orig/scripts/pacman-key.sh.in pacman-5.2.1/scripts/pacman-key.sh.in
---- scripts/pacman-key.sh.in	2019-10-24 06:29:08.000000000 -0700
-+++ scripts/pacman-key.sh.in	2020-05-24 02:30:26.838797182 -0700
-@@ -51,6 +51,7 @@
- UPDATEDB=0
- USE_COLOR='y'
- VERIFY=0
-+GPG_COMMAND='gpg2'
-
- usage() {
- 	printf "pacman-key (pacman) %s\n" ${myver}
-@@ -591,8 +592,8 @@
- 	unset ALL_OFF BOLD BLUE GREEN RED YELLOW
- fi
-
--if ! type -p gpg >/dev/null; then
--	error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key"
-+if ! type -p ${GPG_COMMAND} >/dev/null; then
-+	error "$(gettext "Cannot find the %s binary required for all %s operations.")" "${GPG_COMMAND}" "pacman-key"
- 	exit 1
- fi
-
-@@ -611,7 +612,7 @@
- # file, falling back on a hard default
- PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(pacman-conf --config="$CONFIG" gpgdir)}
-
--GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
-+GPG_PACMAN=(${GPG_COMMAND} --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
- if [[ -n ${KEYSERVER} ]]; then
- 	GPG_PACMAN+=(--keyserver "${KEYSERVER}")
- fi
-
-
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From abc8d638adeb17bde00f56d1aab9b561377be67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:29:19 +0700
Subject: [PATCH 06/26] gpgme: depends on gnupg>=2

---
 srcpkgs/gpgme/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 91b76955d6a..113a3e2012a 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -25,12 +25,6 @@ fi
 
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
-post_extract() {
-	vsed -i 's|GPG = gpg|GPG = gpg2|g' \
-		tests/gpg/Makefile.* tests/json/Makefile.* \
-		lang/qt/tests/Makefile.* lang/python/tests/Makefile.*
-}
-
 libgpgme_package() {
 	short_desc+=" - library"
 	pkg_install() {

From c61a589ffcd6c676606946c57525721b3b495a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:06:24 +0700
Subject: [PATCH 07/26] debootstrap: depends on gnupg2

---
 srcpkgs/debootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index f1be3ccca07..874afc6bbc5 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,9 +1,9 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
 version=1.0.123
-revision=2
+revision=3
 build_style=fetch
-depends="binutils gnupg gzip tar wget xz"
+depends="binutils gnupg2 gzip tar wget xz"
 short_desc="Bootstrap a basic Debian system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 240bfebbb6759762c748a9a20443ae7b0459b012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:06:55 +0700
Subject: [PATCH 08/26] distrobuilder: depends on gnupg2

---
 srcpkgs/distrobuilder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index a6847d085e2..2088a60c254 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,13 +1,13 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.1
-revision=1
+revision=2
 wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"
 hostmakedepends="git"
-depends="debootstrap gnupg squashfs-tools"
+depends="debootstrap gnupg2 squashfs-tools"
 short_desc="System container image builder for LXC and LXD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"

From abb4f329476c36fbf35d7b2c91db8f14dfb2b5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:07:08 +0700
Subject: [PATCH 09/26] dpkg: depends on gnupg2

---
 srcpkgs/dpkg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template
index 19c1079a9f2..cc998c84b7d 100644
--- a/srcpkgs/dpkg/template
+++ b/srcpkgs/dpkg/template
@@ -1,14 +1,14 @@
 # Template file for 'dpkg'
 pkgname=dpkg
 version=1.20.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-start-stop-daemon --with-libz --with-libbz2
  --with-liblzma"
 hostmakedepends="pkg-config perl tar"
 makedepends="zlib-devel bzip2-devel liblzma-devel ncurses-devel"
 depends="perl"
-checkdepends="gnupg perl-Test-Pod"
+checkdepends="gnupg2 perl-Test-Pod"
 short_desc="Debian Package Manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 476976c9fe3c6d7320da0f80a0649c474855965a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:09:10 +0700
Subject: [PATCH 10/26] libjcat: test with gnupg2

---
 srcpkgs/libjcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 1fe26173ce3..2f408a77e1b 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 hostmakedepends="gnutls-tools pkg-config vala"
 makedepends="json-glib-devel gnutls-devel gpgme-devel"
-checkdepends="gnupg"
+checkdepends="gnupg2"
 short_desc="Library for reading and writing Jcat files"
 maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"

From 06c12a0fd2ddf5b3e9acb415ee43a99372f30d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:51 +0700
Subject: [PATCH 11/26] duplicity: depends on gnupg2

---
 srcpkgs/duplicity/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index fa066c26750..c692fc06584 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,11 +1,11 @@
 # Template file for 'duplicity'
 pkgname=duplicity
 version=0.8.18
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 makedepends="python3-devel librsync-devel"
-depends="python3-fasteners gnupg python3-future python3-urllib3"
+depends="python3-fasteners gnupg2 python3-future python3-urllib3"
 short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1b998b7692de6527ec55c7030df4a30a2dea8e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:52 +0700
Subject: [PATCH 12/26] git-secret: depends on gnupg2

---
 srcpkgs/git-secret/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 4dcb69ebf6a..70b02e960b0 100644
--- a/srcpkgs/git-secret/template
+++ b/srcpkgs/git-secret/template
@@ -1,10 +1,10 @@
 # Template file for 'git-secret'
 pkgname=git-secret
 version=0.3.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="PREFIX=/usr"
-depends="bash gawk gnupg coreutils"
+depends="bash gawk gnupg2 coreutils"
 short_desc="Bash-tool to store your private data inside a git repository"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"

From d0d4b9d7c2e0cbc28f3b861808637eeb31009f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:52 +0700
Subject: [PATCH 13/26] libcryptui: depends on gnupg2

---
 srcpkgs/libcryptui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index a0bfef4a32c..6e49836dfb2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,16 +1,16 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
  --disable-schemas-compile $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
+hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg2
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
  libnotify-devel libgnome-keyring-devel"
-depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg"
+depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg2"
 short_desc="GNOME Interface components for OpenPGP"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"

From da582dc522adea5971d78012a13c0a2e0c35d2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:52 +0700
Subject: [PATCH 14/26] lxc: depends on gnupg2

---
 srcpkgs/lxc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 03fbeb400f5..da9ae496f4b 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -3,14 +3,14 @@ _desc="Linux Containers"
 
 pkgname=lxc
 version=4.0.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none
  --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log"
 hostmakedepends="automake libtool pkg-config docbook2x"
 makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
-depends="xz wget gnupg"
+depends="xz wget gnupg2"
 short_desc="${_desc} - utilities"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 homepage="https://linuxcontainers.org"

From c45eff5075a642e23bca0e59712293fb7945b742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:52 +0700
Subject: [PATCH 15/26] playonlinux: depends on gnupg2

---
 srcpkgs/playonlinux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 02083a3ec5c..457cef68ee7 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -1,12 +1,12 @@
 # Template file for 'playonlinux'
 pkgname=playonlinux
 version=4.3.4
-revision=2
+revision=3
 # contains pre-compiled binaries linked against glibc
 archs="i686 x86_64"
 wrksrc="${pkgname}"
 depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
- gnupg xdg-user-dirs libXmu wget p7zip curl jq"
+ gnupg2 xdg-user-dirs libXmu wget p7zip curl jq"
 short_desc="GUI for managing Windows programs under linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"

From cbdc5a322fd0597e25a9a4fcc1d25c12cea85279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:52 +0700
Subject: [PATCH 16/26] python3-gnupg: depends on gnupg2

---
 srcpkgs/python3-gnupg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index fcf3734f505..eb51274cc68 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -2,11 +2,11 @@
 pkgname=python3-gnupg
 _pkgname=python-gnupg
 version=0.4.6
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 gnupg"
+depends="python3 gnupg2"
 short_desc="Python3 wrapper for GnuPG"
 maintainer="Lon Willett <xgit@lonw.net>"
 license="BSD-3-Clause"

From 178cf345e211198c4e3079af560ba5962d4b82cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:53 +0700
Subject: [PATCH 17/26] python3-slixmpp: depends on gnupg2

---
 srcpkgs/python3-slixmpp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-slixmpp/template b/srcpkgs/python3-slixmpp/template
index 1426cb9703a..8a3c42364c7 100644
--- a/srcpkgs/python3-slixmpp/template
+++ b/srcpkgs/python3-slixmpp/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-slixmpp'
 pkgname=python3-slixmpp
 version=1.5.2
-revision=2
+revision=3
 wrksrc="slixmpp-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools python3-Cython"
 makedepends="python3-devel libidn-devel"
 depends="python3-aiodns python3-pyasn1 python3-pyasn1-modules python3-aiohttp"
-checkdepends="python3-pytest gnupg"
+checkdepends="python3-pytest gnupg2"
 short_desc="Elegant Python library for XMPP"
 maintainer="Franklin Delehelle <franklin.delehelle@odena.eu>"
 license="MIT"

From 10edb9463b46633cf63e46a25d8a7d9ec6ac7f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:53 +0700
Subject: [PATCH 18/26] rdup: depends on gnupg2

---
 srcpkgs/rdup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template
index a73f90839ef..d3d5539cab8 100644
--- a/srcpkgs/rdup/template
+++ b/srcpkgs/rdup/template
@@ -1,12 +1,12 @@
 # Template file for 'rdup'
 pkgname=rdup
 version=1.1.15
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="glib-devel libarchive-devel nettle-devel"
 depends="bash"
-checkdepends="dejagnu tar gnupg"
+checkdepends="dejagnu tar gnupg2"
 short_desc="Backup program that doesn't make backups"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="GPL-3.0-or-later"

From 38ab62418f99dea8d61dd0a4803d70a677659bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:53 +0700
Subject: [PATCH 19/26] rkt: depends on gnupg2

---
 srcpkgs/rkt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..69839d1c2dd 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -1,13 +1,13 @@
 # Template file for 'rkt'
 pkgname=rkt
 version=1.30.0
-revision=2
+revision=3
 build_style=gnu-configure
 # KVM support broken
 configure_args="--enable-tpm=no --enable-sdjournal=no
  --with-stage1-flavors=fly,coreos,host
  --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
-hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
+hostmakedepends="automake wget cpio squashfs-tools bc gnupg2 git go"
 makedepends="acl-devel zlib-devel libressl-devel"
 depends="virtual?rkt-stage1"
 short_desc="App Container runtime for Linux"

From b6f9b40c65a583d3105f172992b0871cca3b6b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:53 +0700
Subject: [PATCH 20/26] seahorse-nautilus: depends on gnupg2

---
 srcpkgs/seahorse-nautilus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index a2584685866..870fb34b37d 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,13 +1,13 @@
 # Template file for 'seahorse-nautilus'
 pkgname=seahorse-nautilus
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool gpgme-devel gnupg glib"
+hostmakedepends="pkg-config intltool gpgme-devel gnupg2 glib"
 makedepends="gtk+3-devel nautilus-devel libnotify-devel
  gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
+depends="gnupg2 desktop-file-utils"
 short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From a10469b9be3982a46ce3963bbb767e9841bf17ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:53 +0700
Subject: [PATCH 21/26] seahorse-sharing: depends on gnupg2

---
 srcpkgs/seahorse-sharing/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index 4fa4413e10b..bd71e26b4df 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,12 +1,12 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=4
+revision=5
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool gnupg"
+hostmakedepends="pkg-config intltool gnupg2"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel
  avahi-glib-libs-devel libSM-devel"
-depends="gnupg"
+depends="gnupg2"
 short_desc="Sharing of PGP public keys via DNS-SD and HKP"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2d79eb479e822f169e442b22a31fb3bfc8c39719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:54 +0700
Subject: [PATCH 22/26] spamassassin: depends on gnupg2

---
 srcpkgs/spamassassin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spamassassin/template b/srcpkgs/spamassassin/template
index d778f76ba3e..5aad6cafc08 100644
--- a/srcpkgs/spamassassin/template
+++ b/srcpkgs/spamassassin/template
@@ -1,12 +1,12 @@
 # Template file for 'spamassassin'
 pkgname=spamassassin
 version=3.4.4
-revision=2
+revision=3
 wrksrc="Mail-SpamAssassin-${version}"
 build_style=perl-module
 # Missing optional dependencies:
 #  Mail::SPF, Geo::IP, Razor2, Encode::Detect, Net::Patricia
-hostmakedepends="curl gnupg perl perl-DBI perl-Digest-SHA1 perl-HTML-Parser
+hostmakedepends="curl gnupg2 perl perl-DBI perl-Digest-SHA1 perl-HTML-Parser
  perl-HTTP-Date perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-LWP
  perl-Mail-DKIM perl-Net-DNS perl-NetAddr-IP"
 makedepends="$hostmakedepends"

From dd3617849c236f28300411288701f69a00028db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:54 +0700
Subject: [PATCH 23/26] tomb: depends on gnupg2

---
 srcpkgs/tomb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index f85b1a32aea..825ce473e13 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,11 +1,11 @@
 # Template file for 'tomb'
 pkgname=tomb
 version=2.9
-revision=1
+revision=2
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-depends="sudo gnupg cryptsetup pinentry zsh"
+depends="sudo gnupg2 cryptsetup pinentry zsh"
 short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From d47cd2449a5a06d7ee1905b56400b75e7e946276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:54 +0700
Subject: [PATCH 24/26] vim-gnupg: depends on gnupg2

---
 srcpkgs/vim-gnupg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vim-gnupg/template b/srcpkgs/vim-gnupg/template
index c8433ac2c95..b188dd0d184 100644
--- a/srcpkgs/vim-gnupg/template
+++ b/srcpkgs/vim-gnupg/template
@@ -1,8 +1,8 @@
 # Template file for 'vim-gnupg'
 pkgname=vim-gnupg
 version=2.7.1
-revision=1
-depends="vim-common gnupg"
+revision=2
+depends="vim-common gnupg2"
 short_desc="Plugin for transparent editing of gpg encrypted files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c93f0c1546ca59a5d7836f92b62cbc22c4df6e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:54 +0700
Subject: [PATCH 25/26] yadm: depends on gnupg2

---
 srcpkgs/yadm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index d33617c085e..985abc66ef1 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,8 +1,8 @@
 # Template file for 'yadm'
 pkgname=yadm
 version=3.0.2
-revision=1
-depends="bash git gnupg"
+revision=2
+depends="bash git gnupg2"
 short_desc="Yet Another Dotfiles Manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 0dcb8be56050e2b056b6be9854a8d701abb2f370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 23:12:54 +0700
Subject: [PATCH 26/26] zeroinstall: depends on gnupg2

---
 srcpkgs/zeroinstall/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..2e77d1000a9 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,13 +1,13 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=3
+revision=4
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
-hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
-depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+hostmakedepends="gettext ocaml opam m4 tar pkg-config which gnupg2"
+makedepends="libressl-devel libcurl-devel glib-devel gtk+3-devel"
+depends="gnupg2 desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="LGPL-2.1-only"