Skip to contentSkip to conversation

nmap: fix several new QA warnings.

PATCH New Armin Kuster 1 participant 2 messages Jun 4, 2016

lore
Share & tools
lore

Armin Kuster

author
#0 lore raw

PATCH 1/2 nmap: fix several new QA warnings.

WARNING: nmap-7.12-r0 do_package: QA Issue: nmap: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/bin/ndiff
/usr/bin/nping
/usr/bin/ncat
/usr/lib/python2.7
/usr/lib/python2.7/site-packages
/usr/lib/python2.7/site-packages/ndiff.pyc
/usr/lib/python2.7/site-packages/ndiff.py
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
nmap: 8 installed and not shipped files. [installed-vs-shipped]

remove crazyness and let the system figure out packaging info remove ndiff.py* as the compiled version is installed in /usr/bin
and remove the leftover python site-package cruft.

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-security/nmap/nmap_7.12.bb | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)
recipes-security/nmap/nmap_7.12.bb +9 -14
index 47cd7b6..dadff3d 100644
@@ -10,10 +10,10 @@ SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2"
 SRC_URI[md5sum] = "0764f4dabe7cccda3c49fc3990b62a8a"
 SRC_URI[sha256sum] = "63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04"
 
-inherit autotools-brokensep pkgconfig distro_features_check
+inherit autotools-brokensep pkgconfig python-dir distro_features_check
 
-PACKAGECONFIG = "ncat nping ndiff pcap"
-PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}"
+PACKAGECONFIG ?= "ncat nping ndiff pcap"
+PACKAGECONFIG += " ${@bb.utils.contains('IMAGE_FEATURES', 'x11-base', 'zenmap', '', d)}"
 
 PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
 PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl"

@@ -38,19 +38,14 @@ do_configure() {
     oe_runconf
 }
 
+do_install_append () {
+   # remove python dir, its not used or installed
+   rm -fr ${D}/${libdir}
+}
 
-PACKAGES = "${PN} ${PN}-dbg ${PN}-doc"
-
-FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/* ${bindir}/uninstall_ndiff"
-
-# append packages if enabled
-FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ncat", "${bindir}/ncat ${target_datadir}/ncat", "", d)}"
-FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "nping", "${bindir}/nping", "", d)}"
-FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ndiff", "${bindir}/ndiff ${libdir}/python${PYTHON_BASEVERSION}/site-packages/ndiff.py*", "", d)}"
-
-PACKAGES += "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${PN}-zenmap", "", d)}"
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'zenmap', '${PN}-zenmap', '', d)}"
 
-FILES_${PN}-zenmap = "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${bindir}/*zenmap ${bindir}/xnmap ${datadir}/applications/*  ${bindir}/nmapfe ${datadir}/zenmap/* ${libdir}/python${PYTHON_BASEVERSION}/site-packages/radialnet/* ${libdir}/python${PYTHON_BASEVERSION}/site-packages/zenmap*", "", d)}"
+FILES_${PN}-zenmap = "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${bindir}/*zenmap ${bindir}/xnmap ${datadir}/applications/*  ${bindir}/nmapfe ${datadir}/zenmap/* ${PYTHON_SITEPACKAGES_DIR}/radialnet/* ${PYTHON_SITEPACKAGES_DIR}/zenmap*", "", d)}"
 
 RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}-zenmap = "nmap"
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 samhain: update to 4.1.4

4.1.4:
- Fix for issues with re-evaluation of paths with wildcard patterns:
- no re-evaluation if no match at process startup
- if same pattern used for a file=.. and dir=.. directive, only one (the first in config file) is re-evaluated

- Fix for issues with new directories created when inotify is used:
- recursion depth is not properly set for new directory
- directory gets watched even if recursion depth should be below zero

4.1.3:
- Fix for a regression in DNS resolving if samhain is compiled with '--enable-static'

- On Cygwin/Windows, the default for the 'AvoidBlock' option is now 'off' because of problems reported for this platform.

Signed-off-by Armin Kuster <[email protected]>
---
 .../samhain/{samhain-client_4.1.2.bb => samhain-client_4.1.4.bb}      | 0
 .../samhain/{samhain-server_4.1.2.bb => samhain-server_4.1.4.bb}      | 0
 recipes-security/samhain/samhain.inc                                  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes-security/samhain/{samhain-client_4.1.2.bb => samhain-client_4.1.4.bb} (100%)
 rename recipes-security/samhain/{samhain-server_4.1.2.bb => samhain-server_4.1.4.bb} (100%)
recipes-security/samhain/samhain-client_4.1.4.bb renamed from recipes-security/samhain/samhain-client_4.1.2.bb +0 -0
similarity index 100%
rename from recipes-security/samhain/samhain-client_4.1.2.bb
rename to recipes-security/samhain/samhain-client_4.1.4.bb
recipes-security/samhain/samhain-server_4.1.4.bb renamed from recipes-security/samhain/samhain-server_4.1.2.bb +0 -0
similarity index 100%
rename from recipes-security/samhain/samhain-server_4.1.2.bb
rename to recipes-security/samhain/samhain-server_4.1.4.bb
recipes-security/samhain/samhain.inc +2 -2
index 5c0142b..907f431 100644
@@ -9,8 +9,8 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
 	   file://${INITSCRIPT_NAME}.default \
 	  "
 
-SRC_URI[md5sum] = "9112612fe569a0c92c7479ed2ef3b6f0"
-SRC_URI[sha256sum] = "bb32321b3dc8450351d99e90d25182a029bef1e46b9a0439ade1ca0a744eadb8"
+SRC_URI[md5sum] = "1ab697b7000d0a272d9ade05bb1bc6e0"
+SRC_URI[sha256sum] = "32ee7477af11d9f2f64f30b9cb316c351897c1c994c7b98b0ef17fc0ca5e1d1a"
 
 S = "${WORKDIR}/samhain-${PV}"
Signature · 1 line
1.9.1