From d93501969c7e917567e1fe5c6388a09612e0883f Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 4 Jun 2022 11:39:40 -0700 Subject: arpwatch: update to 3.3 not compatible with musl Signed-off-by: Armin Kuster --- recipes-scanners/arpwatch/arpwatch_3.1.bb | 86 --------------------- recipes-scanners/arpwatch/arpwatch_3.3.bb | 87 ++++++++++++++++++++++ .../arpwatch/files/host_contam_fix.patch | 8 +- 3 files changed, 91 insertions(+), 90 deletions(-) delete mode 100644 recipes-scanners/arpwatch/arpwatch_3.1.bb create mode 100644 recipes-scanners/arpwatch/arpwatch_3.3.bb (limited to 'recipes-scanners/arpwatch') diff --git a/recipes-scanners/arpwatch/arpwatch_3.1.bb b/recipes-scanners/arpwatch/arpwatch_3.1.bb deleted file mode 100644 index 3d8c5ae..0000000 --- a/recipes-scanners/arpwatch/arpwatch_3.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -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" - -DEPENDS += "libpcap" - -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 " - -SRC_URI[sha256sum] = "ee1d15d9a07952c0c017908b9dbfd5ac988fed0058c3cc4fa6c13e0be36f3a9f" - -inherit autotools-brokensep update-rc.d useradd - -ARPWATCH_UID ?= "arpwatch" -ARPWATCH_GID ?= "arpwatch" -APRWATCH_FROM ?= "root " -ARPWATH_REPLY ?= "${ARPWATCH_UID}" - -PACKAGECONFIG ??= "" - -PACKACONFIG[email] = "-with-watcher=email=${APRWATCH_FROM} --with-watchee=email=${ARPWATH_REPLY}, , postfix, postfix postfix-cfg" - -EXTRA_OECONF:append = " --srcdir=${S}" - -CONFIGUREOPTS = " --build=${BUILD_SYS} \ - --host=${HOST_SYS} \ - --target=${TARGET_SYS} \ - --prefix=${prefix} \ - --exec_prefix=${exec_prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --oldincludedir=${oldincludedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - " - -do_configure () { - ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${mandir} - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/init.d - install -d ${D}${prefix}/etc/rc.d - install -d ${D}/var/lib/arpwatch - - oe_runmake install DESTDIR=${D} - install -m 644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir} - install -m 655 ${WORKDIR}/arpwatch_init ${D}${sysconfdir}/init.d/arpwatch - install -m 644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default -} - -INITSCRIPT_NAME = "arpwatch" -INITSCRIPT_PARAMS = "start 02 2 3 4 5 . stop 20 0 1 6 ." - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system ${ARPWATCH_UID}" -USERADD_PARAM:${PN} = "--system -g ${ARPWATCH_GID} --home-dir \ - ${localstatedir}/spool/${BPN} \ - --no-create-home --shell /bin/false ${BPN}" - -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" diff --git a/recipes-scanners/arpwatch/arpwatch_3.3.bb b/recipes-scanners/arpwatch/arpwatch_3.3.bb new file mode 100644 index 0000000..8efb339 --- /dev/null +++ b/recipes-scanners/arpwatch/arpwatch_3.3.bb @@ -0,0 +1,87 @@ +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=0f6cca2f69f384a14e2f5803210ca92e" + +DEPENDS += "libpcap" + +SRC_URI = "https://ee.lbl.gov/downloads/arpwatch/${BP}.tar.gz \ + file://arpwatch.conf \ + file://arpwatch.default \ + file://arpwatch_init \ + file://host_contam_fix.patch \ + " + +SRC_URI[sha256sum] = "d47fa8b291fc37a25a2d0f3e1b64f451dc0be82d714a10ffa6ef8b0b9e33e166" + +inherit autotools-brokensep update-rc.d useradd + +ARPWATCH_UID ?= "arpwatch" +ARPWATCH_GID ?= "arpwatch" +APRWATCH_FROM ?= "root " +ARPWATH_REPLY ?= "${ARPWATCH_UID}" + +PACKAGECONFIG ??= "" + +PACKACONFIG[email] = "-with-watcher=email=${APRWATCH_FROM} --with-watchee=email=${ARPWATH_REPLY}, , postfix, postfix postfix-cfg" + +EXTRA_OECONF:append = " --srcdir=${S}" + +CONFIGUREOPTS = " --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ + --prefix=${prefix} \ + --exec_prefix=${exec_prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --oldincludedir=${oldincludedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + " + +do_configure () { + ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${sbindir} + install -d ${D}${mandir} + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/init.d + install -d ${D}${prefix}/etc/rc.d + install -d ${D}/var/lib/arpwatch + + oe_runmake install DESTDIR=${D} + install -m 644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir} + install -m 655 ${WORKDIR}/arpwatch_init ${D}${sysconfdir}/init.d/arpwatch + install -m 644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default +} + +INITSCRIPT_NAME = "arpwatch" +INITSCRIPT_PARAMS = "start 02 2 3 4 5 . stop 20 0 1 6 ." + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system ${ARPWATCH_UID}" +USERADD_PARAM:${PN} = "--system -g ${ARPWATCH_GID} --home-dir \ + ${localstatedir}/spool/${BPN} \ + --no-create-home --shell /bin/false ${BPN}" + +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" +OMPATIBLE_HOST:libc-musl = "null" + +RDEPENDS:${PN} = "libpcap" diff --git a/recipes-scanners/arpwatch/files/host_contam_fix.patch b/recipes-scanners/arpwatch/files/host_contam_fix.patch index 7d7ffac..2e27aa4 100644 --- a/recipes-scanners/arpwatch/files/host_contam_fix.patch +++ b/recipes-scanners/arpwatch/files/host_contam_fix.patch @@ -4,11 +4,11 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Armin Kuster -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 -- cgit v1.2.3-54-g00ecf