openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

apply 2to3 conversions via patches rather than running during build

Browse Source
This commit is contained in:
sthen
2025-02-18 21:30:55 +00:00
parent 1c8b6aee4a
commit d9ec854929
5 changed files with 1456 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/nmap/Makefile
+1 -3
View File
@@ -3,7 +3,7 @@ COMMENT-main= scan ports and fingerprint stack of network hosts
MODPY_DISTV= 7.92
DISTNAME= nmap-${MODPY_DISTV}
PKGNAME-main= ${DISTNAME}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= net security
SITES= ${HOMEPAGE}/dist/
@@ -59,8 +59,6 @@ BUILD_DEPENDS= devel/bison \
post-extract:
@cd ${WRKSRC} && rm -rf liblua/ libpcre/
2to3 --fix=all --no-diffs --nobackups --verbose --write \
${WRKSRC}/ndiff/*py ${WRKSRC}/ndiff/scripts/ndiff
pre-configure:
@cd ${WRKSRC}/nping ; env PATH=${PORTPATH} \
net/nmap/patches/patch-ndiff_ndiff_py
+1158 -11
View File
File diff suppressed because it is too large Load Diff
net/nmap/patches/patch-ndiff_ndifftest_py
+207
View File
@@ -0,0 +1,207 @@
apply 2to3
Index: ndiff/ndifftest.py
--- ndiff/ndifftest.py.orig
+++ ndiff/ndifftest.py
@@ -22,7 +22,7 @@ for x in dir(ndiff):
sys.dont_write_bytecode = dont_write_bytecode
del dont_write_bytecode
-import StringIO
+import io
class scan_test(unittest.TestCase):
@@ -52,7 +52,7 @@ class scan_test(unittest.TestCase):
scan.load_from_file("test-scans/single.xml")
host = scan.hosts[0]
self.assertEqual(len(host.ports), 5)
- self.assertEqual(host.extraports.items(), [("filtered", 95)])
+ self.assertEqual(list(host.extraports.items()), [("filtered", 95)])
def test_extraports_multi(self):
"""Test that the correct number of known ports is returned when there
@@ -68,9 +68,9 @@ class scan_test(unittest.TestCase):
"""Test that nmaprun information is recorded."""
scan = Scan()
scan.load_from_file("test-scans/empty.xml")
- self.assertEqual(scan.scanner, u"nmap")
- self.assertEqual(scan.version, u"4.90RC2")
- self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100")
+ self.assertEqual(scan.scanner, "nmap")
+ self.assertEqual(scan.version, "4.90RC2")
+ self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100")
def test_addresses(self):
"""Test that addresses are recorded."""
@@ -84,7 +84,7 @@ class scan_test(unittest.TestCase):
scan = Scan()
scan.load_from_file("test-scans/simple.xml")
host = scan.hosts[0]
- self.assertEqual(host.hostnames, [u"scanme.nmap.org"])
+ self.assertEqual(host.hostnames, ["scanme.nmap.org"])
def test_os(self):
"""Test that OS information is recorded."""
@@ -99,7 +99,7 @@ class scan_test(unittest.TestCase):
scan.load_from_file("test-scans/complex.xml")
host = scan.hosts[0]
self.assertTrue(len(host.script_results) > 0)
- self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0)
+ self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0)
# This test is commented out because Nmap XML doesn't store any information
# about down hosts, not even the fact that they are down. Recovering the list
@@ -128,16 +128,16 @@ class host_test(unittest.TestCase):
def test_format_name(self):
h = Host()
- self.assertTrue(isinstance(h.format_name(), basestring))
- h.add_address(IPv4Address(u"127.0.0.1"))
- self.assertTrue(u"127.0.0.1" in h.format_name())
+ self.assertTrue(isinstance(h.format_name(), str))
+ h.add_address(IPv4Address("127.0.0.1"))
+ self.assertTrue("127.0.0.1" in h.format_name())
h.add_address(IPv6Address("::1"))
- self.assertTrue(u"127.0.0.1" in h.format_name())
- self.assertTrue(u"::1" in h.format_name())
- h.add_hostname(u"localhost")
- self.assertTrue(u"127.0.0.1" in h.format_name())
- self.assertTrue(u"::1" in h.format_name())
- self.assertTrue(u"localhost" in h.format_name())
+ self.assertTrue("127.0.0.1" in h.format_name())
+ self.assertTrue("::1" in h.format_name())
+ h.add_hostname("localhost")
+ self.assertTrue("127.0.0.1" in h.format_name())
+ self.assertTrue("::1" in h.format_name())
+ self.assertTrue("localhost" in h.format_name())
def test_empty_get_port(self):
h = Host()
@@ -197,8 +197,8 @@ class host_test(unittest.TestCase):
h = s.hosts[0]
self.assertEqual(len(h.ports), 5)
self.assertEqual(len(h.extraports), 1)
- self.assertEqual(h.extraports.keys()[0], u"filtered")
- self.assertEqual(h.extraports.values()[0], 95)
+ self.assertEqual(list(h.extraports.keys())[0], "filtered")
+ self.assertEqual(list(h.extraports.values())[0], 95)
self.assertEqual(h.state, "up")
@@ -241,13 +241,13 @@ class port_test(unittest.TestCase):
"""Test the Port class."""
def test_spec_string(self):
p = Port((10, "tcp"))
- self.assertEqual(p.spec_string(), u"10/tcp")
+ self.assertEqual(p.spec_string(), "10/tcp")
p = Port((100, "ip"))
- self.assertEqual(p.spec_string(), u"100/ip")
+ self.assertEqual(p.spec_string(), "100/ip")
def test_state_string(self):
p = Port((10, "tcp"))
- self.assertEqual(p.state_string(), u"unknown")
+ self.assertEqual(p.state_string(), "unknown")
class service_test(unittest.TestCase):
@@ -255,47 +255,47 @@ class service_test(unittest.TestCase):
def test_compare(self):
"""Test that services with the same contents compare equal."""
a = Service()
- a.name = u"ftp"
- a.product = u"FooBar FTP"
- a.version = u"1.1.1"
- a.tunnel = u"ssl"
+ a.name = "ftp"
+ a.product = "FooBar FTP"
+ a.version = "1.1.1"
+ a.tunnel = "ssl"
self.assertEqual(a, a)
b = Service()
- b.name = u"ftp"
- b.product = u"FooBar FTP"
- b.version = u"1.1.1"
- b.tunnel = u"ssl"
+ b.name = "ftp"
+ b.product = "FooBar FTP"
+ b.version = "1.1.1"
+ b.tunnel = "ssl"
self.assertEqual(a, b)
- b.name = u"http"
+ b.name = "http"
self.assertNotEqual(a, b)
c = Service()
self.assertNotEqual(a, c)
def test_tunnel(self):
serv = Service()
- serv.name = u"http"
- serv.tunnel = u"ssl"
- self.assertEqual(serv.name_string(), u"ssl/http")
+ serv.name = "http"
+ serv.tunnel = "ssl"
+ self.assertEqual(serv.name_string(), "ssl/http")
def test_version_string(self):
serv = Service()
- serv.product = u"FooBar"
+ serv.product = "FooBar"
self.assertTrue(len(serv.version_string()) > 0)
serv = Service()
- serv.version = u"1.2.3"
+ serv.version = "1.2.3"
self.assertTrue(len(serv.version_string()) > 0)
serv = Service()
- serv.extrainfo = u"misconfigured"
+ serv.extrainfo = "misconfigured"
self.assertTrue(len(serv.version_string()) > 0)
serv = Service()
- serv.product = u"FooBar"
- serv.version = u"1.2.3"
+ serv.product = "FooBar"
+ serv.version = "1.2.3"
# Must match Nmap output.
self.assertEqual(serv.version_string(),
- u"%s %s" % (serv.product, serv.version))
- serv.extrainfo = u"misconfigured"
+ "%s %s" % (serv.product, serv.version))
+ serv.extrainfo = "misconfigured"
self.assertEqual(serv.version_string(),
- u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
+ "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
class ScanDiffSub(ScanDiff):
@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase):
a.load_from_file("test-scans/empty.xml")
b = Scan()
b.load_from_file("test-scans/simple.xml")
- f = StringIO.StringIO()
+ f = io.StringIO()
self.scan_diff = ScanDiffXML(a, b, f)
self.scan_diff.output()
self.xml = f.getvalue()
@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase):
def test_well_formed(self):
try:
document = xml.dom.minidom.parseString(self.xml)
- except Exception, e:
- self.fail(u"Parsing XML diff output caused the exception: %s"
+ except Exception as e:
+ self.fail("Parsing XML diff output caused the exception: %s"
% str(e))
@@ -739,8 +739,8 @@ def host_apply_diff(host, diff):
host.os = diff.host_b.os[:]
if diff.extraports_changed:
- for state in host.extraports.keys():
- for port in host.ports.values():
+ for state in list(host.extraports.keys()):
+ for port in list(host.ports.values()):
if port.state == state:
del host.ports[port.spec]
host.extraports = diff.host_b.extraports.copy()
net/nmap/patches/patch-ndiff_scripts_ndiff
+27
View File
@@ -0,0 +1,27 @@
apply 2to3
Index: ndiff/scripts/ndiff
--- ndiff/scripts/ndiff.orig
+++ ndiff/scripts/ndiff
@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_L
try:
import ndiff
-except ImportError, e:
- print >> sys.stderr, """\
+except ImportError as e:
+ print("""\
Could not import the ndiff module: %s.
-I checked in these directories:""" % repr(e.message)
+I checked in these directories:""" % repr(e.message), file=sys.stderr)
for dir in sys.path:
- print >> sys.stderr, " %s" % dir
- print >> sys.stderr, """\
+ print(" %s" % dir, file=sys.stderr)
+ print("""\
If you installed Ndiff in another directory, you may have to add the
-modules directory to the PYTHONPATH environment variable."""
+modules directory to the PYTHONPATH environment variable.""", file=sys.stderr)
sys.exit(1)
import ndiff
net/nmap/patches/patch-ndiff_setup_py
+63 -4
View File
@@ -1,11 +1,70 @@
apply 2to3 and additional fixes
Index: ndiff/setup.py
--- ndiff/setup.py.orig
+++ ndiff/setup.py
@@ -306,7 +306,7 @@ class my_uninstall(distutils.cmd.Command):
@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.instal
self.saved_prefix = sys.prefix
try:
distutils.command.install.install.finalize_options(self)
- except distutils.errors.DistutilsPlatformError, e:
+ except distutils.errors.DistutilsPlatformError as e:
raise distutils.errors.DistutilsPlatformError(str(e) + """
Installing your distribution's python-dev package may solve this problem.""")
distutils.core.setup(name="ndiff", scripts=["scripts/ndiff"],
py_modules=["ndiff"],
- data_files=[("share/man/man1", ["docs/ndiff.1"])],
@@ -227,7 +227,7 @@ for dir in dirs:
uninstaller_file.close()
# Set exec bit for uninstaller
- mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777
+ mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777
os.chmod(uninstaller_filename, mode)
def write_installed_files(self):
@@ -241,7 +241,7 @@ for dir in dirs:
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(distutils.cmd.Command):
@@ -263,7 +263,7 @@ class my_uninstall(distutils.cmd.Command):
# Read the list of installed files.
try:
f = open(INSTALLED_FILES_NAME, "r")
- except IOError, e:
+ except IOError as e:
if e.errno == errno.ENOENT:
log.error("Couldn't open the installation record '%s'. "
"Have you installed yet?" % INSTALLED_FILES_NAME)
@@ -286,7 +286,7 @@ class my_uninstall(distutils.cmd.Command):
try:
if not self.dry_run:
os.remove(file)
- except OSError, e:
+ except OSError as e:
log.error(str(e))
# Delete the directories. First reverse-sort the normalized paths by
# length so that child directories are deleted before their parents.
@@ -297,16 +297,16 @@ class my_uninstall(distutils.cmd.Command):
log.info("Removing the directory '%s'." % dir)
if not self.dry_run:
os.rmdir(dir)
- except OSError, e:
+ except OSError as e:
if e.errno == errno.ENOTEMPTY:
log.info("Directory '%s' not empty; not removing." % dir)
else:
log.error(str(e))
-distutils.core.setup(name=u"ndiff", scripts=[u"scripts/ndiff"],
- py_modules=[u"ndiff"],
- data_files=[(u"share/man/man1", [u"docs/ndiff.1"])],
+distutils.core.setup(name="ndiff", scripts=["scripts/ndiff"],
+ py_modules=["ndiff"],
+ data_files=[("man/man1", ["docs/ndiff.1"])],
cmdclass={
"install_egg_info": null_command,