Skip to contentSkip to conversation

cleanup and update

PATCH New Armin Kuster 1 participant 4 messages Sep 2, 2014

lore
Share & tools
lore
#0 lore raw

cover cleanup and update

Armin Kuster (3):
libnet-ssleay-perl: remove from layer
layer.conf: add layer depends.
nmap: update to version 6.47

 conf/layer.conf                                  |  2 ++
 recipes-security/nmap/{nmap_6.46.bb => nmap.inc} |  8 +-------
 recipes-security/nmap/nmap_6.47.bb               | 10 ++++++++++
 recipes-security/perl/libnet-ssleay-perl_1.55.bb | 24 ------------------------
 4 files changed, 13 insertions(+), 31 deletions(-)
 rename recipes-security/nmap/{nmap_6.46.bb => nmap.inc} (88%)
 create mode 100644 recipes-security/nmap/nmap_6.47.bb
 delete mode 100644 recipes-security/perl/libnet-ssleay-perl_1.55.bb
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/3 libnet-ssleay-perl: remove from layer

libnet-ssleay-perl is now in meta-perl

---
 recipes-security/perl/libnet-ssleay-perl_1.55.bb | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 recipes-security/perl/libnet-ssleay-perl_1.55.bb
recipes-security/perl/libnet-ssleay-perl_1.55.bb deleted +0 -24
deleted file mode 100644
index 1dd59f4..0000000
@@ -1,24 +0,0 @@
-DESCRIPTION = "Perl module for using OpenSSL"
-
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-
-LIC_FILES_CHKSUM = "file://README;md5=94ec8036b939a2e3c9b5e7f10af8f4ee"
-
-DEPENDS += "perl openssl"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "473b8d66ca69d5784bb0e428721f58e0"
-SRC_URI[sha256sum] = "8cd5f09722e07b4e436102cb3a4b93623d753c171665ca9752c3b39a62ea3a79"
-
-S = "${WORKDIR}/Net-SSLeay-${PV}"
-
-EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto -lz'"
-
-inherit cpan
-
-do_compile() {
-	export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
-	cpan_do_compile
-}
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 layer.conf: add layer depends.

In reply to Armin Kuster

added layerdepends check for perl-layer and opemembedded-layer

---
 conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)
conf/layer.conf +2 -0
index 063268d..c5a717b 100644
@@ -8,3 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "security"
 BBFILE_PATTERN_security = "^${LAYERDIR}/"
 BBFILE_PRIORITY_security = "6"
+
+LAYERDEPENDS_security = "openembedded-layer perl-layer"
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/3 nmap: update to version 6.47

In reply to Armin Kuster

for list of changes see:
http://seclists.org/nmap-dev/2014/q3/335

use nmap.inc to house most code.

---
 recipes-security/nmap/{nmap_6.46.bb => nmap.inc} |  8 +-------
 recipes-security/nmap/nmap_6.47.bb               | 10 ++++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename recipes-security/nmap/{nmap_6.46.bb => nmap.inc} (88%)
 create mode 100644 recipes-security/nmap/nmap_6.47.bb
recipes-security/nmap/nmap.inc renamed from recipes-security/nmap/nmap_6.46.bb +1 -7
similarity index 88%
rename from recipes-security/nmap/nmap_6.46.bb
rename to recipes-security/nmap/nmap.inc
index a04dc7b..79fe7d4 100644
@@ -2,12 +2,6 @@ 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/${BPN}-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "5a36ad3a63d5b7ea5514f745a397436a"
-SRC_URI[sha256sum] = "3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137"
 
 inherit autotools-brokensep pkgconfig distro_features_check
 
@@ -43,7 +37,7 @@ 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*", "", 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)}"
 
recipes-security/nmap/nmap_6.47.bb new file +10 -0
new file mode 100644
index 0000000..bcaee0c
@@ -0,0 +1,10 @@
+
+include nmap.inc
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI = "http://nmap.org/dist/${BPN}-${PV}.tar.bz2"
+
+
+SRC_URI[md5sum] = "edfe81f6763223c0a29bfa15a8526e2a"
+SRC_URI[sha256sum] = "8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591"
Signature · 1 line
1.9.1