net-analyzer/nmap: Old.
authorJeroen Roovers <jer@gentoo.org>
Sat, 11 Feb 2017 13:47:56 +0000 (14:47 +0100)
committerJeroen Roovers <jer@gentoo.org>
Sat, 11 Feb 2017 13:47:56 +0000 (14:47 +0100)
Package-Manager: Portage-2.3.3, Repoman-2.3.1

net-analyzer/nmap/Manifest
net-analyzer/nmap/files/nmap-4.75-nolua.patch [deleted file]
net-analyzer/nmap/files/nmap-6.47-no-libnl.patch [deleted file]
net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch [deleted file]
net-analyzer/nmap/nmap-7.12.ebuild [deleted file]

index da4382c6b42e470755608d5502e97073ddc62b7f..ec28c225d14d85b6cc042460b548a8227919b87a 100644 (file)
@@ -1,4 +1,3 @@
-DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
deleted file mode 100644 (file)
index 21f0e1f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -258,5 +258,5 @@
-       ./config.status --recheck
- makefile.dep:
--      $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
-+      $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
- include makefile.dep
diff --git a/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch b/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
deleted file mode 100644 (file)
index 0e0c6b7..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-nping does not call anything nl_* related so it should not link against libnl (bug #529244)
-Patching configure.ac would be best but eautoreconf does not handle the subdirs very well.
-
---- a/nping/configure
-+++ b/nping/configure
-@@ -4865,64 +4865,6 @@
- fi
--# libpcap can require libnl
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_handle_alloc" >&5
--$as_echo_n "checking for library containing nl_handle_alloc... " >&6; }
--if ${ac_cv_search_nl_handle_alloc+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_func_search_save_LIBS=$LIBS
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char nl_handle_alloc ();
--int
--main ()
--{
--return nl_handle_alloc ();
--  ;
--  return 0;
--}
--_ACEOF
--for ac_lib in '' nl; do
--  if test -z "$ac_lib"; then
--    ac_res="none required"
--  else
--    ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--  fi
--  if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_search_nl_handle_alloc=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext
--  if ${ac_cv_search_nl_handle_alloc+:} false; then :
--  break
--fi
--done
--if ${ac_cv_search_nl_handle_alloc+:} false; then :
--
--else
--  ac_cv_search_nl_handle_alloc=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nl_handle_alloc" >&5
--$as_echo "$ac_cv_search_nl_handle_alloc" >&6; }
--ac_res=$ac_cv_search_nl_handle_alloc
--if test "$ac_res" != no; then :
--  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
--
--fi
--
--
- # We test whether they specified openssl desires explicitly
- use_openssl="yes"
- specialssldir=""
diff --git a/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch
deleted file mode 100644 (file)
index 3839754..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -41,7 +41,6 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
---- a/nsock/src/Makefile.in
-+++ b/nsock/src/Makefile.in
-@@ -13,7 +13,6 @@
- CCOPT = 
- DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
- INCLS = -I../include
- CFLAGS = @CFLAGS@ $(CCOPT)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
---- a/nping/Makefile.in
-+++ b/nping/Makefile.in
-@@ -38,7 +38,6 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
---- a/libnetutil/Makefile.in
-+++ b/libnetutil/Makefile.in
-@@ -5,7 +5,6 @@
- CXXFLAGS = @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@ $(DEFS)
- DEFS = @DEFS@
--DEFS += -D_FORTIFY_SOURCE=2
- AR = ar
- RANLIB = @RANLIB@
---- a/ncat/Makefile.in
-+++ b/ncat/Makefile.in
-@@ -53,7 +53,6 @@
- LIBS = @LIBS@
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
- INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
- RM = rm -f
- STRIP = @STRIP@
---- a/nbase/Makefile.in
-+++ b/nbase/Makefile.in
-@@ -12,7 +12,6 @@
- CCOPT = 
- DEFS = @DEFS@
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC = 
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -11,7 +11,7 @@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@ $(NBASELIB)
--DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@
- APR_LIBS = @APR_LIBS@
- SVN_LIBS = @SVN_LIBS@
diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
deleted file mode 100644 (file)
index b36e279..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-       http://nmap.org/dist/${MY_P}.tar.bz2
-       https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-       system-lua? ( nse )
-       ndiff? ( ${PYTHON_REQUIRED_USE} )
-       zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-       dev-libs/liblinear:=
-       dev-libs/libpcre
-       net-libs/libpcap
-       zenmap? (
-               dev-python/pygtk:2[${PYTHON_USEDEP}]
-               ${PYTHON_DEPS}
-       )
-       system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-       ndiff? ( ${PYTHON_DEPS} )
-       nls? ( virtual/libintl )
-       nmap-update? ( dev-libs/apr dev-vcs/subversion )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-"
-DEPEND="
-       ${RDEPEND}
-       nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if use ndiff || use zenmap; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-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.46-uninstaller.patch \
-               "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-               "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
-               "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-
-       if use nls; then
-               local lingua=''
-               for lingua in ${NMAP_LINGUAS[@]}; do
-                       if ! use linguas_${lingua}; then
-                               rm -r zenmap/share/zenmap/locale/${lingua} || die
-                               rm zenmap/share/zenmap/locale/${lingua}.po || die
-                       fi
-               done
-       else
-               # configure/make ignores --disable-nls
-               for lingua in ${NMAP_LINGUAS[@]}; do
-                       rm -r zenmap/share/zenmap/locale/${lingua} || die
-                       rm zenmap/share/zenmap/locale/${lingua}.po || die
-               done
-       fi
-
-       sed -i \
-               -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-               Makefile.in || die
-
-       sed -i \
-               -e '/rm -f $@/d' \
-               $(find . -name 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 nse --with-liblua=$(usex system-lua /usr included '' '') --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
-       #       --with-liblinear=/usr \
-       #       Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-       local directory
-       for directory in . libnetutil nsock/src \
-               $(usex ncat ncat '') \
-               $(usex nmap-update nmap-update '') \
-               $(usex nping nping '')
-       do
-               emake -C "${directory}" makefile.dep
-       done
-
-       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
-
-       if use zenmap; then
-               doicon "${DISTDIR}/nmap-logo-64.png"
-               python_optimize
-       fi
-}