commit: f79fb97e6bcb4a812383757552a8d5c58cccaef1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 14 02:13:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 14 02:14:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79fb97e
dev-libs/libassuan: fix typo in header Signed-off-by: Sam James <sam <AT> gentoo.org> .../libassuan/files/libassuan-3.0.0-fix-typo.patch | 31 ++++++++++++++++++++++ ...suan-3.0.0.ebuild => libassuan-3.0.0-r1.ebuild} | 5 +++- ...suan-3.0.1.ebuild => libassuan-3.0.1-r1.ebuild} | 7 +++-- profiles/package.mask | 2 +- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dev-libs/libassuan/files/libassuan-3.0.0-fix-typo.patch b/dev-libs/libassuan/files/libassuan-3.0.0-fix-typo.patch new file mode 100644 index 000000000000..1d1a2ff1090f --- /dev/null +++ b/dev-libs/libassuan/files/libassuan-3.0.0-fix-typo.patch @@ -0,0 +1,31 @@ +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=commitdiff;h=b8148b4f5735e1215eb72f208e1ae2891213247e + +From b8148b4f5735e1215eb72f208e1ae2891213247e Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Thu, 11 Jul 2024 09:57:31 +0900 +Subject: [PATCH] Fix typo in assuan.h. + +* src/assuan.h.in (ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE): Fix. + +-- + +Signed-off-by: NIIBE Yutaka <[email protected]> +--- + src/assuan.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/assuan.h.in b/src/assuan.h.in +index 809a59d..69e3c3b 100644 +--- a/src/assuan.h.in ++++ b/src/assuan.h.in +@@ -566,7 +566,7 @@ assuan_pid_t __assuan_waitpid (assuan_context_t ctx, assuan_pid_t pid, + int nowait, int *status, int options); + + #if defined(LIBASSUAN_API_REQUESTED) && LIBASSUAN_API_REQUESTED >= 3 +-#defined ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE 1 ++#define ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE 1 + #endif + + #if defined(ASSUAN_REALLY_REQUIRE_V2_NPTH_SYSTEM_HOOKS) \ +-- +2.30.2 diff --git a/dev-libs/libassuan/libassuan-3.0.0.ebuild b/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild similarity index 95% rename from dev-libs/libassuan/libassuan-3.0.0.ebuild rename to dev-libs/libassuan/libassuan-3.0.0-r1.ebuild index 14a0793c4ea8..7c18fca70839 100644 --- a/dev-libs/libassuan/libassuan-3.0.0.ebuild +++ b/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild @@ -21,11 +21,14 @@ LICENSE="GPL-3 LGPL-2.1" SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -# Note: On each bump, update dep bounds on each version from configure.ac! RDEPEND=">=dev-libs/libgpg-error-1.33" DEPEND="${RDEPEND}" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gnupg )" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.0-fix-typo.patch +) + src_prepare() { default # for Solaris shared libraries diff --git a/dev-libs/libassuan/libassuan-3.0.1.ebuild b/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild similarity index 92% rename from dev-libs/libassuan/libassuan-3.0.1.ebuild rename to dev-libs/libassuan/libassuan-3.0.1-r1.ebuild index b72b5c50a916..3694c68e97cc 100644 --- a/dev-libs/libassuan/libassuan-3.0.1.ebuild +++ b/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,11 +21,14 @@ LICENSE="GPL-3 LGPL-2.1" SLOT="0/$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -# Note: On each bump, update dep bounds on each version from configure.ac! RDEPEND=">=dev-libs/libgpg-error-1.33" DEPEND="${RDEPEND}" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gnupg )" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.0-fix-typo.patch +) + src_prepare() { default # for Solaris shared libraries diff --git a/profiles/package.mask b/profiles/package.mask index 76c079861f2a..458d6b736397 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -519,7 +519,7 @@ app-emulation/virtualbox-kvm # Sam James <[email protected]> (2024-06-25) # The symbol versioning "fix" breaks anything built with 3.0.0. -=dev-libs/libassuan-3.0.1 +=dev-libs/libassuan-3.0.1-r1 # Sam James <[email protected]> (2024-03-28) # Newer 5.4.x releases were signed by a potentially compromised upstream maintainer.
