Attachment 235628 Details for Bug 265567 – security/masscan: fix build on armv6/armv7

[patch] security/masscan: fix build on armv6/armv7

0001-security-masscan-fix-build-on-armv7.patch (text/plain), 1.64 KB, created by Robert Clausecker on 2022-08-02 04:58:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-08-02 04:58:37 UTC

Size: 1.64 KB

patch

obsolete

>From 88b2c29fb3aa4b412484b060530df51b2bfd9801 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 2 Aug 2022 06:56:16 +0200
>Subject: [PATCH] security/masscan: fix build on armv7
>
> - fix armv6/armv7 rdtsc patch
> - add a missing include file
>---
> security/masscan/files/patch-src_out-tcp-services.c | 10 ++++++++++
> security/masscan/files/patch-src_smack1.c           |  3 ++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
> create mode 100644 security/masscan/files/patch-src_out-tcp-services.c
>
>diff --git a/security/masscan/files/patch-src_out-tcp-services.c b/security/masscan/files/patch-src_out-tcp-services.c
>new file mode 100644
>index 000000000000..2e3926af3812
>--- /dev/null
>+++ b/security/masscan/files/patch-src_out-tcp-services.c
>@@ -0,0 +1,10 @@
>+--- src/out-tcp-services.c.orig	2022-08-02 04:53:49 UTC
>++++ src/out-tcp-services.c
>+@@ -1,6 +1,7 @@
>+ #include "out-tcp-services.h"
>+ #include <string.h>
>+ #include <stdlib.h>
>++#include <arpa/inet.h>
>+ 
>+ #ifndef WIN32
>+ #include <netdb.h>
>diff --git a/security/masscan/files/patch-src_smack1.c b/security/masscan/files/patch-src_smack1.c
>index 909d256435cf..e88a20706b8b 100644
>--- a/security/masscan/files/patch-src_smack1.c
>+++ b/security/masscan/files/patch-src_smack1.c
>@@ -6,8 +6,9 @@
>  #include <machine/cpufunc.h>
> -#define __rdtsc rdtsc
> -#if (__ARM_ARCH >= 6)  // V6 is the earliest arch that has a standard cyclecount
>+-unsigned long long rdtsc(void)
> +#if (__ARM_ARCH >= 6 && __ARM_ARCH <= 7)  // V6 is the earliest arch that has a standard cyclecount
>- unsigned long long rdtsc(void)
>++unsigned long long __rdtsc(void)
>  {
>    uint32_t pmccntr;
>    uint32_t pmuseren;
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 265567: 235628