From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= 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 " +maintainer="Jan Christian Grünhage " 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?= 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 " +maintainer="Jan Christian Grünhage " 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 0afa9164c003d4c460dc123bc8f55aa059ccfdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 24 Dec 2022 16:24:21 +0100 Subject: [PATCH 3/3] gnupg: update to 2.4.0. --- ...pcsclite-library-on-musl-libc-as-well.patch | 6 +++--- srcpkgs/gnupg/template | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 7 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?= 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..458c0885c558 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,14 +1,19 @@ # 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" -hostmakedepends="pkg-config gettext" + --with-npth-prefix=${XBPS_CROSS_BASE}/usr + --enable-all-tests" +configure_script="../configure" +hostmakedepends="pkg-config gettext gettext-devel-tools automake" makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel libgcrypt-devel" @@ -18,10 +23,15 @@ maintainer="Jan Christian Grünhage " 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