diff options
| author | Ørjan Malde <red@foxi.me> | 2025-05-06 08:17:00 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2025-05-06 08:17:00 +0200 |
| commit | a6b360d021f6fa7c892f518fca47b1c62594a79a (patch) | |
| tree | c9ab9bfe1e6dae1782e3cfef48d679638a485789 | |
| parent | 762cf09e7abcda209d5be439eeed26360f33408a (diff) | |
| download | midipix_build-a6b360d021f6fa7c892f518fca47b1c62594a79a.tar.bz2 midipix_build-a6b360d021f6fa7c892f518fca47b1c62594a79a.tar.xz | |
groups.d/241.native_packages_inet.d/gnupg.package: bump to v2.5.5
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups.d/241.native_packages_inet.d/gnupg.package | 6 | ||||
| -rw-r--r-- | patches/gnupg-2.3.8.local.patch | 13 | ||||
| -rw-r--r-- | patches/gnupg-2.3.8_pre.local.patch | 21 |
3 files changed, 3 insertions, 37 deletions
diff --git a/groups.d/241.native_packages_inet.d/gnupg.package b/groups.d/241.native_packages_inet.d/gnupg.package index c4339511..1bdf1d26 100644 --- a/groups.d/241.native_packages_inet.d/gnupg.package +++ b/groups.d/241.native_packages_inet.d/gnupg.package @@ -1,8 +1,8 @@ : ${PKG_GNUPG_DEPENDS:="libassuan libgcrypt libgpg_error libksba npth sqlite3"}; -: ${PKG_GNUPG_SHA256SUM:=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed}; -: ${PKG_GNUPG_VERSION:=2.3.8}; +: ${PKG_GNUPG_SHA256SUM:=7afa71d72ff9aaff75a6810b87b486bc492fd752e4f77b07c41759ce4ef36b31}; +: ${PKG_GNUPG_VERSION:=2.5.5}; : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2}; -: ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"}; +: ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--disable-doc --with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"}; : ${PKG_GNUPG_CONFIG_CACHE_EXTRA:=" ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"}; diff --git a/patches/gnupg-2.3.8.local.patch b/patches/gnupg-2.3.8.local.patch deleted file mode 100644 index 7e2d9617..00000000 --- a/patches/gnupg-2.3.8.local.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru gnupg-2.3.8.orig/dirmngr/server.c gnupg-2.3.8/dirmngr/server.c ---- gnupg-2.3.8.orig/dirmngr/server.c 2022-10-07 15:23:50.000000000 +0200 -+++ gnupg-2.3.8/dirmngr/server.c 2022-10-22 15:52:13.224088828 +0200 -@@ -3137,7 +3137,9 @@ - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); -+#endif - ctrl->ks_get_state = NULL; - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); diff --git a/patches/gnupg-2.3.8_pre.local.patch b/patches/gnupg-2.3.8_pre.local.patch deleted file mode 100644 index 947bce1b..00000000 --- a/patches/gnupg-2.3.8_pre.local.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru gnupg-2.3.8.orig/configure gnupg-2.3.8/configure ---- gnupg-2.3.8.orig/configure 2022-10-13 17:56:41.000000000 +0200 -+++ gnupg-2.3.8/configure 2022-10-22 15:45:44.541933579 +0200 -@@ -9004,7 +9004,7 @@ - - if test $ok = yes; then - LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` -+ LIBASSUAN_LIBS="-lassuan -lgpg-error" - have_libassuan=yes - else - LIBASSUAN_CFLAGS="" -@@ -9183,7 +9183,7 @@ - fi - if test $ok = yes; then - KSBA_CFLAGS=`$KSBA_CONFIG --cflags` -- KSBA_LIBS=`$KSBA_CONFIG --libs` -+ KSBA_LIBS="-lksba -lgpg-error -lnpth" - have_ksba=yes - if test -z "$use_gpgrt_config"; then - libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none` |