From 1f28cd51dcd762ebbb22510aed868f1661541252 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 19 Aug 2014 23:11:14 -0700 Subject: nmap: Add gui support Add zenmap to work with gtk+/x11 Signed-off-by: Armin Kuster --- recipes-security/nmap/nmap_6.46.bb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes-security/nmap/nmap_6.46.bb b/recipes-security/nmap/nmap_6.46.bb index 6fe3c6b..573187d 100644 --- a/recipes-security/nmap/nmap_6.46.bb +++ b/recipes-security/nmap/nmap_6.46.bb @@ -1,5 +1,5 @@ SUMMARY = "network auditing tool" -DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing." +DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" SECTION = "security" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" @@ -9,9 +9,10 @@ SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "5a36ad3a63d5b7ea5514f745a397436a" SRC_URI[sha256sum] = "3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig distro_features_check PACKAGECONFIG ??= "ncat nping ndiff pcap" +PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap" PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" @@ -25,7 +26,10 @@ PACKAGECONFIG[ndiff] = ",--without-ndiff," PACKAGECONFIG[lua] = "--with-liblua=${STAGING_LIBDIR}/.., --with-liblua=included, lua" PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" -EXTRA_OECONF = "--without-zenmap" +#Add gui +PACKAGECONFIG[zenmap] = "--with-zenmap, --without-zenmap, gtk+ python-core python-codecs python-io python-logging python-unittest python-xml python-netclient python-doctest python-subprocess python-pygtk, python-core python-codecs python-io python-logging python-netclient python-xml python-unittest python-doctest python-subprocess python-pygtk gtk+" + +EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion" do_configure() { autoconf @@ -41,10 +45,8 @@ FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ncat", "${bindir}/ncat ${ 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*", "", d)}" -# should add a conditional for "--without-zenmap" test. -# zenmap builds if the below are uncommented. Not tested -#PACKAGES =+ "${PN}-zenmap" -#FILES_${PN}-zenmap = "/usr/share/zenmap/*" - +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)}" +RDEPENDS_${PN}-zenmap = "nmap" -- cgit v1.2.3-54-g00ecf