* Re: [PR PATCH] [Updated] [RFC] gnupg update to version 2
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
@ 2021-01-25 15:05 ` sgn
2021-01-25 16:17 ` sgn
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-01-25 15:05 UTC (permalink / raw)
To: ml
[-- 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: 37623 bytes --]
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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 <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"
-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?=
<congdanhqx@gmail.com>
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 <git@damadmai.at>"
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?=
<congdanhqx@gmail.com>
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 <oreo6391@gmail.com>"
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <evan@deaubl.name>"
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?=
<congdanhqx@gmail.com>
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 <duncaen@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <hoang@wetrust.io>"
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <anjan@momi.ca>"
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?=
<congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <contato.fnog@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <Vaelatern@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
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?=
<congdanhqx@gmail.com>
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 <teldra@rotce.de>"
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?=
<congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <daniel.eysser@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg update to version 2
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
2021-01-25 15:05 ` [PR PATCH] [Updated] " sgn
@ 2021-01-25 16:17 ` sgn
2021-04-09 0:17 ` [PR PATCH] [Closed]: [RFC] gnupg2: provides /usr/bin/gpg sgn
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-01-25 16:17 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Closed]: [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
2021-01-25 15:05 ` [PR PATCH] [Updated] " sgn
2021-01-25 16:17 ` sgn
@ 2021-04-09 0:17 ` sgn
2021-07-09 18:07 ` [PR PATCH] [Updated] " sgn
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-04-09 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
There's a closed pull request on the void-packages repository
[RFC] gnupg2: provides /usr/bin/gpg
https://github.com/void-linux/void-packages/pull/28217
Description:
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (2 preceding siblings ...)
2021-04-09 0:17 ` [PR PATCH] [Closed]: [RFC] gnupg2: provides /usr/bin/gpg sgn
@ 2021-07-09 18:07 ` sgn
2021-07-09 18:08 ` sgn
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-09 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 31169 bytes --]
From d2c404f478f829305ccb7f09019fbae098b260c7 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 1/8] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/update | 1 -
srcpkgs/{gnupg => gnupg1}/template | 16 ++++++++++++----
srcpkgs/gnupg1/update | 2 ++
3 files changed, 14 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/gnupg/update
rename srcpkgs/{gnupg => gnupg1}/template (63%)
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg1/template
similarity index 63%
rename from srcpkgs/gnupg/template
rename to srcpkgs/gnupg1/template
index 80d96da518c9..2e68911a2479 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg1/template
@@ -1,11 +1,12 @@
-# Template file for 'gnupg'
-pkgname=gnupg
+# Template file for 'gnupg1'
+pkgname=gnupg1
version=1.4.23
-revision=3
+revision=4
+wrksrc=gnupg-${version}
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"
+short_desc="GNU Privacy Guard v1"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnupg.org/"
@@ -19,6 +20,13 @@ post_extract() {
i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
esac
}
+
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
}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From c0d0b71bb8d1847e9067e36c1150bbd625060f31 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: Sat, 10 Jul 2021 00:33:31 +0700
Subject: [PATCH 2/8] gettext: move gettext shared files to -devel-tools
autopoint wants /usr/share/gettext
---
srcpkgs/gettext/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 3cece9b46621..dfb11a1f886c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
version=0.21
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -60,7 +60,7 @@ gettext-devel-examples_package() {
gettext-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- gettext-devel-tools>=${version}_${revision} xz tar"
+ gettext-devel-tools>=${version}_${revision}"
if [ -n "${_intl_lib}" ]; then
depends+=" gettext-libs>=${version}_${revision}"
fi
@@ -73,13 +73,12 @@ gettext-devel_package() {
do
vmove "usr/lib/lib${_lib}.so"
done
- vmove usr/share/gettext
vmove usr/share/man/man3
}
}
gettext-devel-tools_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} tar xz"
short_desc+=" - development tools"
pkg_install() {
vmove usr/share/aclocal
@@ -87,6 +86,7 @@ gettext-devel-tools_package() {
vmove usr/bin/gettextize
vmove usr/share/man/man1/autopoint.1
vmove usr/share/man/man1/gettextize.1
+ vmove usr/share/gettext
}
}
From 4e8b0be4e336d36b61143960f4c02489592592df 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: Sat, 10 Jul 2021 00:45:45 +0700
Subject: [PATCH 3/8] fixup! gnupg: rename binary to gnupg1
---
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 11 +-
5 files changed, 335 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 2e68911a2479..03844046ff77 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -4,8 +4,11 @@ version=1.4.23
revision=4
wrksrc=gnupg-${version}
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"
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
short_desc="GNU Privacy Guard v1"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
@@ -15,6 +18,10 @@ checksum=c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+}
+
post_extract() {
case "$XBPS_TARGET_MACHINE" in
i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
From c250de930192cea896e2c7e71f1d48d67c1e6375 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 4/8] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 0b242e7cb6b405db1b03423c8aa837abbaf626f0 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 5/8] 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 0b176d22ebd9..f8e88034576a 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"
@@ -46,9 +46,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 9c2f0e62bcb52cd9df7505c55e9029d5349b97da 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 6/8] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From 67ac9f56da062a420eda615d24f87d42e3036608 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 7/8] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 5a758be387f8ef094842faa5c416183acc890824 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 8/8] blackbox: always depends on gnupg
---
srcpkgs/blackbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (3 preceding siblings ...)
2021-07-09 18:07 ` [PR PATCH] [Updated] " sgn
@ 2021-07-09 18:08 ` sgn
2021-07-10 7:32 ` sgn
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-09 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 30911 bytes --]
From 9e89483c8656f9e562fa8b6368bb29db139c7686 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: Sat, 10 Jul 2021 00:33:31 +0700
Subject: [PATCH 1/7] gettext: move gettext shared files to -devel-tools
autopoint wants /usr/share/gettext
---
srcpkgs/gettext/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 3cece9b46621..dfb11a1f886c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
version=0.21
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -60,7 +60,7 @@ gettext-devel-examples_package() {
gettext-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- gettext-devel-tools>=${version}_${revision} xz tar"
+ gettext-devel-tools>=${version}_${revision}"
if [ -n "${_intl_lib}" ]; then
depends+=" gettext-libs>=${version}_${revision}"
fi
@@ -73,13 +73,12 @@ gettext-devel_package() {
do
vmove "usr/lib/lib${_lib}.so"
done
- vmove usr/share/gettext
vmove usr/share/man/man3
}
}
gettext-devel-tools_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} tar xz"
short_desc+=" - development tools"
pkg_install() {
vmove usr/share/aclocal
@@ -87,6 +86,7 @@ gettext-devel-tools_package() {
vmove usr/bin/gettextize
vmove usr/share/man/man1/autopoint.1
vmove usr/share/man/man1/gettextize.1
+ vmove usr/share/gettext
}
}
From e40718f9b049427772d83b47c4ef0fc6463e114b 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 2/7] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From ecbd3c80418f501e6a55e025bbbabc38334a6240 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/7] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 4dce233b95118fb61aa5aed2b854cec3682ab2b9 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 4/7] 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 0b176d22ebd9..f8e88034576a 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"
@@ -46,9 +46,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 b74560d840274721d6a8a54602ba08a0f9683a0e 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 5/7] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From 3a94bdf711145c5e1e0c37a052b47b14cf0a4ca4 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 6/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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 8a69a7cf69da5608da41b34ce8e4be43ed573a28 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/7] blackbox: always depends on gnupg
---
srcpkgs/blackbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (4 preceding siblings ...)
2021-07-09 18:08 ` sgn
@ 2021-07-10 7:32 ` sgn
2021-07-10 11:46 ` sgn
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-10 7:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 35549 bytes --]
From 113a699c3d3f1d468aea3f1829a665a4df906017 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/8] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 66 +++++++++++++++-------------------------
2 files changed, 25 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..36da56cf9dbc 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,33 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # fqdn
+ NOTMUCH_SKIP_TESTS+=" libconfig"
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +90,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From 3d732c1f975d53d07bffb732b7dc6c8b6c7c0307 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: Sat, 10 Jul 2021 00:33:31 +0700
Subject: [PATCH 2/8] gettext: move gettext shared files to -devel-tools
autopoint wants /usr/share/gettext
---
srcpkgs/gettext/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 3cece9b46621..dfb11a1f886c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
version=0.21
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -60,7 +60,7 @@ gettext-devel-examples_package() {
gettext-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- gettext-devel-tools>=${version}_${revision} xz tar"
+ gettext-devel-tools>=${version}_${revision}"
if [ -n "${_intl_lib}" ]; then
depends+=" gettext-libs>=${version}_${revision}"
fi
@@ -73,13 +73,12 @@ gettext-devel_package() {
do
vmove "usr/lib/lib${_lib}.so"
done
- vmove usr/share/gettext
vmove usr/share/man/man3
}
}
gettext-devel-tools_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} tar xz"
short_desc+=" - development tools"
pkg_install() {
vmove usr/share/aclocal
@@ -87,6 +86,7 @@ gettext-devel-tools_package() {
vmove usr/bin/gettextize
vmove usr/share/man/man1/autopoint.1
vmove usr/share/man/man1/gettextize.1
+ vmove usr/share/gettext
}
}
From 69397d60f764f7eec8c1eeb9cdf3bfd6bcdb2ead 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 3/8] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From 3858b8c5413841553af7b0865e69442721515b8b 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 4/8] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 5e00f5f2a628b74972002e4558b51d09e43902f0 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 5/8] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 36da56cf9dbc..b797111f6619 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From d37f78b760ae522924a98a1f617a70cd83b33771 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 6/8] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From b9c108e1f02442de5fc82895f6ee7ba8b78a12bd 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 7/8] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 0389d2cfc90541764e0b52b7af8bf98872c5747e 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 8/8] blackbox: always depends on gnupg
---
srcpkgs/blackbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (5 preceding siblings ...)
2021-07-10 7:32 ` sgn
@ 2021-07-10 11:46 ` sgn
2021-07-10 16:58 ` sgn
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-10 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 34348 bytes --]
From f78ba319b83b140d9bc71de131f17e51b35ef21b 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/7] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From 0b6fcae4496f0f050b3fa653cf47deacf531c422 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 2/7] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From c285dd33e52a5b8ba65ced6f5697059e4e74c5eb 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/7] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 4486306bb5c804f308b6093586713a8097db8262 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 4/7] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From d7a1fd3313b17e91a56f7d3a362df135b91df10f 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 5/7] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From 10fa942a11a0fff2eed53f570649265d0b88bfa5 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 6/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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 1d6baa722039acf346b038f8e26b7b433458198f 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/7] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (6 preceding siblings ...)
2021-07-10 11:46 ` sgn
@ 2021-07-10 16:58 ` sgn
2021-07-11 9:16 ` sgn
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-10 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 34348 bytes --]
From 1345a849e519e31b003ef686f3e2bbc7cd3cea9c 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/7] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From d93fab329f153d9045247a253c2785304e1f1fed 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 2/7] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From c49fe400d97f95705a59b692ca90e35eb4cdf3c7 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/7] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 5a15e1ad1b611b62281b9659789b30d1d1e7686c 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 4/7] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From 6f77761021520c1cf864a73781b56665d252346a 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 5/7] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From 508e1b7e767706a2a5e1463358b87374af455a6d 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 6/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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 781b3ea6170598d906f3fa71d8dc2e0451e39659 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/7] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] [RFC] gnupg2: provides /usr/bin/gpg
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (7 preceding siblings ...)
2021-07-10 16:58 ` sgn
@ 2021-07-11 9:16 ` sgn
2021-07-12 15:32 ` gnupg: update to 2.2.28 leahneukirchen
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-11 9:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 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] gnupg2: provides /usr/bin/gpg
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: 35322 bytes --]
From 06847f8188c25064d9852c2b2f7f5cfd6133c987 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/8] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From 886ff43214008962fac009030fe89c1e426d800f 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 2/8] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From 4738d204ed54de06d60b53cb33e4fe4a9a324a1f 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/8] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 42e12af63b0e7977d1c31750b9d6ffb4a2c91dc5 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 4/8] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From d7c418086b70dd5a818a109a48e9c6e1aefe4300 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 5/8] pacman: our gpg is gpg2
---
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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..4f85346a01ac 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
From 50ad55e8cd5f241a9a6e20dad43b2941c21558d9 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 6/8] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 4a91eff4799a6ac6496332693adf0115072d8b76 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/8] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
From ea0cbadb89d99d6f928965681e2dd0b0b70d8add 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: Sun, 11 Jul 2021 00:14:33 +0700
Subject: [PATCH 8/8] 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 ce21d75e80f4..17641ac07d87 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.3
-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>=2"
short_desc="PAM module to unlock GPG agent"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-3.0-only"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: gnupg: update to 2.2.28
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (8 preceding siblings ...)
2021-07-11 9:16 ` sgn
@ 2021-07-12 15:32 ` leahneukirchen
2021-07-12 15:48 ` [PR PATCH] [Updated] " sgn
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2021-07-12 15:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/28217#issuecomment-878378633
Comment:
Please bump to 2.2.29, this unbreaks Yubikeys.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] gnupg: update to 2.2.28
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (9 preceding siblings ...)
2021-07-12 15:32 ` gnupg: update to 2.2.28 leahneukirchen
@ 2021-07-12 15:48 ` sgn
2021-07-12 15:56 ` [PR PATCH] [Updated] gnupg: update to 2.2.29 sgn
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-12 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 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
gnupg: update to 2.2.28
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: 36948 bytes --]
From 142e58ee3587688962b00d6496ba342a6e7b7468 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/9] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From a8b6206ab2fd4dd42892a3798994677c7eb3e661 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 2/9] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..03844046ff77
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=4
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From 52da5533cd3406557f91f77913d3710e24778806 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/9] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From f9bf8ef51a23f06d6cb4c07f5d5b97d6606c6a8c 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 4/9] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From f763c3cd1edc07dbd6e6cc7f6e10652688439539 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 5/9] pacman: our gpg is gpg2
---
srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
srcpkgs/pacman/template | 11 ++++----
2 files changed, 5 insertions(+), 44 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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..b98560e10637 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
@@ -17,11 +17,10 @@ license="GPL-2.0-or-later"
homepage="https://www.archlinux.org/pacman/"
distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- do_check() {
- : fakechroot is not available
- }
+ make_check=no # fakechroot is not available
else
- checkdepends+=" fakechroot"
+ checkdepends="fakeroot fakechroot gnupg"
fi
From a2f225202784e3bbcef0fae8c1691610b06d119d 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 6/9] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 e25f743ac6b82bade93ea24c0b00bad6041846f4 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/9] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
From 5b235ce36645db2ca4202e8c148d01e4625e0dcc 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: Sun, 11 Jul 2021 00:14:33 +0700
Subject: [PATCH 8/9] 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 ce21d75e80f4..17641ac07d87 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.3
-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>=2"
short_desc="PAM module to unlock GPG agent"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-3.0-only"
From c1efb9f815d116acab751680c54c71b55bab46cb 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, 12 Jul 2021 22:38:13 +0700
Subject: [PATCH 9/9] gnupg: update to 2.2.29.
---
srcpkgs/gnupg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 22ab75856cdb..cbaac34c51b9 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.28
-revision=2
+version=2.2.29
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
--with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ 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"
-checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
+checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
build_options="ldap"
build_options_default="ldap"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] gnupg: update to 2.2.29
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (10 preceding siblings ...)
2021-07-12 15:48 ` [PR PATCH] [Updated] " sgn
@ 2021-07-12 15:56 ` sgn
2021-07-12 20:30 ` [PR REVIEW] " Piraty
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-12 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 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
gnupg: update to 2.2.29
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: 36948 bytes --]
From 142e58ee3587688962b00d6496ba342a6e7b7468 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/9] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From f7263c381a1d626be100ced51314758bdb17c9b6 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 2/9] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..6979b35d0d45
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=1
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From 9ab50f9503dc2306eeaa4b642744ba03a67e728a 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/9] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 36 ++++++++++++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 37 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..0591c33e2e06
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,36 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+ vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
+Index: gnupg-2.2.28/doc/Makefile.in
+===================================================================
+--- gnupg-2.2.28.orig/doc/Makefile.in
++++ gnupg-2.2.28/doc/Makefile.in
+@@ -477,14 +477,6 @@ libcommontlsnpth = ../common/libcommontl
+ examples = examples/README examples/scd-event examples/trustlist.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf \
+- examples/systemd-user/README \
+- examples/systemd-user/dirmngr.service \
+- examples/systemd-user/dirmngr.socket \
+- examples/systemd-user/gpg-agent.service \
+- examples/systemd-user/gpg-agent.socket \
+- examples/systemd-user/gpg-agent-ssh.socket \
+- examples/systemd-user/gpg-agent-browser.socket \
+- examples/systemd-user/gpg-agent-extra.socket \
+ examples/gpgconf.conf examples/pwpattern.list
+
+ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..22ab75856cdb 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,24 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From a3aa7bf80d3bd9fc22750e85c85238a1ddb3b1d0 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 4/9] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From 20a274fb26d447f9a4e7719332fc2aae10266c79 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 5/9] pacman: our gpg is gpg2
---
srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
srcpkgs/pacman/template | 11 ++++----
2 files changed, 5 insertions(+), 44 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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..b98560e10637 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
@@ -17,11 +17,10 @@ license="GPL-2.0-or-later"
homepage="https://www.archlinux.org/pacman/"
distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- do_check() {
- : fakechroot is not available
- }
+ make_check=no # fakechroot is not available
else
- checkdepends+=" fakechroot"
+ checkdepends="fakeroot fakechroot gnupg"
fi
From ea379c2c47892f5852f2d59eb084337ec7767836 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 6/9] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 186e23750f9e7383a36f806a0d3ef88c088124b4 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/9] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
From 3da1b88fefaefe281d4ca6199d8191744bd41d52 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: Sun, 11 Jul 2021 00:14:33 +0700
Subject: [PATCH 8/9] 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 ce21d75e80f4..17641ac07d87 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.3
-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>=2"
short_desc="PAM module to unlock GPG agent"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-3.0-only"
From 9dd60f05e08350874937ae6de8dc19d6b9515dc6 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, 12 Jul 2021 22:38:13 +0700
Subject: [PATCH 9/9] gnupg: update to 2.2.29.
---
srcpkgs/gnupg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 22ab75856cdb..cbaac34c51b9 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.28
-revision=2
+version=2.2.29
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
--with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ 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"
-checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
+checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
build_options="ldap"
build_options_default="ldap"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR REVIEW] gnupg: update to 2.2.29
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (11 preceding siblings ...)
2021-07-12 15:56 ` [PR PATCH] [Updated] gnupg: update to 2.2.29 sgn
@ 2021-07-12 20:30 ` Piraty
2021-07-13 16:16 ` [PR PATCH] [Updated] " sgn
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Piraty @ 2021-07-12 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/28217#discussion_r668234651
Comment:
could just `rm examples/systemd-user` in post_install() ?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] gnupg: update to 2.2.29
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (12 preceding siblings ...)
2021-07-12 20:30 ` [PR REVIEW] " Piraty
@ 2021-07-13 16:16 ` sgn
2021-07-22 14:10 ` sgn
2021-07-22 14:31 ` [PR PATCH] [Merged]: " sgn
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-13 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 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
gnupg: update to 2.2.29
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: 35962 bytes --]
From f7bfba4c3becd4ae08aac10145b0736facad7dde 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: Sat, 10 Jul 2021 12:10:29 +0700
Subject: [PATCH 1/9] notmuch: update to 0.32.2.
---
srcpkgs/notmuch-emacs | 1 -
srcpkgs/notmuch/template | 70 +++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 42 deletions(-)
delete mode 120000 srcpkgs/notmuch-emacs
diff --git a/srcpkgs/notmuch-emacs b/srcpkgs/notmuch-emacs
deleted file mode 120000
index 67778b7eb37e..000000000000
--- a/srcpkgs/notmuch-emacs
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 0b176d22ebd9..58759a9d981f 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,21 +1,28 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.3
+version=0.32.2
revision=1
-hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+build_style=configure
+configure_args="--prefix=/usr
+ --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+ --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
+ desktop-file-utils emacs gnupg2 python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
- python3-cffi python3-setuptools gnupg2"
+ python3-cffi"
depends="gmime3>=3.2.7"
-checkdepends="python3-pytest mdocml dtach gdb tar xz"
+checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
+ openssl"
short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
+checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
+replaces="notmuch-emacs>=0"
# Not a real conflicts, but this package is broken with gpgme 1.13.1-
# gpgme is optional dependency
@@ -23,21 +30,10 @@ conflicts="gpgme<1.14.0_1"
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
if [ ! "$CROSS_BUILD" ]; then
- hostmakedepends+=" desktop-file-utils"
- makedepends+=" ruby-devel emacs"
- subpackages+=" notmuch-ruby notmuch-emacs"
- _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
- --emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
-else
- _args="--without-emacs"
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
fi
-do_configure() {
- ./configure --prefix=/usr \
- --bashcompletiondir=/usr/share/bash-completion/completions \
- --zshcompletiondir=/usr/share/zsh/site-functions ${_args}
-}
-
do_build() {
make ${makejobs}
make -C contrib/notmuch-mutt
@@ -48,33 +44,37 @@ do_build() {
do_check() {
mkdir -p fake-bin
ln -sf /usr/bin/gpg2 fake-bin/gpg
+ ln -sf /usr/bin/gpgv2 fake-bin/gpgv
PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
- case "$XBPS_TARGET_LIBC" in
- musl)
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Seem like gpgconf's problem,
# mutt on musl also have problems with smime
- export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
- *)
+ NOTMUCH_SKIP_TESTS="smime.3 smime.5"
+ else
# This test run under gdb is problematic
- export NOTMUCH_SKIP_TESTS="count.14" ;;
- esac
+ NOTMUCH_SKIP_TESTS="count.14"
+ fi
+ # libconfig because of fqdn
+ # we don't ship python-cffi
+ NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
+ if [ $(id -u) = 0 ]; then
+ NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+ fi
+ export NOTMUCH_SKIP_TESTS
make test
}
do_install() {
make DESTDIR=${DESTDIR} install
- pushd bindings/python
+ cd bindings/python
python3 setup.py build --build-base=build \
install --prefix=/usr --root=${DESTDIR}
- popd
+ cd -
if [ ! "$CROSS_BUILD" ]; then
make DESTDIR=${DESTDIR} -C bindings/ruby install
fi
-}
-
-post_install() {
rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
}
@@ -94,18 +94,6 @@ libnotmuch-devel_package() {
}
}
-notmuch-emacs_package() {
- short_desc+=" - Emacs interface"
- depends="${sourcepkg}-${version}_${revision} virtual?emacs"
- pkg_install() {
- vmove usr/bin/notmuch-emacs-mua
- vmove usr/share/applications
- vmove usr/share/emacs/site-lisp
- vmove usr/share/info/notmuch-emacs*
- vmove usr/share/man/man1/notmuch-emacs*
- }
-}
-
notmuch-mutt_package() {
short_desc+=" - Mutt interface"
depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
From 37b8c2490945744887addb1bc1a63226dd7d78c1 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 2/9] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..6979b35d0d45
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=1
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From a16a8e29892e33f14e720d16caee5458da2d0c83 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 3/9] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 16 ++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 38 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 39 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..b5f2360685f3
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,16 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..436d206a217c 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,25 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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
+ rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user
+ mv ${DESTDIR}/usr/share/doc/gnupg/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From d07c76ab46cb990abd6963adad972b596b5e42c9 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, 12 Jul 2021 22:38:13 +0700
Subject: [PATCH 4/9] gnupg: update to 2.2.29.
---
srcpkgs/gnupg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 436d206a217c..65e76eb0923b 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.28
-revision=2
+version=2.2.29
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
--with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ 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"
-checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
+checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
build_options="ldap"
build_options_default="ldap"
From 2fe84b893fb855ec409070f8732fbf4f2397e885 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 5/9] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From c6b955327c1987e434fd0bd289ab1a86cf440cda 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 6/9] pacman: our gpg is gpg2
---
srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
srcpkgs/pacman/template | 11 ++++----
2 files changed, 5 insertions(+), 44 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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..b98560e10637 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
@@ -17,11 +17,10 @@ license="GPL-2.0-or-later"
homepage="https://www.archlinux.org/pacman/"
distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- do_check() {
- : fakechroot is not available
- }
+ make_check=no # fakechroot is not available
else
- checkdepends+=" fakechroot"
+ checkdepends="fakeroot fakechroot gnupg"
fi
From c81c1027b3e0c507ef9c1c864bc5fc7ce24f4907 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 7/9] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 d9d5bb0f84bad12711141a618840ee1c638baf7e 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 8/9] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
From 678e4947d6a9d346468a97c2b61efef892898270 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: Sun, 11 Jul 2021 00:14:33 +0700
Subject: [PATCH 9/9] 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 ce21d75e80f4..17641ac07d87 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.3
-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>=2"
short_desc="PAM module to unlock GPG agent"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-3.0-only"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] gnupg: update to 2.2.29
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (13 preceding siblings ...)
2021-07-13 16:16 ` [PR PATCH] [Updated] " sgn
@ 2021-07-22 14:10 ` sgn
2021-07-22 14:31 ` [PR PATCH] [Merged]: " sgn
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-22 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 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
gnupg: update to 2.2.29
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: 31174 bytes --]
From 8025db8bc853c7b898b9e2c67956671a2c33e6aa 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 1/8] gnupg: rename binary to gnupg1
---
srcpkgs/gnupg/template | 24 --
srcpkgs/gnupg/update | 1 -
...oking-for-git-info-during-autoreconf.patch | 28 +++
.../0003-change-package-name-to-gnupg1.patch | 23 ++
...OURCE_DATE_EPOCH-for-reproducibility.patch | 220 ++++++++++++++++++
...e-default-digest-algorithm-to-SHA256.patch | 55 +++++
srcpkgs/gnupg1/template | 39 ++++
srcpkgs/gnupg1/update | 2 +
8 files changed, 367 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/gnupg/template
delete mode 100644 srcpkgs/gnupg/update
create mode 100644 srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
create mode 100644 srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
create mode 100644 srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
create mode 100644 srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
create mode 100644 srcpkgs/gnupg1/template
create mode 100644 srcpkgs/gnupg1/update
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
deleted file mode 100644
index 80d96da518c9..000000000000
--- a/srcpkgs/gnupg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'gnupg'
-pkgname=gnupg
-version=1.4.23
-revision=3
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-CFLAGS="-fcommon"
-
-post_extract() {
- case "$XBPS_TARGET_MACHINE" in
- i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
- esac
-}
-post_install() {
- rm ${DESTDIR}/usr/bin/gpgsplit
-}
diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
deleted file mode 100644
index 6bfa7d9a00bc..000000000000
--- a/srcpkgs/gnupg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
new file mode 100644
index 000000000000..803c36357981
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 06:04:20 -0400
+Subject: avoid looking for git info during autoreconf
+
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b92440c..6222be6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.23])
+ # the decimalized short revision number, a beta version string and a
+ # flag indicating a development version (mym4_isgit). Note that the
+ # m4 processing is done by autoconf and not during the configure run.
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision],[])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
diff --git a/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
new file mode 100644
index 000000000000..3e00a9865374
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0003-change-package-name-to-gnupg1.patch
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 1 Apr 2016 01:58:00 -0400
+Subject: change package name to gnupg1
+
+We're moving to calling this gnupg1; this change should affect libexec
+(where the keyserver helpers live), gettext, and other places.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6222be6..53f2ca6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
diff --git a/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
new file mode 100644
index 000000000000..5a535b25fc98
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -0,0 +1,220 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 10:13:47 -0400
+Subject: doc: Enable $SOURCE_DATE_EPOCH for reproducibility
+
+* doc/yat2m.c: update to version from 2.1.15
+* doc/Makefile.am: pass SOURCE_DATE_EPOCH through when building
+ documentation if provided.
+
+The goal of this changeset is to make it easier to make GnuPG build
+reproducibly.
+
+Debian-bug-id: 806494
+---
+ doc/Makefile.am | 1 +
+ doc/yat2m.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4294f83..13933af 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -59,6 +59,7 @@ yat2m-stamp: $(myman_sources)
+ @touch yat2m-stamp.tmp
+ for file in $(myman_sources) ; do \
+ ./yat2m $(YAT2M_OPTIONS) --store \
++ `test -z "$(SOURCE_DATE_EPOCH)" || echo '--date' "$(SOURCE_DATE_EPOCH)"` \
+ `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
+ @mv -f yat2m-stamp.tmp $@
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 86c3c70..9b76f19 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1,5 +1,5 @@
+ /* yat2m.c - Yet Another Texi 2 Man converter
+- * Copyright (C) 2005, 2013 g10 Code GmbH
++ * Copyright (C) 2005, 2013, 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -13,7 +13,7 @@
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+ /*
+@@ -104,6 +104,29 @@
+ #include <time.h>
+
+
++#if __GNUC__
++# define MY_GCC_VERSION (__GNUC__ * 10000 \
++ + __GNUC_MINOR__ * 100 \
++ + __GNUC_PATCHLEVEL__)
++#else
++# define MY_GCC_VERSION 0
++#endif
++
++#if MY_GCC_VERSION >= 20500
++# define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a)))
++# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a)))
++#else
++# define ATTR_PRINTF(f, a)
++# define ATTR_NR_PRINTF(f, a)
++#endif
++#if MY_GCC_VERSION >= 30200
++# define ATTR_MALLOC __attribute__ ((__malloc__))
++#else
++# define ATTR_MALLOC
++#endif
++
++
++
+ #define PGM "yat2m"
+ #define VERSION "1.0"
+
+@@ -120,6 +143,7 @@ static int quiet;
+ static int debug;
+ static const char *opt_source;
+ static const char *opt_release;
++static const char *opt_date;
+ static const char *opt_select;
+ static const char *opt_include;
+ static int opt_store;
+@@ -213,8 +237,16 @@ static const char * const standard_sections[] =
+ static void proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ int *table_level, int *eol_action);
+
++static void die (const char *format, ...) ATTR_NR_PRINTF(1,2);
++static void err (const char *format, ...) ATTR_PRINTF(1,2);
++static void inf (const char *format, ...) ATTR_PRINTF(1,2);
++static void *xmalloc (size_t n) ATTR_MALLOC;
++static void *xcalloc (size_t n, size_t m) ATTR_MALLOC;
+
+
++
++/*-- Functions --*/
++
+ /* Print diagnostic message and exit with failure. */
+ static void
+ die (const char *format, ...)
+@@ -323,8 +355,12 @@ isodatestring (void)
+ {
+ static char buffer[11+5];
+ struct tm *tp;
+- time_t atime = time (NULL);
++ time_t atime;
+
++ if (opt_date && *opt_date)
++ atime = strtoul (opt_date, NULL, 10);
++ else
++ atime = time (NULL);
+ if (atime < 0)
+ strcpy (buffer, "????" "-??" "-??");
+ else
+@@ -553,7 +589,7 @@ get_section_buffer (const char *name)
+ for (i=0; i < thepage.n_sections; i++)
+ if (!thepage.sections[i].name)
+ break;
+- if (i < thepage.n_sections)
++ if (thepage.n_sections && i < thepage.n_sections)
+ sect = thepage.sections + i;
+ else
+ {
+@@ -679,6 +715,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ } cmdtbl[] = {
+ { "command", 0, "\\fB", "\\fR" },
+ { "code", 0, "\\fB", "\\fR" },
++ { "url", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+ { "samp", 0, "\\(aq", "\\(aq" },
+@@ -699,6 +736,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "emph", 0, "\\fI", "\\fR" },
+ { "w", 1 },
+ { "c", 5 },
++ { "efindex", 1 },
+ { "opindex", 1 },
+ { "cpindex", 1 },
+ { "cindex", 1 },
+@@ -708,7 +746,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ { "subsection", 6, "\n.SS " },
+ { "chapheading", 0},
+ { "item", 2, ".TP\n.B " },
+- { "itemx", 2, ".TP\n.B " },
++ { "itemx", 2, ".TQ\n.B " },
+ { "table", 3 },
+ { "itemize", 3 },
+ { "bullet", 0, "* " },
+@@ -755,6 +793,8 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ {
+ if ((*table_level)-- > 1)
+ fputs (".RE\n", fp);
++ else
++ fputs (".P\n", fp);
+ }
+ else if (n >= 7 && !memcmp (s, "example", 7)
+ && (!n || s[7] == ' ' || s[7] == '\t' || s[7] == '\n'))
+@@ -846,7 +886,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
+ }
+ else
+ inf ("texinfo command '%s' not supported (%.*s)", command,
+- ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
++ (int)((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest);
+ }
+
+ if (*rest == '{')
+@@ -958,7 +998,7 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
+ assert (n <= len);
+ s += n; len -= n;
+ s--; len++;
+- in_cmd = 0;
++ /* in_cmd = 0; -- doc only */
+ }
+ }
+
+@@ -1367,7 +1407,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause)
+ }
+
+ if (!incfp)
+- err ("can't open include file '%s':%s",
++ err ("can't open include file '%s': %s",
+ incname, strerror (errno));
+ else
+ {
+@@ -1466,13 +1506,14 @@ main (int argc, char **argv)
+ "Extract man pages from a Texinfo source.\n\n"
+ " --source NAME use NAME as source field\n"
+ " --release STRING use STRING as the release field\n"
++ " --date EPOCH use EPOCH as publication date\n"
+ " --store write output using @manpage name\n"
+ " --select NAME only output pages with @manpage NAME\n"
+ " --verbose enable extra informational output\n"
+ " --debug enable additional debug output\n"
+ " --help display this help and exit\n"
+ " -I DIR also search in include DIR\n"
+- " -D gpgone the only useable define\n\n"
++ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+ "Report bugs to <bugs@g10code.com>.");
+ exit (0);
+@@ -1519,6 +1560,15 @@ main (int argc, char **argv)
+ argc--; argv++;
+ }
+ }
++ else if (!strcmp (*argv, "--date"))
++ {
++ argc--; argv++;
++ if (argc)
++ {
++ opt_date = *argv;
++ argc--; argv++;
++ }
++ }
+ else if (!strcmp (*argv, "--store"))
+ {
+ opt_store = 1;
diff --git a/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
new file mode 100644
index 000000000000..edceb00e9527
--- /dev/null
+++ b/srcpkgs/gnupg1/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
@@ -0,0 +1,55 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 14 Nov 2016 07:57:20 +0900
+Subject: gpg: Change default digest algorithm to SHA256
+
+* g10/main.h: set DEFAULT_DIGEST_ALGO to DIGEST_ALGO_SHA256
+
+--
+
+gnupg 2.x defaults to making signatures and certifications with
+sha256, and has for quite some time; i know of no problems with that
+decision today (it's 2016!). We should emulate it in the 1.4.x
+branch.
+
+Debian-Bug-Id: 824084
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/main.h | 2 +-
+ g10/sign.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/main.h b/g10/main.h
+index a0b96f9..a5500cc 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -38,7 +38,7 @@
+ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+ #endif
+
+-#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
++#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA256
+ #define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
+ #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+
+diff --git a/g10/sign.c b/g10/sign.c
+index ed8ac73..81c5452 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
+@@ -1396,7 +1396,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+
+ if( !digest_algo )
+ {
+- /* Basically, this means use SHA1 always unless it's a v3 RSA
++ /* Basically, this means use the default digest algo always unless it's a v3 RSA
+ key making a v3 cert (use MD5), or the user specified
+ something (use whatever they said), or it's DSA (use the
+ best match). They still can't pick an inappropriate hash
+@@ -1412,7 +1412,7 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
+ else if(sk->pubkey_algo==PUBKEY_ALGO_DSA)
+ digest_algo = match_dsa_hash(mpi_get_nbits(sk->skey[1])/8);
+ else
+- digest_algo = DIGEST_ALGO_SHA1;
++ digest_algo = DEFAULT_DIGEST_ALGO;
+ }
+
+ md = md_open( digest_algo, 0 );
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
new file mode 100644
index 000000000000..6979b35d0d45
--- /dev/null
+++ b/srcpkgs/gnupg1/template
@@ -0,0 +1,39 @@
+# Template file for 'gnupg1'
+pkgname=gnupg1
+version=1.4.23
+revision=1
+wrksrc=gnupg-${version}
+build_style=gnu-configure
+configure_args="--enable-threads=posix --enable-noexecstack
+ gnupg_cv_regex_broken=no"
+hostmakedepends="automake gettext-devel-tools"
+makedepends="bzip2-devel zlib-devel libldap-devel libcurl-devel readline-devel
+ libusb-compat-devel"
+short_desc="GNU Privacy Guard v1"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ i686-musl) sed -i Makefile* -e"s;checks = checks;checks =;" ;;
+ esac
+}
+
+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
+}
diff --git a/srcpkgs/gnupg1/update b/srcpkgs/gnupg1/update
new file mode 100644
index 000000000000..2576122722aa
--- /dev/null
+++ b/srcpkgs/gnupg1/update
@@ -0,0 +1,2 @@
+pkgname=gnupg
+ignore="2.*"
From 236b5882f236e0c7823e8f36c62b8f2eabe20202 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: Sat, 10 Jul 2021 01:01:00 +0700
Subject: [PATCH 2/8] gnupg: update to 2.2.28
---
.../patches/sys-siglist-and-no-systemd.patch | 16 ++++++++
.../patches/use-versioned-pcsclite.patch | 0
srcpkgs/{gnupg2 => gnupg}/template | 38 ++++++++++---------
srcpkgs/gnupg2 | 1 +
srcpkgs/gnupg2-scdaemon | 2 +-
srcpkgs/gnupg2/update | 1 -
6 files changed, 39 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
rename srcpkgs/{gnupg2 => gnupg}/patches/use-versioned-pcsclite.patch (100%)
rename srcpkgs/{gnupg2 => gnupg}/template (61%)
create mode 120000 srcpkgs/gnupg2
delete mode 100644 srcpkgs/gnupg2/update
diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 000000000000..b5f2360685f3
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,16 @@
+No brainer patch converted from
+ vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+ /* Note that we can't use strsignal(), because it is not
+ reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+ return NULL;
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/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68bb..436d206a217c 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
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
--with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
libgcrypt-devel"
@@ -23,20 +22,25 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
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
+ rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user
+ mv ${DESTDIR}/usr/share/doc/gnupg/examples \
+ ${DESTDIR}/usr/share/examples/gnupg
+}
- mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - compat package"
+ pkg_install() {
+ vmkdir usr/bin
+ ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+ ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+ vmkdir usr/share/examples
+ ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+ vmkdir usr/share/doc
+ ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+ }
}
gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 000000000000..ce3d705284c3
--- /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 7a41d0a790f9..ce3d705284c3 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/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02c..000000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg
From 3c62be2078d66e806f3705f145befa858c0c20cb 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, 12 Jul 2021 22:38:13 +0700
Subject: [PATCH 3/8] gnupg: update to 2.2.29.
---
srcpkgs/gnupg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 436d206a217c..65e76eb0923b 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.28
-revision=2
+version=2.2.29
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
--with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ 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"
-checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
+checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
build_options="ldap"
build_options_default="ldap"
From f5cb1596ac1b5df6fc0a9874e1f1217ce6e33b9f 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 4/8] notmuch: do_check: remove gpg2 hack
---
srcpkgs/notmuch/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 58759a9d981f..7fbbafa5197e 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr
--emacslispdir=/usr/share/emacs/site-lisp/notmuch
--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo
- desktop-file-utils emacs gnupg2 python3-setuptools"
+ desktop-file-utils emacs gnupg python3-setuptools"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
python3-cffi"
depends="gmime3>=3.2.7"
@@ -42,10 +42,6 @@ do_build() {
}
do_check() {
- mkdir -p fake-bin
- ln -sf /usr/bin/gpg2 fake-bin/gpg
- ln -sf /usr/bin/gpgv2 fake-bin/gpgv
- PATH=$PWD/fake-bin:$PATH
cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
test/test-databases
if [ "$XBPS_TARGET_LIBC" = musl ]; then
From fd99ebcdb170d9b867ac8f47d0fc1b5c2099ce2a 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 5/8] pacman: our gpg is gpg2
---
srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
srcpkgs/pacman/template | 11 ++++----
2 files changed, 5 insertions(+), 44 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 dd458cae9c4b..000000000000
--- 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
---- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ b/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 d23aba0468bf..b98560e10637 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=2
+revision=3
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"
checkdepends="fakeroot"
short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
@@ -17,11 +17,10 @@ license="GPL-2.0-or-later"
homepage="https://www.archlinux.org/pacman/"
distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- do_check() {
- : fakechroot is not available
- }
+ make_check=no # fakechroot is not available
else
- checkdepends+=" fakechroot"
+ checkdepends="fakeroot fakechroot gnupg"
fi
From 9c99ca9d38455eac6e8d6ccc26a27cc4ba32fc5a 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 6/8] 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 072da12708d4..8633075a8404 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,14 +1,14 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.15.1
-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"
short_desc="GnuPG Made Easy"
maintainer="Orphaned <orphan@voidlinux.org>"
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 aeadba3297b168ec7ec5abda62cb33081b1d4f90 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: Sat, 10 Jul 2021 01:05:50 +0700
Subject: [PATCH 7/8] blackbox: always 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 36cb62d8275c..000000000000
--- 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 e0d94abf4a50..c242782d7937 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 <git@damadmai.at>"
license="MIT"
From b360630eb25efc13a288a27fb0a3a3ebd7faad11 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: Sun, 11 Jul 2021 00:14:33 +0700
Subject: [PATCH 8/8] 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 ce21d75e80f4..17641ac07d87 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.3
-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>=2"
short_desc="PAM module to unlock GPG agent"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-3.0-only"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Merged]: gnupg: update to 2.2.29
2021-01-25 12:40 [PR PATCH] [RFC] gnupg update to version 2 sgn
` (14 preceding siblings ...)
2021-07-22 14:10 ` sgn
@ 2021-07-22 14:31 ` sgn
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2021-07-22 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
There's a merged pull request on the void-packages repository
gnupg: update to 2.2.29
https://github.com/void-linux/void-packages/pull/28217
Description:
^ permalink raw reply [flat|nested] 17+ messages in thread