Sync changes to SLFO-1.2 branch

nmap-7.92.tar.bz2.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRDbWarmnmEJf2g4/gBr58Da5NV0AUCYQ8ebgAKCRABr58Da5NV
+0CueAJ4qDsTIi6sJ521jJutUvrAsqoaSaACfX8sECeGHSnV3VPsTzvj7QxoqiAA=
+=TLt7
+-----END PGP SIGNATURE-----

nmap-7.93.tar.bz2.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRDbWarmnmEJf2g4/gBr58Da5NV0AUCYxE8MQAKCRABr58Da5NV
-0O5/AJ9gaOzfjyroorcnISssqQhiJFMRdgCglxpH5UUDSmAhgQk8IFSWPCNE0kM=
-=SS7E
------END PGP SIGNATURE-----

nmap-fix-build-libpcap-1.10.5.patch

@@ -0,0 +1,54 @@
+Index: b/nse_nsock.cc
+===================================================================
+--- a/nse_nsock.cc
++++ b/nse_nsock.cc
+@@ -33,7 +33,7 @@
+ enum {
+   NSOCK_POOL = lua_upvalueindex(1),
+   NSOCK_SOCKET = lua_upvalueindex(2), /* nsock socket metatable */
+-  PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
++  PCAP_SOCKET_NMAP = lua_upvalueindex(3), /* pcap socket metatable */
+   THREAD_SOCKETS = lua_upvalueindex(4), /* <Thread, Table of Sockets (keys)> */
+   CONNECT_WAITING = lua_upvalueindex(5), /* Threads waiting to lock */
+   KEY_PCAP = lua_upvalueindex(6) /* Keys to pcap sockets */
+@@ -969,7 +969,7 @@ static int nsock_gc (lua_State *L)
+ }
+ 
+ 
+-/****************** PCAP_SOCKET ***********************************************/
++/****************** PCAP_SOCKET_NMAP ***********************************************/
+ 
+ static void dnet_to_pcap_device_name (lua_State *L, const char *device)
+ {
+@@ -1036,7 +1036,7 @@ static int l_pcap_open (lua_State *L)
+       nsock_iod_delete(*nsiod, NSOCK_PENDING_ERROR);
+       luaL_error(L, "can't open pcap reader on %s", device);
+     }
+-    lua_pushvalue(L, PCAP_SOCKET);
++    lua_pushvalue(L, PCAP_SOCKET_NMAP);
+     lua_setmetatable(L, -2);
+     lua_pushvalue(L, 7); /* the pcap socket key */
+     lua_pushvalue(L, -2); /* the pcap socket nsiod */
+@@ -1144,7 +1144,7 @@ LUALIB_API int luaopen_nsock (lua_State
+   /* library upvalues */
+   nsock_pool nsp = new_pool(L); /* NSOCK_POOL */
+   lua_newtable(L); /* NSOCK_SOCKET */
+-  lua_newtable(L); /* PCAP_SOCKET */
++  lua_newtable(L); /* PCAP_SOCKET_NMAP */
+   nseU_weaktable(L, 0, MAX_PARALLELISM, "k"); /* THREAD_SOCKETS */
+   nseU_weaktable(L, 0, 1000, "k"); /* CONNECT_WAITING */
+   nseU_weaktable(L, 0, 0, "v"); /* KEY_PCAP */
+@@ -1164,11 +1164,11 @@ LUALIB_API int luaopen_nsock (lua_State
+   lua_pop(L, 1); /* NSOCK_SOCKET */
+ 
+   /* Create the nsock pcap metatable */
+-  lua_pushvalue(L, top+3); /* PCAP_SOCKET */
++  lua_pushvalue(L, top+3); /* PCAP_SOCKET_NMAP */
+   for (i = top+1; i <= top+nupvals; i++) lua_pushvalue(L, i);
+   lua_pushcclosure(L, pcap_gc, nupvals);
+   lua_setfield(L, top+3, "__gc");
+-  lua_pop(L, 1); /* PCAP_SOCKET */
++  lua_pop(L, 1); /* PCAP_SOCKET_NMAP */
+ 
+ #if HAVE_OPENSSL
+   /* Set up the SSL certificate userdata code in nse_ssl_cert.cc. */

nmap.changes

@@ -1,25 +1,10 @@
 -------------------------------------------------------------------
-Mon Sep  5 08:53:23 UTC 2022 - Robert Frohl <rfrohl@suse.com>
+Fri Feb 28 15:04:53 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Update to 7.93:
+- Add nmap-fix-build-libpcap-1.10.5.patch
-  * This release commemorates Nmap's 25th anniversary! It all started with this September 1, 1997 Phrack article by Fyodor: https://nmap.org/p51-11.html.
+  * libpcap 1.10.5 defines PCAP_SOCKET. Avoid redefinition in nmap by
-  * Ensure Nmap builds with OpenSSL 3.0 using no deprecated API functions. Binaries for this release include OpenSSL 3.0.5.
+    renaming it. Fixes builds with libpcap >= 1.10.5.
-  * Upgrade included libraries: libssh2 1.10.0, zlib 1.2.12, Lua 5.3.6, libpcap 1.10.1
+- Replace deprecated %patchN macros
-  * Fix a bug that prevented Nmap from discovering interfaces on Linux when no IPv4 addresses were configured.
-  * NSE "exception handling" with nmap.new_try() will no longer result in a stack traceback in debug output
-  * Update the Nmap output DTD to match actual output since the `<hosthint>` element was added in Nmap 7.90.
-  * Fix newtargets support: since Nmap 7.92, scripts could not add targets in script pre-scanning phase.
-  * Scripts dhcp-discover and broadcast-dhcp-discover now support setting a client identifier.
-  * Script oracle-tns-version was not reporting the version correctly for Oracle 19c or newer
-  * Script redis-info was crashing or producing inaccurate information about client connections and/or cluster nodes.
-  * Script ipidseq was broken due to calling an unreachable library function.
-  * Support for EC crypto was not properly enabled if Nmap was compiled with OpenSSL in a custom location.
-  * Improvements to event handling and pcap socket garbage collection, fixing potential hangs and crashes.
-  * Fix TDS7 password encoding for mssql.lua, which had been assuming ASCII input even though other parts of the library had been passing it Unicode.
-  * Replace deprecated CPEs for IIS with their updated identifier, cpe:/a:microsoft:internet_information_services
-  * Fix script-terminating error when unknown BSON data types are encountered. Added parsers for most standard data types.
-  * Fix hostname/certificate comparison and matching to handle ASN.1 strings without null terminators, a similar bug to OpenSSL's CVE-2021-3712.
-  * Added support for SOCKS5 proxies that return bind addresses as hostnames, instead of IPv4/IPv6 addresses.
 
 -------------------------------------------------------------------
 Mon Oct  4 17:06:13 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

nmap.spec

@@ -28,7 +28,7 @@
 %define with_python2 1
 %endif
 Name:           nmap
-Version:        7.93
+Version:        7.92
 Release:        0
 Summary:        Network exploration tool and security scanner
 License:        GPL-2.0-or-later
@@ -41,13 +41,15 @@ Patch1:         nmap-7.40-desktop_files.patch
 Patch2:         nmap-4.75-nostrip.patch
 Patch3:         su-to-zenmap.patch
 Patch4:         nmap-ncat-skip-network-tests.patch
+# PATCH-FIX-SUSE nmap-fix-build-libpcap-1.10.5.patch antonio.teixeira@suse.com -- libpcap 1.10.5 defines PCAP_SOCKET. Avoid redefinition in nmap by renaming it.
+Patch5:         nmap-fix-build-libpcap-1.10.5.patch
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel
-BuildRequires:  libopenssl-3-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libssh2-devel
+BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel
 %if %{with_python2}
@@ -119,13 +121,14 @@ Service attacks, route tracing, etc.
 %prep
 %setup -q
 %if %{with_python2}
-%patch1 -p1
+%patch -P 1 -p1
 %endif
-%patch2
+%patch -P 2
 %if %{with_python2}
-%patch3
+%patch -P 3
 %endif
-%patch4 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
 
 # use system provided libraries
 rm -rf libpcap libpcre macosx mswin32