From 5053ba4467144083240f62931e1e51bcfcbce0b9 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 01/21] gnupg: update to 2.2.27. --- srcpkgs/gnupg-scdaemon | 1 + .../patches/use-versioned-pcsclite.patch | 0 srcpkgs/gnupg/template | 59 +++++++++++++++---- srcpkgs/gnupg/update | 1 - srcpkgs/gnupg2 | 1 + srcpkgs/gnupg2-scdaemon | 2 +- srcpkgs/gnupg2/template | 48 --------------- srcpkgs/gnupg2/update | 1 - 8 files changed, 49 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..3dbb81d2469 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,24 +1,57 @@ # Template file for 'gnupg' pkgname=gnupg -version=1.4.23 -revision=3 +version=2.2.27 +revision=2 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 + ln -s gpg $DESTDIR/usr/bin/gpg2 +} + +gnupg-scdaemon_package() { + depends="${sourcepkg}>=${version}_${revision} libpcsclite" + short_desc+=" - smartcard daemon" + provides="gnupg2-scdaemon-${version}_${revision}" + pkg_install() { + vmove usr/libexec/scdaemon + vmove usr/share/man/man1/scdaemon.1 + } +} + +gnupg2_package() { + depends="gnupg>=${version}_${revision}" + short_desc+=" - symlink compat" + pkg_install() { + vmove usr/bin/gpg2 + } +} + +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 920fc0de72d42b5b0bf830c8616665b312abc784 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 02/21] 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 e21daf1f3cf643fbc5b0090d277a9f9faa3ebfb4 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 03/21] 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 b298af69d5345cf9ff7af9f27d5ed12b615128d2 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 04/21] 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..dda8cf039b7 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 gnupg" 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 6f9ed08d34ef4f224b35bf544180e01cbb9d02f2 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 05/21] 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 349b0395f3c070680fafe622df923b7c42179043 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 20:37:26 +0700 Subject: [PATCH 06/21] git-annex: use gpg --- srcpkgs/git-annex/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 53a796cab1a..5794ad3af1f 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,12 +1,12 @@ # Template file for 'git-annex' pkgname=git-annex version=8.20200908 -revision=1 +revision=2 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>=2.0.0_1" 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" From 3ae1b15a1def30d072c233768a3208ffbf6236c6 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 20:51:34 +0700 Subject: [PATCH 07/21] flatpak: s/gnupg2/gnupg/ --- srcpkgs/flatpak/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 9c8065af2c0..2e61be505e9 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,7 +1,7 @@ # Template file for 'flatpak' pkgname=flatpak version=1.10.1 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" @@ -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>=2.0.0_1" +checkdepends="attr-progs bubblewrap dbus gnupg socat which" short_desc="Application sandboxing and distribution framework" maintainer="Duncaen " license="LGPL-2.1-or-later" From 71d88cabc5ede6a28a61d9efbc3389d461271637 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 08/21] 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 22b56deec017633244fa2b49e0cb3f25eaf12f9d 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 21:23:48 +0700 Subject: [PATCH 09/21] seahorse-sharing: fix localedir --- .../seahorse-sharing/patches/fix-gnupg-version.patch | 11 ----------- srcpkgs/seahorse-sharing/template | 11 ++++++----- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch diff --git a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch b/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch deleted file mode 100644 index e15ae233ff9..00000000000 --- a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac 2013-03-25 12:02:04.000000000 +0100 -+++ configure.ac 2016-08-31 01:03:33.238915208 +0200 -@@ -43,7 +43,7 @@ - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ 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 diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index a1883d54423..4fa4413e10b 100644 --- a/srcpkgs/seahorse-sharing/template +++ b/srcpkgs/seahorse-sharing/template @@ -1,10 +1,9 @@ # Template file for 'seahorse-sharing' pkgname=seahorse-sharing version=3.8.0 -revision=3 +revision=4 build_style=gnu-configure -hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel - gpgme-devel gnupg" +hostmakedepends="pkg-config intltool gnupg" makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel avahi-glib-libs-devel libSM-devel" depends="gnupg" @@ -15,6 +14,8 @@ homepage="http://www.gnome.org/projects/seahorse/" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e216e7d5709e688e142b4e96710759f5be54c39ac6c2d58f2eec330e4dfef92b -pre_configure() { - autoreconf -fi +post_patch() { + vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \ + -e '/accepted_versions=/s/2\.0/2.2/' \ + configure } From 999fbd463d23db5a6e685270fd0ae364468b5f09 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 21:28:04 +0700 Subject: [PATCH 10/21] docker-credential-pass: indirectly depends on gpg via pass --- srcpkgs/docker-credential-pass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template index 40b1d54529f..cf740e5eb79 100644 --- a/srcpkgs/docker-credential-pass/template +++ b/srcpkgs/docker-credential-pass/template @@ -1,13 +1,13 @@ # Template file for 'docker-credential-pass' pkgname=docker-credential-pass version=0.6.3 -revision=1 +revision=2 archs="x86_64* ppc64le*" 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" short_desc="Use native stores to keep Docker credentials safe" maintainer="Hoang Nguyen " license="MIT" From d6282804a4b971b87ead8dab5c71bf936d0dd243 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 21:31:37 +0700 Subject: [PATCH 11/21] gcr: depends on gnupg>=2 --- srcpkgs/gcr/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e9101168195..33982e7b338 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,14 +1,14 @@ # Template file for 'gcr' pkgname=gcr version=3.38.0 -revision=1 +revision=2 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>=2.0.0_1" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" From b0667945141eb1bd42e8debd6d3c536918b0021d 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 21:35:43 +0700 Subject: [PATCH 12/21] git-remote-gcrypt: depends on gnupg --- srcpkgs/git-remote-gcrypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-remote-gcrypt/template b/srcpkgs/git-remote-gcrypt/template index 37af2142e43..267a00a83a0 100644 --- a/srcpkgs/git-remote-gcrypt/template +++ b/srcpkgs/git-remote-gcrypt/template @@ -1,9 +1,9 @@ # Template file for 'git-remote-gcrypt' pkgname=git-remote-gcrypt version=1.3 -revision=1 +revision=2 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" From 8a1c738f5164697206421078b31d966eaf136755 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 21:36:35 +0700 Subject: [PATCH 13/21] gmime3: check with gnupg --- srcpkgs/gmime3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 5d26fa8820cc819670617c03205ce0a8e1927632 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 21:37:13 +0700 Subject: [PATCH 14/21] gopass: depends on gnupg --- srcpkgs/gopass/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index 2f6f5c860fa..a1907a4bf98 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,12 +1,12 @@ # Template file for 'gopass' pkgname=gopass version=1.10.1 -revision=2 +revision=3 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" From 099986292aae2514666382894d35b1c7b16249fc 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 21:38:00 +0700 Subject: [PATCH 15/21] gpa: depends on gnupg --- srcpkgs/gpa/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gpa/template b/srcpkgs/gpa/template index 1a926f1f242..67a38e5eef0 100644 --- a/srcpkgs/gpa/template +++ b/srcpkgs/gpa/template @@ -1,12 +1,12 @@ # Template file for 'gpa' pkgname=gpa version=0.10.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gpgme-devel gtk+-devel" -depends="desktop-file-utils gnupg2" -short_desc="A graphical user interface for GnuPG" +depends="desktop-file-utils gnupg" +short_desc="GnuPG's graphical user interface" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/related_software/gpa/" From 901e023d45f9a76666febfb923ebabe731888e89 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 21:40:50 +0700 Subject: [PATCH 16/21] keybase: depends on gnupg --- srcpkgs/keybase/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 7297f4b80ff..22204d8910d 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,7 +1,7 @@ # Template file for 'keybase' pkgname=keybase version=5.5.2 -revision=1 +revision=2 wrksrc="client-v${version}" build_style=go go_import_path="github.com/keybase/client" @@ -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" From d376b85b2bda2248d29bad653e7508e9814b5282 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 21:41:50 +0700 Subject: [PATCH 17/21] pam-gnupg: depends on gnupg --- srcpkgs/pam-gnupg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pam-gnupg/template b/srcpkgs/pam-gnupg/template index e1efffe4d24..dea0c5277e2 100644 --- a/srcpkgs/pam-gnupg/template +++ b/srcpkgs/pam-gnupg/template @@ -1,12 +1,12 @@ # Template file for 'pam-gnupg' pkgname=pam-gnupg version=0.2 -revision=1 +revision=2 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" From b2513019a730e7e90d9d3930356072356d89f96a 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 21:48:17 +0700 Subject: [PATCH 18/21] pass: depends on gnupg --- srcpkgs/pass/patches/gpg-is-gpg2.patch | 100 +++++++++++++++++++++++++ srcpkgs/pass/template | 6 +- 2 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/pass/patches/gpg-is-gpg2.patch diff --git a/srcpkgs/pass/patches/gpg-is-gpg2.patch b/srcpkgs/pass/patches/gpg-is-gpg2.patch new file mode 100644 index 00000000000..bdd1834c72d --- /dev/null +++ b/srcpkgs/pass/patches/gpg-is-gpg2.patch @@ -0,0 +1,100 @@ +diff --git contrib/importers/password-exporter2pass.py contrib/importers/password-exporter2pass.py +index 135feda..0c38591 100755 +--- contrib/importers/password-exporter2pass.py ++++ contrib/importers/password-exporter2pass.py +@@ -161,7 +161,7 @@ def passimport(filepath, prefix=None, force=False, verbose=False, quiet=False): + # + # Workaround: add the first signing key id explicitly with: + # +- # SIGKEY=$(gpg2 --list-keys --with-colons user@example.com | \ ++ # SIGKEY=$(gpg --list-keys --with-colons user@example.com | \ + # awk -F : '/:s:$/ {printf "0x%s\n", $5; exit}') + # pass git config --add user.signingkey "${SIGKEY}" + +diff --git man/pass.1 man/pass.1 +index a555dcb..5cbd1d8 100644 +--- man/pass.1 ++++ man/pass.1 +@@ -17,7 +17,7 @@ pass - stores, retrieves, generates, and synchronizes passwords securely + + .B pass + is a very simple password store that keeps passwords inside +-.BR gpg2 (1) ++.BR gpg (1) + encrypted files inside a simple directory tree residing at + .IR ~/.password-store . + The +@@ -466,7 +466,7 @@ The \fBinit\fP command will keep signatures of \fB.gpg-id\fP files up to date. + .I EDITOR + The location of the text editor used by \fBedit\fP. + .SH SEE ALSO +-.BR gpg2 (1), ++.BR gpg (1), + .BR tr (1), + .BR git (1), + .BR xclip (1), +diff --git src/completion/pass.bash-completion src/completion/pass.bash-completion +index bbe9d0c..6d3e02c 100644 +--- src/completion/pass.bash-completion ++++ src/completion/pass.bash-completion +@@ -73,7 +73,7 @@ _pass_complete_folders () { + _pass_complete_keys () { + local IFS=$'\n' + # Extract names and email addresses from gpg --list-keys +- local keys="$(gpg2 --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d')" ++ local keys="$(gpg --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d')" + COMPREPLY+=($(compgen -W "${keys}" -- ${cur})) + } + +diff --git src/completion/pass.fish-completion src/completion/pass.fish-completion +index 8637874..21206a8 100644 +--- src/completion/pass.fish-completion ++++ src/completion/pass.fish-completion +@@ -32,7 +32,7 @@ function __fish_pass_uses_command + end + + function __fish_pass_print_gpg_keys +- gpg2 --list-keys | grep uid | sed 's/.*<\(.*\)>/\1/' ++ gpg --list-keys | grep uid | sed 's/.*<\(.*\)>/\1/' + end + + function __fish_pass_print +diff --git src/completion/pass.zsh-completion src/completion/pass.zsh-completion +index 27ce15a..8d6e308 100644 +--- src/completion/pass.zsh-completion ++++ src/completion/pass.zsh-completion +@@ -138,7 +138,7 @@ _pass_complete_entries () { + _pass_complete_keys () { + local IFS=$'\n' + # Extract names and email addresses from gpg --list-keys +- _values 'gpg keys' $(gpg2 --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d') ++ _values 'gpg keys' $(gpg --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d') + } + + _pass +diff --git src/password-store.sh src/password-store.sh +index d0cc2ac..074de10 100755 +--- src/password-store.sh ++++ src/password-store.sh +@@ -9,8 +9,7 @@ set -o pipefail + GPG_OPTS=( $PASSWORD_STORE_GPG_OPTS "--quiet" "--yes" "--compress-algo=none" "--no-encrypt-to" ) + GPG="gpg" + export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}" +-which gpg2 &>/dev/null && GPG="gpg2" +-[[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" ) ++GPG_OPTS+=( "--batch" "--use-agent" ) + + PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}" + EXTENSIONS="${PASSWORD_STORE_EXTENSIONS_DIR:-$PREFIX/.extensions}" +diff --git tests/setup.sh tests/setup.sh +index 5d1e794..3f571f7 100644 +--- tests/setup.sh ++++ tests/setup.sh +@@ -52,7 +52,6 @@ fi + export GNUPGHOME="$TEST_HOME/gnupg/" + chmod 700 "$GNUPGHOME" + GPG="gpg" +-which gpg2 &>/dev/null && GPG="gpg2" + + # We don't want any currently running agent to conflict. + unset GPG_AGENT_INFO diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template index 33f0811c76d..0a5789e7058 100644 --- a/srcpkgs/pass/template +++ b/srcpkgs/pass/template @@ -1,12 +1,12 @@ # Template file for 'pass' pkgname=pass version=1.7.3 -revision=5 +revision=6 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" +checkdepends="gnupg tree git" short_desc="Stores, retrieves, generates, and synchronizes passwords securely" maintainer="teldra " license="GPL-2.0-or-later" From 9f9470ca759d7b39c2fbf7ec57967ecdcab8d5b4 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 21:57:02 +0700 Subject: [PATCH 19/21] seahorse: depends on gnupg --- srcpkgs/seahorse/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index 9cf5c354d69..f861f5237fc 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -1,15 +1,15 @@ # Template file for 'seahorse' pkgname=seahorse version=3.38.0.1 -revision=1 +revision=2 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" From b2e736503ec525be7ca4f75903cc1a7dbb7e9048 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 22:02:38 +0700 Subject: [PATCH 20/21] tpm: depends on gnupg --- srcpkgs/tpm/patches/gpg-is-gpg2.patch | 31 +++++++++++++++++++++++++++ srcpkgs/tpm/template | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/tpm/patches/gpg-is-gpg2.patch diff --git a/srcpkgs/tpm/patches/gpg-is-gpg2.patch b/srcpkgs/tpm/patches/gpg-is-gpg2.patch new file mode 100644 index 00000000000..1e990cdf379 --- /dev/null +++ b/srcpkgs/tpm/patches/gpg-is-gpg2.patch @@ -0,0 +1,31 @@ +--- tpm ++++ tpm +@@ -38,9 +38,9 @@ + + gpg() { + if [ -n "${PASSWORD_STORE_KEY}" ]; then +- gpg2 $GPG_OPTS --recipient "${PASSWORD_STORE_KEY}" "$@" ++ /usr/bin/gpg $GPG_OPTS --recipient "${PASSWORD_STORE_KEY}" "$@" + else +- gpg2 $GPG_OPTS --default-recipient-self "$@" ++ /usr/bin/gpg $GPG_OPTS --default-recipient-self "$@" + fi + } + +--- tpm.1 ++++ tpm.1 +@@ -146,7 +146,7 @@ + .SH "DESCRIPTION" + .IX Header "DESCRIPTION" + tpm is a tiny shell script which is heavily inspired and largely +-compatible with \fBpass\fR\|(1). Just like pass it uses \fBgpg2\fR\|(1) to securely ++compatible with \fBpass\fR\|(1). Just like pass it uses \fBgpg\fR\|(1) to securely + store your passwords, the major difference between pass and tpm is that + the latter is a lot more minimal. Furthermore, tpm is written entirely + in \s-1POSIX\s0 shell. +@@ -199,4 +199,4 @@ + .Ve + .SH "SEE ALSO" + .IX Header "SEE ALSO" +-\&\fBgpg2\fR\|(1), \fBpass\fR\|(1), \fBpwgen\fR\|(1), \fBxclip\fR\|(1) ++\&\fBgpg\fR\|(1), \fBpass\fR\|(1), \fBpwgen\fR\|(1), \fBxclip\fR\|(1) diff --git a/srcpkgs/tpm/template b/srcpkgs/tpm/template index 347c3cd807a..44a0d3dc9de 100644 --- a/srcpkgs/tpm/template +++ b/srcpkgs/tpm/template @@ -1,10 +1,10 @@ # Template file for 'tpm' pkgname=tpm version=1.3.3 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="perl" -depends="gnupg2" +depends="gnupg" short_desc="Tiny password manager" maintainer="Orphaned " license="GPL-3.0-or-later" From 4dac0c457f54629781aa1c6a6c2287b03e5ddf7f 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 22:05:27 +0700 Subject: [PATCH 21/21] torbrowser-launcher: depends on gnupg --- srcpkgs/torbrowser-launcher/patches/gpg-is-gpg2.patch | 11 +++++++++++ srcpkgs/torbrowser-launcher/template | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/torbrowser-launcher/patches/gpg-is-gpg2.patch diff --git a/srcpkgs/torbrowser-launcher/patches/gpg-is-gpg2.patch b/srcpkgs/torbrowser-launcher/patches/gpg-is-gpg2.patch new file mode 100644 index 00000000000..c601a9fbabb --- /dev/null +++ b/srcpkgs/torbrowser-launcher/patches/gpg-is-gpg2.patch @@ -0,0 +1,11 @@ +--- torbrowser_launcher/common.py ++++ torbrowser_launcher/common.py +@@ -255,7 +255,7 @@ + # Fetch key from wkd, as per https://support.torproject.org/tbb/how-to-verify-signature/ + p = subprocess.Popen( + [ +- "gpg2", ++ "gpg", + "--status-fd", + "2", + "--homedir", diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template index 2d8ce5bf282..36bd5515829 100644 --- a/srcpkgs/torbrowser-launcher/template +++ b/srcpkgs/torbrowser-launcher/template @@ -1,12 +1,12 @@ # Template file for 'torbrowser-launcher' pkgname=torbrowser-launcher version=0.3.3 -revision=2 +revision=3 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"