Skip to contentSkip to conversation

arpwatch: riscv not supported

PATCH In review Armin Kuster 2 participants 6 messages Jun 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 arpwatch: riscv not supported

exclude this arch for compat list

---
 recipes-scanners/arpwatch/arpwatch_3.1.bb | 3 +++
 1 file changed, 3 insertions(+)
recipes-scanners/arpwatch/arpwatch_3.1.bb +3 -0
index c8d31cf..3d8c5ae 100644
@@ -80,4 +80,7 @@ CONFFILE_FILES = "${sysconfdir}/${PN}.conf"
 FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \
                ${sysconfdir} /var/lib/arpwatch"
 
+COMPATIBLE_HOST:riscv32 = "null"
+COMPATIBLE_HOST:riscv64 = "null"
+
 RDEPENDS:${PN} = "libpcap"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/5 packagegroup-core-security: drop arpwatch for riscv from pkg grp

---
 recipes-core/packagegroup/packagegroup-core-security.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-core/packagegroup/packagegroup-core-security.bb +1 -1
index b20ef31..40ff06b 100644
@@ -42,7 +42,7 @@ RDEPENDS:packagegroup-security-utils = "\
 
 SUMMARY:packagegroup-security-scanners = "Security scanners"
 RDEPENDS:packagegroup-security-scanners = "\
-    arpwatch \
+    ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " arpwatch",d)} \
     chkrootkit \
     isic \
     ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " clamav clamav-daemon clamav-freshclam",d)} \
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/5 chkrootkit: Fix missing includes for musl

In reply to Armin Kuster
---
 recipes-scanners/rootkits/chkrootkit_0.55.bb  |  3 +-
 .../rootkits/files/musl_fix.patch             | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 recipes-scanners/rootkits/files/musl_fix.patch
recipes-scanners/rootkits/chkrootkit_0.55.bb +2 -1
index 4293aec..fe0e989 100644
@@ -5,7 +5,8 @@ SECTION = "security"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fdbe53788f7081c63387d8087273f5ff"
 
-SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/c/${BPN}/${BPN}_${PV}.orig.tar.gz"
+SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
+           file://musl_fix.patch"
 SRC_URI[sha256sum] = "a81c0286ec449313f953701202a00e81b204fc2cf43e278585a11c12a5e0258b"
 
 inherit autotools-brokensep
recipes-scanners/rootkits/files/musl_fix.patch new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
2.25.1
#3 lore raw

PATCH 4/5 arpwatch: update to 3.3

In reply to Armin Kuster

not compatible with musl

---
 .../arpwatch/{arpwatch_3.1.bb => arpwatch_3.3.bb}        | 9 +++++----
 recipes-scanners/arpwatch/files/host_contam_fix.patch    | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename recipes-scanners/arpwatch/{arpwatch_3.1.bb => arpwatch_3.3.bb} (90%)
recipes-scanners/arpwatch/arpwatch_3.3.bb renamed from recipes-scanners/arpwatch/arpwatch_3.1.bb +5 -4
similarity index 90%
rename from recipes-scanners/arpwatch/arpwatch_3.1.bb
rename to recipes-scanners/arpwatch/arpwatch_3.3.bb
index 3d8c5ae..8efb339 100644
@@ -1,7 +1,7 @@
 SUMARRY = "The ethernet monitor program; for keeping track of ethernet/ip address pairings"
 LICENSE = "BSD-4-Clause"
 HOME_PAGE = "http://ee.lbl.gov/"
-LIC_FILES_CHKSUM = "file://configure;md5=74ca964ed34fda7b46c6fe3e50bded9d"
+LIC_FILES_CHKSUM = "file://configure;md5=0f6cca2f69f384a14e2f5803210ca92e"
 
 DEPENDS += "libpcap"
 
@@ -9,10 +9,10 @@ SRC_URI = "https://ee.lbl.gov/downloads/arpwatch/${BP}.tar.gz \
            file://arpwatch.conf \
            file://arpwatch.default \
            file://arpwatch_init  \
-           file://postfix_workaround.patch \
-           file://host_contam_fix.patch "
+           file://host_contam_fix.patch \
+           "
 
-SRC_URI[sha256sum] = "ee1d15d9a07952c0c017908b9dbfd5ac988fed0058c3cc4fa6c13e0be36f3a9f"
+SRC_URI[sha256sum] = "d47fa8b291fc37a25a2d0f3e1b64f451dc0be82d714a10ffa6ef8b0b9e33e166"
 
 inherit  autotools-brokensep update-rc.d useradd
 
@@ -82,5 +82,6 @@ FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \
 
 COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:riscv64 = "null"
+OMPATIBLE_HOST:libc-musl = "null"
 
 RDEPENDS:${PN} = "libpcap"
recipes-scanners/arpwatch/files/host_contam_fix.patch +4 -4
index 7d7ffac..2e27aa4 100644
@@ -4,11 +4,11 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Armin Kuster <[email protected]>
 
-Index: arpwatch-3.0/configure
+Index: arpwatch-3.3/configure
 ===================================================================
---- arpwatch-3.0.orig/configure
-+++ arpwatch-3.0/configure
-@@ -4349,8 +4349,8 @@ fi
+--- arpwatch-3.3.orig/configure
++++ arpwatch-3.3/configure
+@@ -4353,8 +4353,8 @@ fi
  	    CC=cc
  	    export CC
      fi
Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/5 packagegroup-core-security: don't include aprwatch for musl

In reply to Armin Kuster
---
 recipes-core/packagegroup/packagegroup-core-security.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-core/packagegroup/packagegroup-core-security.bb +1 -0
index 40ff06b..f381d91 100644
@@ -48,6 +48,7 @@ RDEPENDS:packagegroup-security-scanners = "\
     ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " clamav clamav-daemon clamav-freshclam",d)} \
     "
 RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "clamav clamav-daemon clamav-freshclam"
+RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "arpwatch"
 
 SUMMARY:packagegroup-security-audit = "Security Audit tools "
 RDEPENDS:packagegroup-security-audit = " \
Signature · 1 line
2.25.1
#4 lore raw

Re: [yocto] [meta-security][PATCH 4/5] arpwatch: update to 3.3

In reply to Armin Kuster
Quoted 1 line · Armin Kuster

not compatible with musl

...

recipes-scanners/arpwatch/arpwatch_3.3.bb FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \ · line 85

Quoted 5 lines
recipes-scanners/arpwatch/arpwatch_3.3.bb renamed from recipes-scanners/arpwatch/arpwatch_3.1.bb +1 -0
@@ -82,5 +82,6 @@ FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \
 
  COMPATIBLE_HOST:riscv32 = "null"
  COMPATIBLE_HOST:riscv64 = "null"
+OMPATIBLE_HOST:libc-musl = "null"

typo?