* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2019-01-25 14:39 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2019-01-25 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 0390c17140e8122552113b7da35220788de78b47
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 14:39:28 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 14:39:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0390c171
net-analyzer/nmap: include more time.h
Fixes: https://bugs.gentoo.org/676206
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/nmap/files/nmap-7.70-time.patch | 30 ++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
index 6d12ea8f96f..4b97bdf4904 100644
--- a/net-analyzer/nmap/files/nmap-7.70-time.patch
+++ b/net-analyzer/nmap/files/nmap-7.70-time.patch
@@ -8,3 +8,33 @@
extern NmapOps o;
+--- a/nmap.cc
++++ b/nmap.cc
+@@ -161,6 +161,7 @@
+ #endif
+
+ #include <fcntl.h>
++#include <time.h>
+
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+--- a/osscan2.cc
++++ b/osscan2.cc
+@@ -147,6 +147,7 @@
+
+ #include <list>
+ #include <math.h>
++#include <time.h>
+
+ extern NmapOps o;
+ #ifdef WIN32
+--- a/output.cc
++++ b/output.cc
+@@ -153,6 +153,7 @@
+ #include "libnetutil/netutil.h"
+
+ #include <math.h>
++#include <time.h>
+
+ #include <set>
+ #include <vector>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2020-02-05 12:00 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-02-05 12:00 UTC (permalink / raw
To: gentoo-commits
commit: d94de70abf5b87fd5c3226f6a5030ca47fdf2ad4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 12:00:26 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 12:00:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94de70a
net-analyzer/nmap: Update patch
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/nmap/files/nmap-9999-netutil-else.patch | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
index a96a04b7a87..c9b3350d986 100644
--- a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
+++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
@@ -9,12 +9,3 @@
/* TCP Flags */
p = tflags;
-@@ -2633,7 +2633,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
- (tcpoptinfo[0]!='\0') ? " " : "",
- tcpoptinfo, ipinfo);
- }
-- } else{
-+ } else {
- /* If the packet does not fall into any other category, then we have a
- really screwed-up packet. */
- /* This ought to be unreachable; if static analysis flags it as such, delete it. */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2020-06-17 17:49 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-06-17 17:49 UTC (permalink / raw
To: gentoo-commits
commit: b0167a38dd7fd885e3de526ed5aead1820dfe538
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 14:14:08 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:49:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0167a38
net-analyzer/nmap: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16293
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-analyzer/nmap/files/nmap-7.70-time.patch | 40 ----------------------------
1 file changed, 40 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
deleted file mode 100644
index 4b97bdf4904..00000000000
--- a/net-analyzer/nmap/files/nmap-7.70-time.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/nmap_error.cc
-+++ b/nmap_error.cc
-@@ -135,6 +135,7 @@
- #include "xml.h"
-
- #include <errno.h>
-+#include <time.h>
-
- extern NmapOps o;
-
---- a/nmap.cc
-+++ b/nmap.cc
-@@ -161,6 +161,7 @@
- #endif
-
- #include <fcntl.h>
-+#include <time.h>
-
- #ifdef HAVE_PWD_H
- #include <pwd.h>
---- a/osscan2.cc
-+++ b/osscan2.cc
-@@ -147,6 +147,7 @@
-
- #include <list>
- #include <math.h>
-+#include <time.h>
-
- extern NmapOps o;
- #ifdef WIN32
---- a/output.cc
-+++ b/output.cc
-@@ -153,6 +153,7 @@
- #include "libnetutil/netutil.h"
-
- #include <math.h>
-+#include <time.h>
-
- #include <set>
- #include <vector>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2022-12-26 10:19 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-26 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 69cba480c48a85602263bb2f7d2398d78b0240e2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 26 08:38:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 10:19:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cba480
net-analyzer/nmap: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28822
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nmap/files/nmap-9999-python3.patch | 103 ------------------------
1 file changed, 103 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-9999-python3.patch b/net-analyzer/nmap/files/nmap-9999-python3.patch
deleted file mode 100644
index 3d740d759b3c..000000000000
--- a/net-analyzer/nmap/files/nmap-9999-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 <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):
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2024-01-14 21:03 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-14 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 1dca374f26b6217b45669668952489049c7a42c3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 20:53:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 21:02:36 2024 +0000
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 <sam <AT> 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 @@
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/
@ 2024-04-27 4:20 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-04-27 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 197a020b2d9db8c6e2b82d56db20664155cc3e46
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 04:17:23 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 04:19:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197a020b
net-analyzer/nmap: add upstream refs to patch
Signed-off-by: Sam James <sam <AT> 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 <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 20 Jul 2023 16:21:23 +0000
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-27 4:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-14 21:03 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-27 4:20 Sam James
2022-12-26 10:19 Sam James
2020-06-17 17:49 Aaron Bauman
2020-02-05 12:00 Jeroen Roovers
2019-01-25 14:39 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox