Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
Date: Fri, 30 Sep 2016 09:15:49
Message-Id: 1475226918.75f050b5a4f4a5050e94e872a2fdea93e92f9174.jer@gentoo
1 commit: 75f050b5a4f4a5050e94e872a2fdea93e92f9174
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 09:15:18 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 09:15:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f050b5
7
8 net-analyzer/nmap: Old.
9
10 Package-Manager: portage-2.3.1
11
12 net-analyzer/nmap/Manifest | 2 -
13 net-analyzer/nmap/files/nmap-7.25-EC.patch | 38 -------
14 net-analyzer/nmap/nmap-7.25_beta1.ebuild | 172 -----------------------------
15 net-analyzer/nmap/nmap-7.25_beta2.ebuild | 172 -----------------------------
16 4 files changed, 384 deletions(-)
17
18 diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
19 index 1a19fab..99a27b4 100644
20 --- a/net-analyzer/nmap/Manifest
21 +++ b/net-analyzer/nmap/Manifest
22 @@ -1,7 +1,5 @@
23 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
24 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
25 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
26 -DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94
27 -DIST nmap-7.25BETA2.tar.bz2 8874592 SHA256 6c66a150c9e346ccdca0aa16ef8c2a5310449444fe15cf5ec3f3a151978378d0 SHA512 0a40267d578ac7ff461783a4b22e584a7c3fee42c321843fce24dd6cddabc068cc7acd0fc8fd85f3952ed05033792adcb28e2919ed70f5fb30826a81c4777fe0 WHIRLPOOL 4c165d45afe0295f5cdb68cd90e7e7d5951ffb31115b3aedc37722872b130adab088cae851c12db0d213aabecfbdcda2b1dae48c6a01bdd8e5d98148c084c98d
28 DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
29 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
30
31 diff --git a/net-analyzer/nmap/files/nmap-7.25-EC.patch b/net-analyzer/nmap/files/nmap-7.25-EC.patch
32 deleted file mode 100644
33 index fff5679..00000000
34 --- a/net-analyzer/nmap/files/nmap-7.25-EC.patch
35 +++ /dev/null
36 @@ -1,38 +0,0 @@
37 - - Check for EVP_PKEY_get1_EC_KEY
38 - - Comment out inappropriate AC_CONFIG_SUBDIRS
39 -
40 ---- a/configure.ac
41 -+++ b/configure.ac
42 -@@ -387,6 +387,12 @@
43 - AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument]) ],
44 - [ -lcrypto ])
45 - fi
46 -+
47 -+ if test "$use_openssl" = "yes"; then
48 -+ AC_CHECK_LIB(crypto, EVP_PKEY_get1_EC_KEY,
49 -+ [AC_DEFINE(HAVE_EVP_PKEY_EC, 1, [Have EVP_PKEY_get1_EC_KEY])],
50 -+ [AC_MSG_WARN([Disabling support for EC crypto])])
51 -+ fi
52 - fi
53 -
54 - OPENSSL_LIBS=
55 -@@ -516,7 +522,7 @@
56 -
57 - # If we still don't have it, we use our own
58 - if test $have_pcre != yes ; then
59 -- AC_CONFIG_SUBDIRS( libpcre )
60 -+# AC_CONFIG_SUBDIRS( libpcre )
61 - CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
62 - LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
63 - PCRE_BUILD="build-pcre"
64 ---- a/nse_ssl_cert.cc
65 -+++ b/nse_ssl_cert.cc
66 -@@ -434,7 +434,7 @@
67 - }
68 -
69 - int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
70 --#ifdef EVP_PKEY_EC
71 -+#ifdef HAVE_EVP_PKEY_EC
72 - EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(pubkey);
73 - const EC_GROUP *group = EC_KEY_get0_group(ec_key);
74 - int nid;
75
76 diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
77 deleted file mode 100644
78 index 2005f65..00000000
79 --- a/net-analyzer/nmap/nmap-7.25_beta1.ebuild
80 +++ /dev/null
81 @@ -1,172 +0,0 @@
82 -# Copyright 1999-2016 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -# $Id$
85 -
86 -EAPI=5
87 -
88 -PYTHON_COMPAT=( python2_7 )
89 -PYTHON_REQ_USE="sqlite,xml"
90 -inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
91 -
92 -MY_P=${P/_beta/BETA}
93 -
94 -DESCRIPTION="A utility for network discovery and security auditing"
95 -HOMEPAGE="http://nmap.org/"
96 -SRC_URI="
97 - http://nmap.org/dist/${MY_P}.tar.bz2
98 - https://dev.gentoo.org/~jer/nmap-logo-64.png
99 -"
100 -
101 -LICENSE="GPL-2"
102 -SLOT="0"
103 -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"
104 -
105 -IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
106 -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
107 -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
108 -
109 -REQUIRED_USE="
110 - system-lua? ( nse )
111 - ndiff? ( ${PYTHON_REQUIRED_USE} )
112 - zenmap? ( ${PYTHON_REQUIRED_USE} )
113 -"
114 -
115 -RDEPEND="
116 - dev-libs/liblinear:=
117 - dev-libs/libpcre
118 - || ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
119 - zenmap? (
120 - dev-python/pygtk:2[${PYTHON_USEDEP}]
121 - ${PYTHON_DEPS}
122 - )
123 - system-lua? ( >=dev-lang/lua-5.2[deprecated] )
124 - ndiff? ( ${PYTHON_DEPS} )
125 - nls? ( virtual/libintl )
126 - nmap-update? ( dev-libs/apr dev-vcs/subversion )
127 - ssl? (
128 - !libressl? ( dev-libs/openssl:0= )
129 - libressl? ( dev-libs/libressl:= )
130 - )
131 -"
132 -DEPEND="
133 - ${RDEPEND}
134 - nls? ( sys-devel/gettext )
135 -"
136 -
137 -S="${WORKDIR}/${MY_P}"
138 -
139 -pkg_setup() {
140 - if use ndiff || use zenmap; then
141 - python-single-r1_pkg_setup
142 - fi
143 -}
144 -
145 -src_unpack() {
146 - # prevent unpacking the logo
147 - unpack ${MY_P}.tar.bz2
148 -}
149 -
150 -src_prepare() {
151 - epatch \
152 - "${FILESDIR}"/${PN}-4.75-nolua.patch \
153 - "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
154 - "${FILESDIR}"/${PN}-5.21-python.patch \
155 - "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
156 - "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
157 - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
158 - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
159 - "${FILESDIR}"/${PN}-7.25-EC.patch
160 -
161 - if use nls; then
162 - local lingua=''
163 - for lingua in ${NMAP_LINGUAS[@]}; do
164 - if ! use linguas_${lingua}; then
165 - rm -r zenmap/share/zenmap/locale/${lingua} || die
166 - rm zenmap/share/zenmap/locale/${lingua}.po || die
167 - fi
168 - done
169 - else
170 - # configure/make ignores --disable-nls
171 - for lingua in ${NMAP_LINGUAS[@]}; do
172 - rm -r zenmap/share/zenmap/locale/${lingua} || die
173 - rm zenmap/share/zenmap/locale/${lingua}.po || die
174 - done
175 - fi
176 -
177 - sed -i \
178 - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
179 - Makefile.in || die
180 -
181 - sed -i \
182 - -e '/rm -f $@/d' \
183 - $(find . -name Makefile.in) \
184 - || die
185 -
186 - # Fix desktop files wrt bug #432714
187 - sed -i \
188 - -e '/^Encoding/d' \
189 - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
190 - zenmap/install_scripts/unix/zenmap-root.desktop \
191 - zenmap/install_scripts/unix/zenmap.desktop || die
192 -
193 - epatch_user
194 -
195 - eautoreconf
196 -}
197 -
198 -src_configure() {
199 - # The bundled libdnet is incompatible with the version available in the
200 - # tree, so we cannot use the system library here.
201 - econf \
202 - $(use_enable ipv6) \
203 - $(use_enable nls) \
204 - $(use_with zenmap) \
205 - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
206 - $(use_with ncat) \
207 - $(use_with ndiff) \
208 - $(use_with nmap-update) \
209 - $(use_with nping) \
210 - $(use_with ssl openssl) \
211 - --with-libdnet=included \
212 - --with-pcre=/usr
213 - # --with-liblinear=/usr \
214 - # Commented because configure does weird things, while autodetection works
215 -}
216 -
217 -src_compile() {
218 - local directory
219 - for directory in . libnetutil nsock/src \
220 - $(usex ncat ncat '') \
221 - $(usex nmap-update nmap-update '') \
222 - $(usex nping nping '')
223 - do
224 - emake -C "${directory}" makefile.dep
225 - done
226 -
227 - emake \
228 - AR=$(tc-getAR) \
229 - RANLIB=$(tc-getRANLIB)
230 -}
231 -
232 -src_install() {
233 - LC_ALL=C emake -j1 \
234 - DESTDIR="${D}" \
235 - STRIP=: \
236 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
237 - install
238 - if use nmap-update;then
239 - LC_ALL=C emake -j1 \
240 - -C nmap-update \
241 - DESTDIR="${D}" \
242 - STRIP=: \
243 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
244 - install
245 - fi
246 -
247 - dodoc CHANGELOG HACKING docs/README docs/*.txt
248 -
249 - if use zenmap; then
250 - doicon "${DISTDIR}/nmap-logo-64.png"
251 - python_optimize
252 - fi
253 -}
254
255 diff --git a/net-analyzer/nmap/nmap-7.25_beta2.ebuild b/net-analyzer/nmap/nmap-7.25_beta2.ebuild
256 deleted file mode 100644
257 index 1fe61b5..00000000
258 --- a/net-analyzer/nmap/nmap-7.25_beta2.ebuild
259 +++ /dev/null
260 @@ -1,172 +0,0 @@
261 -# Copyright 1999-2016 Gentoo Foundation
262 -# Distributed under the terms of the GNU General Public License v2
263 -# $Id$
264 -
265 -EAPI=5
266 -
267 -PYTHON_COMPAT=( python2_7 )
268 -PYTHON_REQ_USE="sqlite,xml"
269 -inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
270 -
271 -MY_P=${P/_beta/BETA}
272 -
273 -DESCRIPTION="A utility for network discovery and security auditing"
274 -HOMEPAGE="http://nmap.org/"
275 -SRC_URI="
276 - http://nmap.org/dist/${MY_P}.tar.bz2
277 - https://dev.gentoo.org/~jer/nmap-logo-64.png
278 -"
279 -
280 -LICENSE="GPL-2"
281 -SLOT="0"
282 -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"
283 -
284 -IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
285 -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
286 -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
287 -
288 -REQUIRED_USE="
289 - system-lua? ( nse )
290 - ndiff? ( ${PYTHON_REQUIRED_USE} )
291 - zenmap? ( ${PYTHON_REQUIRED_USE} )
292 -"
293 -
294 -RDEPEND="
295 - dev-libs/liblinear:=
296 - dev-libs/libpcre
297 - || ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
298 - zenmap? (
299 - dev-python/pygtk:2[${PYTHON_USEDEP}]
300 - ${PYTHON_DEPS}
301 - )
302 - system-lua? ( >=dev-lang/lua-5.2[deprecated] )
303 - ndiff? ( ${PYTHON_DEPS} )
304 - nls? ( virtual/libintl )
305 - nmap-update? ( dev-libs/apr dev-vcs/subversion )
306 - ssl? (
307 - !libressl? ( dev-libs/openssl:0= )
308 - libressl? ( dev-libs/libressl:= )
309 - )
310 -"
311 -DEPEND="
312 - ${RDEPEND}
313 - nls? ( sys-devel/gettext )
314 -"
315 -
316 -S="${WORKDIR}/${MY_P}"
317 -
318 -pkg_setup() {
319 - if use ndiff || use zenmap; then
320 - python-single-r1_pkg_setup
321 - fi
322 -}
323 -
324 -src_unpack() {
325 - # prevent unpacking the logo
326 - unpack ${MY_P}.tar.bz2
327 -}
328 -
329 -src_prepare() {
330 - epatch \
331 - "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
332 - "${FILESDIR}"/${PN}-5.21-python.patch \
333 - "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
334 - "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
335 - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
336 - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
337 - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
338 - "${FILESDIR}"/${PN}-7.25-libpcre.patch
339 -
340 - if use nls; then
341 - local lingua=''
342 - for lingua in ${NMAP_LINGUAS[@]}; do
343 - if ! use linguas_${lingua}; then
344 - rm -r zenmap/share/zenmap/locale/${lingua} || die
345 - rm zenmap/share/zenmap/locale/${lingua}.po || die
346 - fi
347 - done
348 - else
349 - # configure/make ignores --disable-nls
350 - for lingua in ${NMAP_LINGUAS[@]}; do
351 - rm -r zenmap/share/zenmap/locale/${lingua} || die
352 - rm zenmap/share/zenmap/locale/${lingua}.po || die
353 - done
354 - fi
355 -
356 - sed -i \
357 - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
358 - Makefile.in || die
359 -
360 - sed -i \
361 - -e '/rm -f $@/d' \
362 - $(find . -name Makefile.in) \
363 - || die
364 -
365 - # Fix desktop files wrt bug #432714
366 - sed -i \
367 - -e '/^Encoding/d' \
368 - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
369 - zenmap/install_scripts/unix/zenmap-root.desktop \
370 - zenmap/install_scripts/unix/zenmap.desktop || die
371 -
372 - epatch_user
373 -
374 - eautoreconf
375 -}
376 -
377 -src_configure() {
378 - # The bundled libdnet is incompatible with the version available in the
379 - # tree, so we cannot use the system library here.
380 - econf \
381 - $(use_enable ipv6) \
382 - $(use_enable nls) \
383 - $(use_with zenmap) \
384 - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
385 - $(use_with ncat) \
386 - $(use_with ndiff) \
387 - $(use_with nmap-update) \
388 - $(use_with nping) \
389 - $(use_with ssl openssl) \
390 - --with-libdnet=included \
391 - --with-pcre=/usr
392 - # --with-liblinear=/usr \
393 - # Commented because configure does weird things, while autodetection works
394 -}
395 -
396 -src_compile() {
397 - local directory
398 - for directory in . libnetutil nsock/src \
399 - $(usex ncat ncat '') \
400 - $(usex nmap-update nmap-update '') \
401 - $(usex nping nping '')
402 - do
403 - emake -C "${directory}" makefile.dep
404 - done
405 -
406 - emake \
407 - AR=$(tc-getAR) \
408 - RANLIB=$(tc-getRANLIB)
409 -}
410 -
411 -src_install() {
412 - LC_ALL=C emake -j1 \
413 - DESTDIR="${D}" \
414 - STRIP=: \
415 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
416 - install
417 - if use nmap-update;then
418 - LC_ALL=C emake -j1 \
419 - -C nmap-update \
420 - DESTDIR="${D}" \
421 - STRIP=: \
422 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
423 - install
424 - fi
425 -
426 - dodoc CHANGELOG HACKING docs/README docs/*.txt
427 -
428 - if use zenmap; then
429 - doicon "${DISTDIR}/nmap-logo-64.png"
430 - python_optimize
431 - fi
432 -}