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, 25 Jan 2019 14:14:08
Message-Id: 1548425630.b58e9ab433da5a8629d049ff3a73b348a27b5528.jer@gentoo
1 commit: b58e9ab433da5a8629d049ff3a73b348a27b5528
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 25 14:13:37 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 25 14:13:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58e9ab4
7
8 net-analyzer/nmap: nmap_error.cc: include time.h
9
10 Fixes: https://bugs.gentoo.org/676206
11 Package-Manager: Portage-2.3.58, Repoman-2.3.12
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 net-analyzer/nmap/files/nmap-7.70-time.patch | 10 ++++++++++
15 net-analyzer/nmap/nmap-7.70.ebuild | 5 ++---
16 net-analyzer/nmap/nmap-9999.ebuild | 3 ++-
17 3 files changed, 14 insertions(+), 4 deletions(-)
18
19 diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
20 new file mode 100644
21 index 00000000000..6d12ea8f96f
22 --- /dev/null
23 +++ b/net-analyzer/nmap/files/nmap-7.70-time.patch
24 @@ -0,0 +1,10 @@
25 +--- a/nmap_error.cc
26 ++++ b/nmap_error.cc
27 +@@ -135,6 +135,7 @@
28 + #include "xml.h"
29 +
30 + #include <errno.h>
31 ++#include <time.h>
32 +
33 + extern NmapOps o;
34 +
35
36 diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
37 index 692e3cb1290..e9bc260c7a9 100644
38 --- a/net-analyzer/nmap/nmap-7.70.ebuild
39 +++ b/net-analyzer/nmap/nmap-7.70.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2018 Gentoo Foundation
42 +# Copyright 1999-2019 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI=6
46 @@ -25,13 +25,11 @@ IUSE="
47 zenmap
48 "
49 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
50 -
51 REQUIRED_USE="
52 system-lua? ( nse )
53 ndiff? ( ${PYTHON_REQUIRED_USE} )
54 zenmap? ( ${PYTHON_REQUIRED_USE} )
55 "
56 -
57 RDEPEND="
58 dev-libs/liblinear:=
59 dev-libs/libpcre
60 @@ -66,6 +64,7 @@ PATCHES=(
61 "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
62 "${FILESDIR}"/${PN}-7.25-libpcre.patch
63 "${FILESDIR}"/${PN}-7.31-libnl.patch
64 + "${FILESDIR}"/${PN}-7.70-time.patch
65 )
66 S="${WORKDIR}/${MY_P}"
67
68
69 diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
70 index a54dd5819b1..c282246d451 100644
71 --- a/net-analyzer/nmap/nmap-9999.ebuild
72 +++ b/net-analyzer/nmap/nmap-9999.ebuild
73 @@ -1,4 +1,4 @@
74 -# Copyright 1999-2018 Gentoo Foundation
75 +# Copyright 1999-2019 Gentoo Authors
76 # Distributed under the terms of the GNU General Public License v2
77
78 EAPI=6
79 @@ -65,6 +65,7 @@ PATCHES=(
80 "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
81 "${FILESDIR}"/${PN}-7.25-libpcre.patch
82 "${FILESDIR}"/${PN}-7.31-libnl.patch
83 + "${FILESDIR}"/${PN}-7.70-time.patch
84 )
85 S="${WORKDIR}/${MY_P}"