From df044df33a68315b2f819797b4b9183f7969bf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:24:01 +0700 Subject: [PATCH 1/7] gnupg: update to 2.2.27. --- srcpkgs/gnupg-scdaemon | 1 + .../patches/use-versioned-pcsclite.patch | 0 srcpkgs/gnupg/template | 55 ++++++++++++++----- srcpkgs/gnupg/update | 1 - srcpkgs/gnupg2 | 1 + srcpkgs/gnupg2-scdaemon | 2 +- srcpkgs/gnupg2/template | 48 ---------------- srcpkgs/gnupg2/update | 1 - 8 files changed, 45 insertions(+), 64 deletions(-) create mode 120000 srcpkgs/gnupg-scdaemon rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%) delete mode 100644 srcpkgs/gnupg/update create mode 120000 srcpkgs/gnupg2 delete mode 100644 srcpkgs/gnupg2/template delete mode 100644 srcpkgs/gnupg2/update diff --git a/srcpkgs/gnupg-scdaemon b/srcpkgs/gnupg-scdaemon new file mode 120000 index 00000000000..ce3d705284c --- /dev/null +++ b/srcpkgs/gnupg-scdaemon @@ -0,0 +1 @@ +gnupg \ No newline at end of file diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg/patches/use-versioned-pcsclite.patch similarity index 100% rename from srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch rename to srcpkgs/gnupg/patches/use-versioned-pcsclite.patch diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template index 80d96da518c..feda90e445a 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,24 +1,53 @@ # Template file for 'gnupg' pkgname=gnupg -version=1.4.23 -revision=3 +version=2.2.27 +revision=1 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" -short_desc="The GNU Privacy Guard" +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 + --with-npth-prefix=${XBPS_CROSS_BASE}/usr" +hostmakedepends="pkg-config" +makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel + libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel" +depends="pinentry" +short_desc="GNU Privacy Guard" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/" distfiles="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba +checksum=34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399 +build_options="ldap" +build_options_default="ldap" -CFLAGS="-fcommon" - -post_extract() { - case "$XBPS_TARGET_MACHINE" in - i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;; - esac +post_patch() { + # On at least aarch64, configure sets this even though it doesn't exist + vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c + vsed -i '/examples\/systemd-user/d' doc/Makefile.in } + post_install() { - rm ${DESTDIR}/usr/bin/gpgsplit + vmkdir usr/share/examples +} + +gnupg-scdaemon_package() { + depends="${sourcepkg}>=${version}_${revision} libpcsclite" + short_desc+=" - smartcard daemon" + pkg_install() { + vmove usr/libexec/scdaemon + vmove usr/share/man/man1/scdaemon.1 + } +} + +gnupg2_package() { + depends="gnupg>=${version}_${revision}" + short_desc+=" - transition package" + build_style=meta +} + +gnupg2-scdaemon_package() { + depends="gnupg-scdaemon>=${version}_${revision}" + short_desc+=" - smartcard daemon (transition package)" + build_style=meta } diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update deleted file mode 100644 index 6bfa7d9a00b..00000000000 --- a/srcpkgs/gnupg/update +++ /dev/null @@ -1 +0,0 @@ -ignore="2.*" diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2 new file mode 120000 index 00000000000..ce3d705284c --- /dev/null +++ b/srcpkgs/gnupg2 @@ -0,0 +1 @@ +gnupg \ No newline at end of file diff --git a/srcpkgs/gnupg2-scdaemon b/srcpkgs/gnupg2-scdaemon index 7a41d0a790f..ce3d705284c 120000 --- a/srcpkgs/gnupg2-scdaemon +++ b/srcpkgs/gnupg2-scdaemon @@ -1 +1 @@ -gnupg2 \ No newline at end of file +gnupg \ No newline at end of file diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template deleted file mode 100644 index 8cd59ff07a5..00000000000 --- a/srcpkgs/gnupg2/template +++ /dev/null @@ -1,48 +0,0 @@ -# Template file for 'gnupg2' -pkgname=gnupg2 -version=2.2.27 -revision=1 -wrksrc="gnupg-${version}" -build_style=gnu-configure -configure_args="--enable-gpg-is-gpg2 $(vopt_enable ldap) - --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr - --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr - --with-ksba-prefix=${XBPS_CROSS_BASE}/usr - --with-npth-prefix=${XBPS_CROSS_BASE}/usr" -hostmakedepends="pkg-config" -makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel - libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel" -depends="pinentry" -short_desc="GNU Privacy Guard (2.x)" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://www.gnupg.org/" -distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399 -build_options="ldap" -build_options_default="ldap" - -post_patch() { - # On at least aarch64, configure sets this even though it doesn't exist - vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c - vsed -i '/examples\/systemd-user/d' doc/Makefile.in -} - -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 -} - -gnupg2-scdaemon_package() { - depends="${sourcepkg}>=${version}_${revision} libpcsclite" - short_desc+=" - smartcard daemon" - pkg_install() { - vmove usr/libexec/scdaemon - vmove usr/share/man/man1/scdaemon.1 - } -} diff --git a/srcpkgs/gnupg2/update b/srcpkgs/gnupg2/update deleted file mode 100644 index 95f92483c02..00000000000 --- a/srcpkgs/gnupg2/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=gnupg From aae51b628c140f77a0e599ea3fd3676d37fc8a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:25:29 +0700 Subject: [PATCH 2/7] blackbox: depends on gnupg --- 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..c242782d793 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 gnupg" short_desc="Safely store secrets in Git/Mercurial/Subversion" maintainer="Daniel A. Maierhofer " license="MIT" From 2249f010480958854d3f7cbf193b09988f59128d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:26:24 +0700 Subject: [PATCH 3/7] pacman: depends on gnupg --- srcpkgs/pacman/patches/gpg2gpg2.patch | 38 --------------------------- srcpkgs/pacman/template | 4 +-- 2 files changed, 2 insertions(+), 40 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..dda73aadc03 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" @@ -9,7 +9,7 @@ conf_files="/etc/pacman.conf" build_style=meson hostmakedepends="autoconf automake curl libtool gettext-devel pkg-config asciidoc" makedepends="libarchive-devel gpgme-devel libcurl-devel" -depends="gnupg2" +depends="gnupg>=2.0.0_1" checkdepends="fakeroot" short_desc="Simple library-based package manager" maintainer="oreo639 " From 4b551c909b9f8e23e8a2a4af5bc0cf6b0e62ba30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:27:07 +0700 Subject: [PATCH 4/7] notmuch: do_check: remove gpg2 hack --- srcpkgs/notmuch/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index d96cd07da6a..36471539d31 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -4,7 +4,7 @@ version=0.31.3 revision=1 hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo" makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel - python3-cffi python3-setuptools gnupg2" + python3-cffi python3-setuptools gnupg" 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 3a3eb9e86309dbe0ee4dad3bbffb2c1b03b23429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:29:19 +0700 Subject: [PATCH 5/7] gpgme: depends on gnupg>=2 --- srcpkgs/gpgme/template | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 91b76955d6a..7e0342d6d62 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -1,14 +1,14 @@ # 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 --with-libassuan-prefix=$XBPS_CROSS_BASE/usr" -hostmakedepends="gnupg2 pkg-config qt5-host-tools qt5-qmake" +hostmakedepends="gnupg pkg-config qt5-host-tools qt5-qmake" makedepends="libassuan-devel qt5-tools-devel" -depends="gnupg2" +depends="gnupg>=2.0.0_1" short_desc="GnuPG Made Easy" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" @@ -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 2c906c2e1b5af2e59c00dfc9f31409dd744c74b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:33:03 +0700 Subject: [PATCH 6/7] seahorse-sharing: fix gnupg version patch --- srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch b/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch index 7130ee6a044..e15ae233ff9 100644 --- a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch +++ b/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch @@ -5,7 +5,7 @@ if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1" ++ accepted_versions="1.2 1.4 2.0 2.1 2.2" AC_PATH_PROGS(GNUPG, [gpg gpg2], no) ok="no" if test "$GNUPG" != "no"; then From e0f5306bbb0af37ae8c2251764a2eae3b8d48940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 19:34:39 +0700 Subject: [PATCH 7/7] srcpkgs: rename gnupg2 to gnupg en mass --- srcpkgs/alot/template | 2 +- srcpkgs/docker-credential-pass/template | 2 +- srcpkgs/flatpak/template | 4 ++-- srcpkgs/gcr/template | 4 ++-- srcpkgs/git-annex/template | 4 ++-- srcpkgs/git-remote-gcrypt/template | 2 +- srcpkgs/gmime3/template | 2 +- srcpkgs/gopass/template | 4 ++-- srcpkgs/gpa/template | 2 +- srcpkgs/keybase/template | 2 +- srcpkgs/pam-gnupg/template | 4 ++-- srcpkgs/pass/template | 4 ++-- srcpkgs/seahorse/template | 4 ++-- srcpkgs/torbrowser-launcher/template | 4 ++-- srcpkgs/tpm/template | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template index 314bbe011aa..3f29482d8d2 100644 --- a/srcpkgs/alot/template +++ b/srcpkgs/alot/template @@ -6,7 +6,7 @@ build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx" depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj python3-gpg python3-magic python3-urwidtrees" -checkdepends="$depends gnupg2 procps-ng python3-pytest" +checkdepends="$depends gnupg procps-ng python3-pytest" short_desc="Terminal-based mail user agent based on the notmuch mail indexer" maintainer="Felix Van der Jeugt " license="GPL-3.0-or-later" diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template index 40b1d54529f..36267aa7610 100644 --- a/srcpkgs/docker-credential-pass/template +++ b/srcpkgs/docker-credential-pass/template @@ -7,7 +7,7 @@ wrksrc="docker-credential-helpers-${version}" build_style=go go_import_path="github.com/docker/docker-credential-helpers" go_package="${go_import_path}/pass/cmd" -depends="pass gnupg2" +depends="pass gnupg" short_desc="Use native stores to keep Docker credentials safe" maintainer="Hoang Nguyen " license="MIT" diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 9c8065af2c0..258f0968223 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -13,8 +13,8 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison python3-parsing docbook docbook-xml docbook-xsl" makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel" -depends="bubblewrap gnupg2" -checkdepends="attr-progs bubblewrap dbus gnupg2 socat which" +depends="bubblewrap gnupg" +checkdepends="attr-progs bubblewrap dbus gnupg socat which" short_desc="Application sandboxing and distribution framework" maintainer="Duncaen " license="LGPL-2.1-or-later" diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e9101168195..27eb98eab9d 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -4,11 +4,11 @@ version=3.38.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config +hostmakedepends="gettext glib-devel gnupg gtk-doc intltool pkg-config libxslt $(vopt_if vala vala)" makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel $(vopt_if vala vala)" -depends="desktop-file-utils hicolor-icon-theme gnupg2" +depends="desktop-file-utils hicolor-icon-theme gnupg" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 53a796cab1a..9c4cb712422 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -3,10 +3,10 @@ pkgname=git-annex version=8.20200908 revision=1 build_style=haskell-stack -makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel +makedepends="curl file-devel gnupg gnutls-devel gsasl-devel libxml2-devel lsof rsync git" # depends are utilities required by git-annex -depends="git rsync curl lsof gnupg2" +depends="git rsync curl lsof gnupg" short_desc="Git addon for managing large files" maintainer="Evan Deaubl " license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license" diff --git a/srcpkgs/git-remote-gcrypt/template b/srcpkgs/git-remote-gcrypt/template index 37af2142e43..b038728fa83 100644 --- a/srcpkgs/git-remote-gcrypt/template +++ b/srcpkgs/git-remote-gcrypt/template @@ -3,7 +3,7 @@ pkgname=git-remote-gcrypt version=1.3 revision=1 hostmakedepends="python3-docutils" -depends="git bash gnupg2" +depends="git bash gnupg" short_desc="PGP-encrypted git remotes" maintainer="Anjandev Momi " license="GPL-3.0-only" diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template index 43e04197d50..872dbe224c0 100644 --- a/srcpkgs/gmime3/template +++ b/srcpkgs/gmime3/template @@ -10,7 +10,7 @@ configure_args="--disable-static --enable-crypto $(vopt_enable vala) hostmakedepends="pkg-config $(vopt_if vala vala)" makedepends="glib-devel gpgme-devel libidn2-devel $(vopt_if vala vala)" -checkdepends="gnupg2" +checkdepends="gnupg" short_desc="GNOME Core mime parsing library" maintainer="Enno Boland " license="LGPL-2.1-or-later" diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index 2f6f5c860fa..85f5cee2542 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -5,8 +5,8 @@ revision=2 build_style=go go_import_path=github.com/gopasspw/gopass go_package="${go_import_path} ${go_import_path}/cmd/..." -makedepends="gnupg2" -depends="gnupg2 git" +makedepends="gnupg" +depends="gnupg git" short_desc="Slightly more awesome standard unix password manager for teams" maintainer="Felipe Nogueira " license="MIT" diff --git a/srcpkgs/gpa/template b/srcpkgs/gpa/template index 1a926f1f242..4047382e6e2 100644 --- a/srcpkgs/gpa/template +++ b/srcpkgs/gpa/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gpgme-devel gtk+-devel" -depends="desktop-file-utils gnupg2" +depends="desktop-file-utils gnupg" short_desc="A graphical user interface for GnuPG" maintainer="Orphaned " license="GPL-3.0-or-later" diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 7297f4b80ff..31703f6554c 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -11,7 +11,7 @@ ${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase ${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector" go_build_tags="production" hostmakedepends="git" -depends="gnupg2" +depends="gnupg" short_desc="Client for keybase.io" maintainer="Toyam Cox " license="BSD-3-Clause" diff --git a/srcpkgs/pam-gnupg/template b/srcpkgs/pam-gnupg/template index e1efffe4d24..82f310d8bb6 100644 --- a/srcpkgs/pam-gnupg/template +++ b/srcpkgs/pam-gnupg/template @@ -4,9 +4,9 @@ version=0.2 revision=1 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/security" -hostmakedepends="automake libtool gnupg2" +hostmakedepends="automake libtool gnupg" makedepends="pam-devel" -depends="gnupg2" +depends="gnupg" short_desc="PAM module to unlock GPG agent" maintainer="Andrew J. Hesford " license="GPL-3.0-only" diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template index 33f0811c76d..f8f6fabbff4 100644 --- a/srcpkgs/pass/template +++ b/srcpkgs/pass/template @@ -5,8 +5,8 @@ revision=5 wrksrc="password-store-${version}" build_style=gnu-makefile make_install_args="WITH_BASHCOMP=yes WITH_ZSHCOMP=yes WITH_FISHCOMP=yes" -depends="bash gnupg2 tree which" -checkdepends="gnupg2 tree which git" +depends="bash gnupg tree which" +checkdepends="gnupg tree which git" short_desc="Stores, retrieves, generates, and synchronizes passwords securely" maintainer="teldra " license="GPL-2.0-or-later" diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index 9cf5c354d69..20e3091e47f 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -4,12 +4,12 @@ version=3.38.0.1 revision=1 build_style=meson build_helper=gir -hostmakedepends="gcr-devel gettext glib-devel gnupg2 itstool libsecret-devel +hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel openssh pkg-config vala" makedepends="avahi-glib-libs-devel gcr-devel gpgme-devel gtk+3-devel libgirepository-devel libhandy1-devel libldap-devel libsecret-devel libsoup-devel libpwquality-devel" -depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 gnupg2 openssh" +depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 gnupg openssh" short_desc="GNOME application for managing encryption keys" maintainer="Enno Boland " license="GPL-2.0-or-later" diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template index 2d8ce5bf282..00656876dde 100644 --- a/srcpkgs/torbrowser-launcher/template +++ b/srcpkgs/torbrowser-launcher/template @@ -5,8 +5,8 @@ revision=2 archs="i686 x86_64" # limited by Tor Browser itself build_style=python3-module hostmakedepends="gettext python3-setuptools" -depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg2 tor dbus-glib - python3-packaging" +depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg + tor dbus-glib python3-packaging" short_desc="Securely download, verify and run Tor Browser" maintainer="Daniel Eyßer " license="MIT" diff --git a/srcpkgs/tpm/template b/srcpkgs/tpm/template index 347c3cd807a..c2b369cca03 100644 --- a/srcpkgs/tpm/template +++ b/srcpkgs/tpm/template @@ -4,7 +4,7 @@ version=1.3.3 revision=2 build_style=gnu-makefile hostmakedepends="perl" -depends="gnupg2" +depends="gnupg" short_desc="Tiny password manager" maintainer="Orphaned " license="GPL-3.0-or-later"