net-analyzer/nmap: Version bump.
authorJeroen Roovers <jer@gentoo.org>
Fri, 22 Jul 2016 05:46:11 +0000 (07:46 +0200)
committerJeroen Roovers <jer@gentoo.org>
Fri, 22 Jul 2016 05:47:24 +0000 (07:47 +0200)
Package-Manager: portage-2.3.0

net-analyzer/nmap/Manifest
net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch [moved from net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch with 85% similarity]
net-analyzer/nmap/nmap-7.25_beta1.ebuild [new file with mode: 0644]
net-analyzer/nmap/nmap-9999.ebuild

index ae873971c93af5bc765270b4c64a06d2be718ddf..fb8f011ab86a6496bf0359f9fce3c8719745762e 100644 (file)
@@ -2,4 +2,5 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-7.11.tar.bz2 8960056 SHA256 13fa971555dec00e495a5b72c1f9efa1363b8e6c7388a2f05117cb0778c0954a SHA512 d64481afaa1cb1e70261a21ccff935bb7d45966f78f03a653d0cd32719bd7b13c05938716f906eb9f4b12d80ac772fb7e4dd434048fb947712267d73073f69f5 WHIRLPOOL e22b6bf9019f45d1c2017be0ca7f129bdc40d09df597b3ae50280dd6c9c67839b989fb562520d1c46f617c5280e7e10f35d0e42f8be4a033cc0f0250e0dd999e
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
+DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
similarity index 85%
rename from net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch
rename to net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
index 5f79238d19a3849840606e48a3a1c97d685d0aef..85594038bf6f4d5cc069131843d8e9c6cc8d6d87 100644 (file)
@@ -1,14 +1,25 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@
- # 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.
+--- a/nbase/Makefile.in
++++ b/nbase/Makefile.in
+@@ -12,7 +12,7 @@
+ CCOPT = 
+ DEFS = @DEFS@
+ # With GCC, add extra security checks to source code.
 -DEFS += -D_FORTIFY_SOURCE=2
-+#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
++DEFS += 
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
+ STATIC = 
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -53,7 +53,7 @@
+ LIBS = @LIBS@
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
+ RM = rm -f
+ STRIP = @STRIP@
 --- a/nsock/src/Makefile.in
 +++ b/nsock/src/Makefile.in
 @@ -13,7 +13,7 @@
  DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
  # With GCC, add extra security checks to source code.
 -DEFS += -D_FORTIFY_SOURCE=2
-+#DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
  INCLS = -I../include
  CFLAGS = @CFLAGS@ $(CCOPT)
  # CFLAGS = -g -Wall $(DEFS) $(INCLS)
---- a/nping/Makefile.in
-+++ b/nping/Makefile.in
-@@ -37,7 +37,7 @@
- # 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
-+#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,7 @@
  CPPFLAGS = @CPPFLAGS@ $(DEFS)
  DEFS = @DEFS@
 -DEFS += -D_FORTIFY_SOURCE=2
-+#DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
  AR = ar
  RANLIB = @RANLIB@
  
---- a/ncat/Makefile.in
-+++ b/ncat/Makefile.in
-@@ -52,7 +52,7 @@
- LIBS = @LIBS@
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
- # With GCC, add extra security checks to source code.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,7 +41,7 @@
+ # 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
-+#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
-@@ -11,7 +11,7 @@
- CCOPT = 
- DEFS = @DEFS@
- # With GCC, add extra security checks to source code.
++DEFS += 
+ # 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/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -38,7 +38,7 @@
+ # 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
-+#DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC = 
++DEFS += 
+ # 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/nmap-update/Makefile.in
 +++ b/nmap-update/Makefile.in
-@@ -10,7 +10,7 @@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
+@@ -12,7 +12,7 @@
  LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@ $(NBASELIB)
+ MAC_FLAGS =
+ LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS)
 -DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@
++DEFS = @DEFS@ 
  APR_LIBS = @APR_LIBS@
  SVN_LIBS = @SVN_LIBS@
-
diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
new file mode 100644 (file)
index 0000000..979b7b5
--- /dev/null
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 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[ipv6?]
+       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.25-liblua-ar.patch \
+               "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.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
+}
index 813a279b2ef831eee61870b2f6bb082a1116e99e..bfeb1ee80dfbf08fa29a8b68d5d09c499364a7d3 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -67,7 +67,7 @@ src_prepare() {
                "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
                "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
                "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-               "${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch
+               "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 
        if use nls; then
                local lingua=''