aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-02-22 11:45:39 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2020-02-22 11:45:39 +0100
commit3e27da2e570268d135e1e70342b7e2b37faad7d6 (patch)
tree5660a4fc35687210891b49c60769a25ba9e64a04
parent7f804747d9f15527f27480dc5bb0bff17e4e1e42 (diff)
testing/ettercap: fix build with None build type
-rw-r--r--testing/ettercap/APKBUILD6
-rw-r--r--testing/ettercap/none-build-type.patch15
2 files changed, 19 insertions, 2 deletions
diff --git a/testing/ettercap/APKBUILD b/testing/ettercap/APKBUILD
index 7f029c97fa9..0dad4d80d38 100644
--- a/testing/ettercap/APKBUILD
+++ b/testing/ettercap/APKBUILD
@@ -11,7 +11,8 @@ makedepends="cmake make gcc musl-dev ncurses-dev curl-dev libpcap-dev
libnet-dev pcre-dev flex bison linux-headers geoip-dev
check-dev"
subpackages="$pkgname-doc lib$pkgname:libs"
-source="https://github.com/Ettercap/ettercap/releases/download/v$pkgver/ettercap-$pkgver.tar.gz"
+source="https://github.com/Ettercap/ettercap/releases/download/v$pkgver/ettercap-$pkgver.tar.gz
+ none-build-type.patch"
build() {
mkdir build
@@ -41,4 +42,5 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="d7058c1c633647bb5ae8575826c0c03e2adcc079e79b2cb188b2ab99cd7980ca439170571b8f80a98cc3327ce2cae9ad906391c1d79cfd763bacb3e6abf61b27 ettercap-0.8.3.tar.gz"
+sha512sums="d7058c1c633647bb5ae8575826c0c03e2adcc079e79b2cb188b2ab99cd7980ca439170571b8f80a98cc3327ce2cae9ad906391c1d79cfd763bacb3e6abf61b27 ettercap-0.8.3.tar.gz
+9aae86ee1599b4ffa0b9c0c5acc7939675db12c02d53f0e47d6e18acc513c020e0dbc63812536f8d8716132e0f8aeaf2ff737b0c9d11e8d814074ded82093b7c none-build-type.patch"
diff --git a/testing/ettercap/none-build-type.patch b/testing/ettercap/none-build-type.patch
new file mode 100644
index 00000000000..b5ee19ed0f3
--- /dev/null
+++ b/testing/ettercap/none-build-type.patch
@@ -0,0 +1,15 @@
+The build system includes its one check for available CMake build types.
+This check is incorrect as it doesn't include the None build type.
+
+diff -upr ettercap-0.8.3.orig/CMakeLists.txt ettercap-0.8.3/CMakeLists.txt
+--- ettercap-0.8.3.orig/CMakeLists.txt 2020-02-22 11:43:41.543886679 +0100
++++ ettercap-0.8.3/CMakeLists.txt 2020-02-22 11:43:57.684103657 +0100
+@@ -22,7 +22,7 @@ option(LIBRARY_BUILD "Build for libetter
+ option(INSTALL_DESKTOP "Install ettercap desktop files" ON)
+
+
+-set(VALID_BUILD_TYPES Debug Release RelWithDebInfo)
++set(VALID_BUILD_TYPES None Debug Release RelWithDebInfo)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ # Default to using "Release" as our build type.