[arch-commits] Commit in ettercap/trunk (PKGBUILD build.patch)

[Jelle van der Waa]

    Date: Friday, September 13, 2019 @ 16:56:57
  Author: jelle
Revision: 510355

upgpkg: ettercap 0.8.3-1

Upstream update.

Added:
  ettercap/trunk/build.patch
Modified:
  ettercap/trunk/PKGBUILD

-------------+
 PKGBUILD    |   23 +++++++++--------------
 build.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-13 16:43:05 UTC (rev 510354)
+++ PKGBUILD	2019-09-13 16:56:57 UTC (rev 510355)
@@ -3,26 +3,21 @@
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.8.2
-pkgrel=5
+pkgver=0.8.3
+pkgrel=1
 arch=('x86_64')
 url="https://ettercap.github.com/ettercap/"
 license=('GPL')
-depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet' 'ethtool' 'curl')
-makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
+depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet' 'ethtool' 'curl' 'geoip')
+makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk3' 'harfbuzz')
 options=('!makeflags' '!emptydirs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" 0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch
-        CVE-2017-6430.patch CVE-2017-8366.patch)
-sha1sums=('7e528632ca01c5977da1a0af56a5e05fbc383832'
-          '425fd778afd8fd75baccb9fb0a43c7b246304b32'
-          '3a3d6423368403f03205077493e80c1c4ebaab26'
-          'eabee4ad0ff0832b3cf46f453e3fa4ee8768f325')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" build.patch)
+sha1sums=('1db39315b2b2b574dc1eb3f7ae72871ad2391e2f'
+          '6d01c9517dc8b2981dccf9bd92c592ff8a7f90ba')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
-  patch -Np1 -i $srcdir/0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch
-  patch -Np1 -i $srcdir/CVE-2017-6430.patch
-  patch -Np1 -i $srcdir/CVE-2017-8366.patch
+  patch -Np1 -i $srcdir/build.patch
 }
 
 build() {
@@ -54,7 +49,7 @@
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
-  depends+=('gtk2')
+  depends+=('gtk3' 'harfbuzz')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')

Added: build.patch
===================================================================
--- build.patch	                        (rev 0)
+++ build.patch	2019-09-13 16:56:57 UTC (rev 510355)
@@ -0,0 +1,13 @@
+diff --git a/cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGTK3.cmake
+index ebbf0400..245fde13 100644
+--- a/cmake/Modules/FindGTK3.cmake
++++ b/cmake/Modules/FindGTK3.cmake
+@@ -388,7 +388,7 @@ endif()
+ #
+ 
+ find_package(Freetype)
+-list(APPEND GTK3_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
++list(APPEND GTK3_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} /usr/include/harfbuzz)
+ list(APPEND GTK3_LIBRARIES ${FREETYPE_LIBRARIES})
+ 
+ foreach(_GTK3_component ${GTK3_FIND_COMPONENTS})