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 36e65e0910971465b5d16112be281d9485bd9d1b 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template index adc6202164c1..974c8ca392dc 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 +checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c libksba-devel_package() { depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}" From 856e7cf7d3a47c64d8c53bf49f9445cd6150218f 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. --- ...csclite-library-on-musl-libc-as-well.patch | 6 +- ...ests-gpgme-for-in-source-tree-builds.patch | 63 +++++++++++++++++++ srcpkgs/gnupg/template | 10 ++- 3 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch 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/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch new file mode 100644 index 000000000000..cd0f695043a6 --- /dev/null +++ b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch @@ -0,0 +1,63 @@ +From a4ec37b589a0646f2e756921f7abbb578cb5464d Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 21 Dec 2022 10:52:24 +0900 +Subject: [PATCH 2/2] tests: Fix tests/gpgme for in-source-tree builds. + +* tests/gpgme/Makefile.am: Don't use setup.scm/ dir. +* tests/gpgme/all-tests.scm: Fix the name of the environment. + +-- + +GnuPG-bug-id: 6313 +Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d +Signed-off-by: NIIBE Yutaka +--- + tests/gpgme/Makefile.am | 5 ++--- + tests/gpgme/all-tests.scm | 4 ++-- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am +index ca7be13df..ae98db4a0 100644 +--- a/tests/gpgme/Makefile.am ++++ b/tests/gpgme/Makefile.am +@@ -47,8 +47,7 @@ check: xcheck + + .PHONY: xcheck + xcheck: +- @$(MKDIR_P) setup.scm/tests \ +- tests/gpg lang/qt/tests lang/python/tests ++ @$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests + $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ + $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) + +@@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml + all-local: $(required_pgms) + + clean-local: +- -rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests ++ -rm -rf tests lang +diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm +index 1746c4ee1..aef7d6a21 100644 +--- a/tests/gpgme/all-tests.scm ++++ b/tests/gpgme/all-tests.scm +@@ -41,7 +41,7 @@ + (test::scm + #f + #f +- (path-join "tests" "gpgme" "setup.scm" "tests" "gpg") ++ (path-join "tests" "gpgme" "tests" "gpg") + (in-srcdir "tests" "gpgme" "setup.scm") + "--" "tests" "gpg"))) + (define setup-py +@@ -49,7 +49,7 @@ + (test::scm + #f + #f +- (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests") ++ (path-join "tests" "gpgme" "lang" "python" "tests") + (in-srcdir "tests" "gpgme" "setup.scm") + "--" "lang" "python" "tests"))) + +-- +2.39.0 + diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template index 08751d2bea31..d1f9607c4a99 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,6 +1,6 @@ # Template file for 'gnupg' pkgname=gnupg -version=2.3.8 +version=2.4.0 revision=1 build_style=gnu-configure configure_args="$(vopt_enable ldap) @@ -8,7 +8,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" -hostmakedepends="pkg-config gettext" +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 +18,14 @@ 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 build_options="ldap" build_options_default="ldap" +pre_configure() { + autoreconf -fi +} + post_install() { vmkdir usr/share/examples rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user