| 1 |
commit: 629c66e841a616ab168923fb009bf50fcb30ade8 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 03:35:24 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 03:35:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629c66e8 |
| 7 |
|
| 8 |
net-analyzer/nmap: add 7.93 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-analyzer/nmap/Manifest | 2 ++ |
| 13 |
.../nmap/{nmap-9999.ebuild => nmap-7.93.ebuild} | 18 +++++++----------- |
| 14 |
net-analyzer/nmap/nmap-9999.ebuild | 18 +++++++----------- |
| 15 |
3 files changed, 16 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest |
| 18 |
index 49819935ca25..ba0eb83f06f4 100644 |
| 19 |
--- a/net-analyzer/nmap/Manifest |
| 20 |
+++ b/net-analyzer/nmap/Manifest |
| 21 |
@@ -1,2 +1,4 @@ |
| 22 |
DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59 |
| 23 |
DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a |
| 24 |
+DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd |
| 25 |
+DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9 |
| 26 |
|
| 27 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild |
| 28 |
similarity index 90% |
| 29 |
copy from net-analyzer/nmap/nmap-9999.ebuild |
| 30 |
copy to net-analyzer/nmap/nmap-7.93.ebuild |
| 31 |
index 62661ccfa927..9470b5ddbf08 100644 |
| 32 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 33 |
+++ b/net-analyzer/nmap/nmap-7.93.ebuild |
| 34 |
@@ -1,7 +1,7 @@ |
| 35 |
# Copyright 1999-2022 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=7 |
| 39 |
+EAPI=8 |
| 40 |
|
| 41 |
LUA_COMPAT=( lua5-3 ) |
| 42 |
LUA_REQ_USE="deprecated" |
| 43 |
@@ -14,8 +14,6 @@ if [[ ${PV} == *9999* ]] ; then |
| 44 |
|
| 45 |
EGIT_REPO_URI="https://github.com/nmap/nmap" |
| 46 |
|
| 47 |
- # Just in case for now as future seems undecided. |
| 48 |
- LICENSE="NPSL" |
| 49 |
else |
| 50 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc |
| 51 |
inherit verify-sig |
| 52 |
@@ -24,10 +22,9 @@ else |
| 53 |
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" |
| 54 |
|
| 55 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 56 |
- |
| 57 |
- LICENSE="|| ( NPSL GPL-2 )" |
| 58 |
fi |
| 59 |
|
| 60 |
+LICENSE="|| ( NPSL GPL-2 )" |
| 61 |
SLOT="0" |
| 62 |
IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" |
| 63 |
REQUIRED_USE=" |
| 64 |
@@ -54,9 +51,10 @@ RDEPEND=" |
| 65 |
system-lua? ( ${LUA_DEPS} ) |
| 66 |
" |
| 67 |
DEPEND="${RDEPEND}" |
| 68 |
+BDEPEND="virtual/pkgconfig" |
| 69 |
|
| 70 |
if [[ ${PV} != *9999* ]] ; then |
| 71 |
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )" |
| 72 |
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" |
| 73 |
fi |
| 74 |
|
| 75 |
PATCHES=( |
| 76 |
@@ -92,7 +90,7 @@ src_prepare() { |
| 77 |
eautoreconf |
| 78 |
|
| 79 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 80 |
- # we need the original for a Darwin-specific fix, bug #604432 |
| 81 |
+ # We need the original for a Darwin-specific fix, bug #604432 |
| 82 |
mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die |
| 83 |
fi |
| 84 |
} |
| 85 |
@@ -112,16 +110,14 @@ src_configure() { |
| 86 |
--cache-file="${S}"/config.cache \ |
| 87 |
--with-libdnet=included \ |
| 88 |
--with-pcre="${ESYSROOT}"/usr \ |
| 89 |
+ --without-dpdk \ |
| 90 |
--without-ndiff \ |
| 91 |
--without-zenmap |
| 92 |
} |
| 93 |
|
| 94 |
src_compile() { |
| 95 |
local directory |
| 96 |
- for directory in . libnetutil nsock/src \ |
| 97 |
- $(usex ncat ncat '') \ |
| 98 |
- $(usex nping nping '') |
| 99 |
- do |
| 100 |
+ for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do |
| 101 |
emake -C "${directory}" makefile.dep |
| 102 |
done |
| 103 |
|
| 104 |
|
| 105 |
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild |
| 106 |
index 62661ccfa927..9470b5ddbf08 100644 |
| 107 |
--- a/net-analyzer/nmap/nmap-9999.ebuild |
| 108 |
+++ b/net-analyzer/nmap/nmap-9999.ebuild |
| 109 |
@@ -1,7 +1,7 @@ |
| 110 |
# Copyright 1999-2022 Gentoo Authors |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
|
| 113 |
-EAPI=7 |
| 114 |
+EAPI=8 |
| 115 |
|
| 116 |
LUA_COMPAT=( lua5-3 ) |
| 117 |
LUA_REQ_USE="deprecated" |
| 118 |
@@ -14,8 +14,6 @@ if [[ ${PV} == *9999* ]] ; then |
| 119 |
|
| 120 |
EGIT_REPO_URI="https://github.com/nmap/nmap" |
| 121 |
|
| 122 |
- # Just in case for now as future seems undecided. |
| 123 |
- LICENSE="NPSL" |
| 124 |
else |
| 125 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc |
| 126 |
inherit verify-sig |
| 127 |
@@ -24,10 +22,9 @@ else |
| 128 |
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" |
| 129 |
|
| 130 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 131 |
- |
| 132 |
- LICENSE="|| ( NPSL GPL-2 )" |
| 133 |
fi |
| 134 |
|
| 135 |
+LICENSE="|| ( NPSL GPL-2 )" |
| 136 |
SLOT="0" |
| 137 |
IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" |
| 138 |
REQUIRED_USE=" |
| 139 |
@@ -54,9 +51,10 @@ RDEPEND=" |
| 140 |
system-lua? ( ${LUA_DEPS} ) |
| 141 |
" |
| 142 |
DEPEND="${RDEPEND}" |
| 143 |
+BDEPEND="virtual/pkgconfig" |
| 144 |
|
| 145 |
if [[ ${PV} != *9999* ]] ; then |
| 146 |
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )" |
| 147 |
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" |
| 148 |
fi |
| 149 |
|
| 150 |
PATCHES=( |
| 151 |
@@ -92,7 +90,7 @@ src_prepare() { |
| 152 |
eautoreconf |
| 153 |
|
| 154 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 155 |
- # we need the original for a Darwin-specific fix, bug #604432 |
| 156 |
+ # We need the original for a Darwin-specific fix, bug #604432 |
| 157 |
mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die |
| 158 |
fi |
| 159 |
} |
| 160 |
@@ -112,16 +110,14 @@ src_configure() { |
| 161 |
--cache-file="${S}"/config.cache \ |
| 162 |
--with-libdnet=included \ |
| 163 |
--with-pcre="${ESYSROOT}"/usr \ |
| 164 |
+ --without-dpdk \ |
| 165 |
--without-ndiff \ |
| 166 |
--without-zenmap |
| 167 |
} |
| 168 |
|
| 169 |
src_compile() { |
| 170 |
local directory |
| 171 |
- for directory in . libnetutil nsock/src \ |
| 172 |
- $(usex ncat ncat '') \ |
| 173 |
- $(usex nping nping '') |
| 174 |
- do |
| 175 |
+ for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do |
| 176 |
emake -C "${directory}" makefile.dep |
| 177 |
done |
Archives