net-analyzer/nmap: Move to portage-stable

Local fixes no longer needed on sync with upstream.

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2015-06-25 15:23:38 -07:00
parent 00c75ee887
commit 3076170dda
9 changed files with 0 additions and 256 deletions

View File

@ -1,2 +0,0 @@
DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98
DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

View File

@ -1,10 +0,0 @@
diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
--- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200
+++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200
@@ -258,5 +258,5 @@
./config.status --recheck
makefile.dep:
- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
+ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
include makefile.dep

View File

@ -1,11 +0,0 @@
--- nmap-5.10BETA1/Target.h.org 2009-12-08 08:21:59.000000000 +0100
+++ nmap-5.10BETA1/Target.h 2009-12-08 08:22:02.000000000 +0100
@@ -99,6 +99,8 @@
#ifndef NOLUA
#include "nse_main.h"
+#else
+#include <string>
#endif
#include "portreasons.h"

View File

@ -1,21 +0,0 @@
diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
--- nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.000000000 +0100
+++ nmap-5.21/Makefile.in 2010-01-31 09:54:48.000000000 +0100
@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
install-zenmap: $(ZENMAPDIR)/setup.py
$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
# Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
# already a link.
@@ -267,7 +267,7 @@ build-ndiff:
cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
install-ndiff:
- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
NSE_FILES = scripts/script.db scripts/*.nse
NSE_LIB_LUA_FILES = nselib/*.lua

View File

@ -1,20 +0,0 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,6 +119,8 @@
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+$(NBASEDIR)/libnbase.a: nbase_build
+
build-%: %/Makefile
cd $* && $(MAKE)
@@ -152,7 +154,7 @@
liblinear_build: $(LIBLINEARDIR)/Makefile
@echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)"
-build-nmap-update: nmap-update/default_channel.h
+build-nmap-update: nbase_build nmap-update/default_channel.h
#$(LIBPCAPDIR)/Makefile:
# @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure

View File

@ -1,20 +0,0 @@
--- a/liblua/Makefile
+++ b/liblua/Makefile
@@ -11,7 +11,7 @@
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
-AR= ar rcu
+AR= ar
RANLIB= ranlib
RM= rm -f
@@ -56,7 +56,7 @@
a: $(ALL_A)
$(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
+ $(AR) rcu $@ $(BASE_O)
$(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A)

View File

@ -1,13 +0,0 @@
--- nmap-6.40/ncat/ncat_posix.c.orig 2014-02-12 17:09:12.970777567 -0800
+++ nmap-6.40/ncat/ncat_posix.c 2014-02-12 17:10:06.135387292 -0800
@@ -122,7 +122,10 @@
/* $Id$ */
#include "ncat.h"
+
+#ifdef HAVE_LUA
#include "ncat_lua.h"
+#endif
char **cmdline_split(const char *cmdexec);

View File

@ -1,18 +0,0 @@
--- a/zenmap/setup.py
+++ b/zenmap/setup.py
@@ -238,7 +238,6 @@
self.set_perms()
self.set_modules_path()
self.fix_paths()
- self.create_uninstaller()
self.write_installed_files()
def get_installed_files(self):
@@ -255,7 +254,6 @@
for dirpath, dirs, files in os.walk(os.path.join(self.install_data, data_dir)):
for dir in dirs:
installed_files.append(os.path.join(dirpath, dir))
- installed_files.append(os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
return installed_files
def create_uninstaller(self):

View File

@ -1,141 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40-r1.ebuild,v 1.3 2013/12/01 20:36:20 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
MY_P=${P/_beta/BETA}
DESCRIPTION="A utility for network exploration or security auditing"
HOMEPAGE="http://nmap.org/"
SRC_URI="
http://nmap.org/dist/${MY_P}.tar.bz2
http://dev.gentoo.org/~jer/nmap-logo-64.png
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
NMAP_PYTHON_DEPEND="
|| ( ${PYTHON_DEPS} )
"
RDEPEND="
dev-libs/libpcre
net-libs/libpcap[ipv6?]
zenmap? (
dev-python/pygtk:2
${NMAP_PYTHON_DEPEND}
)
lua? ( >=dev-lang/lua-5.2[deprecated] )
ndiff? ( ${NMAP_PYTHON_DEPEND} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
ssl? ( dev-libs/openssl )
"
DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
"
S="${WORKDIR}/${MY_P}"
src_unpack() {
# prevent unpacking the logo
unpack ${MY_P}.tar.bz2
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.75-nolua.patch \
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
"${FILESDIR}"/${PN}-5.21-python.patch \
"${FILESDIR}"/${PN}-6.01-make.patch \
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${P}-ncat-no-lua.patch \
"${FILESDIR}"/${P}-uninstaller.patch
sed -i \
-e 's/-m 755 -s ncat/-m 755 ncat/' \
ncat/Makefile.in || die
if use nls; then
local lingua=''
for lingua in ${NMAP_LINGUAS}; do
if ! use linguas_${lingua}; then
rm -rf zenmap/share/zenmap/locale/${lingua}
rm -f zenmap/share/zenmap/locale/${lingua}.po
fi
done
else
# configure/make ignores --disable-nls
for lingua in ${NMAP_LINGUAS}; do
rm -rf zenmap/share/zenmap/locale/${lingua}
rm -f zenmap/share/zenmap/locale/${lingua}.po
done
fi
sed -i \
-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
Makefile.in || die
# Fix desktop files wrt bug #432714
sed -i \
-e '/^Encoding/d' \
-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
}
src_configure() {
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_with zenmap) \
$(usex lua --with-liblua=/usr --without-liblua) \
$(use_with ncat) \
$(use_with ndiff) \
$(use_with nmap-update) \
$(use_with nping) \
$(use_with ssl openssl) \
--with-libdnet=included \
--with-pcre=/usr
}
src_compile() {
emake \
AR=$(tc-getAR) \
RANLIB=$(tc-getRANLIB )
}
src_install() {
LC_ALL=C emake -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
install
if use nmap-update;then
LC_ALL=C emake -j1 \
-C nmap-update \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
install
fi
dodoc CHANGELOG HACKING docs/README docs/*.txt
use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
}