diff options
author | Armin Kuster <akuster808@gmail.com> | 2015-01-13 23:06:39 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2015-02-01 10:21:23 -0800 |
commit | cfd9713682a03bc8b9f0cd2045b9a14b36b1f9fe (patch) | |
tree | 0322dacf189dc8d71b37955eaf0c805c9c2e7864 | |
parent | a456a33628be343e9291a42e652c6958273e2148 (diff) | |
download | meta-security-cfd9713682a03bc8b9f0cd2045b9a14b36b1f9fe.tar.gz |
nmap: fix QA issue
WARNING: QA Issue: nmap requires /usr/bin/python, but no providers in its RDEPENDS [file-rdeps]
move nmap.inc back into recipe
colapse ${BPN}-${PV} to ${BP}
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/nmap/nmap.inc | 46 | ||||
-rw-r--r-- | recipes-security/nmap/nmap_6.47.bb | 52 |
2 files changed, 48 insertions, 50 deletions
diff --git a/recipes-security/nmap/nmap.inc b/recipes-security/nmap/nmap.inc deleted file mode 100644 index 79fe7d4..0000000 --- a/recipes-security/nmap/nmap.inc +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | SUMMARY = "network auditing tool" | ||
2 | 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" | ||
3 | SECTION = "security" | ||
4 | LICENSE = "GPL-2.0" | ||
5 | |||
6 | inherit autotools-brokensep pkgconfig distro_features_check | ||
7 | |||
8 | PACKAGECONFIG = "ncat nping ndiff pcap lua" | ||
9 | PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}" | ||
10 | |||
11 | PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" | ||
12 | PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" | ||
13 | |||
14 | #disable/enable packages | ||
15 | PACKAGECONFIG[nping] = ",--without-nping," | ||
16 | PACKAGECONFIG[ncat] = ",--without-ncat," | ||
17 | PACKAGECONFIG[ndiff] = ",--without-ndiff," | ||
18 | |||
19 | #use nmap's Included or system's libs | ||
20 | PACKAGECONFIG[lua] = "--with-liblua=${STAGING_LIBDIR}/.., --without-liblua, lua" | ||
21 | PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" | ||
22 | |||
23 | #Add gui | ||
24 | 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+" | ||
25 | |||
26 | EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion" | ||
27 | |||
28 | do_configure() { | ||
29 | autoconf | ||
30 | oe_runconf | ||
31 | } | ||
32 | |||
33 | PACKAGES = "${PN} ${PN}-dbg ${PN}-doc" | ||
34 | |||
35 | FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/*" | ||
36 | |||
37 | # append packages if enabled | ||
38 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ncat", "${bindir}/ncat ${target_datadir}/ncat", "", d)}" | ||
39 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "nping", "${bindir}/nping", "", d)}" | ||
40 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ndiff", "${bindir}/ndiff ${libdir}/python${PYTHON_BASEVERSION}/site-packages/ndiff.py*", "", d)}" | ||
41 | |||
42 | PACKAGES += "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${PN}-zenmap", "", d)}" | ||
43 | |||
44 | 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)}" | ||
45 | |||
46 | RDEPENDS_${PN}-zenmap = "nmap" | ||
diff --git a/recipes-security/nmap/nmap_6.47.bb b/recipes-security/nmap/nmap_6.47.bb index bcaee0c..2c43bf7 100644 --- a/recipes-security/nmap/nmap_6.47.bb +++ b/recipes-security/nmap/nmap_6.47.bb | |||
@@ -1,10 +1,54 @@ | |||
1 | 1 | SUMMARY = "network auditing tool" | |
2 | include nmap.inc | 2 | 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" |
3 | SECTION = "security" | ||
4 | LICENSE = "GPL-2.0" | ||
3 | 5 | ||
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | 6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" |
5 | 7 | ||
6 | SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2" | 8 | SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2" |
7 | |||
8 | 9 | ||
9 | SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a" | 10 | SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a" |
10 | SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591" | 11 | SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591" |
12 | |||
13 | inherit autotools-brokensep pkgconfig distro_features_check | ||
14 | |||
15 | PACKAGECONFIG = "ncat nping ndiff pcap lua" | ||
16 | PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}" | ||
17 | |||
18 | PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" | ||
19 | PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" | ||
20 | |||
21 | #disable/enable packages | ||
22 | PACKAGECONFIG[nping] = ",--without-nping," | ||
23 | PACKAGECONFIG[ncat] = ",--without-ncat," | ||
24 | PACKAGECONFIG[ndiff] = ",--without-ndiff," | ||
25 | |||
26 | #use nmap's Included or system's libs | ||
27 | PACKAGECONFIG[lua] = "--with-liblua=${STAGING_LIBDIR}/.., --without-liblua, lua" | ||
28 | PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" | ||
29 | |||
30 | #Add gui | ||
31 | 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+" | ||
32 | |||
33 | EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion" | ||
34 | |||
35 | do_configure() { | ||
36 | autoconf | ||
37 | oe_runconf | ||
38 | } | ||
39 | |||
40 | PACKAGES = "${PN} ${PN}-dbg ${PN}-doc" | ||
41 | |||
42 | FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/*" | ||
43 | |||
44 | # append packages if enabled | ||
45 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ncat", "${bindir}/ncat ${target_datadir}/ncat", "", d)}" | ||
46 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "nping", "${bindir}/nping", "", d)}" | ||
47 | FILES_${PN} += "${@bb.utils.contains("PACKAGECONFIG", "ndiff", "${bindir}/ndiff ${libdir}/python${PYTHON_BASEVERSION}/site-packages/ndiff.py*", "", d)}" | ||
48 | |||
49 | PACKAGES += "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${PN}-zenmap", "", d)}" | ||
50 | |||
51 | 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)}" | ||
52 | |||
53 | RDEPENDS_${PN} = "python" | ||
54 | RDEPENDS_${PN}-zenmap = "nmap" | ||