diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-24 04:00:35 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-24 04:00:35 +0100 |
| commit | 7b07caa9d1459f9cba33cb8e7fceddf23a36583d (patch) | |
| tree | 5d3d2b29e18ac5ec08ee8c9c6220a60b25f4480e /app-crypt | |
| parent | net-ftp/proftpd: Stabilize 1.3.8b sparc, #934755 (diff) | |
| download | gentoo-7b07caa9d1459f9cba33cb8e7fceddf23a36583d.tar.gz gentoo-7b07caa9d1459f9cba33cb8e7fceddf23a36583d.tar.bz2 gentoo-7b07caa9d1459f9cba33cb8e7fceddf23a36583d.zip | |
app-crypt/pinentry: allow <1.3 to build w/ >=libassuan-3
Delete the bundled macro so it uses the system copy which knows libassuan-3
is compatible with libassuan-2 API-wise.
Closes: https://bugs.gentoo.org/934771
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch | 46 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-1.2.1-r7.ebuild | 3 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-1.2.1-r8.ebuild | 3 |
3 files changed, 52 insertions, 0 deletions
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch b/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch new file mode 100644 index 000000000000..35b71998e87a --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/934771 +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=a39ba412ab24721d4edb6476156371f8bf1d3ff9 + +From a39ba412ab24721d4edb6476156371f8bf1d3ff9 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Fri, 28 Jul 2023 14:09:11 +0900 +Subject: [PATCH] build: Update libassuan.m4 for libassuan version 3 in future. + +* m4/libassuan.m4: Update from libassuan master. + +-- + +New libassuan 3 has backward compatible API. + +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +--- a/m4/libassuan.m4 ++++ b/m4/libassuan.m4 +@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but + dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + dnl SPDX-License-Identifier: FSFULLR +-# Last-changed: 2022-11-01 ++# Last-changed: 2023-07-26 + + dnl + dnl Common code used for libassuan detection [internal] +@@ -89,6 +89,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + + if test $ok = yes; then + AC_MSG_RESULT([yes ($libassuan_config_version)]) ++ AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) + else + AC_MSG_RESULT(no) + fi +@@ -104,6 +105,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + AC_MSG_CHECKING([LIBASSUAN API version]) + if test "$req_libassuan_api" -eq "$tmp" ; then + AC_MSG_RESULT(okay) ++ elif test "$req_libassuan_api" -eq 2 -a "$tmp" -eq 3; then ++ AC_MSG_RESULT(okay) + else + ok=no + AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.]) +-- +2.30.2 + diff --git a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild index 1d1c3ad9f119..3ddf24c5674c 100644 --- a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild +++ b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild @@ -58,6 +58,9 @@ src_prepare() { unset FLTK_CONFIG + # bug #934771 + rm m4/libassuan.m4 || die + eautoreconf } diff --git a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild index b44f3638784c..7f097b060824 100644 --- a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild +++ b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild @@ -59,6 +59,9 @@ src_prepare() { unset FLTK_CONFIG + # bug #934771 + rm m4/libassuan.m4 || die + eautoreconf } |