diff --git a/devel/dfuzzer/Makefile b/devel/dfuzzer/Makefile index 0222cc8a391a..a234df34ae79 100644 --- a/devel/dfuzzer/Makefile +++ b/devel/dfuzzer/Makefile @@ -1,39 +1,39 @@ PORTNAME= dfuzzer DISTVERSIONPREFIX= v -DISTVERSION= 2.3 +DISTVERSION= 2.4 CATEGORIES= devel sysutils MAINTAINER= arrowd@FreeBSD.org COMMENT= D-Bus fuzzer utility WWW= https://github.com/dbus-fuzzer/dfuzzer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= gnome meson pkgconfig USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= dbus-fuzzer PLIST_FILES= bin/dfuzzer \ "@sample etc/dfuzzer.conf.sample" OPTIONS_DEFINE= MANPAGES MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt \ docbook-xsl>=0:textproc/docbook-xsl MANPAGES_PLIST_FILES= share/man/man1/dfuzzer.1.gz post-patch: ${REINPLACE_CMD} -e 's|/etc/dfuzzer.conf|${PREFIX}/etc/dfuzzer.conf|' \ ${WRKSRC}/man/dfuzzer.xml \ ${WRKSRC}/src/suppression.c ${REINPLACE_CMD} -e 's|/stat|/status|g' ${WRKSRC}/test/test-util.c post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/dfuzzer.conf \ ${STAGEDIR}${PREFIX}/etc/dfuzzer.conf.sample .include diff --git a/devel/dfuzzer/distinfo b/devel/dfuzzer/distinfo index 73d9e1528f68..34316094913e 100644 --- a/devel/dfuzzer/distinfo +++ b/devel/dfuzzer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761920957 -SHA256 (dbus-fuzzer-dfuzzer-v2.3_GH0.tar.gz) = bd54bdd87c0d7c2818f6907130ef8c818ff454472503c74bd178fa39d2824cd6 -SIZE (dbus-fuzzer-dfuzzer-v2.3_GH0.tar.gz) = 53427 +TIMESTAMP = 1761983664 +SHA256 (dbus-fuzzer-dfuzzer-v2.4_GH0.tar.gz) = 82f042536eba0db3566ff42590d6646104a4e0512046e2314ed20ad1c607667a +SIZE (dbus-fuzzer-dfuzzer-v2.4_GH0.tar.gz) = 53502 diff --git a/devel/dfuzzer/files/patch-src_suppression.c b/devel/dfuzzer/files/patch-src_suppression.c deleted file mode 100644 index 30b09ac56c2a..000000000000 --- a/devel/dfuzzer/files/patch-src_suppression.c +++ /dev/null @@ -1,53 +0,0 @@ -From 4d9b7c01d68f64a93a25ff49504bbeca664adbc5 Mon Sep 17 00:00:00 2001 -From: Frantisek Sumsal -Date: Wed, 29 Oct 2025 13:31:11 +0100 -Subject: [PATCH] suppression: avoid using sscanf()'s %m specifier - -As it's not available in BSD libc. - -Addresses: #153 ---- src/suppression.c.orig 2024-01-29 15:03:13 UTC -+++ src/suppression.c -@@ -100,25 +100,31 @@ int df_suppression_load(GList **suppressions, const ch - df_verbose("Found suppressions for bus: '%s'\n", service_name); - - while ((n = getline(&line, &len, f)) > 0) { -+ g_auto(GStrv) tokens = NULL; - g_autoptr(char) suppression = NULL, description = NULL; - g_autoptr(suppression_item_t) item = NULL; -+ int token_count; - char *p; - -+ /* Strip leading and trailing whitespaces and check if the line is empty after the stripping - -+ * if so, skip it */ -+ g_strstrip(line); -+ if (line[0] == '\0') -+ continue; -+ -+ /* Beginning of the next section, stop here */ - if (line[0] == '[') - break; - -- /* The line contains only whitespace, skip it */ -- if (strspn(line, " \t\r\n") == (size_t) n) -- continue; -- -- /* Drop the newline character for nices error messages */ -- if (line[n - 1] == '\n') -- line[n - 1] = 0; -- -- /* The suppression description is optional, so let's accept such -- * lines as well */ -- if (sscanf(line, "%ms %m[^\n]", &suppression, &description) < 1) -+ /* Split the line into either ' ' or just '' */ -+ tokens = g_strsplit_set(line, " \t\r\n", 2); -+ token_count = g_strv_length(tokens); -+ if (token_count < 1) - return df_fail_ret(-1, "Failed to parse line '%s'\n", line); -+ -+ suppression = g_strdup(tokens[0]); -+ if (token_count > 1) -+ description = g_strdup(g_strstrip(tokens[1])); - - item = calloc(sizeof(*item), 1); - if (!item)