no more dep on xplico

2 files changed, 14 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ee909316d9f..54fc860d697e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Mar 20 19:40:42 UTC 2016
+# Sun Jul 17 17:25:23 UTC 2016
 pkgbase = capanalysis
 	pkgdesc = PCAP files from another point of view
 	pkgver = v1.2.0
@@ -10,7 +10,7 @@ pkgbase = capanalysis
 	arch = x86_64
 	license = GPL
 	makedepends = xxd
-	makedepends = xplico
+	makedepends = ndpi
 	depends = glibc
 	depends = libpcap
 	depends = libpqxx
@@ -24,9 +24,11 @@ pkgbase = capanalysis
 	depends = php-pgsql
 	depends = postgresql
 	source = capanalysis::git+https://github.com/xplico/CapAnalysis.git
+	source = xplico::git+https://github.com/M0Rf30/xplico.git
 	source = capanalysis.service
 	source = capana.conf
 	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = 9c33942e477795f97539cc7e57e404cf
 	md5sums = 9c8e3ca78f5dd0b8616b6c8b1e5e4e1e
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e66771adccf..2829740bb3bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,20 +8,22 @@ pkgdesc="PCAP files from another point of view"
 url="http://www.capanalysis.net/"
 license=('GPL')
 depends=('glibc' 'libpcap' 'libpqxx' 'sqlite' 'openssl' 'zlib' 'wireshark-cli' 'apache' 'php-apache' 'php-sqlite' 'php-pgsql' 'postgresql')
-makedepends=(xxd xplico)
+makedepends=('xxd' 'ndpi')
 source=('capanalysis::git+https://github.com/xplico/CapAnalysis.git'
+	'xplico::git+https://github.com/M0Rf30/xplico.git'
 	capanalysis.service
 	capana.conf)
 install=capanalysis.install
 
 prepare() {
-    cd capanalysis
+    cd $srcdir
+    cd xplico
+    msg2 "Compiling xplico..."
+    make LOCAL_NDPI=1 -j1
+    msg2 "Compiling CapAnalysis..."
+    cd ../capanalysis
     make pkgbin
-    make subdir capanalysis check_version
-    mkdir ../xplico
-    cd ../xplico
-    ln -sr /opt/xplico/bin/xplico .
-    ln -sr /opt/xplico/bin/modules/ .
+    make
 }
 package() {
     cd capanalysis
@@ -38,5 +40,6 @@ pkgver() {
 }
 
 md5sums=('SKIP'
+         'SKIP'
          '9c33942e477795f97539cc7e57e404cf'
          '9c8e3ca78f5dd0b8616b6c8b1e5e4e1e')