mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

security/openvas: fix build on armv7

Browse Source 
- fix a wrong formatting specifier
 - mute a well-intended but irrelevant warning.  It would be better to
   just kill -Werror altogether as per policy, but I'll leave this up to
   the maintainer
 - remove a REINPLACE_CMD now that the same effect is achieved by patch

Approved by:	portmgr (build fix blanket)
MFH:		2023Q4
This commit is contained in:
Robert Clausecker 2023-11-04 07:19:31 +01:00
parent eadeaa9f44
commit c5f3ade2af
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/openvas/Makefile
View File

@ -44,8 +44,14 @@ GROUPS= ${USERS}
CFLAGS+= -Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8
.endif
# The struct this error is about is only ever accessed using bcopy() and memset(),
# so the unaligned structure doesn't matter. Disable the error, but keep it as a
# warning so we can see where it is.
CFLAGS_armv6= -Wno-error=unaligned-access
CFLAGS_armv7= -Wno-error=unaligned-access
post-patch:
@${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
@${REINPLACE_CMD} -e 's|vendor_version_get ()|vendor_version_get (void)|g' ${WRKSRC}/misc/vendorversion.c

31
security/openvas/files/patch-src_attack.c
View File

@ -1,6 +1,33 @@
--- src/attack.c.orig 2023-01-03 21:45:22 UTC
--- src/attack.c.orig 2023-10-11 11:14:13 UTC
+++ src/attack.c
@@ -1493,13 +1493,13 @@ stop:
@@ -31,7 +31,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>
@@ -1095,7 +1095,7 @@ apply_hosts_reverse_lookup_preferences (gvm_hosts_t *h
gvm_hosts_t *excluded;
excluded = gvm_hosts_reverse_lookup_unify_excluded (hosts);
- g_debug ("reverse_lookup_unify: Skipped %lu host(s).", excluded->count);
+ g_debug ("reverse_lookup_unify: Skipped %zu host(s).", excluded->count);
// Get the amount of hosts which are excluded now for this option,
// but they are already in the exclude list.
@@ -1111,7 +1111,7 @@ apply_hosts_reverse_lookup_preferences (gvm_hosts_t *h
gvm_hosts_t *excluded;
excluded = gvm_hosts_reverse_lookup_only_excluded (hosts);
- g_debug ("reverse_lookup_unify: Skipped %lu host(s).", excluded->count);
+ g_debug ("reverse_lookup_unify: Skipped %zu host(s).", excluded->count);
// Get the amount of hosts which are excluded now for this option,
// but they are already in the exclude list.
// This is to avoid issues with the scan progress calculation, since
@@ -1614,13 +1614,13 @@ stop:
gettimeofday (&now, NULL);
if (test_alive_hosts_only)