1 |
commit: ea4700211ee287890357c61481c140d85d29f554 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 09:56:18 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 09:56:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea470021 |
7 |
|
8 |
net-analyzer/nmap: [QA] Revert "Version 7.90" |
9 |
|
10 |
Reverting due to GLEP 81 non-compliance and other QA regressions. |
11 |
|
12 |
Reverts: 29fc9b2db792adbb2f739c5b9d7b2b9c6c644809 |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
net-analyzer/nmap/Manifest | 1 - |
16 |
.../nmap/files/nmap-7.90-no-FORTIFY_SOURCE.patch | 66 ----------- |
17 |
net-analyzer/nmap/nmap-7.90.ebuild | 121 --------------------- |
18 |
3 files changed, 188 deletions(-) |
19 |
|
20 |
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest |
21 |
index a93780188aa..e34efcfd0b5 100644 |
22 |
--- a/net-analyzer/nmap/Manifest |
23 |
+++ b/net-analyzer/nmap/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b |
26 |
-DIST nmap-7.90.tar.bz2 10485842 BLAKE2B 96307cf51bdf24758f0ee77e29108c112fce49128f209f163a4fa38b5f4e0e1a820a08097ea9fa05cf1ce79604e7f30a4cdfd5b693e5dcf458e3a9955b527957 SHA512 b77c31ef43c9a069f0f63a3cc166021f714a8664cca4d51d1b8467cb166f5e3acb4a4bd0f2bdad7f87777a506ef56cc54fa094e664997c8e436b50208214e7c6 |
27 |
DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 |
28 |
|
29 |
diff --git a/net-analyzer/nmap/files/nmap-7.90-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.90-no-FORTIFY_SOURCE.patch |
30 |
deleted file mode 100644 |
31 |
index b4c06be942e..00000000000 |
32 |
--- a/net-analyzer/nmap/files/nmap-7.90-no-FORTIFY_SOURCE.patch |
33 |
+++ /dev/null |
34 |
@@ -1,66 +0,0 @@ |
35 |
---- a/nbase/Makefile.in |
36 |
-+++ b/nbase/Makefile.in |
37 |
-@@ -12,7 +12,7 @@ |
38 |
- CCOPT = |
39 |
- DEFS = @DEFS@ |
40 |
- # With GCC, add extra security checks to source code. |
41 |
--DEFS += -D_FORTIFY_SOURCE=2 |
42 |
-+DEFS += |
43 |
- CPPFLAGS = @CPPFLAGS@ |
44 |
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) |
45 |
- STATIC = |
46 |
---- a/ncat/Makefile.in |
47 |
-+++ b/ncat/Makefile.in |
48 |
-@@ -53,7 +53,7 @@ |
49 |
- LIBS = @LIBS@ |
50 |
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" |
51 |
- # With GCC, add extra security checks to source code. |
52 |
--DEFS += -D_FORTIFY_SOURCE=2 |
53 |
-+DEFS += |
54 |
- INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) |
55 |
- RM = rm -f |
56 |
- STRIP = @STRIP@ |
57 |
---- a/nsock/src/Makefile.in |
58 |
-+++ b/nsock/src/Makefile.in |
59 |
-@@ -13,7 +13,7 @@ |
60 |
- CCOPT = |
61 |
- DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" |
62 |
- # With GCC, add extra security checks to source code. |
63 |
--DEFS += -D_FORTIFY_SOURCE=2 |
64 |
-+DEFS += |
65 |
- INCLS = -I../include |
66 |
- CFLAGS = @CFLAGS@ $(CCOPT) |
67 |
- # CFLAGS = -g -Wall $(DEFS) $(INCLS) |
68 |
---- a/libnetutil/Makefile.in |
69 |
-+++ b/libnetutil/Makefile.in |
70 |
-@@ -5,7 +5,7 @@ |
71 |
- CXXFLAGS = @CXXFLAGS@ |
72 |
- CPPFLAGS = @CPPFLAGS@ $(DEFS) |
73 |
- DEFS = @DEFS@ |
74 |
--DEFS += -D_FORTIFY_SOURCE=2 |
75 |
-+DEFS += |
76 |
- AR = ar |
77 |
- RANLIB = @RANLIB@ |
78 |
- |
79 |
---- a/Makefile.in |
80 |
-+++ b/Makefile.in |
81 |
-@@ -41,7 +41,7 @@ |
82 |
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html |
83 |
- # Level 1 only makes changes that don't affect "conforming" programs, |
84 |
- # while level 2 enforces additional restrictions. |
85 |
--DEFS += -D_FORTIFY_SOURCE=2 |
86 |
-+DEFS += |
87 |
- # For mtrace debugging -- see MTRACE define in main.cc for instructions |
88 |
- # Should only be enabled during debugging and not in any real release. |
89 |
- # DEFS += -DMTRACE=1 |
90 |
---- a/nping/Makefile.in |
91 |
-+++ b/nping/Makefile.in |
92 |
-@@ -38,7 +38,7 @@ |
93 |
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html |
94 |
- # Level 1 only makes changes that don't affect "conforming" programs, |
95 |
- # while level 2 enforces additional restrictions. |
96 |
--DEFS += -D_FORTIFY_SOURCE=2 |
97 |
-+DEFS += |
98 |
- # For mtrace debugging -- see MTRACE define in main.cc for instructions |
99 |
- # Should only be enabled during debugging and not in any real release. |
100 |
- # DEFS += -DMTRACE=1 |
101 |
|
102 |
diff --git a/net-analyzer/nmap/nmap-7.90.ebuild b/net-analyzer/nmap/nmap-7.90.ebuild |
103 |
deleted file mode 100644 |
104 |
index 2b988dd25f2..00000000000 |
105 |
--- a/net-analyzer/nmap/nmap-7.90.ebuild |
106 |
+++ /dev/null |
107 |
@@ -1,121 +0,0 @@ |
108 |
-# Copyright 1999-2020 Gentoo Authors |
109 |
-# Distributed under the terms of the GNU General Public License v2 |
110 |
- |
111 |
-EAPI=7 |
112 |
- |
113 |
-MY_P=${P/_beta/BETA} |
114 |
-inherit autotools desktop flag-o-matic toolchain-funcs user |
115 |
- |
116 |
-DESCRIPTION="A utility for network discovery and security auditing" |
117 |
-HOMEPAGE="https://nmap.org/" |
118 |
-SRC_URI=" |
119 |
- https://nmap.org/dist/${MY_P}.tar.bz2 |
120 |
- https://dev.gentoo.org/~jer/nmap-logo-64.png |
121 |
-" |
122 |
- |
123 |
-LICENSE="NPSL" |
124 |
-SLOT="0" |
125 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
126 |
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" |
127 |
-REQUIRED_USE="system-lua? ( nse )" |
128 |
- |
129 |
-RDEPEND=" |
130 |
- dev-libs/liblinear:= |
131 |
- dev-libs/libpcre |
132 |
- net-libs/libpcap |
133 |
- libssh2? ( |
134 |
- net-libs/libssh2[zlib] |
135 |
- sys-libs/zlib |
136 |
- ) |
137 |
- nse? ( sys-libs/zlib ) |
138 |
- ssl? ( |
139 |
- !libressl? ( dev-libs/openssl:0= ) |
140 |
- libressl? ( dev-libs/libressl:= ) |
141 |
- ) |
142 |
- system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) |
143 |
-" |
144 |
-DEPEND="${RDEPEND}" |
145 |
- |
146 |
-PATCHES=( |
147 |
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch |
148 |
- "${FILESDIR}"/${PN}-5.21-python.patch |
149 |
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch |
150 |
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch |
151 |
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch |
152 |
- "${FILESDIR}"/${PN}-7.25-libpcre.patch |
153 |
- "${FILESDIR}"/${PN}-7.31-libnl.patch |
154 |
- "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch |
155 |
- "${FILESDIR}"/${PN}-7.90-no-FORTIFY_SOURCE.patch |
156 |
-) |
157 |
-S="${WORKDIR}/${MY_P}" |
158 |
- |
159 |
-src_prepare() { |
160 |
- rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die |
161 |
- |
162 |
- cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die |
163 |
- |
164 |
- default |
165 |
- |
166 |
- sed -i \ |
167 |
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ |
168 |
- Makefile.in || die |
169 |
- # Fix desktop files wrt bug #432714 |
170 |
- sed -i \ |
171 |
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ |
172 |
- zenmap/install_scripts/unix/zenmap-root.desktop \ |
173 |
- zenmap/install_scripts/unix/zenmap.desktop || die |
174 |
- |
175 |
- cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die |
176 |
- |
177 |
- eautoreconf |
178 |
- |
179 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
180 |
- # we need the original for a Darwin-specific fix, bug #604432 |
181 |
- mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die |
182 |
- fi |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- # The bundled libdnet is incompatible with the version available in the |
187 |
- # tree, so we cannot use the system library here. |
188 |
- econf \ |
189 |
- $(use_enable ipv6) \ |
190 |
- $(use_with libssh2) \ |
191 |
- $(use_with ncat) \ |
192 |
- --without-ndiff \ |
193 |
- $(use_with nping) \ |
194 |
- $(use_with ssl openssl) \ |
195 |
- --without-zenmap \ |
196 |
- $(usex libssh2 --with-zlib) \ |
197 |
- $(usex nse --with-zlib) \ |
198 |
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ |
199 |
- --cache-file="${S}"/config.cache \ |
200 |
- --with-libdnet=included \ |
201 |
- --with-pcre=/usr |
202 |
- # Commented out because configure does weird things |
203 |
- # --with-liblinear=/usr \ |
204 |
-} |
205 |
- |
206 |
-src_compile() { |
207 |
- local directory |
208 |
- for directory in . libnetutil nsock/src \ |
209 |
- $(usex ncat ncat '') \ |
210 |
- $(usex nping nping '') |
211 |
- do |
212 |
- emake -C "${directory}" makefile.dep |
213 |
- done |
214 |
- |
215 |
- emake \ |
216 |
- AR=$(tc-getAR) \ |
217 |
- RANLIB=$(tc-getRANLIB) |
218 |
-} |
219 |
- |
220 |
-src_install() { |
221 |
- LC_ALL=C emake -j1 \ |
222 |
- DESTDIR="${D}" \ |
223 |
- STRIP=: \ |
224 |
- nmapdatadir="${EPREFIX}"/usr/share/nmap \ |
225 |
- install |
226 |
- |
227 |
- dodoc CHANGELOG HACKING docs/README docs/*.txt |
228 |
-} |