From 9eba881355b06febfbd5dbb425010e2a0f4cc3dc Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 27 Nov 2015 20:03:46 -0800 Subject: nmap: package update to 7.0 removed integrated patch Changed LIC_FILES_CHKSUM from generic OE to a file within the package sources. Signed-off-by: Armin Kuster --- .../nmap/files/add_aarch64_to_configure.patch | 28 ------------ recipes-security/nmap/nmap_6.47.bb | 53 ---------------------- recipes-security/nmap/nmap_7.00.bb | 52 +++++++++++++++++++++ 3 files changed, 52 insertions(+), 81 deletions(-) delete mode 100644 recipes-security/nmap/files/add_aarch64_to_configure.patch delete mode 100644 recipes-security/nmap/nmap_6.47.bb create mode 100644 recipes-security/nmap/nmap_7.00.bb diff --git a/recipes-security/nmap/files/add_aarch64_to_configure.patch b/recipes-security/nmap/files/add_aarch64_to_configure.patch deleted file mode 100644 index 27b3d76..0000000 --- a/recipes-security/nmap/files/add_aarch64_to_configure.patch +++ /dev/null @@ -1,28 +0,0 @@ -nmap: Add support for aarch64* builds - -Upstream-Status: Submitted to nmap-dev - -Signed-off-by: Armin Kuster - -Index: config.sub -=================================================================== ---- a/config.sub -+++ b/config.sub -@@ -249,7 +249,7 @@ case $basic_machine in - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | am33_2.0 \ -+ | am33_2.0 | aarch64 | aarch64be \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ -@@ -343,7 +343,7 @@ case $basic_machine in - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -+ | avr-* | avr32-* | aarch64-* | aarch64be-*\ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ diff --git a/recipes-security/nmap/nmap_6.47.bb b/recipes-security/nmap/nmap_6.47.bb deleted file mode 100644 index e9ce1c9..0000000 --- a/recipes-security/nmap/nmap_6.47.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "network auditing tool" -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" - -SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ - file://add_aarch64_to_configure.patch" - -SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a" -SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591" - -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, libpcap" -PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" - -#disable/enable packages -PACKAGECONFIG[nping] = ",--without-nping," -PACKAGECONFIG[ncat] = ",--without-ncat," -PACKAGECONFIG[ndiff] = ",--without-ndiff," - -PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" - -#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 --with-liblua=included" - -do_configure() { - autoconf - oe_runconf -} - -PACKAGES = "${PN} ${PN}-dbg ${PN}-doc" - -FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/*" - -# 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)}" - -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} = "python" -RDEPENDS_${PN}-zenmap = "nmap" diff --git a/recipes-security/nmap/nmap_7.00.bb b/recipes-security/nmap/nmap_7.00.bb new file mode 100644 index 0000000..0a4e310 --- /dev/null +++ b/recipes-security/nmap/nmap_7.00.bb @@ -0,0 +1,52 @@ +SUMMARY = "network auditing tool" +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://COPYING;beginline=7;endline=12;md5=51f7052ac85aaf1a2127f7803de1261e" + +SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2" + +SRC_URI[md5sum] = "6cdf5d03cc3294b99d69dfca83f2f2ee" +SRC_URI[sha256sum] = "9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae" + +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, libpcap" +PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" + +#disable/enable packages +PACKAGECONFIG[nping] = ",--without-nping," +PACKAGECONFIG[ncat] = ",--without-ncat," +PACKAGECONFIG[ndiff] = ",--without-ndiff," + +PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" + +#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 --with-liblua=included" + +do_configure() { + autoconf + oe_runconf +} + +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)}" + +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} = "python" +RDEPENDS_${PN}-zenmap = "nmap" -- cgit v1.2.3-54-g00ecf