subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-analyzer\/nmap\/"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-09-01 Thread Sam James

commit: 16c922b4fd1d889ded3196b5aa37d6c9e511c8aa
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  1 07:41:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  1 09:04:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c922b4

net-analyzer/nmap: fix libpcre configure arg

Not going to touch the older ebuilds as they work fine for now.

Closes: https://bugs.gentoo.org/937837
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 0fa4d25ff5fa..a93dbd521953 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -154,7 +154,7 @@ src_configure() {
# The bundled libdnet is incompatible with the version 
available in the
# tree, so we cannot use the system library here.
--with-libdnet=included
-   --with-pcre="${ESYSROOT}"/usr
+   --with-libpcre="${ESYSROOT}"/usr
--without-dpdk
)

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: b4a6f62464cbf772ffe70ebc3944a7774d5fef66
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a6f624

net-analyzer/nmap: Stabilize 7.95 ppc64, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index 4036fc0387b0..ade7b3e5de69 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: 02793706ea5dd944073a5abb2d411f001b7eb8b0
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02793706

net-analyzer/nmap: Stabilize 7.95 arm64, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index 52eaf81a1a05..4036fc0387b0 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: 2d92919faf19d87846b83a62e645e68ad43e0ff1
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d92919f

net-analyzer/nmap: Stabilize 7.95 x86, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index ade7b3e5de69..a16a9653997a 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: add1150d7cea0c57c741ce57ca0c292b5b32bc91
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add1150d

net-analyzer/nmap: Stabilize 7.95 amd64, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index a16a9653997a..82218df92303 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: 6ec0e18954365f0b40b0cce1a17cf46f030ba001
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec0e189

net-analyzer/nmap: Stabilize 7.95 ppc, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index 151abb4025c9..af4839aa63fa 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: 1de6012f978f891a5825d88ec847361a1f2315eb
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de6012f

net-analyzer/nmap: Stabilize 7.95 arm, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index 0fa4d25ff5fa..151abb4025c9 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-05-10 Thread Sam James

commit: 045f6e55220b149bfeb8b73f1df535e902c44649
Author: Sam James  gentoo  org>
AuthorDate: Fri May 10 23:07:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 10 23:07:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045f6e55

net-analyzer/nmap: Stabilize 7.95 sparc, #931695

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
index af4839aa63fa..52eaf81a1a05 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: 35c742846f57f2fedf5eab06c391232d2dce793e
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c74284

net-analyzer/nmap: Stabilize 7.94-r1 arm64, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 483564501d6c..c41acf8a5f9c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: 566601c24ca2278d08e1237969d028c486676c20
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566601c2

net-analyzer/nmap: Stabilize 7.94-r1 amd64, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 9211bf31763d..483564501d6c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: 839f009f78e3062846d915fabd5662a629015fef
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839f009f

net-analyzer/nmap: Stabilize 7.94-r1 x86, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index b81d359012f1..9211bf31763d 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: ac3ef35b28ace9cdcd53380d524c7ed74372b373
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3ef35b

net-analyzer/nmap: Stabilize 7.94-r1 sparc, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index c41acf8a5f9c..304ec31f2f31 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: a413f103e8c2d3dd2351b5865fabe6338cfefbc0
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a413f103

net-analyzer/nmap: Stabilize 7.94-r1 arm, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 304ec31f2f31..b7291c14554c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: cc3dd7eaf893d4e781757521570c516d957bf3e9
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3dd7ea

net-analyzer/nmap: Stabilize 7.94-r1 ppc, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 52851938ccf2..b81d359012f1 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: 7ab44b7f9f5f46f8864ec8c1564b9916128c17d4
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 06:41:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:41:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab44b7f

net-analyzer/nmap: Stabilize 7.94-r1 ppc64, #930960

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 9050bebb7efe..52851938ccf2 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2024-04-29 Thread Sam James

commit: e96b131c7c5036490685986a33d4711e601e3385
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 27 04:36:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 04:38:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96b131c

net-analyzer/nmap: add 7.95

Closes: https://bugs.gentoo.org/916709
Closes: https://bugs.gentoo.org/927775
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest |  4 ++-
 .../nmap/{nmap-.ebuild => nmap-7.95.ebuild}| 37 --
 net-analyzer/nmap/nmap-.ebuild | 37 --
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 49124d2a35a6..633b02eaf585 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,6 @@
 DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 
0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97
 SHA512 
d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 
5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a
 SHA512 
a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
 DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 
38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9
 SHA512 
dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec
-DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B 
d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c
 SHA512 
3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2
+DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 
860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b
 SHA512 
e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd
+DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 
4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c
 SHA512 
fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e
+DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 
31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71
 SHA512 
ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-7.95.ebuild
similarity index 88%
copy from net-analyzer/nmap/nmap-.ebuild
copy to net-analyzer/nmap/nmap-7.95.ebuild
index 043bcfa6f516..0fa4d25ff5fa 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
-inherit autotools lua-single plocale python-single-r1 toolchain-funcs
+inherit autotools distutils-r1 lua-single plocale toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
@@ -27,7 +30,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz";
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz";
 
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
@@ -73,6 +76,7 @@ BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
nls? ( sys-devel/gettext )
+   zenmap? ( ${DISTUTILS_DEPS} )
 "
 
 if [[ ${PV} != ** ]] ; then
@@ -80,12 +84,10 @@ if [[ ${PV} != ** ]] ; then
 fi
 
 PATCHES=(
-   "${WORKDIR}"/${PN}-7.95-patches
+   "${WORKDIR}"/${PN}-7.95-patches-2
 )
 
 pkg_setup() {
-   python-single-r1_pkg_setup
-
use nse && lua-single_pkg_setup
 }
 
@@ -134,6 +136,8 @@ src_configu

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/

2024-04-26 Thread Sam James

commit: bae33e2d2aafdf4713ebd7497be221961e0359d3
Author: Hank Leininger  korelogic  com>
AuthorDate: Wed Nov 29 22:33:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 27 04:19:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae33e2d

net-analyzer/nmap: fix segv with large --top-ports argument

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/918874
Closes: https://github.com/gentoo/gentoo/pull/34055
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap-7.94-topport.patch |  26 
 net-analyzer/nmap/nmap-7.94-r1.ebuild   | 189 
 2 files changed, 215 insertions(+)

diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch 
b/net-analyzer/nmap/files/nmap-7.94-topport.patch
new file mode 100644
index ..7b62c18b8cc7
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.94-topport.patch
@@ -0,0 +1,26 @@
+From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001
+From: dmiller 
+Date: Thu, 20 Jul 2023 16:21:23 +
+Subject: [PATCH] Add missing braces. Fixes #2679
+
+---
+ services.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/services.cc b/services.cc
+index a0899c7509..2a709dca97 100644
+--- a/services.cc
 b/services.cc
+@@ -496,9 +496,10 @@ void gettoppts(double level, const char *portlist, struct 
scan_lists * ports, co
+ if (sctpmax && strcmp(current->s_proto, "sctp") == 0
+ && (!ptsdata_initialized ||
+   is_port_member(ptsdata.sctp_ports, ptsdata.sctp_count, current))
+-   )
++   ) {
+   ports->sctp_ports[ports->sctp_count++] = current->s_port;
+-sctpmax--;
++  sctpmax--;
++}
+ break;
+   default:
+ break;

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild 
b/net-analyzer/nmap/nmap-7.94-r1.ebuild
new file mode 100644
index ..9050bebb7efe
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10..11} )
+PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
+PLOCALE_BACKUP="en"
+inherit autotools lua-single plocale python-single-r1 toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/";
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nmap/nmap";
+
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+   inherit verify-sig
+
+   SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+   SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
+
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.95"
+SLOT="0"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   nse? ( ${LUA_REQUIRED_USE} )
+   symlink? ( ncat )
+"
+
+RDEPEND="
+   dev-libs/liblinear:=
+   dev-libs/libpcre
+   net-libs/libpcap
+   ndiff? ( ${PYTHON_DEPS} )
+   libssh2? (
+   net-libs/libssh2[zlib]
+   sys-libs/zlib
+   )
+   nls? ( virtual/libintl )
+   nse? (
+   ${LUA_DEPS}
+   sys-libs/zlib
+   )
+   ssl? ( dev-libs/openssl:= )
+   symlink? (
+   ncat? (
+   !net-analyzer/netcat
+   !net-analyzer/openbsd-netcat
+   )
+   )
+   zenmap? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   ')
+   )
+"
+DEPEND="${RDEPEND}"
+# Python is always needed at build time for some scripts
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+   "${WORKDIR}"/${PN}-7.94-patches
+   "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch
+   "${FILESDIR}"/${PN}-7.94-topport.patch
+)
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+
+   use nse && lua-single_pkg_setup
+}
+
+src_unpack() {
+   if [[ ${PV} == * ]] ; then
+   git-r3_src_unpack
+   elif use verify-sig ; then
+   # Needed for downloaded patch (which is unsigned, which is fine)
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+   fi
+
+   default
+}
+
+src_prepare() {
+   default
+
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/

2024-04-26 Thread Sam James

commit: 197a020b2d9db8c6e2b82d56db20664155cc3e46
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 27 04:17:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 27 04:19:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197a020b

net-analyzer/nmap: add upstream refs to patch

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap-7.94-topport.patch | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch 
b/net-analyzer/nmap/files/nmap-7.94-topport.patch
index 7b62c18b8cc7..0ba568d317e3 100644
--- a/net-analyzer/nmap/files/nmap-7.94-topport.patch
+++ b/net-analyzer/nmap/files/nmap-7.94-topport.patch
@@ -1,3 +1,8 @@
+https://bugs.gentoo.org/918874
+https://github.com/nmap/nmap/issues/2655
+https://github.com/nmap/nmap/issues/2679
+https://github.com/nmap/nmap/commit/edad9c059ca45bccab8c0f41fe6fc6546c60153a
+
 From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001
 From: dmiller 
 Date: Thu, 20 Jul 2023 16:21:23 +

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/

2024-01-14 Thread Sam James

commit: 1dca374f26b6217b45669668952489049c7a42c3
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 14 20:53:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 14 21:02:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dca374f

net-analyzer/nmap: add references to patch

Bug: https://bugs.gentoo.org/920712
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch 
b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
index 7a17ce11bb39..bf6affb516d0 100644
--- a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
+++ b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
@@ -1,3 +1,5 @@
+https://github.com/nmap/nmap/pull/2763
+https://bugs.gentoo.org/920712
 --- a/libdnet-stripped/config/acinclude.m4
 +++ b/libdnet-stripped/config/acinclude.m4
 @@ -201,6 +201,8 @@

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2023-12-29 Thread David Seifert

commit: 2913f79874078ce53bc911beba04e67d9a424fa8
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 29 10:12:41 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 29 10:12:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2913f798

net-analyzer/nmap: fix autoconf 2.72 failure

Closes: https://bugs.gentoo.org/920712
Signed-off-by: David Seifert  gentoo.org>

 .../nmap/files/nmap-7.94-autoconf-2.72.patch   | 31 ++
 net-analyzer/nmap/nmap-7.94.ebuild |  1 +
 2 files changed, 32 insertions(+)

diff --git a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch 
b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
new file mode 100644
index ..7a17ce11bb39
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
@@ -0,0 +1,31 @@
+--- a/libdnet-stripped/config/acinclude.m4
 b/libdnet-stripped/config/acinclude.m4
+@@ -201,6 +201,8 @@
+ dnl
+ AC_DEFUN(AC_DNET_IOCTL_ARP,
+ [AC_MSG_CHECKING(for arp(7) ioctls)
++AC_PROG_EGREP
++AC_PROG_CPP
+ AC_CACHE_VAL(ac_cv_dnet_ioctl_arp,
+   AC_EGREP_CPP(werd, [
+ # include 
+--- a/libdnet-stripped/configure.in
 b/libdnet-stripped/configure.in
+@@ -211,7 +211,7 @@
+ AC_REPLACE_FUNCS(err strlcpy strsep)
+ 
+ dnl Checks for other system-specific jonks.
+-if test "$CYGWIN" != yes ; then
++AS_IF([test "$CYGWIN" != yes], [
+   AC_DNET_BSD_BPF
+   AC_DNET_LINUX_PROCFS
+   AC_DNET_LINUX_PF_PACKET
+@@ -221,7 +221,7 @@
+   AC_DNET_RAWIP_HOST_OFFLEN
+   AC_DNET_RAWIP_COOKED
+   AC_DNET_GETKERNINFO
+-fi
++])
+ 
+ dnl Check for arp interface.
+ if test "$ac_cv_header_Iphlpapi_h" = yes ; then

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 8543936d281c..ffeeafdf2411 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -81,6 +81,7 @@ fi
 
 PATCHES=(
"${WORKDIR}"/${PN}-7.94-patches
+   "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2023-12-29 Thread David Seifert

commit: 234eac5405c71375eda9d80d6656349cf7746722
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 29 10:12:40 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 29 10:12:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234eac54

net-analyzer/nmap: drop 7.92-r3, 7.93-r3

Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/nmap/Manifest |   4 -
 .../nmap/files/nmap-5.10_beta1-string.patch|  11 -
 net-analyzer/nmap/files/nmap-5.21-python.patch |  21 --
 net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch  |  20 --
 .../nmap/files/nmap-6.46-uninstaller.patch |  19 --
 net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch   |  11 -
 net-analyzer/nmap/files/nmap-7.25-libpcre.patch|  10 -
 net-analyzer/nmap/files/nmap-7.31-libnl.patch  |  15 --
 .../nmap/files/nmap-7.80-ac-config-subdirs.patch   |  26 --
 .../nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch   |  66 -
 .../nmap/files/nmap-7.93-openssl-1.1.patch | 287 -
 .../nmap/files/nmap--netutil-else.patch|  11 -
 net-analyzer/nmap/nmap-7.92-r3.ebuild  | 141 --
 net-analyzer/nmap/nmap-7.93-r3.ebuild  | 154 ---
 14 files changed, 796 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5696ae9f2ec4..49124d2a35a6 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,7 +1,3 @@
-DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
-DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
-DIST nmap-7.93.tar.bz2 10823114 BLAKE2B 
e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995
 SHA512 
4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
-DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f
 SHA512 
9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
 DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 
0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97
 SHA512 
d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 
5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a
 SHA512 
a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
 DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 
38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9
 SHA512 
dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec

diff --git a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch 
b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
deleted file mode 100644
index df29db3782d5..
--- a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 nmap-5.10BETA1/Target.h.org2009-12-08 08:21:59.0 +0100
-+++ nmap-5.10BETA1/Target.h2009-12-08 08:22:02.0 +0100
-@@ -99,6 +99,8 @@
- 
- #ifndef NOLUA
- #include "nse_main.h"
-+#else
-+#include 
- #endif
- 
- #include "portreasons.h"

diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch 
b/net-analyzer/nmap/files/nmap-5.21-python.patch
deleted file mode 100644
index aa0d4f9db953..
--- a/net-analyzer/nmap/files/nmap-5.21-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
 nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.0 +0100
-+++ nmap-5.21/Makefile.in  2010-01-31 09:54:48.0 +0100
-@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
-   $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
--  cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix 
"$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-+  cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-07-05 Thread Sam James

commit: 8aa9f0c823c3a569a512327be65cc9d039c89f32
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  6 05:58:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  6 05:58:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa9f0c8

net-analyzer/nmap: port  to libpcre2

Closes: https://bugs.gentoo.org/887081
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest | 1 +
 net-analyzer/nmap/nmap-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 05183fc01e09..5696ae9f2ec4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -5,3 +5,4 @@ DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e5
 DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 
0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97
 SHA512 
d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 
5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a
 SHA512 
a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
 DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 
38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9
 SHA512 
dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec
+DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B 
d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c
 SHA512 
3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 246e6bb067d6..dd5c455a7461 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -27,7 +27,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz";
 
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
@@ -41,7 +41,7 @@ REQUIRED_USE="
 
 RDEPEND="
dev-libs/liblinear:=
-   dev-libs/libpcre
+   dev-libs/libpcre2
net-libs/libpcap
ndiff? ( ${PYTHON_DEPS} )
libssh2? (
@@ -80,7 +80,7 @@ if [[ ${PV} != ** ]] ; then
 fi
 
 PATCHES=(
-   "${WORKDIR}"/${PN}-7.94-patches
+   "${WORKDIR}"/${PN}-7.95-patches
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: d260abe4bc18a01fcaa6c46d3c5bda4d6e762886
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d260abe4

net-analyzer/nmap: Stabilize 7.94 arm64, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 246e6bb067d6..6978def26374 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: 312a735899344e15b1793ccb71f98f864d586c60
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312a7358

net-analyzer/nmap: Stabilize 7.94 amd64, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 6978def26374..81a8d12e3859 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: 6df5e9ba9794b8f098398ce628807c42a199d4ab
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df5e9ba

net-analyzer/nmap: Stabilize 7.94 ppc, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 629381122901..11c82c8402cc 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: fa66f07e58b91f00a069fe2a4ec98c5a7d4c40d6
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa66f07e

net-analyzer/nmap: Stabilize 7.94 sparc, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 7cdb9f5b02a3..629381122901 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: 1995ea4644af00f120970cc90018982594b76001
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1995ea46

net-analyzer/nmap: Stabilize 7.94 x86, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index dc608fe43f08..7cdb9f5b02a3 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: 05b4fbec408fdef42e591d6ecb134b15054f36cc
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b4fbec

net-analyzer/nmap: Stabilize 7.94 ppc64, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 8a703fb68b54..dc608fe43f08 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-06-25 Thread Sam James

commit: d5160eb64080799287c53839816e9b91aba02a29
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 25 07:04:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 25 07:04:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5160eb6

net-analyzer/nmap: Stabilize 7.94 arm, #909138

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index 81a8d12e3859..8a703fb68b54 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-05-21 Thread Sam James

commit: 64620d3c640666e4e9a345d92babb5167b4e7692
Author: Sam James  gentoo  org>
AuthorDate: Sun May 21 19:41:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 21 19:41:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64620d3c

net-analyzer/nmap: fix live ebuild

Closes: https://bugs.gentoo.org/906903
Fixes: 77eba6f506b1f629034647c8b7debcba8d599a6a
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 7 +--
 net-analyzer/nmap/nmap-.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index a12d68736f19..246e6bb067d6 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -22,12 +22,13 @@ else
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
+
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
@@ -89,7 +90,9 @@ pkg_setup() {
 }
 
 src_unpack() {
-   if use verify-sig ; then
+   if [[ ${PV} == * ]] ; then
+   git-r3_src_unpack
+   elif use verify-sig ; then
# Needed for downloaded patch (which is unsigned, which is fine)
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
fi

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index a12d68736f19..246e6bb067d6 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -22,12 +22,13 @@ else
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
+
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
@@ -89,7 +90,9 @@ pkg_setup() {
 }
 
 src_unpack() {
-   if use verify-sig ; then
+   if [[ ${PV} == * ]] ; then
+   git-r3_src_unpack
+   elif use verify-sig ; then
# Needed for downloaded patch (which is unsigned, which is fine)
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-05-21 Thread Sam James

commit: 2d14f7eae55af52cb3e811d6326d9820a3aa2faa
Author: Sam James  gentoo  org>
AuthorDate: Sun May 21 19:18:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 21 19:35:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d14f7ea

net-analyzer/nmap: disable py3.9

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 net-analyzer/nmap/nmap-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
index d1dbe307710b..a12d68736f19 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
 inherit autotools lua-single plocale python-single-r1 toolchain-funcs

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index d1dbe307710b..a12d68736f19 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
 inherit autotools lua-single plocale python-single-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-05-21 Thread Sam James

commit: 77eba6f506b1f629034647c8b7debcba8d599a6a
Author: Sam James  gentoo  org>
AuthorDate: Sun May 21 18:33:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 21 18:35:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eba6f5

net-analyzer/nmap: add 7.94

Bug: https://bugs.gentoo.org/906881
Closes: https://bugs.gentoo.org/702288
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest |  3 +++
 .../nmap/{nmap-.ebuild => nmap-7.94.ebuild}| 23 +++---
 net-analyzer/nmap/nmap-.ebuild | 23 +++---
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ba0eb83f06f4..05183fc01e09 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -2,3 +2,6 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B 
e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995
 SHA512 
4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f
 SHA512 
9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
+DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 
0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97
 SHA512 
d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
+DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 
5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a
 SHA512 
a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
+DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 
38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9
 SHA512 
dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-7.94.ebuild
similarity index 89%
copy from net-analyzer/nmap/nmap-.ebuild
copy to net-analyzer/nmap/nmap-7.94.ebuild
index f18840ef8839..d1dbe307710b 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{9..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
@@ -22,6 +22,7 @@ else
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -78,16 +79,7 @@ if [[ ${PV} != ** ]] ; then
 fi
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-   "${FILESDIR}"/${PN}-5.21-python.patch
-   "${FILESDIR}"/${PN}-6.46-uninstaller.patch
-   "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-   "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-7.25-libpcre.patch
-   "${FILESDIR}"/${PN}-7.31-libnl.patch
-   "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-   "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-   "${FILESDIR}"/${PN}--netutil-else.patch
+   "${WORKDIR}"/${PN}-7.94-patches
 )
 
 pkg_setup() {
@@ -96,6 +88,15 @@ pkg_setup() {
use nse && lua-single_pkg_setup
 }
 
+src_unpack() {
+   if use verify-sig ; then
+   # Needed for downloaded patch (which is unsigned, which is fine)
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+   fi
+
+   default
+}
+
 src_prepare() {
default
 

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index f18840ef8839..d1dbe307710b 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -3,7 +3,7 @@

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-04-02 Thread Sam James

commit: 54c3961cd8fd050411752bc036f2e6d24b1aa075
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  2 21:54:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  2 21:56:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c3961c

net-analyzer/nmap: tidy up system-lua logic

In 5bb392d690d47baf051b7efaea990a0afda25618, we unmasked system-lua, but iamben
points out the REQUIRED_USE logic was backwards here where system-lua needed
nse on rather than the other way around.

Fix that by just dropping system-lua as a flag, so we now always use the
system Lua if we need it (i.e. if we're building nse).

Bug: https://bugs.gentoo.org/253269
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/metadata.xml|  1 -
 .../nmap/{nmap-7.92-r2.ebuild => nmap-7.92-r3.ebuild} | 14 --
 .../nmap/{nmap-7.93-r2.ebuild => nmap-7.93-r3.ebuild} | 14 --
 net-analyzer/nmap/nmap-.ebuild| 15 +--
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index e31f57e3f592..c93c9fdc4493 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@
Install the nping utility
Include support for the Nmap Scripting Engine 
(NSE)
Install symlink to nc
-   Use dev-lang/lua instead of 
the bundled liblua
Install the GTK+ based nmap GUI, 
zenmap



diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild 
b/net-analyzer/nmap/nmap-7.92-r3.ebuild
similarity index 91%
rename from net-analyzer/nmap/nmap-7.92-r2.ebuild
rename to net-analyzer/nmap/nmap-7.92-r3.ebuild
index 2c418afbe2a5..62e1a494d022 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r3.ebuild
@@ -26,9 +26,9 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-   system-lua? ( nse ${LUA_REQUIRED_USE} )
+   nse? ( ${LUA_REQUIRED_USE} )
symlink? ( ncat )
 "
 
@@ -40,13 +40,15 @@ RDEPEND="
net-libs/libssh2[zlib]
sys-libs/zlib
)
-   nse? ( sys-libs/zlib )
+   nse? (
+   ${LUA_DEPS}
+   sys-libs/zlib
+   )
ssl? ( dev-libs/openssl:0= )
symlink? (
!net-analyzer/netcat
!net-analyzer/openbsd-netcat
)
-   system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -67,7 +69,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-   use system-lua && lua-single_pkg_setup
+   use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -99,9 +101,9 @@ src_configure() {
$(use_with libssh2) \
$(use_with ncat) \
$(use_with nping) \
+   $(use_with nse liblua) \
$(use_with ssl openssl) \
$(usex libssh2 --with-zlib) \
-   $(usex nse --with-liblua=$(usex system-lua yes included '' '') 
--without-liblua) \
$(usex nse --with-zlib) \
--cache-file="${S}"/config.cache \
--with-libdnet=included \

diff --git a/net-analyzer/nmap/nmap-7.93-r2.ebuild 
b/net-analyzer/nmap/nmap-7.93-r3.ebuild
similarity index 92%
rename from net-analyzer/nmap/nmap-7.93-r2.ebuild
rename to net-analyzer/nmap/nmap-7.93-r3.ebuild
index 0b02e213c5e4..d2a477897b76 100644
--- a/net-analyzer/nmap/nmap-7.93-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r3.ebuild
@@ -28,9 +28,9 @@ fi
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="|| ( NPSL-0.94 NPSL-0.95 )"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-   system-lua? ( nse ${LUA_REQUIRED_USE} )
+   nse? ( ${LUA_REQUIRED_USE} )
symlink? ( ncat )
 "
 
@@ -42,7 +42,10 @@ RDEPEND="
net-libs/libssh2[zlib]
sys-libs/zlib
)
-   nse? ( sys-libs/zlib )
+   nse? (
+   ${LUA_DEPS}
+   sys-libs/zlib
+   )
ssl? ( dev-libs/openssl:0= )
symlink? (
ncat? (
@@ -50,7 +53,6 @@ RDEPEND="
!net-analyzer/openbsd-netcat
)
)
-   system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -79,7 +81,7 @@ PATCHES=(
 pkg_setup() {
python-any-r1_pkg_setup
 
-   use system-lua && lua-single_pkg_setup
+   use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -114,9 +116,9 @@ src_configure() {
$(use_with libssh2) \
$(use_with ncat) \
$(use_with nping) \
+   $(use_with nse liblua) \
$(use_with ssl openssl) \
$(usex libssh2 --with-zlib) \
-   $(usex nse --with-liblua=$(usex sys

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-01-12 Thread Ulrich Müller

commit: 7a0075bffbf7e96b999bd888ed399a34f46ea4cc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Jan 12 17:15:00 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jan 12 17:18:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0075bf

net-analyzer/nmap: Update LICENSE

"Versions of Nmap released under previous versions of the NPSL may also
be used under the NPSL 0.95 terms." (https://nmap.org/changelog)

Signed-off-by: Ulrich Müller  gentoo.org>

 net-analyzer/nmap/nmap-7.92-r2.ebuild  | 2 +-
 net-analyzer/nmap/{nmap-7.93-r1.ebuild => nmap-7.93-r2.ebuild} | 2 +-
 net-analyzer/nmap/nmap-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild 
b/net-analyzer/nmap/nmap-7.92-r2.ebuild
index b048ac202f48..2c418afbe2a5 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -22,7 +22,7 @@ else
 
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-   LICENSE="|| ( NPSL-0.92 GPL-2 )"
+   LICENSE="|| ( NPSL-0.92 NPSL-0.95 GPL-2 )"
 fi
 
 SLOT="0"

diff --git a/net-analyzer/nmap/nmap-7.93-r1.ebuild 
b/net-analyzer/nmap/nmap-7.93-r2.ebuild
similarity index 98%
rename from net-analyzer/nmap/nmap-7.93-r1.ebuild
rename to net-analyzer/nmap/nmap-7.93-r2.ebuild
index 58b6435c8550..fd0f89bab51f 100644
--- a/net-analyzer/nmap/nmap-7.93-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r2.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 # https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.94"
+LICENSE="|| ( NPSL-0.94 NPSL-0.95 )"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 103c09dbfcaf..446c5f2db922 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 # https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.94"
+LICENSE="NPSL-0.95"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-01-10 Thread Sam James

commit: a6b7d460c0cc771d7a6bdae1cd1841f5a85683bc
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 10 08:35:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 10 08:36:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b7d460

net-analyzer/nmap: crank copyright

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild 
b/net-analyzer/nmap/nmap-7.92-r2.ebuild
index 9ed09a572931..b048ac202f48 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index cb3c5fa1e068..103c09dbfcaf 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-01-10 Thread Sam James

commit: a569f13b5a60aff8d82db75bedcda526728be8b1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 04:56:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 10 08:34:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a569f13b

Revert "net-analyzer/nmap: drop 7.92-r2"

This reverts commit 0fe19fdc6d362149e8f6df90f04fa1423ff8c010.

This is the last version released under GPL-2 for compatibility:
https://nmap.org/npsl/

It says:
"""
Note that some releases of Nmap may fall under a previous version of this 
license,
or a different license entirely. The exact terms for a given version of Nmap can
be found in the included LICENSE or COPYING file.

To ease the transition to the NPSL, the first three Nmap releases made under
that license (Nmap 7.90, 7.91, and 7.92) may also be used under the previous
Nmap license terms by anyone who prefers those.
"""

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest|   2 +
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 142 ++
 2 files changed, 144 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8e4258cbc673..ba0eb83f06f4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,4 @@
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B 
e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995
 SHA512 
4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f
 SHA512 
9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild 
b/net-analyzer/nmap/nmap-7.92-r2.ebuild
new file mode 100644
index ..699b452ebd6e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/";
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nmap/nmap";
+
+   # Just in case for now as future seems undecided.
+   LICENSE="NPSL"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
+   inherit verify-sig
+
+   SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+   SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+   LICENSE="|| ( NPSL GPL-2 )"
+fi
+
+SLOT="0"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+   system-lua? ( nse ${LUA_REQUIRED_USE} )
+   symlink? ( ncat )
+"
+
+RDEPEND="
+   dev-libs/liblinear:=
+   dev-libs/libpcre
+   net-libs/libpcap
+   libssh2? (
+   net-libs/libssh2[zlib]
+   sys-libs/zlib
+   )
+   nse? ( sys-libs/zlib )
+   ssl? ( dev-libs/openssl:0= )
+   symlink? (
+   !net-analyzer/netcat
+   !net-analyzer/openbsd-netcat
+   )
+   system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.10_beta1-string.patch
+   "${FILESDIR}"/${PN}-5.21-python.patch
+   "${FILESDIR}"/${PN}-6.46-uninstaller.patch
+   "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+   "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-7.25-libpcre.patch
+   "${FILESDIR}"/${PN}-7.31-libnl.patch
+   "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+   "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+pkg_setup() {
+   use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   rm -r liblinear/ libpcap/ libpcre

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2023-01-10 Thread Sam James

commit: 25e5315c5470b97446e1074c787440883db7fd34
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 05:15:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 10 08:34:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e5315c

net-analyzer/nmap: fix LICENSE

Apologies for missing this before - for some reason (it was in October,
so I can't recall exactly) I didn't update LICENSE with the 7.93 bump
(perhaps thought the issue wasn't resolved b/c upstream bug still open...?)

Bug: https://github.com/nmap/nmap/issues/2199
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/{nmap-7.93.ebuild => nmap-7.93-r1.ebuild} | 5 +++--
 net-analyzer/nmap/nmap-.ebuild  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93-r1.ebuild
similarity index 97%
rename from net-analyzer/nmap/nmap-7.93.ebuild
rename to net-analyzer/nmap/nmap-7.93-r1.ebuild
index 1c9da575583a..58b6435c8550 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,8 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 747d81979e00..cb3c5fa1e068 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -27,7 +27,8 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/

2022-12-26 Thread Sam James

commit: 69cba480c48a85602263bb2f7d2398d78b0240e2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Dec 26 08:38:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 26 10:19:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cba480

net-analyzer/nmap: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28822
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap--python3.patch | 103 
 1 file changed, 103 deletions(-)

diff --git a/net-analyzer/nmap/files/nmap--python3.patch 
b/net-analyzer/nmap/files/nmap--python3.patch
deleted file mode 100644
index 3d740d759b3c..
--- a/net-analyzer/nmap/files/nmap--python3.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/nmap/nmap/pull/2580
-
-From 14f8e230a61748b1cde86d13a2cf2353d7ad1fa7 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 9 Dec 2022 15:58:35 +
-Subject: [PATCH] zenmap: further Python 3 compatibility fixes
-
-Without this, we get:
-```
-Traceback (most recent call last):
-  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
584, in 
-setup(**setup_args)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 
185, in setup
-return run_commands(dist)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 
201, in run_commands
-dist.run_commands()
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 
969, in run_commands
-self.run_command(cmd)
-  File "/usr/lib/python3.10/site-packages/setuptools/dist.py", line 1208, in 
run_command
-super().run_command(command)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 
988, in run_command
-cmd_obj.run()
-  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
188, in run
-self.write_installed_files()
-  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
419, in write_installed_files
-print >> f, output
-TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' 
and '_io.TextIOWrapper'. Did you mean "print(, file=)"?
-make: *** [Makefile:372: install-zenmap] Error 1
-```
-
-This is because Python 3 doesn't support Python 2-style print without
-parentheses, or specifying the output file in that manner.
-
-Signed-off-by: Sam James 
 a/zenmap/setup.py
-+++ b/zenmap/setup.py
-@@ -215,13 +215,13 @@ def create_uninstaller(self):
- #!/usr/bin/env python3
- import errno, os, os.path, sys
- 
--print 'Uninstall %(name)s %(version)s'
-+print('Uninstall %(name)s %(version)s')
- 
- answer = raw_input('Are you sure that you want to uninstall '
- '%(name)s %(version)s? (yes/no) ')
- 
- if answer != 'yes' and answer != 'y':
--print 'Not uninstalling.'
-+print('Not uninstalling.')
- sys.exit(0)
- 
- """ % {'name': APP_DISPLAY_NAME, 'version': VERSION}
-@@ -237,8 +237,8 @@ def create_uninstaller(self):
- # This should never happen (everything gets installed
- # inside the root), but if it does, be safe and don't
- # delete anything.
--uninstaller += ("print '%s was not installed inside "
--"the root %s; skipping.'\n" % (output, self.root))
-+uninstaller += ("print('%s was not installed inside "
-+"the root %s; skipping.')\n" % (output, self.root))
- continue
- output = path_strip_prefix(output, self.root)
- assert os.path.isabs(output)
-@@ -262,24 +262,24 @@ def create_uninstaller(self):
- dirs.append(path)
- # Delete the files.
- for file in files:
--print "Removing '%s'." % file
-+print("Removing '%s'." % file)
- try:
- os.remove(file)
- except OSError as e:
--print >> sys.stderr, '  Error: %s.' % str(e)
-+print('  Error: %s.' % str(e), file=sys.stderr)
- # Delete the directories. First reverse-sort the normalized paths by
- # length so that child directories are deleted before their parents.
- dirs = [os.path.normpath(dir) for dir in dirs]
- dirs.sort(key = len, reverse = True)
- for dir in dirs:
- try:
--print "Removing the directory '%s'." % dir
-+print("Removing the directory '%s'." % dir)
- os.rmdir(dir)
- except OSError as e:
- if e.errno == errno.ENOTEMPTY:
--print "Directory '%s' not empty; not removing." % dir
-+print("Directory '%s' not empty; not removing." % dir)
- else:
--print >> sys.stderr, str(e)
-+print(str(e), file=sys.stderr)
- """
- 
- uninstaller_file = open(uninstaller_filename, 'w')
-@@ -419,7 +419,7 @@ def write_installed_files(self):
- with open(INSTALLED_FILES_NA

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-12-15 Thread Sam James

commit: 596a1d015f482ba524a8e9ca791841c190df1804
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:03:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:03:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596a1d01

net-analyzer/nmap: drop upstreamed python3 patch in live

Bug: https://bugs.gentoo.org/702288
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 4588e1d360ac..747d81979e00 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -84,7 +84,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
"${FILESDIR}"/${PN}--netutil-else.patch
-   "${FILESDIR}"/${PN}--python3.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2022-12-09 Thread Sam James

commit: 350458ecda5f78ef834191b50029b1e48548f188
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  9 16:04:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  9 16:48:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350458ec

net-analyzer/nmap: restore ndiff, zenmap (now Python 3) to live

Bug: https://bugs.gentoo.org/702288
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap--python3.patch | 103 
 net-analyzer/nmap/metadata.xml  |   2 +
 net-analyzer/nmap/nmap-.ebuild  |  74 -
 3 files changed, 157 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/nmap/files/nmap--python3.patch 
b/net-analyzer/nmap/files/nmap--python3.patch
new file mode 100644
index ..3d740d759b3c
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap--python3.patch
@@ -0,0 +1,103 @@
+https://github.com/nmap/nmap/pull/2580
+
+From 14f8e230a61748b1cde86d13a2cf2353d7ad1fa7 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 9 Dec 2022 15:58:35 +
+Subject: [PATCH] zenmap: further Python 3 compatibility fixes
+
+Without this, we get:
+```
+Traceback (most recent call last):
+  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
584, in 
+setup(**setup_args)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 
185, in setup
+return run_commands(dist)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 
201, in run_commands
+dist.run_commands()
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 
969, in run_commands
+self.run_command(cmd)
+  File "/usr/lib/python3.10/site-packages/setuptools/dist.py", line 1208, in 
run_command
+super().run_command(command)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 
988, in run_command
+cmd_obj.run()
+  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
188, in run
+self.write_installed_files()
+  File 
"/var/tmp/portage/net-analyzer/nmap-/work/nmap-/zenmap/setup.py", line 
419, in write_installed_files
+print >> f, output
+TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' 
and '_io.TextIOWrapper'. Did you mean "print(, file=)"?
+make: *** [Makefile:372: install-zenmap] Error 1
+```
+
+This is because Python 3 doesn't support Python 2-style print without
+parentheses, or specifying the output file in that manner.
+
+Signed-off-by: Sam James 
+--- a/zenmap/setup.py
 b/zenmap/setup.py
+@@ -215,13 +215,13 @@ def create_uninstaller(self):
+ #!/usr/bin/env python3
+ import errno, os, os.path, sys
+ 
+-print 'Uninstall %(name)s %(version)s'
++print('Uninstall %(name)s %(version)s')
+ 
+ answer = raw_input('Are you sure that you want to uninstall '
+ '%(name)s %(version)s? (yes/no) ')
+ 
+ if answer != 'yes' and answer != 'y':
+-print 'Not uninstalling.'
++print('Not uninstalling.')
+ sys.exit(0)
+ 
+ """ % {'name': APP_DISPLAY_NAME, 'version': VERSION}
+@@ -237,8 +237,8 @@ def create_uninstaller(self):
+ # This should never happen (everything gets installed
+ # inside the root), but if it does, be safe and don't
+ # delete anything.
+-uninstaller += ("print '%s was not installed inside "
+-"the root %s; skipping.'\n" % (output, self.root))
++uninstaller += ("print('%s was not installed inside "
++"the root %s; skipping.')\n" % (output, self.root))
+ continue
+ output = path_strip_prefix(output, self.root)
+ assert os.path.isabs(output)
+@@ -262,24 +262,24 @@ def create_uninstaller(self):
+ dirs.append(path)
+ # Delete the files.
+ for file in files:
+-print "Removing '%s'." % file
++print("Removing '%s'." % file)
+ try:
+ os.remove(file)
+ except OSError as e:
+-print >> sys.stderr, '  Error: %s.' % str(e)
++print('  Error: %s.' % str(e), file=sys.stderr)
+ # Delete the directories. First reverse-sort the normalized paths by
+ # length so that child directories are deleted before their parents.
+ dirs = [os.path.normpath(dir) for dir in dirs]
+ dirs.sort(key = len, reverse = True)
+ for dir in dirs:
+ try:
+-print "Removing the directory '%s'." % dir
++print("Removing the directory '%s'." % dir)
+ os.rmdir(dir)
+ except OSError as e:
+ if e.errno == errno.ENOTEMPTY:
+-print "Directory '%s' not empty; not removing." % dir
++print("Directory '%s' not empty; not removing." % dir)
+ else:
+-print >> sys.stderr, str(e)
++print(str(e), file=sys.stderr)
+ """
+ 
+ uninstaller_file = open(uninstaller_filename, 'w')
+@@ -419

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-28 Thread Sam James

commit: 0fe19fdc6d362149e8f6df90f04fa1423ff8c010
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 19:36:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 19:50:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe19fdc

net-analyzer/nmap: drop 7.92-r2

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest|   2 -
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 142 --
 2 files changed, 144 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ba0eb83f06f4..8e4258cbc673 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,2 @@
-DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
-DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B 
e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995
 SHA512 
4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f
 SHA512 
9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild 
b/net-analyzer/nmap/nmap-7.92-r2.ebuild
deleted file mode 100644
index 699b452ebd6e..
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/";
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-
-   EGIT_REPO_URI="https://github.com/nmap/nmap";
-
-   # Just in case for now as future seems undecided.
-   LICENSE="NPSL"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
-   inherit verify-sig
-
-   SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-   SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-   LICENSE="|| ( NPSL GPL-2 )"
-fi
-
-SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
-REQUIRED_USE="
-   system-lua? ( nse ${LUA_REQUIRED_USE} )
-   symlink? ( ncat )
-"
-
-RDEPEND="
-   dev-libs/liblinear:=
-   dev-libs/libpcre
-   net-libs/libpcap
-   libssh2? (
-   net-libs/libssh2[zlib]
-   sys-libs/zlib
-   )
-   nse? ( sys-libs/zlib )
-   ssl? ( dev-libs/openssl:0= )
-   symlink? (
-   !net-analyzer/netcat
-   !net-analyzer/openbsd-netcat
-   )
-   system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV} != ** ]] ; then
-   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-   "${FILESDIR}"/${PN}-5.21-python.patch
-   "${FILESDIR}"/${PN}-6.46-uninstaller.patch
-   "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-   "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-7.25-libpcre.patch
-   "${FILESDIR}"/${PN}-7.31-libnl.patch
-   "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-   "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-   use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-   cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-   default
-
-   sed -i \
-   -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-   Makefile.in || die
-
-   cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-   eautoreconf
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # we need the original for a Darwin-specific fix, bug #604432
-   mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-   fi
-}
-
-src_configure() {
-   # The bundled libdnet is incompatib

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 3115ab568925606e26785f49d40aceeb34d9d47e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:48:34 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:48:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3115ab56

net-analyzer/nmap: Stabilize 7.93 x86, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index 0ece400f8063..1c9da575583a 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 1f1211581347eb0e9360624d2eaa95f926840c29
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:47:28 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:47:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f121158

net-analyzer/nmap: Stabilize 7.93 sparc, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index fdbb8ffc92a8..0ece400f8063 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 73727dc6e7a275c9e83971ed61450d4fafbbb512
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:46:15 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:46:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73727dc6

net-analyzer/nmap: Stabilize 7.93 ppc64, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index dfb065f1b367..fdbb8ffc92a8 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 8417cfccbd8908c120b29bbde4c255622254a314
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:45:02 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:45:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8417cfcc

net-analyzer/nmap: Stabilize 7.93 ppc, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index 3e7f39264f41..dfb065f1b367 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 89794c26aba9f8062f17f0db796e080eafb11d4b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:44:04 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:44:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89794c26

net-analyzer/nmap: Stabilize 7.93 arm64, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index b6e1417999aa..3e7f39264f41 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 724809afcc8aa8728389cd50c77816724ea7654d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:42:55 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:42:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724809af

net-analyzer/nmap: Stabilize 7.93 arm, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index c140d89a884c..b6e1417999aa 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-10-10 Thread Agostino Sarubbo

commit: 8af3c5209625c19c720c307ed9da08e7f70a3b75
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:41:07 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:41:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af3c520

net-analyzer/nmap: Stabilize 7.93 amd64, #876655

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index 7c6ddc0d5bfd..c140d89a884c 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2022-09-08 Thread Sam James

commit: c63cfea0ac092bf463d6a13ae976fa788f548378
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  9 01:26:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  9 01:41:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63cfea0

net-analyzer/nmap: use upstream patch for < OpenSSL 3

Bug: https://bugs.gentoo.org/868483
Signed-off-by: Sam James  gentoo.org>

 .../nmap/files/nmap-7.93-openssl-1.1.patch | 287 +
 net-analyzer/nmap/nmap-7.93.ebuild |   7 +-
 net-analyzer/nmap/nmap-.ebuild |   6 +-
 3 files changed, 290 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/nmap/files/nmap-7.93-openssl-1.1.patch 
b/net-analyzer/nmap/files/nmap-7.93-openssl-1.1.patch
new file mode 100644
index ..211cc2dbb7f7
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.93-openssl-1.1.patch
@@ -0,0 +1,287 @@
+https://github.com/nmap/nmap/commit/d6bea8dcdee36a3902cece14097993350306f1b6
+https://github.com/nmap/nmap/issues/2516
+https://bugs.gentoo.org/868483
+
+From: dmiller 
+Date: Tue, 6 Sep 2022 22:39:34 +
+Subject: [PATCH] Build based on OpenSSL version, not API level. Fixes #2516
+
+--- a/ncat/http_digest.c
 b/ncat/http_digest.c
+@@ -133,7 +133,7 @@ int http_digest_init_secret(void)
+ return 0;
+ }
+ 
+-#if OPENSSL_API_LEVEL < 10100
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+ #define EVP_MD_CTX_new EVP_MD_CTX_create
+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
+ #endif
+--- a/ncat/ncat_connect.c
 b/ncat/ncat_connect.c
+@@ -82,8 +82,8 @@
+ #include 
+ 
+ /* Deprecated in OpenSSL 3.0 */
+-#if OPENSSL_API_LEVEL >= 3
+-#define SSL_get_peer_certificate SSL_get1_peer_certificate
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
++# define SSL_get_peer_certificate SSL_get1_peer_certificate
+ #endif
+ #endif
+ 
+--- a/ncat/ncat_ssl.c
 b/ncat/ncat_ssl.c
+@@ -80,7 +80,7 @@
+ #define FUNC_ASN1_STRING_data ASN1_STRING_data
+ #endif
+ 
+-#if OPENSSL_API_LEVEL >= 3
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
+ #include 
+ /* Deprecated in OpenSSL 3.0 */
+ #define SSL_get_peer_certificate SSL_get1_peer_certificate
+@@ -117,7 +117,7 @@ SSL_CTX *setup_ssl_listen(void)
+ OpenSSL_add_all_algorithms();
+ ERR_load_crypto_strings();
+ SSL_load_error_strings();
+-#elif OPENSSL_API_LEVEL >= 3
++#elif OPENSSL_VERSION_NUMBER >= 0x3000L
+   if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
+   {
+ loguser("OpenSSL legacy provider failed to load.\n");
+@@ -477,7 +477,7 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
+ const char *commonName = "localhost";
+ char dNSName[128];
+ int rc;
+-#if OPENSSL_API_LEVEL < 3
++#if OPENSSL_VERSION_NUMBER < 0x3000L
+ int ret = 0;
+ RSA *rsa = NULL;
+ BIGNUM *bne = NULL;
+--- a/ncat/ncat_ssl.h
 b/ncat/ncat_ssl.h
+@@ -67,18 +67,6 @@
+ #include 
+ #include 
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x90L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+- (((OPENSSL_API_COMPAT >> 28) & 0xF) * 1  \
+-  + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-  + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+ #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
+ 
+ enum {
+--- a/ncat/test/test-wildcard.c
 b/ncat/test/test-wildcard.c
+@@ -20,7 +20,7 @@ are rejected. The SSL transactions happen over OpenSSL BIO 
pairs.
+ 
+ #include "ncat_core.h"
+ #include "ncat_ssl.h"
+-#if OPENSSL_API_LEVEL < 3
++#if OPENSSL_VERSION_NUMBER < 0x3000L
+ #include 
+ #endif
+ 
+@@ -294,7 +294,7 @@ static int set_dNSNames(X509 *cert, const struct lstr 
dNSNames[])
+ static int gen_cert(X509 **cert, EVP_PKEY **key,
+ const struct lstr commonNames[], const struct lstr dNSNames[])
+ {
+-#if OPENSSL_API_LEVEL < 3
++#if OPENSSL_VERSION_NUMBER < 0x3000L
+ int rc, ret=0;
+ RSA *rsa = NULL;
+ BIGNUM *bne = NULL;
+--- a/nse_openssl.cc
 b/nse_openssl.cc
+@@ -20,6 +20,9 @@
+ #define FUNC_EVP_CIPHER_CTX_init EVP_CIPHER_CTX_reset
+ #define FUNC_EVP_CIPHER_CTX_cleanup EVP_CIPHER_CTX_reset
+ #define PASS_EVP_CTX(ctx) (ctx)
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
++# include 
++#endif
+ #else
+ #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_init
+ #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_cleanup
+@@ -37,23 +40,6 @@ extern NmapOps o;
+ 
+ #include "nse_openssl.h"
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x90L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+- (((OPENSSL_API_COMPAT >> 28) & 0xF) * 1  \
+-  + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-  + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+-
+-#if OPENSSL_API_LEVEL >= 3
+-#include 
+-#endif
+-
+ #define NSE_SSL_LUA_ERR(_L) \
+ luaL_error(_L, "O

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-09-04 Thread Sam James

commit: e86f2d6edad50bc23e970dd413171d28ff54ba65
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  4 23:55:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  4 23:55:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86f2d6e

net-analyzer/nmap: fix build with < OpenSSL 3; don't automagically detect 
python2

Closes: https://bugs.gentoo.org/868483
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 17 +++--
 net-analyzer/nmap/nmap-.ebuild | 17 +++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
@@ -51,7 +52,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+"
 
 if [[ ${PV} != ** ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+   python-any-r1_pkg_setup
+
use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+   export ac_cv_path_PYTHON="${PYTHON}"
+   export am_cv_pathless_PYTHON="${EPYTHON}"
+
+   # Workaround for https://github.com/nmap/nmap/issues/2516
+   # bug #868483
+   append-cppflags -DOPENSSL_API_COMPAT=10101
+
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
@@ -51,7 +52,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+"
 
 if [[ ${PV} != ** ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+   python-any-r1_pkg_setup
+
use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+   export ac_cv_path_PYTHON="${PYTHON}"
+   export am_cv_pathless_PYTHON="${EPYTHON}"
+
+   # Workaround for https://github.com/nmap/nmap/issues/2516
+   # bug #868483
+   append-cppflags -DOPENSSL_API_COMPAT=10101
+
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-09-02 Thread Sam James

commit: 629c66e841a616ab168923fb009bf50fcb30ade8
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 03:35:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 03:35:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629c66e8

net-analyzer/nmap: add 7.93

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest |  2 ++
 .../nmap/{nmap-.ebuild => nmap-7.93.ebuild}| 18 +++---
 net-analyzer/nmap/nmap-.ebuild | 18 +++---
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 49819935ca25..ba0eb83f06f4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,4 @@
 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
+DIST nmap-7.93.tar.bz2 10823114 BLAKE2B 
e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995
 SHA512 
4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
+DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 
0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f
 SHA512 
9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-7.93.ebuild
similarity index 90%
copy from net-analyzer/nmap/nmap-.ebuild
copy to net-analyzer/nmap/nmap-7.93.ebuild
index 62661ccfa927..9470b5ddbf08 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
@@ -14,8 +14,6 @@ if [[ ${PV} == ** ]] ; then
 
EGIT_REPO_URI="https://github.com/nmap/nmap";
 
-   # Just in case for now as future seems undecided.
-   LICENSE="NPSL"
 else
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
inherit verify-sig
@@ -24,10 +22,9 @@ else
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-   LICENSE="|| ( NPSL GPL-2 )"
 fi
 
+LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="
@@ -54,9 +51,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 if [[ ${PV} != ** ]] ; then
-   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
@@ -92,7 +90,7 @@ src_prepare() {
eautoreconf
 
if [[ ${CHOST} == *-darwin* ]] ; then
-   # we need the original for a Darwin-specific fix, bug #604432
+   # We need the original for a Darwin-specific fix, bug #604432
mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
fi
 }
@@ -112,16 +110,14 @@ src_configure() {
--cache-file="${S}"/config.cache \
--with-libdnet=included \
--with-pcre="${ESYSROOT}"/usr \
+   --without-dpdk \
--without-ndiff \
--without-zenmap
 }
 
 src_compile() {
local directory
-   for directory in . libnetutil nsock/src \
-   $(usex ncat ncat '') \
-   $(usex nping nping '')
-   do
+   for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
emake -C "${directory}" makefile.dep
done
 

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 62661ccfa927..9470b5ddbf08 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
@@ -14,8 +14,6 @@ if [[ ${PV} == ** ]] ; then
 
EGI

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-07-19 Thread Sam James

commit: 82dd30fa966e703982dfed6e6cf258f2fa0405fb
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 19 15:08:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 19 15:09:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82dd30fa

net-analyzer/nmap: add blockers on netcat

Closes: https://bugs.gentoo.org/858365
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/{nmap-7.92-r1.ebuild => nmap-7.92-r2.ebuild} | 4 
 net-analyzer/nmap/nmap-.ebuild | 8 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r1.ebuild 
b/net-analyzer/nmap/nmap-7.92-r2.ebuild
similarity index 97%
rename from net-analyzer/nmap/nmap-7.92-r1.ebuild
rename to net-analyzer/nmap/nmap-7.92-r2.ebuild
index 752a2273e4f7..699b452ebd6e 100644
--- a/net-analyzer/nmap/nmap-7.92-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
)
nse? ( sys-libs/zlib )
ssl? ( dev-libs/openssl:0= )
+   symlink? (
+   !net-analyzer/netcat
+   !net-analyzer/openbsd-netcat
+   )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 3b55f48a5dbd..62661ccfa927 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi
@@ -45,6 +45,12 @@ RDEPEND="
)
nse? ( sys-libs/zlib )
ssl? ( dev-libs/openssl:0= )
+   symlink? (
+   ncat? (
+   !net-analyzer/netcat
+   !net-analyzer/openbsd-netcat
+   )
+   )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-07-14 Thread Sam James

commit: f1367051f359503107ca26cc9971f5513da9f50d
Author: Mathieu Tortuyaux  microsoft  com>
AuthorDate: Sat Jul  9 14:20:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 14 11:06:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1367051

net-analyzer/nmap: add symlink from ncat to nc

For compatiblity, it's good to have `nc` in the PATH too.

[sam: keep it as an extra flag to avoid more blockers;
it's useful to be able to evaluate two implementations.]

Closes: https://github.com/gentoo/gentoo/pull/26287
Signed-off-by: Mathieu Tortuyaux  microsoft.com>
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/metadata.xml  | 1 +
 net-analyzer/nmap/{nmap-7.92.ebuild => nmap-7.92-r1.ebuild} | 9 +++--
 net-analyzer/nmap/nmap-.ebuild  | 9 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 21fee1f7bbb0..4ca312aa6de6 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -18,6 +18,7 @@
Install the ncat utility
Install the nping utility
Include support for the Nmap Scripting Engine 
(NSE)
+   Install symlink to nc
Use dev-lang/lua instead of 
the bundled liblua

 

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92-r1.ebuild
similarity index 94%
rename from net-analyzer/nmap/nmap-7.92.ebuild
rename to net-analyzer/nmap/nmap-7.92-r1.ebuild
index 8d80c56138aa..752a2273e4f7 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r1.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+   system-lua? ( nse ${LUA_REQUIRED_USE} )
+   symlink? ( ncat )
+"
 
 RDEPEND="
dev-libs/liblinear:=
@@ -130,4 +133,6 @@ src_install() {
install
 
dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+   use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 2812d6599000..3b55f48a5dbd 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+   system-lua? ( nse ${LUA_REQUIRED_USE} )
+   symlink? ( ncat )
+"
 
 RDEPEND="
dev-libs/liblinear:=
@@ -131,4 +134,6 @@ src_install() {
install
 
dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+   use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-04-17 Thread Sam James

commit: 5b02b5c1379a25b7992cde481441b12467bdd58c
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 17:22:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 17:22:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b02b5c1

net-analyzer/nmap: fix UnusedLocalUse

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 1e504a2dd7d7..21fee1f7bbb0 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@

Enable SSH support through 
net-libs/libssh2
Install the ncat utility
-   Install nmap-update, which uses 
dev-vcs/subversion to update nmap scripts in your home 
directory
Install the nping utility
Include support for the Nmap Scripting Engine 
(NSE)
Use dev-lang/lua instead of 
the bundled liblua

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2022-04-17 Thread Sam James

commit: dcd047efaa0460385bc7a93d99b8ed7f0510bb5c
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 16:39:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:39:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd047ef

net-analyzer/nmap: drop 7.80-r2, 7.91-r2

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest |   3 -
 .../nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch   |  77 
 net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch |  37 --
 .../nmap/files/nmap-7.91-ncat-unix-sockets.patch   |  30 -
 net-analyzer/nmap/nmap-7.80-r2.ebuild  | 134 -
 net-analyzer/nmap/nmap-7.91-r2.ebuild  | 132 
 6 files changed, 413 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 335efc4b01d6..49819935ca25 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,2 @@
-DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 
513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b58b716070e05105a09b0185622aed9268715ae2c
 SHA512 
d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
-DIST nmap-7.91.tar.bz2 10503500 BLAKE2B 
a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded
 SHA512 
9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 
16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1
 SHA512 
376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a

diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch 
b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
deleted file mode 100644
index 85594038bf6f..
--- a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,77 +0,0 @@
 a/nbase/Makefile.in
-+++ b/nbase/Makefile.in
-@@ -12,7 +12,7 @@
- CCOPT = 
- DEFS = @DEFS@
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC = 
 a/ncat/Makefile.in
-+++ b/ncat/Makefile.in
-@@ -53,7 +53,7 @@
- LIBS = @LIBS@
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
- RM = rm -f
- STRIP = @STRIP@
 a/nsock/src/Makefile.in
-+++ b/nsock/src/Makefile.in
-@@ -13,7 +13,7 @@
- CCOPT = 
- DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- INCLS = -I../include
- CFLAGS = @CFLAGS@ $(CCOPT)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
 a/libnetutil/Makefile.in
-+++ b/libnetutil/Makefile.in
-@@ -5,7 +5,7 @@
- CXXFLAGS = @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@ $(DEFS)
- DEFS = @DEFS@
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- AR = ar
- RANLIB = @RANLIB@
- 
 a/Makefile.in
-+++ b/Makefile.in
-@@ -41,7 +41,7 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
 a/nping/Makefile.in
-+++ b/nping/Makefile.in
-@@ -38,7 +38,7 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS += 
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
 a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -12,7 +12,7 @@
- L

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-03-20 Thread Sam James

commit: 364385a3aef73b6f0fa20ff8c11b1aff44bdacc4
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 18:42:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 18:43:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364385a3

net-analyzer/nmap: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 6 +++---
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 6 +++---
 net-analyzer/nmap/nmap-7.92.ebuild| 4 ++--
 net-analyzer/nmap/nmap-.ebuild| 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 37d6bd0196ec..1734ec441e00 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,8 +111,8 @@ src_compile() {
done
 
emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 7beabe6e0b00..1af1818ce083 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -117,8 +117,8 @@ src_compile() {
done
 
emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 8578d039870f..8d80c56138aa 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -116,8 +116,8 @@ src_compile() {
done
 
emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index e04fab825e5c..2812d6599000 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -117,8 +117,8 @@ src_compile() {
done
 
emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2022-01-21 Thread Sam James

commit: e2418094a1aa5653cbaf3a88cb5d354f58a7032e
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 22 04:41:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 22 04:41:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2418094

net-analyzer/nmap: force -j1 again in src_install for now

Apparently not fixed, or a new issue resurfaced anyway.

Closes: https://bugs.gentoo.org/831713
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 4 +++-
 net-analyzer/nmap/nmap-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 348adce730a5..8578d039870f 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -121,7 +121,9 @@ src_compile() {
 }
 
 src_install() {
+   # See bug #831713 for return of -j1
LC_ALL=C emake \
+   -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 466e9b414a06..e04fab825e5c 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -122,7 +122,9 @@ src_compile() {
 }
 
 src_install() {
+   # See bug #831713 for return of -j1
LC_ALL=C emake \
+   -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, profiles/updates/, app-crypt/openpgp-keys-nmap/, ...

2021-12-18 Thread Michał Górny

commit: c719bbe77a72c53e15a47891440f756b3dbc6896
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 17 22:15:45 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec 18 22:32:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c719bbe7

Move {app-crypt → sec-keys}/openpgp-keys-nmap

Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild   | 2 +-
 net-analyzer/nmap/nmap-7.92.ebuild  | 2 +-
 net-analyzer/nmap/nmap-.ebuild  | 2 +-
 profiles/updates/4Q-2021| 1 +
 {app-crypt => sec-keys}/openpgp-keys-nmap/Manifest  | 0
 {app-crypt => sec-keys}/openpgp-keys-nmap/metadata.xml  | 0
 .../openpgp-keys-nmap/openpgp-keys-nmap-20210416.ebuild | 0
 7 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index d8498b958689..7beabe6e0b00 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != ** ]] ; then
-   BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index b24708e3ba63..348adce730a5 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != ** ]] ; then
-   BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 996ba7b0df85..466e9b414a06 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [[ ${PV} != ** ]] ; then
-   BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(

diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 99dd7190a292..aa82aae19895 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -20,3 +20,4 @@ move app-crypt/openpgp-keys-linuxcontainers 
sec-keys/openpgp-keys-linuxcontainer
 move app-crypt/openpgp-keys-midipix sec-keys/openpgp-keys-midipix
 move app-crypt/openpgp-keys-miniupnp sec-keys/openpgp-keys-miniupnp
 move app-crypt/openpgp-keys-mlichvar sec-keys/openpgp-keys-mlichvar
+move app-crypt/openpgp-keys-nmap sec-keys/openpgp-keys-nmap

diff --git a/app-crypt/openpgp-keys-nmap/Manifest 
b/sec-keys/openpgp-keys-nmap/Manifest
similarity index 100%
rename from app-crypt/openpgp-keys-nmap/Manifest
rename to sec-keys/openpgp-keys-nmap/Manifest

diff --git a/app-crypt/openpgp-keys-nmap/metadata.xml 
b/sec-keys/openpgp-keys-nmap/metadata.xml
similarity index 100%
rename from app-crypt/openpgp-keys-nmap/metadata.xml
rename to sec-keys/openpgp-keys-nmap/metadata.xml

diff --git a/app-crypt/openpgp-keys-nmap/openpgp-keys-nmap-20210416.ebuild 
b/sec-keys/openpgp-keys-nmap/openpgp-keys-nmap-20210416.ebuild
similarity index 100%
rename from app-crypt/openpgp-keys-nmap/openpgp-keys-nmap-20210416.ebuild
rename to sec-keys/openpgp-keys-nmap/openpgp-keys-nmap-20210416.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-11-19 Thread Sam James

commit: a3b2d7f8404b9e772094be8b45e4e6d3fb927cf1
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 19 07:53:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 19 08:33:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b2d7f8

net-analyzer/nmap: drop -j1 from install

Been meaning to grep for -j1 and look at what I can do
after seeing slyfox's recent blog post (and then
a recent comment in a Portage bug) and have been
chipping away at them since. After that latest
reminder, noticed this one!

This has been there since 2005 as far as I can
tell and was fixed upstream in 2006:
https://github.com/nmap/nmap/commit/be9e8bf7b105f1f423f01a92f5b243de58da4693

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 net-analyzer/nmap/nmap-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index ab5c1cca1c67..b24708e3ba63 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -121,7 +121,7 @@ src_compile() {
 }
 
 src_install() {
-   LC_ALL=C emake -j1 \
+   LC_ALL=C emake \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 58f0f67de1fa..996ba7b0df85 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -122,7 +122,7 @@ src_compile() {
 }
 
 src_install() {
-   LC_ALL=C emake -j1 \
+   LC_ALL=C emake \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-27 Thread Marek Szuba

commit: 66afd8b440f60edd2c601b6fc01b895442f19e58
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep 27 14:52:26 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep 27 14:52:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66afd8b4

net-analyzer/nmap: keyword 7.92 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 8b3167e3b42..ab5c1cca1c6 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-13 Thread Sam James

commit: 4e46d1c0d6781d25cf80f6efc486ea32a9e07671
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 14 05:16:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 14 05:16:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e46d1c0

net-analyzer/nmap: Stabilize 7.92 sparc, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index fc296eb4d60..8b3167e3b42 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-13 Thread Sam James

commit: 71a3d0519de0ebd8be2eb560f5141d1a7ff9e033
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 14 05:14:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 14 05:14:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a3d051

net-analyzer/nmap: Stabilize 7.92 arm, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 5a7e17130df..fc296eb4d60 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-13 Thread Sam James

commit: 39db185e7dbfa6afba645238a365debd8e4ba78f
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 14 05:13:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 14 05:13:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39db185e

net-analyzer/nmap: Stabilize 7.92 arm64, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 83ebdbbb2a9..5a7e17130df 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-12 Thread Sam James

commit: f724976884ab95cae95e4e8d3b060c64609ee574
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 12 23:00:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 12 23:00:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7249768

net-analyzer/nmap: Stabilize 7.92 ppc64, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 05feca33a6a..a5697e1792c 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-12 Thread Sam James

commit: 7db0f296cd84c79c1fb078c0b2c5d9fc977dc48e
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 12 23:00:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 12 23:00:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db0f296

net-analyzer/nmap: Stabilize 7.92 ppc, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index a5697e1792c..83ebdbbb2a9 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-12 Thread Sam James

commit: ea00833c75735fa1a69879d9617734190f301996
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 12 22:59:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 12 22:59:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea00833c

net-analyzer/nmap: Stabilize 7.92 amd64, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index d0ab6cc2b59..74e746d6207 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-09-12 Thread Sam James

commit: c0098151133b1682cadf260cc8e8195f45d4383e
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 12 22:59:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 12 22:59:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0098151

net-analyzer/nmap: Stabilize 7.92 x86, #812815

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
index 74e746d6207..05feca33a6a 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
LICENSE="|| ( NPSL GPL-2 )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-08-08 Thread Sam James

commit: a355cce76d15a88a307c07ee7939a2b8148f6d22
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 02:08:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 02:08:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a355cce7

net-analyzer/nmap: add 7.92

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest   | 2 ++
 net-analyzer/nmap/{nmap-.ebuild => nmap-7.92.ebuild} | 8 
 net-analyzer/nmap/nmap-.ebuild   | 7 ---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d261befb90a..335efc4b01d 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,5 @@
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 
513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b58b716070e05105a09b0185622aed9268715ae2c
 SHA512 
d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B 
a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded
 SHA512 
9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
 DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 
16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1
 SHA512 
376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 
0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 SHA512 
7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B 
a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd
 SHA512 
300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-7.92.ebuild
similarity index 91%
copy from net-analyzer/nmap/nmap-.ebuild
copy to net-analyzer/nmap/nmap-7.92.ebuild
index 0b17737335e..d0ab6cc2b59 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -17,14 +17,15 @@ if [[ ${PV} == ** ]] ; then
# Just in case for now as future seems undecided.
LICENSE="NPSL"
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
LICENSE="|| ( NPSL GPL-2 )"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SLOT="0"
@@ -59,7 +60,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.31-libnl.patch
"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-   "${FILESDIR}"/${PN}--netutil-else.patch
 )
 
 pkg_setup() {
@@ -101,7 +101,7 @@ src_configure() {
$(usex nse --with-zlib) \
--cache-file="${S}"/config.cache \
--with-libdnet=included \
-   --with-pcre=/usr \
+   --with-pcre="${ESYSROOT}"/usr \
--without-ndiff \
--without-zenmap
 }

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 0b17737335e..58f0f67de1f 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -17,14 +17,15 @@ if [[ ${PV} == ** ]] ; then
# Just in case for now as future seems undecided.
LICENSE="NPSL"
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
LICENSE="|| ( NPSL GPL-2 )"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-07-31 Thread Michał Górny

commit: f93385a369dd481ff392bc3c093ce225a15394dd
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul 31 06:35:24 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul 31 13:32:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93385a3

net-analyzer/nmap: Use BROOT for verify-sig key path

Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 2011c9655da..d8498b95868 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == ** ]] ; then
# Just in case for now as future seems undecided.
LICENSE="NPSL"
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 0143075841b..0b17737335e 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == ** ]] ; then
# Just in case for now as future seems undecided.
LICENSE="NPSL"
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
inherit verify-sig
 
SRC_URI="https://nmap.org/dist/${P}.tar.bz2";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-29 Thread Mikle Kolyada

commit: ebb3687ff9e7414380486ba1a1309a6fadece4b6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Apr 29 18:09:16 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Apr 29 18:28:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb3687f

net-analyzer/nmap: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 7 ++-
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 7 ++-
 net-analyzer/nmap/nmap-.ebuild| 7 ++-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 4ce4485f5c7..37d6bd0196e 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -31,10 +31,7 @@ RDEPEND="
dev-vcs/subversion
)
nse? ( sys-libs/zlib )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
+   ssl? ( dev-libs/openssl:0= )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 492355ccf04..2011c9655da 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -40,10 +40,7 @@ RDEPEND="
sys-libs/zlib
)
nse? ( sys-libs/zlib )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
+   ssl? ( dev-libs/openssl:0= )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index fa6114906f2..0143075841b 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -40,10 +40,7 @@ RDEPEND="
sys-libs/zlib
)
nse? ( sys-libs/zlib )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
+   ssl? ( dev-libs/openssl:0= )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-23 Thread Sam James

commit: 347a4912b2fa1cf57e6205c4f716ad3e1b3c309a
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 23 13:34:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 23 13:34:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347a4912

net-analyzer/nmap: drop 7.91-r1

Closes: https://bugs.gentoo.org/782583
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 116 --
 1 file changed, 116 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
deleted file mode 100644
index ab9ed8c0ddb..000
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/";
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-
-LICENSE="|| ( NPSL GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-   dev-libs/liblinear:=
-   dev-libs/libpcre
-   net-libs/libpcap
-   libssh2? (
-   net-libs/libssh2[zlib]
-   sys-libs/zlib
-   )
-   nse? ( sys-libs/zlib )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-   "${FILESDIR}"/${PN}-5.21-python.patch
-   "${FILESDIR}"/${PN}-6.46-uninstaller.patch
-   "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-   "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-7.25-libpcre.patch
-   "${FILESDIR}"/${PN}-7.31-libnl.patch
-   "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-   "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-   use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-   cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-   default
-
-   sed -i \
-   -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-   Makefile.in || die
-
-   cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-   eautoreconf
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # we need the original for a Darwin-specific fix, bug #604432
-   mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-   fi
-}
-
-src_configure() {
-   # The bundled libdnet is incompatible with the version available in the
-   # tree, so we cannot use the system library here.
-   econf \
-   $(use_enable ipv6) \
-   $(use_with libssh2) \
-   $(use_with ncat) \
-   $(use_with nping) \
-   $(use_with ssl openssl) \
-   $(usex libssh2 --with-zlib) \
-   $(usex nse --with-liblua=$(usex system-lua yes included '' '') 
--without-liblua) \
-   $(usex nse --with-zlib) \
-   --cache-file="${S}"/config.cache \
-   --with-libdnet=included \
-   --with-pcre=/usr \
-   --without-ndiff \
-   --without-zenmap
-}
-
-src_compile() {
-   local directory
-   for directory in . libnetutil nsock/src \
-   $(usex ncat ncat '') \
-   $(usex nping nping '')
-   do
-   emake -C "${directory}" makefile.dep
-   done
-
-   emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-   LC_ALL=C emake -j1 \
-   DESTDIR="${D}" \
-   STRIP=: \
-   nmapdatadir="${EPREFIX}"/usr/share/nmap \
-   install
-
-   dodoc CHANGELOG HACKING docs/README docs/*.txt
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-misc/chrony/

2021-04-15 Thread Sam James

commit: 40383a04ef95327b961084eecd00076f2e47233b
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 04:33:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 04:40:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40383a04

net-analyzer/nmap: use live template

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 29 ++---
 net-analyzer/nmap/nmap-.ebuild| 25 +
 net-misc/chrony/chrony-.ebuild| 11 +++
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 6778cf91051..492355ccf04 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -5,17 +5,29 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
-inherit autotools lua-single toolchain-funcs verify-sig
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nmap/nmap";
+
+   # Just in case for now as future seems undecided.
+   LICENSE="NPSL"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+   inherit verify-sig
+
+   SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+   SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+   LICENSE="|| ( NPSL GPL-2 )"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
-LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
@@ -35,7 +47,10 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+fi
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.10_beta1-string.patch

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 0b9f3ddf365..fa6114906f2 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -5,15 +5,28 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-
-inherit autotools git-r3 lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nmap/nmap";
+
+   # Just in case for now as future seems undecided.
+   LICENSE="NPSL"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+   inherit verify-sig
 
-EGIT_REPO_URI="https://github.com/nmap/nmap";
+   SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+   SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+   LICENSE="|| ( NPSL GPL-2 )"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
-LICENSE="NPSL"
 SLOT="0"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
@@ -35,6 +48,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+fi
+
 PATCHES=(
"${FILESDIR}"/${PN}-5.10_beta1-string.patch
"${FILESDIR}"/${PN}-5.21-python.patch

diff --git a/net-misc/chrony/chrony-.ebuild 
b/net-misc/chrony/chrony-.ebuild
index 0b13721b537..5287ba540c7 100644
--- a/net-misc/chrony/chrony-.ebuild
+++ b/net-misc/chrony/chrony-.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
-inherit systemd tmpfiles toolchain-funcs verify-sig
+inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/ 
https://git.tuxfamily.org/chrony/chrony.git";
@@ -13,6 +12,9 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git";
 else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
+   inherit verify-sig
+
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz";
SRC_URI+=" verify-sig? ( 
https://download.tuxfamily.org/chrony/${P}-tar-gz-asc.txt

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-15 Thread Sam James

commit: 259e3d2c5867d70c8f09edfa5c9ce48a881262ea
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 04:27:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 04:40:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259e3d2c

net-analyzer/nmap: add verify-sig support

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/Manifest| 1 +
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5451f0f7941..d261befb90a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,3 @@
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 
513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b58b716070e05105a09b0185622aed9268715ae2c
 SHA512 
d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B 
a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded
 SHA512 
9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
+DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 
16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1
 SHA512 
376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 165e7157943..6778cf91051 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-
-inherit autotools lua-single toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+inherit autotools lua-single toolchain-funcs verify-sig
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";
 SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
@@ -34,6 +35,7 @@ RDEPEND="
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.10_beta1-string.patch

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-15 Thread Sam James

commit: 1531ebd278bc2f562975914ba5a6e618e3419e60
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 00:39:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 00:39:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1531ebd2

net-analyzer/nmap: Stabilize 7.91-r2 ppc, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 782a8b63f97..165e7157943 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-13 Thread Sam James

commit: 2d3da4124c272e9205015b36eea6a9b6f29910b6
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 16:05:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 16:05:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3da412

net-analyzer/nmap: Stabilize 7.91-r2 ppc64, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 35300760756..782a8b63f97 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-13 Thread Sam James

commit: ac034dc5fc08559c2c1ad69c33b1c2a9ecfa382e
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 16:05:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 16:05:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac034dc5

net-analyzer/nmap: Stabilize 7.91-r2 arm, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index b0579310df9..cfa3646ca6f 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-13 Thread Sam James

commit: c407939010af6f074763a4f32e40b0656417a66a
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 16:05:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 16:05:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4079390

net-analyzer/nmap: Stabilize 7.91-r2 sparc, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index cfa3646ca6f..35300760756 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-13 Thread Sam James

commit: 8be0675acb066f4ca4d3bed2d0f625f83b433184
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 16:05:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 16:05:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be0675a

net-analyzer/nmap: Stabilize 7.91-r2 arm64, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 96f3cae61dc..b0579310df9 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-13 Thread Sam James

commit: 7518f40a9c38dd833e20585b92287f8e0add3f1d
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 16:03:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 16:03:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7518f40a

net-analyzer/nmap: Stabilize 7.91-r2 x86, #782583

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 24cec4cd2f4..96f3cae61dc 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-04-03 Thread Sam James

commit: 814f95e9ceba083345c0a49ee3bcdd44c490caf8
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  2 01:32:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 15:55:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814f95e9

net-analyzer/nmap: drop unused desktop, flag-o-matic

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-.ebuild| 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 5f48909bca0..4ce4485f5c7 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools desktop flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 8b08d910d67..ab9ed8c0ddb 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 09c622523f3..587628f5722 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 782f91bf13e..0b9f3ddf365 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs
+inherit autotools git-r3 lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/";

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-03-11 Thread Sam James

commit: bdd30173fbcbce509dba00a67d41e4b93fa7ed3b
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 11 18:14:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 11 18:14:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd30173

net-analyzer/nmap: revert 7.91-r2 keywords

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 62abcdf5afc..09c622523f3 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/

2021-03-11 Thread Sam James

commit: b2d8627328c93bdd62a507f7e78228a8e00de59e
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 11 18:14:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 11 18:14:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d86273

net-analyzer/nmap: add upstream patches for ncat

Closes: https://bugs.gentoo.org/765148
Closes: https://bugs.gentoo.org/770808
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch |  37 +++
 .../nmap/files/nmap-7.91-ncat-unix-sockets.patch   |  30 ++
 net-analyzer/nmap/nmap-7.91-r2.ebuild  | 118 +
 3 files changed, 185 insertions(+)

diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch 
b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
new file mode 100644
index 000..513c7fbd418
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/770808
+https://github.com/nmap/nmap/commit/169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689
+
+From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001
+From: dmiller 
+Date: Thu, 19 Nov 2020 17:34:24 +
+Subject: [PATCH] Restore call to post_connect in non-ssl case. Fixes #2149
+
+---
+ ncat/ncat_connect.c | 11 ---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
+index 606eac412f..f59dd4372f 100644
+--- a/ncat/ncat_connect.c
 b/ncat/ncat_connect.c
+@@ -1064,12 +1064,17 @@ int ncat_connect(void)
+ bye("Failed to set hostname on iod.");
+ if (o.ssl)
+ {
++/* connect_handler creates stdin_nsi and calls post_connect */
+ nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, 
o.conntimeout, NULL, NULL);
+ }
++else
++{
++/* Create IOD for nsp->stdin */
++if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
++bye("Failed to create stdin nsiod.");
+ 
+-/* Create IOD for nsp->stdin */
+-if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
+-bye("Failed to create stdin nsiod.");
++post_connect(mypool, cs.sock_nsi);
++}
+ }
+ 
+ /* connect */

diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch 
b/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch
new file mode 100644
index 000..f617fd4b134
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/765148
+https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323
+
+From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001
+From: nnposter 
+Date: Fri, 16 Oct 2020 02:54:52 +
+Subject: [PATCH] Fix a Unix domain socket crash. Fixes #2154
+
+diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
+index 8942d83cb9..2792a6ac24 100644
+--- a/ncat/ncat_main.c
 b/ncat/ncat_main.c
+@@ -846,7 +846,7 @@ int main(int argc, char *argv[])
+ targetaddrs->addr.un.sun_family = AF_UNIX;
+ strncpy(targetaddrs->addr.un.sun_path, argv[optind], 
sizeof(targetaddrs->addr.un.sun_path));
+ targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un);
+-o.target = argv[optind];
++o.sslservername = o.target = argv[optind];
+ optind++;
+ } else
+ #endif
+@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
+ targetaddrs->addr.vm.svm_cid = long_cid;
+ 
+ targetaddrs->addrlen = sizeof(targetaddrs->addr.vm);
+-o.target = argv[optind];
++o.sslservername = o.target = argv[optind];
+ optind++;
+ }
+ } else

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild 
b/net-analyzer/nmap/nmap-7.91-r2.ebuild
new file mode 100644
index 000..62abcdf5afc
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/";
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
+
+LICENSE="|| ( NPSL GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+   dev-libs/liblinear:=
+   dev-libs/libpcre
+   net-libs/libpcap
+   libssh2? (
+   net-libs/libssh2[zlib]
+   sys-libs/zlib
+   )
+   nse? ( sys-libs/zlib )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-03-06 Thread Ulrich Müller

commit: ba502f42a7ab3f8282dd5b88cf8c4126971c987e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Mar  6 20:34:12 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Mar  6 20:34:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba502f42

net-analyzer/nmap: Update LICENSE

"Effective immediately, Nmap 7.91 (which is the current version) and
7.90 can also be used and redistributed under the previous (Nmap 7.80)
license terms."
https://github.com/nmap/nmap/issues/2199#issuecomment-792048244

Bug: https://bugs.gentoo.org/749390
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 610bd50821a..8b08d910d67 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Network exploration tool and security / port 
scanner"
 HOMEPAGE="https://nmap.org/";
 SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
-LICENSE="NPSL"
+LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-03-03 Thread Sam James

commit: aa8f5b8468677803bbfe9e93a7e35c4cd4eeb5de
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  4 04:55:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  4 04:55:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8f5b84

net-analyzer/nmap: remove old

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 129 --
 net-analyzer/nmap/nmap-7.91.ebuild| 108 
 2 files changed, 237 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild 
b/net-analyzer/nmap/nmap-7.80-r1.ebuild
deleted file mode 100644
index 41fbe9aca70..000
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/";
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
-   dev-libs/liblinear:=
-   dev-libs/libpcre
-   net-libs/libpcap
-   libssh2? (
-   net-libs/libssh2[zlib]
-   sys-libs/zlib
-   )
-   nmap-update? (
-   dev-libs/apr
-   dev-vcs/subversion
-   )
-   nse? ( sys-libs/zlib )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-   "${FILESDIR}"/${PN}-5.21-python.patch
-   "${FILESDIR}"/${PN}-6.46-uninstaller.patch
-   "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-   "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-   "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-7.25-libpcre.patch
-   "${FILESDIR}"/${PN}-7.31-libnl.patch
-   "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-)
-
-src_prepare() {
-   rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-   cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-   default
-
-   sed -i \
-   -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-   Makefile.in || die
-   # Fix desktop files wrt bug #432714
-   sed -i \
-   -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-   zenmap/install_scripts/unix/zenmap-root.desktop \
-   zenmap/install_scripts/unix/zenmap.desktop || die
-
-   cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-   eautoreconf
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # we need the original for a Darwin-specific fix, bug #604432
-   mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-   fi
-}
-
-src_configure() {
-   # The bundled libdnet is incompatible with the version available in the
-   # tree, so we cannot use the system library here.
-   econf \
-   $(use_enable ipv6) \
-   $(use_with libssh2) \
-   $(use_with ncat) \
-   --without-ndiff \
-   $(use_with nmap-update) \
-   $(use_with nping) \
-   $(use_with ssl openssl) \
-   --without-zenmap \
-   $(usex libssh2 --with-zlib) \
-   $(usex nse --with-zlib) \
-   $(usex nse --with-liblua=$(usex system-lua /usr included '' '') 
--without-liblua) \
-   --cache-file="${S}"/config.cache \
-   --with-libdnet=included \
-   --with-pcre=/usr
-   #   Commented out because configure does weird things
-   #   --with-liblinear=/usr \
-}
-
-src_compile() {
-   local directory
-   for directory in . libnetutil nsock/src \
-   $(usex ncat ncat '') \
-   $(usex nmap-update nmap-update '') \
-   $(usex nping nping '')
-   do
-   emake -C "${directory}" makefile.dep
-   done
-
-   emake \
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-   LC_ALL=C emake -j1 \
-   DESTDIR="${D}" \
-   STRIP=: \
-   nmapdatadir="${EPREFIX}"/usr/share/nmap \
-   install
-   if use nmap-update;then
-   LC_ALL=C emake -j1 \
-   -C nmap-update \
-   DESTDIR="${D}" \
-   STRIP=: \
-   nmapdatadir="${EPREFIX}"/usr/share/nmap \
-   install
-   fi
-
-   dodoc

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-18 Thread Sam James

commit: af677eb1c6b112c0649545bfd82f772dda1348ac
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 08:22:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 08:22:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af677eb1

net-analyzer/nmap: Stabilize 7.91-r1 ppc, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index a4146a8..610bd50821a 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-18 Thread Sam James

commit: 9cc47a302a27f2d086e82b4f7c0b6516fb7f49a5
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 08:22:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 08:22:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc47a30

net-analyzer/nmap: Stabilize 7.80-r2 ppc, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6a0187c3ab5..5f48909bca0 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-16 Thread Sam James

commit: 412fac654821d7b2bc2a0f86a62dcc94871c044f
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 16 12:33:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 16 12:33:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412fac65

net-analyzer/nmap: Stabilize 7.91-r1 arm, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 6af2f924049..a4146a8 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-16 Thread Sam James

commit: 9eb191fcce7d9969751ee33fb99f3ebc8aff65b6
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 16 12:33:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 16 12:33:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb191fc

net-analyzer/nmap: Stabilize 7.80-r2 arm, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6b0ca2a471a..6a0187c3ab5 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-13 Thread Sam James

commit: 42ace55f23428439e5f7aea1c692cf95e69472bd
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 02:10:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 02:10:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ace55f

net-analyzer/nmap: Stabilize 7.91-r1 arm64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 8b21bb0c8e6..6af2f924049 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-13 Thread Sam James

commit: 5f0fddfc64b0eb593fd2de09c434cd25e2a5952b
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 02:10:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 02:10:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0fddfc

net-analyzer/nmap: Stabilize 7.80-r2 arm64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index f6b39c90554..6b0ca2a471a 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-05 Thread Sam James

commit: a0b102f378d2965cfc64ac86849d82862fe901fd
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 12:30:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 12:30:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b102f3

net-analyzer/nmap: Stabilize 7.80-r2 x86, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 3c6bf8c786e..f6b39c90554 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-05 Thread Sam James

commit: f11b62c271554ab368cc58539a7cd0e60dbda598
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 12:30:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 12:30:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11b62c2

net-analyzer/nmap: Stabilize 7.91-r1 x86, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index c11901c3144..8b21bb0c8e6 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-05 Thread Sam James

commit: 722179fe57307388a26ca4b6e340bac4ae714bf0
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 10:40:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 10:40:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722179fe

net-analyzer/nmap: Stabilize 7.91-r1 amd64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 475b418f52e..c11901c3144 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-05 Thread Sam James

commit: 8dce6bb3f15181e2c8a68f4a2366500f8e0767ac
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 10:40:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 10:40:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dce6bb3

net-analyzer/nmap: Stabilize 7.80-r2 amd64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6259d01db17..3c6bf8c786e 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-04 Thread Sam James

commit: 6bb9422ba4297f7759800049f5df51761814f44b
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 06:35:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 06:35:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb9422b

net-analyzer/nmap: Stabilize 7.80-r2 ppc64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 9707914dc4d..6259d01db17 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-04 Thread Sam James

commit: 3a0a9667b917f041243875064306a4d77df918d9
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 06:35:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 06:35:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0a9667

net-analyzer/nmap: Stabilize 7.91-r1 ppc64, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index fe7f573fe0b..475b418f52e 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-04 Thread Sam James

commit: efe6f3e34333725d15a7e56d205ba87687b4b5ed
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 06:34:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 06:34:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe6f3e3

net-analyzer/nmap: Stabilize 7.80-r2 sparc, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 86253e24991..9707914dc4d 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-02-04 Thread Sam James

commit: 216702a8def65c3196ec178a98c03dc230b6125f
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 06:34:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 06:34:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216702a8

net-analyzer/nmap: Stabilize 7.91-r1 sparc, #768750

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 29cae90c6f0..fe7f573fe0b 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-01-25 Thread Mikle Kolyada

commit: 103cc745cf921addfe9d96b93a406123134f1987
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 25 22:22:58 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 25 22:23:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103cc745

net-analyzer/nmap: add myself as maintainer

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/nmap/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 668d67a59b2..0d1aaf91510 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -9,9 +9,9 @@
dilfri...@gentoo.org
Andreas K. Hüttel

-   
-   net...@gentoo.org
-   Gentoo network monitoring and analysis project
+   
+   zlog...@gentoo.org
+   Mikle Kolyada


Enable SSH support through 
net-libs/libssh2

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2021-01-06 Thread Fabian Groffen

commit: eea26de7b61dc7f188ee7a35a0bbfd84f32ee626
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:34:37 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 14:35:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea26de7

net-analyzer/nmap: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.80-r2.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.91-r1.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.91.ebuild| 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild 
b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index a70d5648057..41fbe9aca70 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild 
b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 7b40515497d..86253e24991 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild 
b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 3b611d01445..29cae90c6f0 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild 
b/net-analyzer/nmap/nmap-7.91.ebuild
index ecd6339ffe9..006cbe5ee03 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2";
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"

1 2 3 >

1 - 100 of 218 matches

Mail list logo