diff options
Diffstat (limited to 'recipes-security')
3 files changed, 0 insertions, 139 deletions
diff --git a/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch b/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch deleted file mode 100644 index 356b507..0000000 --- a/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | [PATCH] redefine the python library install dir | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | If install-lib is not defined, it is always /usr/lib/, but it | ||
6 | maybe /usr/lib64 for multilib | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | --- | ||
10 | Makefile.in | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile.in b/Makefile.in | ||
14 | index 1bb062c..cced2fb 100644 | ||
15 | --- a/Makefile.in | ||
16 | +++ b/Makefile.in | ||
17 | @@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py | ||
18 | |||
19 | install-zenmap: $(ZENMAPDIR)/setup.py | ||
20 | $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
21 | - cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") | ||
22 | + cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)") | ||
23 | $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ | ||
24 | # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is | ||
25 | # already a link. | ||
26 | @@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD | ||
27 | @cd $(NPINGDIR) && $(MAKE) | ||
28 | |||
29 | install-ndiff: | ||
30 | - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") | ||
31 | + cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") | ||
32 | |||
33 | NSE_FILES = scripts/script.db scripts/*.nse | ||
34 | NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc | ||
35 | -- | ||
36 | 1.9.1 | ||
37 | |||
diff --git a/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch b/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch deleted file mode 100644 index cfe043a..0000000 --- a/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | [PATCH] replace "./shtool mkdir" with coreutils mkdir command | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | "./shtool mkdir" is used when mkdir has not -p parameter, but mkdir in today | ||
6 | most release has supportted the -p parameter, not need to use shtool, and it | ||
7 | can not fix the race if two process are running mkdir to create same dir | ||
8 | |||
9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
10 | --- | ||
11 | ncat/Makefile.in | 4 ++-- | ||
12 | nmap-update/Makefile.in | 2 +- | ||
13 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/ncat/Makefile.in b/ncat/Makefile.in | ||
16 | index cfd306d..2166e08 100644 | ||
17 | --- a/ncat/Makefile.in | ||
18 | +++ b/ncat/Makefile.in | ||
19 | @@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile | ||
20 | |||
21 | install: $(TARGET) | ||
22 | @echo Installing Ncat; | ||
23 | - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
24 | + mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
25 | $(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat | ||
26 | $(STRIP) -x $(DESTDIR)$(bindir)/ncat | ||
27 | if [ -n "$(DATAFILES)" ]; then \ | ||
28 | - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgdatadir); \ | ||
29 | + mkdir -p -m 755 $(DESTDIR)$(pkgdatadir); \ | ||
30 | $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \ | ||
31 | fi | ||
32 | $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 | ||
33 | diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in | ||
34 | index 89ff928..93f48d8 100644 | ||
35 | --- a/nmap-update/Makefile.in | ||
36 | +++ b/nmap-update/Makefile.in | ||
37 | @@ -37,7 +37,7 @@ $(NBASELIB): | ||
38 | cd $(NBASEDIR) && $(MAKE) | ||
39 | |||
40 | install: nmap-update | ||
41 | - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
42 | + mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
43 | $(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir) | ||
44 | $(STRIP) -x $(DESTDIR)$(bindir)/nmap-update | ||
45 | $(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/ | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||
diff --git a/recipes-security/nmap/nmap_7.60.bb b/recipes-security/nmap/nmap_7.60.bb deleted file mode 100644 index a6616eb..0000000 --- a/recipes-security/nmap/nmap_7.60.bb +++ /dev/null | |||
@@ -1,54 +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 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=700c690f4ca6b1754f3f1db8645e42d9" | ||
7 | |||
8 | SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ | ||
9 | file://nmap-redefine-the-python-library-dir.patch \ | ||
10 | file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "4e454266559ddf2c4e2109866c62560c" | ||
14 | SRC_URI[sha256sum] = "a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21" | ||
15 | |||
16 | inherit autotools-brokensep pkgconfig pythonnative distro_features_check | ||
17 | |||
18 | PACKAGECONFIG ?= "ncat nping ndiff pcap" | ||
19 | PACKAGECONFIG += " ${@bb.utils.contains('IMAGE_FEATURES', 'x11-base', 'zenmap', '', d)}" | ||
20 | |||
21 | PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" | ||
22 | PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" | ||
23 | PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" | ||
24 | PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" | ||
25 | PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" | ||
26 | |||
27 | #disable/enable packages | ||
28 | PACKAGECONFIG[nping] = ",--without-nping," | ||
29 | PACKAGECONFIG[ncat] = ",--without-ncat," | ||
30 | PACKAGECONFIG[ndiff] = ",--without-ndiff,python" | ||
31 | PACKAGECONFIG[update] = ",--without-nmap-update," | ||
32 | |||
33 | #Add gui | ||
34 | 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+" | ||
35 | |||
36 | EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included" | ||
37 | |||
38 | export PYTHON_SITEPACKAGES_DIR | ||
39 | |||
40 | do_configure() { | ||
41 | # strip hard coded python2# | ||
42 | sed -i -e 's=python2\.*=python=g' ${S}/configure.ac | ||
43 | sed -i -e 's=python2\.*=python=g' ${S}/configure | ||
44 | autoconf | ||
45 | oe_runconf | ||
46 | } | ||
47 | |||
48 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'zenmap', '${PN}-zenmap', '', d)}" | ||
49 | |||
50 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" | ||
51 | FILES_${PN}-zenmap = "${@bb.utils.contains("PACKAGECONFIG", "zenmap", "${bindir}/*zenmap ${bindir}/xnmap ${datadir}/applications/* ${bindir}/nmapfe ${datadir}/zenmap/* ${PYTHON_SITEPACKAGES_DIR}/radialnet/* ${PYTHON_SITEPACKAGES_DIR}/zenmap*", "", d)}" | ||
52 | |||
53 | RDEPENDS_${PN} = "python" | ||
54 | RDEPENDS_${PN}-zenmap = "nmap" | ||