1 |
commit: c75af5c1d308a9e32868191a8f7f2b1d9b8fac39 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 17 16:25:14 2020 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 17 16:25:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75af5c1 |
7 |
|
8 |
net-analyzer/nmap: nmap-update removed |
9 |
|
10 |
upstream has removed nmap-update |
11 |
https://github.com/nmap/nmap/commit/210adf941ece00a6f1e0f4dbe89861c10f12c33d |
12 |
|
13 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
14 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
15 |
|
16 |
.../files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch | 66 ++++++++++++++++++++++ |
17 |
net-analyzer/nmap/nmap-9999.ebuild | 18 +----- |
18 |
2 files changed, 68 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..b4c06be942e |
23 |
--- /dev/null |
24 |
+++ b/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch |
25 |
@@ -0,0 +1,66 @@ |
26 |
+--- a/nbase/Makefile.in |
27 |
++++ b/nbase/Makefile.in |
28 |
+@@ -12,7 +12,7 @@ |
29 |
+ CCOPT = |
30 |
+ DEFS = @DEFS@ |
31 |
+ # With GCC, add extra security checks to source code. |
32 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
33 |
++DEFS += |
34 |
+ CPPFLAGS = @CPPFLAGS@ |
35 |
+ CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) |
36 |
+ STATIC = |
37 |
+--- a/ncat/Makefile.in |
38 |
++++ b/ncat/Makefile.in |
39 |
+@@ -53,7 +53,7 @@ |
40 |
+ LIBS = @LIBS@ |
41 |
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" |
42 |
+ # With GCC, add extra security checks to source code. |
43 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
44 |
++DEFS += |
45 |
+ INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) |
46 |
+ RM = rm -f |
47 |
+ STRIP = @STRIP@ |
48 |
+--- a/nsock/src/Makefile.in |
49 |
++++ b/nsock/src/Makefile.in |
50 |
+@@ -13,7 +13,7 @@ |
51 |
+ CCOPT = |
52 |
+ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" |
53 |
+ # With GCC, add extra security checks to source code. |
54 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
55 |
++DEFS += |
56 |
+ INCLS = -I../include |
57 |
+ CFLAGS = @CFLAGS@ $(CCOPT) |
58 |
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS) |
59 |
+--- a/libnetutil/Makefile.in |
60 |
++++ b/libnetutil/Makefile.in |
61 |
+@@ -5,7 +5,7 @@ |
62 |
+ CXXFLAGS = @CXXFLAGS@ |
63 |
+ CPPFLAGS = @CPPFLAGS@ $(DEFS) |
64 |
+ DEFS = @DEFS@ |
65 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
66 |
++DEFS += |
67 |
+ AR = ar |
68 |
+ RANLIB = @RANLIB@ |
69 |
+ |
70 |
+--- a/Makefile.in |
71 |
++++ b/Makefile.in |
72 |
+@@ -41,7 +41,7 @@ |
73 |
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html |
74 |
+ # Level 1 only makes changes that don't affect "conforming" programs, |
75 |
+ # while level 2 enforces additional restrictions. |
76 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
77 |
++DEFS += |
78 |
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions |
79 |
+ # Should only be enabled during debugging and not in any real release. |
80 |
+ # DEFS += -DMTRACE=1 |
81 |
+--- a/nping/Makefile.in |
82 |
++++ b/nping/Makefile.in |
83 |
+@@ -38,7 +38,7 @@ |
84 |
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html |
85 |
+ # Level 1 only makes changes that don't affect "conforming" programs, |
86 |
+ # while level 2 enforces additional restrictions. |
87 |
+-DEFS += -D_FORTIFY_SOURCE=2 |
88 |
++DEFS += |
89 |
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions |
90 |
+ # Should only be enabled during debugging and not in any real release. |
91 |
+ # DEFS += -DMTRACE=1 |
92 |
|
93 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
94 |
index f45ed83d38a..9334acee75c 100644 |
95 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
96 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
97 |
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" |
98 |
|
99 |
LICENSE="GPL-2" |
100 |
SLOT="0" |
101 |
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua" |
102 |
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" |
103 |
REQUIRED_USE="system-lua? ( nse )" |
104 |
|
105 |
RDEPEND=" |
106 |
@@ -25,10 +25,6 @@ RDEPEND=" |
107 |
net-libs/libssh2[zlib] |
108 |
sys-libs/zlib |
109 |
) |
110 |
- nmap-update? ( |
111 |
- dev-libs/apr |
112 |
- dev-vcs/subversion |
113 |
- ) |
114 |
nse? ( sys-libs/zlib ) |
115 |
ssl? ( |
116 |
!libressl? ( dev-libs/openssl:0= ) |
117 |
@@ -43,7 +39,7 @@ PATCHES=( |
118 |
"${FILESDIR}"/${PN}-5.21-python.patch |
119 |
"${FILESDIR}"/${PN}-6.46-uninstaller.patch |
120 |
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch |
121 |
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch |
122 |
+ "${FILESDIR}"/${PN}-7.80SVN-no-FORTIFY_SOURCE.patch |
123 |
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch |
124 |
"${FILESDIR}"/${PN}-7.25-libpcre.patch |
125 |
"${FILESDIR}"/${PN}-7.31-libnl.patch |
126 |
@@ -86,7 +82,6 @@ src_configure() { |
127 |
$(use_with libssh2) \ |
128 |
$(use_with ncat) \ |
129 |
--without-ndiff \ |
130 |
- $(use_with nmap-update) \ |
131 |
$(use_with nping) \ |
132 |
$(use_with ssl openssl) \ |
133 |
--without-zenmap \ |
134 |
@@ -104,7 +99,6 @@ src_compile() { |
135 |
local directory |
136 |
for directory in . libnetutil nsock/src \ |
137 |
$(usex ncat ncat '') \ |
138 |
- $(usex nmap-update nmap-update '') \ |
139 |
$(usex nping nping '') |
140 |
do |
141 |
emake -C "${directory}" makefile.dep |
142 |
@@ -121,14 +115,6 @@ src_install() { |
143 |
STRIP=: \ |
144 |
nmapdatadir="${EPREFIX}"/usr/share/nmap \ |
145 |
install |
146 |
- if use nmap-update;then |
147 |
- LC_ALL=C emake -j1 \ |
148 |
- -C nmap-update \ |
149 |
- DESTDIR="${D}" \ |
150 |
- STRIP=: \ |
151 |
- nmapdatadir="${EPREFIX}"/usr/share/nmap \ |
152 |
- install |
153 |
- fi |
154 |
|
155 |
dodoc CHANGELOG HACKING docs/README docs/*.txt |
156 |
} |