From 3606ceecb950b302a6ba2a9882aeeff2a851e5dc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 9 Dec 2022 21:18:42 +0000
Subject: gentoo auto-resync : 09:12:2022 - 21:18:42
---
net-analyzer/Manifest.gz | Bin 44898 -> 44891 bytes
net-analyzer/nmap/Manifest | 5 +-
net-analyzer/nmap/files/nmap-9999-python3.patch | 103 ++++++++++++++++++++++++
net-analyzer/nmap/metadata.xml | 2 +
net-analyzer/nmap/nmap-9999.ebuild | 74 ++++++++++++-----
net-analyzer/ttcp/Manifest | 2 +-
net-analyzer/ttcp/ttcp-1.12-r3.ebuild | 2 +-
7 files changed, 162 insertions(+), 26 deletions(-)
create mode 100644 net-analyzer/nmap/files/nmap-9999-python3.patch
(limited to 'net-analyzer')
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fbb91c939003..01faee724ecb 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5d85e43cceca..23d4e26e703c 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -10,8 +10,9 @@ AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c
AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86
AUX nmap-7.93-openssl-1.1.patch 9229 BLAKE2B 1dc23ee66574296264882a0c99ae671cb31ea629b38884e6e68a15fab4bd5990e58208a4a7dece52724a970f43eff2d05baf955db6f7545076d38316bfd8e99b SHA512 fd7d52c6bf0bfe1c3953e864d328e6b2609a284c202f7be84019a22f79c467e64ec063dd89819cafb930d8526c5ae16e6fa004109cfc886fa46dfbdc2c23ed1c
AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
+AUX nmap-9999-python3.patch 4321 BLAKE2B 11b864345c044f10397416640ad23ce79fdaf81400e39e530a435c0ad36bb80f2cbc979ea683a0162ddac986eab8eb6c3caf8c86cc4ff95738acbfc6fc28d0f0 SHA512 23b86b61cc36fe454a3ae098fbf34e5bf4cf4e2f12c88e2e3260bb4d7ad236b5ca3c460262c0bb99518428180ccf13c9839123faaaf60c8a83b578ec9b1a11c9
DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
EBUILD nmap-7.93.ebuild 3598 BLAKE2B f8c000828ba49cf456b44518cf95e48d3845124171cee50efccb439e9285ce275631eba48182370c6011a9f61e54d59b5331eae382f1c0903fbde11ae7e1fe4f SHA512 005b778fba01d7c504a6dcecac540a5d0f0a23fa5ff41d3d60ade333fdf7812dc67fb039be6db96b9385dee8682d8e28bd91e607864057ca66798a97a0aed7f0
-EBUILD nmap-9999.ebuild 3567 BLAKE2B a6858edc41fc1bbf5858a776c43dad936474794cdffa2712801cf4d067e5bd7f69d6fe8fef22df0ca0339c5b0d5ae3bc56935900f58bf133805f618e99164570 SHA512 432cae675dc6320c2960e8b7387e525c02181de0cf1227b5e5fa79605d4a1f4ee2799d1f039b772e16a389b624f8ce20effed61d3a91af3eee49afd5c6e249ed
-MISC metadata.xml 964 BLAKE2B be7a2b72cd346cdcf83df81cab6c28666067a17516e58bb0570572fcc4467258de1e913cb9448635080e0c3915c9efd0a4b2e19c6a480d70afda149574f725eb SHA512 fd3ef56d6a5513553a934348712ad0e9c5a6578f3eb8d9069cb5ea7076eafd58c207a1f5007371bedb60e9319c221280d37f129804eb3072b1fb4adb8e4da184
+EBUILD nmap-9999.ebuild 4356 BLAKE2B 4c02fa442398a48bff6ae5ac805db0a416ce50cb7fbb044fc2fbeafafc029b9e8e9453323ac1c1e39803fba2dd67d1c00bea668bc765bca0754e5848bf25b300 SHA512 80e5ac289915fed97b2f2da3f53e7e8174fe3c481b73fd87af2d5649a5d59d8a32ab8f5529dfd9229838cf155e499d8057b0bc05eda00bc05d748e07885aa96e
+MISC metadata.xml 1087 BLAKE2B f447e02d4a3be7c9674d8352a9bd1a6bb6bf359b2e2581bdea4815be05b687a69cecf10c88943a2359f5b8374bf59aec9813a120c4fb03ffca770fabc30addbf SHA512 35f0ae4c95db6f3d6654d6b36912e725d944bc510260ba3581f39c0f5ff1247b7deebadb9402ef146051f08fa1f50a3f5b663df16a78ef48fc1c9f4fd74a1e9c
diff --git a/net-analyzer/nmap/files/nmap-9999-python3.patch b/net-analyzer/nmap/files/nmap-9999-python3.patch
new file mode 100644
index 000000000000..3d740d759b3c
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-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 <sam@gentoo.org>
+Date: Fri, 9 Dec 2022 15:58:35 +0000
+Subject: [PATCH] zenmap: further Python 3 compatibility fixes
+
+Without this, we get:
+```
+Traceback (most recent call last):
+ File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 584, in <module>
+ 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-9999/work/nmap-9999/zenmap/setup.py", line 188, in run
+ self.write_installed_files()
+ File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/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(<message>, file=<output_stream>)"?
+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 <sam@gentoo.org>
+--- 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_NAME, "w") as f:
+ for output in self.get_installed_files():
+ assert "\n" not in output
+- print >> f, output
++ print(output, file=f)
+
+
+ class my_uninstall(Command):
+
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 25a709611821..92acf338fc61 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,10 +16,12 @@
<use>
<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
<flag name="ncat">Install the ncat utility</flag>
+ <flag name="ndiff">Install the ndiff utility</flag>
<flag name="nping">Install the nping utility</flag>
<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
<flag name="symlink">Install symlink to nc</flag>
<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
+ <flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
</use>
<upstream>
<remote-id type="github">nmap/nmap</remote-id>
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 7fc911c6d87a..4588e1d360ac 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -6,7 +6,9 @@ EAPI=8
LUA_COMPAT=( lua5-3 )
LUA_REQ_USE="deprecated"
PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools lua-single python-any-r1 toolchain-funcs
+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/"
@@ -27,8 +29,9 @@ fi
LICENSE="|| ( NPSL GPL-2 )"
SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
system-lua? ( nse ${LUA_REQUIRED_USE} )
symlink? ( ncat )
"
@@ -37,12 +40,14 @@ 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? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl:0= )
+ ssl? ( dev-libs/openssl:= )
symlink? (
ncat? (
!net-analyzer/netcat
@@ -50,11 +55,18 @@ RDEPEND="
)
)
system-lua? ( ${LUA_DEPS} )
+ zenmap? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ )
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
+ nls? ( sys-devel/gettext )
"
if [[ ${PV} != *9999* ]] ; then
@@ -72,20 +84,30 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
"${FILESDIR}"/${PN}-9999-netutil-else.patch
+ "${FILESDIR}"/${PN}-9999-python3.patch
)
pkg_setup() {
- python-any-r1_pkg_setup
+ python-single-r1_pkg_setup
use system-lua && lua-single_pkg_setup
}
src_prepare() {
+ default
+
+ # Drop bundled libraries
rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
- default
+ delete_disabled_locale() {
+ # Force here as PLOCALES contains supported locales for man
+ # pages and zenmap doesn't have all of those
+ rm -rf zenmap/share/zenmap/locale/${1} || die
+ rm -f zenmap/share/zenmap/locale/${1}.po || die
+ }
+ plocale_for_each_disabled_locale delete_disabled_locale
sed -i \
-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
@@ -105,23 +127,27 @@ src_configure() {
export ac_cv_path_PYTHON="${PYTHON}"
export am_cv_pathless_PYTHON="${EPYTHON}"
- # 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="${ESYSROOT}"/usr \
- --without-dpdk \
- --without-ndiff \
- --without-zenmap
+ local myeconfargs=(
+ $(use_enable ipv6)
+ $(use_enable nls)
+ $(use_with libssh2)
+ $(use_with ncat)
+ $(use_with ndiff)
+ $(use_with nping)
+ $(use_with ssl openssl)
+ $(use_with zenmap)
+ $(usex libssh2 --with-zlib)
+ $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua)
+ $(usex nse --with-zlib)
+ --cache-file="${S}"/config.cache
+ # 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
+ --without-dpdk
+ )
+
+ econf "${myeconfargs[@]}"
}
src_compile() {
@@ -146,5 +172,9 @@ src_install() {
dodoc CHANGELOG HACKING docs/README docs/*.txt
+ if use ndiff || use zenmap ; then
+ python_optimize
+ fi
+
use symlink && dosym /usr/bin/ncat /usr/bin/nc
}
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
index 2c6c5e1501ea..bd37f5d05e9b 100644
--- a/net-analyzer/ttcp/Manifest
+++ b/net-analyzer/ttcp/Manifest
@@ -1,4 +1,4 @@
DIST ttcp-1.12.c 23690 BLAKE2B 972869da1e2e945702e6852648166eefae224b39715ef8495526ec7cd33cdb1e69fa10bb356a96e701f8b597c547b3090956320f947a02f1fad0b12d027b7e32 SHA512 8fc800b05fcf3590d15a87983ac7abc3646c6d4a89f7cc6b91e495066a90a6ce21f7bd7b6ab21e09f07bfa20c39bdc7bcec479449d7cd2b88639dc6cca4a432e
DIST ttcp-1.12.tar.bz2 8086 BLAKE2B 42ec3d82d56ef28527c096be7b6ea568997f0028ebf51811974fec8c444a39785996b0a51eedff6cec6c53f215e4300a3dee91e45f54dbe979d1d1c42e792ab1 SHA512 2218f801a04964dcc684bac2957f892569e4458eb7770e26d4ac5a9a5beebb16b9191cacd8e60cceee306b8fe53000248b52457cb679a3d12ad4308bb0066dbb
-EBUILD ttcp-1.12-r3.ebuild 675 BLAKE2B dd4693a4b19738e6e35d11920a9940e6534f162f8bf96412a843ff61fc8fe64856075233c107a7efbd764ed653bc21226301fc32863ce5333fd0b249e3d22ea3 SHA512 5ccae2fb95590310d07d7a17c3617e7f82cdded376cfd7e30881fc08a28fcae653151d957632ae226774b896b711f9ef605e5cc43e14f69a6266feccc45b134e
+EBUILD ttcp-1.12-r3.ebuild 675 BLAKE2B b4c568b0cd8c41847ef68766a3d7be9cc5d5ed0f013205cae07038053a044633530596824a507f52c2d2805385174e5e8dd4067817539ce2bb2951efce4889f5 SHA512 21373c8f9b104323be54b8436f2cb537354c1002a76781047a0b4929df26923acf5fb78aaf482dfdf45964d091165a44ec7523089ec1cb8a0f2090db4805014a
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/ttcp/ttcp-1.12-r3.ebuild b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
index bd4b1e8b315a..1fae3ce9f5fa 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
src_prepare() {
- mv "${DISTDIR}"/${P}.c ${PN}.c || die
+ cp "${DISTDIR}"/${P}.c ${PN}.c || die
default
}
--
cgit v1.2.3