Attachment 238374 Details for Bug 268017 – security/openvas: fix build on armv7

[patch] security/openvas: fix build on armv7

0001-security-openvas-fix-build-on-armv7.patch (text/plain), 3.13 KB, created by Robert Clausecker on 2022-11-27 18:18:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-11-27 18:18:06 UTC

Size: 3.13 KB

patch

obsolete

>From 9de292563641597978f2bfe712f93d3272713fc6 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Sun, 27 Nov 2022 16:54:13 +0100
>Subject: [PATCH] security/openvas: fix build on armv7
>
>Also add missing USES=ssl and remove useless REINPLACE_CMD.
>---
> security/openvas/Makefile                 |  5 ++-
> security/openvas/files/patch-src_attack.c | 37 +++++++++++++++++++++++
> 2 files changed, 39 insertions(+), 3 deletions(-)
> create mode 100644 security/openvas/files/patch-src_attack.c
>
>diff --git a/security/openvas/Makefile b/security/openvas/Makefile
>index d55067eb9a99..eaf731724432 100644
>--- a/security/openvas/Makefile
>+++ b/security/openvas/Makefile
>@@ -29,7 +29,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	greenbone
> GH_PROJECT=	${PORTNAME}-scanner
> 
>-USES=		bison cmake gnome pkgconfig python:3.5+
>+USES=		bison cmake gnome pkgconfig python:3.5+ ssl
> USE_GNOME=	glib20
> 
> USERS=		gvm
>@@ -38,11 +38,10 @@ GROUPS=		${USERS}
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|g_pattern_match_string|g_pattern_spec_match_string|g' ${WRKSRC}/misc/strutils.c
> .if ${OSVERSION} < 1301000
> 	@${REINPLACE_CMD} -e 's|-Wunused-but-set-variable|-Wunused-variable|g' ${WRKSRC}/nasl/nasl_grammar.y
> .endif
>-	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c
>+	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/nasl_plugins.c
> 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c
> 
> post-install:
>diff --git a/security/openvas/files/patch-src_attack.c b/security/openvas/files/patch-src_attack.c
>new file mode 100644
>index 000000000000..e3e8b8615b0a
>--- /dev/null
>+++ b/security/openvas/files/patch-src_attack.c
>@@ -0,0 +1,37 @@
>+--- src/attack.c.orig	2022-07-18 09:07:38 UTC
>++++ src/attack.c
>+@@ -40,7 +40,7 @@
>+ #include "utils.h"
>+ 
>+ #include <arpa/inet.h> /* for inet_ntoa() */
>+-#include <bsd/unistd.h>
>++
>+ #include <errno.h> /* for errno() */
>+ #include <fcntl.h>
>+ #include <glib.h>
>+@@ -53,6 +53,7 @@
>+ #include <gvm/util/nvticache.h> /* for nvticache_t */
>+ #include <pthread.h>
>+ #include <stdlib.h>   /* for exit() */
>++#include <stdint.h>   /* for intmax_t */
>+ #include <string.h>   /* for strlen() */
>+ #include <sys/wait.h> /* for waitpid() */
>+ #include <unistd.h>   /* for close() */
>+@@ -1493,13 +1494,13 @@ stop:
>+ 
>+   gettimeofday (&now, NULL);
>+   if (test_alive_hosts_only)
>+-    g_message ("Vulnerability scan %s finished in %ld seconds: "
>++    g_message ("Vulnerability scan %s finished in %jd seconds: "
>+                "%d alive hosts of %d",
>+-               globals->scan_id, now.tv_sec - then.tv_sec,
>++               globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
>+                gvm_hosts_count (alive_hosts_list), gvm_hosts_count (hosts));
>+   else
>+-    g_message ("Vulnerability scan %s finished in %ld seconds: %d hosts",
>+-               globals->scan_id, now.tv_sec - then.tv_sec,
>++    g_message ("Vulnerability scan %s finished in %jd seconds: %d hosts",
>++               globals->scan_id, (intmax_t)(now.tv_sec - then.tv_sec),
>+                gvm_hosts_count (hosts));
>+ 
>+   gvm_hosts_free (hosts);
>-- 
>2.37.3
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 268017: 238374