ettercap: 0.8.3.1-> 0.8.4

1. Changelog
   https://github.com/Ettercap/ettercap/releases/tag/v0.8.4

2. Remove following patches as they were merged upstream
   0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch
   0002-allow-build-with-cmake-4.patch

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch

@@ -1,38 +0,0 @@
-From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 23 Mar 2023 10:23:14 -0700
-Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider
- version 8+
-
-Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is
-reset to 0, current check assumes major version to be 7 at max and hence
-on systems with libcurl 8+ this check breaks and build fails
-
-Fixes
-
-TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed
- ^
-1 error generated.
-
-Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plug-ins/sslstrip/sslstrip.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c
-index 327bf58a..d9b67c8b 100644
---- a/plug-ins/sslstrip/sslstrip.c
-+++ b/plug-ins/sslstrip/sslstrip.c
-@@ -51,7 +51,7 @@
- 
- #include <curl/curl.h>
- 
--#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26)
-+#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26)
- #error libcurl 7.26.0 or up is needed
- #endif
- 
--- 
-2.40.0
-

meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch

@@ -1,54 +0,0 @@
-From 337e790d4fc8fed00a4f62047de1bc702f06105e Mon Sep 17 00:00:00 2001
-From: Alper Ak <alperyasinak1@gmail.com>
-Date: Wed, 9 Jul 2025 14:15:32 +0300
-Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
- compatibility
-
-Fix:
-
-| CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
-|   Compatibility with CMake < 3.5 has been removed from CMake.
-|
-|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
-|   to tell CMake that the project requires at least <min> but has been updated
-|   to work with policies introduced by <max> or earlier.
-|
-|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Submitted [https://github.com/Ettercap/ettercap/pull/1279]
-
-Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
----
- CMakeLists.txt               | 2 +-
- cmake/Modules/FindGTK3.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1c08875a..600bd9f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.5)
- project(ettercap C)
- 
- set(VERSION "0.8.3.1")
-diff --git a/cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGTK3.cmake
-index e07a4e90..f37fee1c 100644
---- a/cmake/Modules/FindGTK3.cmake
-+++ b/cmake/Modules/FindGTK3.cmake
-@@ -351,7 +351,7 @@ endif()
- #
- if(GTK3_FIND_VERSION)
-   if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
--    cmake_minimum_required(VERSION 2.6.2)
-+    cmake_minimum_required(VERSION 3.5)
-   endif()
-   set(GTK3_FAILED_VERSION_CHECK true)
-   if(GTK3_DEBUG)
--- 
-2.43.0
-

meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb

@@ -7,6 +7,7 @@ inherit cmake
 
 DEPENDS += "ethtool \
             geoip \
+            libmaxminddb \
             librepo \
             libnet \
             libpcap \
@@ -20,11 +21,9 @@ DEPENDS += "ethtool \
 
 RDEPENDS:${PN} += "bash ethtool libgcc"
 
-SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \
+SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV}"
-           file://0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch \
-           file://0002-allow-build-with-cmake-4.patch"
 
-SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31"
+SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508"
 
 EXTRA_OECMAKE = " \
     -DCMAKE_SKIP_RPATH=TRUE \