diff options
| -rw-r--r-- | meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch | 38 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ettercap/ettercap/0002-allow-build-with-cmake-4.patch | 54 | ||||
| -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 @@ | |||
| 1 | From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 23 Mar 2023 10:23:14 -0700 | ||
| 4 | Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider | ||
| 5 | version 8+ | ||
| 6 | |||
| 7 | Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is | ||
| 8 | reset to 0, current check assumes major version to be 7 at max and hence | ||
| 9 | on systems with libcurl 8+ this check breaks and build fails | ||
| 10 | |||
| 11 | Fixes | ||
| 12 | |||
| 13 | 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 | ||
| 14 | ^ | ||
| 15 | 1 error generated. | ||
| 16 | |||
| 17 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63] | ||
| 18 | Signed-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 | |||
| 23 | diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c | ||
| 24 | index 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 | -- | ||
| 37 | 2.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 @@ | |||
| 1 | From 337e790d4fc8fed00a4f62047de1bc702f06105e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Wed, 9 Jul 2025 14:15:32 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 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 | |||
| 21 | Upstream-Status: Submitted [https://github.com/Ettercap/ettercap/pull/1279] | ||
| 22 | |||
| 23 | Signed-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 | |||
| 29 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 30 | index 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") | ||
| 39 | diff --git a/cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGTK3.cmake | ||
| 40 | index 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 | -- | ||
| 53 | 2.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 | ||
| 8 | DEPENDS += "ethtool \ | 8 | DEPENDS += "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 | ||
| 21 | RDEPENDS:${PN} += "bash ethtool libgcc" | 22 | RDEPENDS:${PN} += "bash ethtool libgcc" |
| 22 | 23 | ||
| 23 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \ | 24 | SRC_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 | ||
| 27 | SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" | 26 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" |
| 28 | 27 | ||
| 29 | EXTRA_OECMAKE = " \ | 28 | EXTRA_OECMAKE = " \ |
| 30 | -DCMAKE_SKIP_RPATH=TRUE \ | 29 | -DCMAKE_SKIP_RPATH=TRUE \ |
