zerochaos 15/05/12 16:06:37
Modified: nmap-9999.ebuild metadata.xml nmap-6.47-r2.ebuild
nmap-6.47-r1.ebuild ChangeLog
Log:
fix build for 9999, rename lua->nse (9999 only for now) bug #529688, fix
ambiguous openssl slot dep
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
DD11F94A)
Revision Changes Path
1.3 net-analyzer/nmap/nmap-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?r1=1.2&r2=1.3
Index: nmap-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nmap-9999.ebuild 26 Jan 2015 12:08:35 -0000 1.2
+++ nmap-9999.ebuild 12 May 2015 16:06:37 -0000 1.3
@@ -1,32 +1,40 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.2
2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.3
2015/05/12 16:06:37 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 subversion toolchain-funcs
+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/";
-ESVN_REPO_URI="https://svn.nmap.org/nmap";
-SRC_URI="
- http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit subversion
+ ESVN_REPO_URI="https://svn.nmap.org/nmap";
+ SRC_URI="http://dev.gentoo.org/~jer/nmap-logo-64.png";
+ KEYWORDS=""
+else
+ SRC_URI="
+ http://nmap.org/dist/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~jer/nmap-logo-64.png
+ "
+ 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"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
REQUIRED_USE="
- system-lua? ( lua )
+ system-lua? ( nse )
ndiff? ( ${PYTHON_REQUIRED_USE} )
zenmap? ( ${PYTHON_REQUIRED_USE} )
"
@@ -43,7 +51,7 @@
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0= )
"
DEPEND="
${RDEPEND}
@@ -67,7 +75,7 @@
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
+ "${FILESDIR}"/${PN}-9999-no-FORTIFY_SOURCE.patch
if use nls; then
local lingua=''
@@ -106,7 +114,7 @@
$(use_enable ipv6) \
$(use_enable nls) \
$(use_with zenmap) \
- $(usex lua --with-liblua=$(usex system-lua /usr included '' '')
--without-liblua) \
+ $(usex nse --with-liblua=$(usex system-lua /usr included '' '')
--without-liblua) \
$(use_with ncat) \
$(use_with ndiff) \
$(use_with nmap-update) \
1.13 net-analyzer/nmap/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.13&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.13&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?r1=1.12&r2=1.13
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml 18 Nov 2014 14:48:10 -0000 1.12
+++ metadata.xml 12 May 2015 16:06:37 -0000 1.13
@@ -9,6 +9,7 @@
<flag name="ndiff">Install the ndiff utility</flag>
<flag name="nmap-update">Install nmap-update, which uses
<pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home
directory</flag>
<flag name="nping">Install the nping utility</flag>
+<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
</use>
</pkgmetadata>
1.2 net-analyzer/nmap/nmap-6.47-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild?r1=1.1&r2=1.2
Index: nmap-6.47-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nmap-6.47-r2.ebuild 26 Jan 2015 12:08:35 -0000 1.1
+++ nmap-6.47-r2.ebuild 12 May 2015 16:06:37 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.1
2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.2
2015/05/12 16:06:37 zerochaos Exp $
EAPI=5
@@ -43,7 +43,7 @@
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0= )
"
DEPEND="
${RDEPEND}
1.14 net-analyzer/nmap/nmap-6.47-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild?r1=1.13&r2=1.14
Index: nmap-6.47-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nmap-6.47-r1.ebuild 3 Dec 2014 09:57:43 -0000 1.13
+++ nmap-6.47-r1.ebuild 12 May 2015 16:06:37 -0000 1.14
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v
1.13 2014/12/03 09:57:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r1.ebuild,v
1.14 2015/05/12 16:06:37 zerochaos Exp $
EAPI=5
@@ -43,7 +43,7 @@
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0= )
"
DEPEND="
${RDEPEND}
1.335 net-analyzer/nmap/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.335&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.335&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.334&r2=1.335
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- ChangeLog 26 Jan 2015 12:08:35 -0000 1.334
+++ ChangeLog 12 May 2015 16:06:37 -0000 1.335
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/nmap
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.334
2015/01/26 12:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.335
2015/05/12 16:06:37 zerochaos Exp $
+
+ 12 May 2015; Rick Farina <[email protected]>
+ +files/nmap-9999-no-FORTIFY_SOURCE.patch, metadata.xml, nmap-6.47-r1.ebuild,
+ nmap-6.47-r2.ebuild, nmap-9999.ebuild:
+ fix build for 9999, rename lua->nse (9999 only for now) bug #529688, fix
+ ambiguous openssl slot dep
*nmap-6.47-r2 (26 Jan 2015)
![http://dev.gentoo.org/~jer/nmap-logo-64.png"](http://dev.gentoo.org/~jer/nmap-logo-64.png"){kind=link}