From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: sequoia-chameleon-gnupg-0.6.0
Date: Fri, 15 Mar 2024 19:35:02 +0100 [thread overview]
Message-ID: <20240315183502.B35F72BD18@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49301@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1546 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/sequoia-chameleon-gnupg
https://github.com/void-linux/void-packages/pull/49301
New package: sequoia-chameleon-gnupg-0.6.0
- gnupg1: add alternatives for gpg and gpgv
- gnupg: add alternatives for gpg and gpgv
- New package: sequoia-chameleon-gnupg-0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
revival of https://github.com/void-linux/void-packages/pull/41306
@sgn, you had comments in the previous PR about the alternatives groups. I've set `--enable-gpg-is-gpg2` for `gnupg`, so I believe that fixes your broken scenario:
```
$ gpgconf --check-programs
gpg:OpenPGP:/usr/bin/gpg2:1:1:
gpgsm:S/MIME:/usr/bin/gpgsm:1:1:
keyboxd:Public Keys:/usr/libexec/keyboxd:1:1:
gpg-agent:Private Keys:/usr/bin/gpg-agent:1:1:
scdaemon:Smartcards:/usr/libexec/scdaemon:1:1:
dirmngr:Network:/usr/bin/dirmngr:1:1:
pinentry:Passphrase Entry:/usr/bin/pinentry:1:1:
```
Additionally, should `gnupg2` just become a dummy package, with doc and examples directories being called `gnupg2` with a symlink to `gnupg` in the main package?
A patch file from https://github.com/void-linux/void-packages/pull/49301.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/sequoia-chameleon-gnupg-49301.patch --]
[-- Type: text/x-diff, Size: 5133 bytes --]
From f32e530c390b63459bd41536e4e260e1de47155e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 14 Mar 2024 17:55:26 -0400
Subject: [PATCH 1/3] gnupg1: add alternatives for gpg and gpgv
---
srcpkgs/gnupg1/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index e86147006aa165..bd5735fdebc776 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
@@ -14,6 +14,10 @@ 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
+alternatives="gpg:gpg:/usr/bin/gpg1
+ gpg:gpgv:/usr/bin/gpgv1
+ gpg:gpg.1:/usr/share/man/man1/gpg1.1
+ gpg:gpgv.1:/usr/share/man/man1/gpgv1.1"
CFLAGS="-fcommon"
From d99cf17bd587ab6fef98ecdb4ecf8cf5a32e435b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 14 Mar 2024 17:56:21 -0400
Subject: [PATCH 2/3] gnupg: add alternatives for gpg and gpgv
---
srcpkgs/gnupg/template | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 35057913185db1..e9fb72e2d7f62c 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.5
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
@@ -12,7 +12,7 @@ configure_args="$(vopt_enable ldap)
--with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
--with-ksba-prefix=${XBPS_CROSS_BASE}/usr
--with-npth-prefix=${XBPS_CROSS_BASE}/usr
- --enable-all-tests"
+ --enable-all-tests --enable-gpg-is-gpg2"
configure_script="../configure"
hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
@@ -25,6 +25,10 @@ license="GPL-3.0-or-later"
homepage="https://www.gnupg.org/"
distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
checksum=f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277
+alternatives="gpg:gpg:/usr/bin/gpg2
+ gpg:gpgv:/usr/bin/gpgv2
+ gpg:gpg.1:/usr/share/man/man1/gpg2.1
+ gpg:gpgv.1:/usr/share/man/man1/gpgv2.1"
make_check_pre='env TESTFLAGS="--parallel=${XBPS_MAKEJOBS}"'
build_options="ldap"
build_options_default="ldap"
@@ -33,24 +37,23 @@ post_extract() {
mkdir build
}
+pre_check() {
+ # when --enable-gpg-is-gpg2 is set, tests look for gpg2, which is created at install time
+ ln -s gpg bin/gpg2
+}
+
post_install() {
vmkdir usr/share/examples
- mv ${DESTDIR}/usr/share/doc/gnupg/examples \
- ${DESTDIR}/usr/share/examples/gnupg
+ mv "${DESTDIR}/usr/share/doc/gnupg/examples" \
+ "${DESTDIR}/usr/share/examples/gnupg"
+ ln -s gnupg "${DESTDIR}/usr/share/examples/gnupg2"
+ ln -s 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
- }
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
}
gnupg2-scdaemon_package() {
From bfe0124b5b188e6722b7b048a4a9e9275394fb1d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 14 Mar 2024 17:59:09 -0400
Subject: [PATCH 3/3] New package: sequoia-chameleon-gnupg-0.6.0
---
srcpkgs/sequoia-chameleon-gnupg/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/sequoia-chameleon-gnupg/template
diff --git a/srcpkgs/sequoia-chameleon-gnupg/template b/srcpkgs/sequoia-chameleon-gnupg/template
new file mode 100644
index 00000000000000..f1a907859bc466
--- /dev/null
+++ b/srcpkgs/sequoia-chameleon-gnupg/template
@@ -0,0 +1,17 @@
+# Template file for 'sequoia-chameleon-gnupg'
+pkgname=sequoia-chameleon-gnupg
+version=0.6.0
+revision=1
+build_style=cargo
+_deps="nettle-devel openssl-devel sqlite-devel"
+hostmakedepends="pkg-config llvm clang"
+makedepends="${_deps}"
+checkdepends="gnupg faketime sequoia-sq"
+short_desc="Re-implmentation of gpg and gpgv from Sequoia OpenPGP"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg"
+distfiles="https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${version}/sequoia-chameleon-gnupg-v${version}.tar.gz"
+checksum=777f466384389435c42d789d17f22b1a54f9e44647a3ae645c7645da67054b31
+alternatives="gpg:gpg:/usr/bin/gpg-sq
+ gpg:gpgv:/usr/bin/gpgv-sq"
next prev parent reply other threads:[~2024-03-15 18:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 7:19 [PR PATCH] " classabbyamp
2024-03-15 17:12 ` [PR PATCH] [Updated] " classabbyamp
2024-03-15 18:35 ` classabbyamp [this message]
2024-03-19 17:43 ` classabbyamp
2024-03-19 18:16 ` classabbyamp
2024-03-21 7:33 ` classabbyamp
2024-03-21 7:37 ` classabbyamp
2024-03-21 7:44 ` classabbyamp
2024-03-22 8:14 ` New package: sequoia-chameleon-gnupg-0.7.0 0x5c
2024-04-05 22:56 ` [PR PATCH] [Updated] " classabbyamp
2024-05-07 17:04 ` classabbyamp
2024-05-07 17:21 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240315183502.B35F72BD18@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).