From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gnupg: update to 2.4.0.
Date: Tue, 27 Dec 2022 10:40:49 +0100 [thread overview]
Message-ID: <20221227094049.nRF6mF1-rnRXP0GeVGsb2grSVcWPIgvGE-EaGOQKuBg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41270@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1722 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-2.4.0_1
https://github.com/void-linux/void-packages/pull/41270
gnupg: update to 2.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
I'd like others to test this as well. Last time, we've had problems with people
running into issues. <del>And we've got an additional problem this time, because
their test suite isn't passing, which at least some other distros are also
running into.</del> I'd like to keep this open as a draft for now, but I'm using it
for now.
EDIT: The problem with the test suite has been fixed by applying an upstream patch, thanks for the help with automake @kruceter
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41270.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-2.4.0_1-41270.patch --]
[-- Type: text/x-diff, Size: 5621 bytes --]
From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:32 +0100
Subject: [PATCH 1/3] libgpg-error: update to 1.46.
---
srcpkgs/libgpg-error/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 0bcf2a42e221..32fc7f573718 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,14 +1,15 @@
# Template file for 'libgpg-error'
pkgname=libgpg-error
-version=1.45
+version=1.46
revision=1
build_style=gnu-configure
+configure_args="--enable-install-gpg-error-config"
short_desc="Library for error values used by GnuPG component"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26
+checksum=b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
if [ "$CROSS_BUILD" ]; then
hostmakedepends="qemu-user-static"
From 9160209029f823351a726e913231de3bc75193c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:37 +0100
Subject: [PATCH 2/3] libksba: update to 1.6.3.
---
srcpkgs/libksba/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..e5a59cba024e 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
# Template file for 'libksba'
pkgname=libksba
-version=1.6.0
+version=1.6.3
revision=1
build_style=gnu-configure
makedepends="libgpg-error-devel"
short_desc="CMS and X.509 access library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-2.0-or-later,LGPL-3.0-or-later"
homepage="https://www.gnupg.org/related_software/libksba/index.html"
-distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+distfiles="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2"
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
libksba-devel_package() {
depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"
From f79f9c27c1414f8f19852c3f93ddf76c45eedb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:21 +0100
Subject: [PATCH 3/3] gnupg: update to 2.4.0.
---
...d-pcsclite-library-on-musl-libc-as-well.patch | 6 +++---
srcpkgs/gnupg/template | 16 +++++++++++++---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb 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, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
---
scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
#else
#define DEFAULT_PCSC_DRIVER "libpcsclite.so"
--
-2.38.0
+2.39.0
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..753b17e1f033 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,13 +1,18 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.3.8
+version=2.4.0
revision=1
+# We're building outside of the source tree, because upstream told us to:
+# https://dev.gnupg.org/T6313#166339
+build_wrksrc=build
build_style=gnu-configure
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"
+ --with-npth-prefix=${XBPS_CROSS_BASE}/usr
+ --enable-all-tests"
+configure_script="../configure"
hostmakedepends="pkg-config gettext"
makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
@@ -18,10 +23,15 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.gnupg.org/"
distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
+checksum=1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483
+make_check_pre='env TESTFLAGS="--parallel=${XBPS_MAKEJOBS}"'
build_options="ldap"
build_options_default="ldap"
+post_extract() {
+ mkdir build
+}
+
post_install() {
vmkdir usr/share/examples
rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user
next prev parent reply other threads:[~2022-12-27 9:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-24 15:26 [PR PATCH] " jcgruenhage
2022-12-25 18:15 ` kruceter
2022-12-26 20:22 ` [PR PATCH] [Updated] " jcgruenhage
2022-12-26 20:26 ` jcgruenhage
2022-12-26 20:29 ` jcgruenhage
2022-12-27 1:33 ` [PR REVIEW] " sgn
2022-12-27 8:03 ` jcgruenhage
2022-12-27 9:37 ` [PR PATCH] [Updated] " jcgruenhage
2022-12-27 9:39 ` [PR REVIEW] " jcgruenhage
2022-12-27 9:40 ` jcgruenhage [this message]
2022-12-31 16:33 ` paper42
2023-01-01 17:13 ` jcgruenhage
2023-01-01 18:15 ` paper42
2023-01-01 18:23 ` jcgruenhage
2023-01-01 18:24 ` jcgruenhage
2023-01-02 3:50 ` sgn
2023-01-02 3:51 ` sgn
2023-01-14 13:02 ` [PR PATCH] [Updated] " jcgruenhage
2023-01-14 19:35 ` [PR REVIEW] " jcgruenhage
2023-01-15 9:18 ` [PR PATCH] [Merged]: " paper42
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=20221227094049.nRF6mF1-rnRXP0GeVGsb2grSVcWPIgvGE-EaGOQKuBg@z \
--to=jcgruenhage@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).