commit: 0e9bffaf0c73a064861831d8081da3047f9b2862 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Wed Jun 5 13:06:18 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Wed Jun 5 13:19:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e9bffaf
net-misc/FORT-validator: restore compat with older libxml2 versions 5d0270aaf228fe067d2226de9888908bb23e6a09 broke compatibility with <dev-libs/libxml2-2.12.0 due to API changes. Backport commits that fix previous patch. Bug: https://bugs.gentoo.org/928331 Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> ....4-r1.ebuild => FORT-validator-1.5.4-r2.ebuild} | 2 +- ....1-r1.ebuild => FORT-validator-1.6.1-r2.ebuild} | 2 +- ....2-r1.ebuild => FORT-validator-1.6.2-r2.ebuild} | 2 +- .../files/FORT-validator-1.5.4-GCC14.patch | 28 ------------------- .../FORT-validator-1.5.4-libxml2-2.12.0.patch | 31 ++++++++++++++++++++++ 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild similarity index 96% rename from net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild rename to net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild index b24747b38..2918d6134 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86" IUSE="caps test" RESTRICT="!test? ( test )" -PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch +PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch DEPEND=" acct-group/fort diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild similarity index 96% rename from net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild rename to net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild index c8938f818..0ab008b61 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86" IUSE="caps test" RESTRICT="!test? ( test )" -PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch +PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch DEPEND=" acct-group/fort diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild similarity index 96% rename from net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild rename to net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild index c7d69b4de..f65c32359 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86" IUSE="caps test" RESTRICT="!test? ( test )" -PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch +PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch DEPEND=" acct-group/fort diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch deleted file mode 100644 index 7a417fd24..000000000 --- a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/NICMx/FORT-validator/pull/137 - -Since we don't manipulate any struct members, I believe we can safely take a -const xmlError * argument instead, as per libxml2's documentation . - -I also believe we can drop the string-termination handling, because C strings -end with \0 and therefore ptr[strlen(ptr)-1] is always \0. - -Author: Lucio Sauer <[email protected]> ---- a/src/xml/relax_ng.c -+++ b/src/xml/relax_ng.c -@@ -36,14 +36,9 @@ relax_ng_log_warn(void *ctx, const char *msg, ...) - } - - static void --relax_ng_log_str_err(void *userData, xmlErrorPtr error) -+relax_ng_log_str_err(void *userData, const xmlError *error) - { -- char *ptr; -- -- ptr = error->message; -- if (ptr[strlen(ptr) - 1] == '\n') -- ptr[strlen(ptr) - 1] = '\0'; -- pr_val_err("%s (at line %d)", ptr, error->line); -+ pr_val_err("%s (at line %d)", error->message, error->line); - } - - /* Initialize global schema to parse RRDP files */ diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch new file mode 100644 index 000000000..f050f418e --- /dev/null +++ b/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch @@ -0,0 +1,31 @@ +Backport commits 58a94fc..cdf9248 that enable compatibility with +>=dev-libs/libxml2-2.12.0. + +Author: Lucio Sauer <[email protected]> +--- a/src/xml/relax_ng.c ++++ b/src/xml/relax_ng.c +@@ -35,15 +35,17 @@ relax_ng_log_warn(void *ctx, const char *msg, ...) + VLOG_MSG(warn) + } + ++/* Signature changed at libxml2 commit 61034116d0a3c8b295c6137956adc3ae55720. */ ++#if LIBXML_VERSION >= 21200 ++#define XMLERROR_PARAMTYPE const xmlError * ++#else ++#define XMLERROR_PARAMTYPE xmlErrorPtr ++#endif ++ + static void +-relax_ng_log_str_err(void *userData, xmlErrorPtr error) ++relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error) + { +- char *ptr; +- +- ptr = error->message; +- if (ptr[strlen(ptr) - 1] == '\n') +- ptr[strlen(ptr) - 1] = '\0'; +- pr_val_err("%s (at line %d)", ptr, error->line); ++ pr_val_err("%s (at line %d)", error->message, error->line); + } + + /* Initialize global schema to parse RRDP files */
