gentoo resync : 12.05.2022

3 files changed, 0 insertions, 144 deletions

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..000000000000
--- 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 @@
- LDFLAGS = @LDFLAGS@
- MAC_FLAGS =
- LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS)
--DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@ 
- APR_LIBS = @APR_LIBS@
- SVN_LIBS = @SVN_LIBS@
- 
diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
deleted file mode 100644
index 513c7fbd418f..000000000000
--- a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/770808
-https://github.com/nmap/nmap/commit/169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689
-
-From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Thu, 19 Nov 2020 17:34:24 +0000
-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
deleted file mode 100644
index f617fd4b134c..000000000000
--- a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/765148
-https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323
-
-From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001
-From: nnposter <nnposter@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Fri, 16 Oct 2020 02:54:52 +0000
-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