Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.25.ebuild nmap-6.47.ebuild nmap-6.01.ebuild nmap-6.46.ebuild ChangeLog
Date: Thu, 28 Aug 2014 10:07:50
Message-Id: 20140828100745.E725141A9@oystercatcher.gentoo.org
1 jer 14/08/28 10:07:45
2
3 Modified: nmap-6.25.ebuild nmap-6.01.ebuild nmap-6.46.ebuild
4 ChangeLog
5 Added: nmap-6.47.ebuild
6 Log:
7 Version bump. Remove <python2.7 dependencies.
8
9 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
10
11 Revision Changes Path
12 1.30 net-analyzer/nmap/nmap-6.25.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.30&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.30&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?r1=1.29&r2=1.30
17
18 Index: nmap-6.25.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v
21 retrieving revision 1.29
22 retrieving revision 1.30
23 diff -u -r1.29 -r1.30
24 --- nmap-6.25.ebuild 1 Dec 2013 20:36:20 -0000 1.29
25 +++ nmap-6.25.ebuild 28 Aug 2014 10:07:45 -0000 1.30
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2013 Gentoo Foundation
28 +# Copyright 1999-2014 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.29 2013/12/01 20:36:20 zerochaos Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.30 2014/08/28 10:07:45 jer Exp $
32
33 EAPI="4"
34
35 @@ -28,8 +28,6 @@
36 NMAP_PYTHON_DEPEND="
37 || (
38 dev-lang/python:2.7[sqlite]
39 - dev-lang/python:2.6[sqlite]
40 - dev-lang/python:2.5[sqlite]
41 )
42 "
43 RDEPEND="
44
45
46
47 1.26 net-analyzer/nmap/nmap-6.01.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.26&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.26&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?r1=1.25&r2=1.26
52
53 Index: nmap-6.01.ebuild
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v
56 retrieving revision 1.25
57 retrieving revision 1.26
58 diff -u -r1.25 -r1.26
59 --- nmap-6.01.ebuild 2 Aug 2013 13:52:45 -0000 1.25
60 +++ nmap-6.01.ebuild 28 Aug 2014 10:07:45 -0000 1.26
61 @@ -1,6 +1,6 @@
62 -# Copyright 1999-2013 Gentoo Foundation
63 +# Copyright 1999-2014 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.25 2013/08/02 13:52:45 jer Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.26 2014/08/28 10:07:45 jer Exp $
67
68 EAPI="4"
69
70 @@ -23,8 +23,6 @@
71 NMAP_PYTHON_DEPEND="
72 || (
73 dev-lang/python:2.7[sqlite]
74 - dev-lang/python:2.6[sqlite]
75 - dev-lang/python:2.5[sqlite]
76 )
77 "
78 DEPEND="
79
80
81
82 1.3 net-analyzer/nmap/nmap-6.46.ebuild
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?rev=1.3&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?rev=1.3&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild?r1=1.2&r2=1.3
87
88 Index: nmap-6.46.ebuild
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v
91 retrieving revision 1.2
92 retrieving revision 1.3
93 diff -u -r1.2 -r1.3
94 --- nmap-6.46.ebuild 6 Jun 2014 00:19:47 -0000 1.2
95 +++ nmap-6.46.ebuild 28 Aug 2014 10:07:45 -0000 1.3
96 @@ -1,10 +1,10 @@
97 # Copyright 1999-2014 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.2 2014/06/06 00:19:47 jer Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.3 2014/08/28 10:07:45 jer Exp $
101
102 EAPI=5
103
104 -PYTHON_COMPAT=( python2_{6,7} )
105 +PYTHON_COMPAT=( python2_7 )
106 PYTHON_REQ_USE="sqlite"
107 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
108
109
110
111
112 1.310 net-analyzer/nmap/ChangeLog
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.310&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.310&content-type=text/plain
116 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.309&r2=1.310
117
118 Index: ChangeLog
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
121 retrieving revision 1.309
122 retrieving revision 1.310
123 diff -u -r1.309 -r1.310
124 --- ChangeLog 6 Jun 2014 00:25:23 -0000 1.309
125 +++ ChangeLog 28 Aug 2014 10:07:45 -0000 1.310
126 @@ -1,6 +1,12 @@
127 # ChangeLog for net-analyzer/nmap
128 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
129 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.309 2014/06/06 00:25:23 jer Exp $
130 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.310 2014/08/28 10:07:45 jer Exp $
131 +
132 +*nmap-6.47 (28 Aug 2014)
133 +
134 + 28 Aug 2014; Jeroen Roovers <jer@g.o> nmap-6.01.ebuild,
135 + nmap-6.25.ebuild, nmap-6.46.ebuild, +nmap-6.47.ebuild:
136 + Version bump. Remove <python2.7 dependencies.
137
138 06 Jun 2014; Jeroen Roovers <jer@g.o> -nmap-6.40.ebuild,
139 -nmap-6.40-r1.ebuild, -files/nmap-6.40-uninstaller.patch:
140
141
142
143 1.1 net-analyzer/nmap/nmap-6.47.ebuild
144
145 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.1&view=markup
146 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.1&content-type=text/plain
147
148 Index: nmap-6.47.ebuild
149 ===================================================================
150 # Copyright 1999-2014 Gentoo Foundation
151 # Distributed under the terms of the GNU General Public License v2
152 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.1 2014/08/28 10:07:45 jer Exp $
153
154 EAPI=5
155
156 PYTHON_COMPAT=( python2_7 )
157 PYTHON_REQ_USE="sqlite,xml"
158 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
159
160 MY_P=${P/_beta/BETA}
161
162 DESCRIPTION="A utility for network exploration or security auditing"
163 HOMEPAGE="http://nmap.org/"
164 SRC_URI="
165 http://nmap.org/dist/${MY_P}.tar.bz2
166 http://dev.gentoo.org/~jer/nmap-logo-64.png
167 "
168
169 LICENSE="GPL-2"
170 SLOT="0"
171 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"
172
173 IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
174 NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
175 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
176
177 NMAP_PYTHON_DEPEND="
178 || ( ${PYTHON_DEPS} )
179 "
180 RDEPEND="
181 dev-libs/liblinear
182 dev-libs/libpcre
183 net-libs/libpcap[ipv6?]
184 zenmap? (
185 dev-python/pygtk:2
186 ${NMAP_PYTHON_DEPEND}
187 )
188 lua? ( >=dev-lang/lua-5.2[deprecated] )
189 ndiff? ( ${NMAP_PYTHON_DEPEND} )
190 nls? ( virtual/libintl )
191 nmap-update? ( dev-libs/apr dev-vcs/subversion )
192 ssl? ( dev-libs/openssl )
193 "
194 DEPEND="
195 ${RDEPEND}
196 nls? ( sys-devel/gettext )
197 "
198
199 S="${WORKDIR}/${MY_P}"
200
201 src_unpack() {
202 # prevent unpacking the logo
203 unpack ${MY_P}.tar.bz2
204 }
205
206 src_prepare() {
207 epatch \
208 "${FILESDIR}"/${PN}-4.75-nolua.patch \
209 "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
210 "${FILESDIR}"/${PN}-5.21-python.patch \
211 "${FILESDIR}"/${PN}-6.01-make.patch \
212 "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
213 "${FILESDIR}"/${PN}-6.46-uninstaller.patch
214
215 sed -i \
216 -e 's/-m 755 -s ncat/-m 755 ncat/' \
217 ncat/Makefile.in || die
218
219 if use nls; then
220 local lingua=''
221 for lingua in ${NMAP_LINGUAS}; do
222 if ! use linguas_${lingua}; then
223 rm -rf zenmap/share/zenmap/locale/${lingua}
224 rm -f zenmap/share/zenmap/locale/${lingua}.po
225 fi
226 done
227 else
228 # configure/make ignores --disable-nls
229 for lingua in ${NMAP_LINGUAS}; do
230 rm -rf zenmap/share/zenmap/locale/${lingua}
231 rm -f zenmap/share/zenmap/locale/${lingua}.po
232 done
233 fi
234
235 sed -i \
236 -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
237 Makefile.in || die
238
239 # Fix desktop files wrt bug #432714
240 sed -i \
241 -e '/^Encoding/d' \
242 -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
243 zenmap/install_scripts/unix/zenmap-root.desktop \
244 zenmap/install_scripts/unix/zenmap.desktop || die
245
246 epatch_user
247 }
248
249 src_configure() {
250 # The bundled libdnet is incompatible with the version available in the
251 # tree, so we cannot use the system library here.
252 econf \
253 $(use_enable ipv6) \
254 $(use_enable nls) \
255 $(use_with zenmap) \
256 $(usex lua --with-liblua=/usr --without-liblua) \
257 $(use_with ncat) \
258 $(use_with ndiff) \
259 $(use_with nmap-update) \
260 $(use_with nping) \
261 $(use_with ssl openssl) \
262 --with-libdnet=included \
263 --with-pcre=/usr
264 # --with-liblinear=/usr \
265 # Commented because configure does weird things, while autodetection works
266 }
267
268 src_compile() {
269 emake \
270 AR=$(tc-getAR) \
271 RANLIB=$(tc-getRANLIB )
272 }
273
274 src_install() {
275 LC_ALL=C emake -j1 \
276 DESTDIR="${D}" \
277 STRIP=: \
278 nmapdatadir="${EPREFIX}"/usr/share/nmap \
279 install
280 if use nmap-update;then
281 LC_ALL=C emake -j1 \
282 -C nmap-update \
283 DESTDIR="${D}" \
284 STRIP=: \
285 nmapdatadir="${EPREFIX}"/usr/share/nmap \
286 install
287 fi
288
289 dodoc CHANGELOG HACKING docs/README docs/*.txt
290
291 use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
292 }
Report Message
Find on MARC Find on Google Groups