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 <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2015-11-27 20:03:46 -08:00
parent 41bac8038a
commit 9eba881355
2 changed files with 5 additions and 34 deletions

View File

@@ -1,28 +0,0 @@
nmap: Add support for aarch64* builds
Upstream-Status: Submitted to nmap-dev
Signed-off-by: Armin Kuster <akuster@mvista.com>
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-* \

View File

@@ -3,13 +3,12 @@ DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utili
SECTION = "security"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=51f7052ac85aaf1a2127f7803de1261e"
SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \
file://add_aarch64_to_configure.patch"
SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2"
SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a"
SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591"
SRC_URI[md5sum] = "6cdf5d03cc3294b99d69dfca83f2f2ee"
SRC_URI[sha256sum] = "9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae"
inherit autotools-brokensep pkgconfig distro_features_check
@@ -38,7 +37,7 @@ do_configure() {
PACKAGES = "${PN} ${PN}-dbg ${PN}-doc"
FILES_${PN} = "${bindir}/nmap ${datadir}/nmap/*"
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)}"