summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch38
-rw-r--r--meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch54
-rw-r--r--meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb (renamed from meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb)7
3 files changed, 3 insertions, 96 deletions
diff --git a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch
deleted file mode 100644
index 592ea52f2e..0000000000
--- a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Mar 2023 10:23:14 -0700
4Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider
5 version 8+
6
7Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is
8reset to 0, current check assumes major version to be 7 at max and hence
9on systems with libcurl 8+ this check breaks and build fails
10
11Fixes
12
13TOPDIR/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
14 ^
151 error generated.
16
17Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 plug-ins/sslstrip/sslstrip.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c
24index 327bf58a..d9b67c8b 100644
25--- a/plug-ins/sslstrip/sslstrip.c
26+++ b/plug-ins/sslstrip/sslstrip.c
27@@ -51,7 +51,7 @@
28
29 #include <curl/curl.h>
30
31-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26)
32+#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26)
33 #error libcurl 7.26.0 or up is needed
34 #endif
35
36--
372.40.0
38
diff --git a/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch b/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch
deleted file mode 100644
index 70e48f7d9e..0000000000
--- a/meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 337e790d4fc8fed00a4f62047de1bc702f06105e Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Wed, 9 Jul 2025 14:15:32 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
5 compatibility
6
7Fix:
8
9| CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
10| Compatibility with CMake < 3.5 has been removed from CMake.
11|
12| Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
13| to tell CMake that the project requires at least <min> but has been updated
14| to work with policies introduced by <max> or earlier.
15|
16| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
17|
18|
19| -- Configuring incomplete, errors occurred!
20
21Upstream-Status: Submitted [https://github.com/Ettercap/ettercap/pull/1279]
22
23Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
24---
25 CMakeLists.txt | 2 +-
26 cmake/Modules/FindGTK3.cmake | 2 +-
27 2 files changed, 2 insertions(+), 2 deletions(-)
28
29diff --git a/CMakeLists.txt b/CMakeLists.txt
30index 1c08875a..600bd9f4 100644
31--- a/CMakeLists.txt
32+++ b/CMakeLists.txt
33@@ -1,4 +1,4 @@
34-cmake_minimum_required(VERSION 2.8)
35+cmake_minimum_required(VERSION 3.5)
36 project(ettercap C)
37
38 set(VERSION "0.8.3.1")
39diff --git a/cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGTK3.cmake
40index e07a4e90..f37fee1c 100644
41--- a/cmake/Modules/FindGTK3.cmake
42+++ b/cmake/Modules/FindGTK3.cmake
43@@ -351,7 +351,7 @@ endif()
44 #
45 if(GTK3_FIND_VERSION)
46 if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
47- cmake_minimum_required(VERSION 2.6.2)
48+ cmake_minimum_required(VERSION 3.5)
49 endif()
50 set(GTK3_FAILED_VERSION_CHECK true)
51 if(GTK3_DEBUG)
52--
532.43.0
54
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb
index 027b6dd190..3784d12b85 100644
--- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
+++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb
@@ -7,6 +7,7 @@ inherit cmake
7 7
8DEPENDS += "ethtool \ 8DEPENDS += "ethtool \
9 geoip \ 9 geoip \
10 libmaxminddb \
10 librepo \ 11 librepo \
11 libnet \ 12 libnet \
12 libpcap \ 13 libpcap \
@@ -20,11 +21,9 @@ DEPENDS += "ethtool \
20 21
21RDEPENDS:${PN} += "bash ethtool libgcc" 22RDEPENDS:${PN} += "bash ethtool libgcc"
22 23
23SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \ 24SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV}"
24 file://0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch \
25 file://0002-allow-build-with-cmake-4.patch"
26 25
27SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" 26SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508"
28 27
29EXTRA_OECMAKE = " \ 28EXTRA_OECMAKE = " \
30 -DCMAKE_SKIP_RPATH=TRUE \ 29 -DCMAKE_SKIP_RPATH=TRUE \