ndpi: 1.2.3

2 files changed, 34 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3fc6b685050..f5be96d877b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Nov 20 19:27:57 UTC 2017
 pkgbase = capanalysis
 	pkgdesc = PCAP files from another point of view
-	pkgver = 1.2.2
+	pkgver = 1.2.3
 	pkgrel = 1
 	url = http://www.capanalysis.net/
 	install = capanalysis.install
@@ -23,14 +21,12 @@ pkgbase = capanalysis
 	depends = php-pgsql
 	depends = postgresql
 	depends = ndpi
-	source = https://github.com/xplico/CapAnalysis/archive/v1.2.2.tar.gz
-	source = https://github.com/xplico/xplico/archive/v1.2.1.tar.gz
-	source = https://github.com/xplico/xplico/commit/1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
+	source = https://github.com/xplico/CapAnalysis/archive/v1.2.3.tar.gz
+	source = xplico::git+https://github.com/xplico/xplico
 	source = capanalysis.service
 	source = capana.conf
-	md5sums = aea82f79f1c42f6ce6dbacef1fdf3a1c
-	md5sums = b16b1f1dc8520b3bbc5c3cd9439ca38a
-	md5sums = 813a0ca8e13f674d3458173f90ac2e94
+	md5sums = bebf4b7fa8cdf11ff75c9b105a405159
+	md5sums = SKIP
 	md5sums = 9c33942e477795f97539cc7e57e404cf
 	md5sums = 9c8e3ca78f5dd0b8616b6c8b1e5e4e1e
 
diff --git a/PKGBUILD b/PKGBUILD
index 0dc65589cbb1..78671d5aa065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Contributor: robertfoster
 
 pkgname=capanalysis
-pkgver=1.2.2
-_xplicover=1.2.1
+pkgver=1.2.3
 pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="PCAP files from another point of view"
@@ -11,35 +10,40 @@ license=('GPL')
 depends=('glibc' 'libpcap' 'libpqxx' 'sqlite' 'openssl' 'zlib' 'wireshark-cli' 'apache' 'php-apache' 'php-sqlite' 'php-pgsql' 'postgresql' 'ndpi')
 makedepends=('xxd')
 source=("https://github.com/xplico/CapAnalysis/archive/v$pkgver.tar.gz"
-	"https://github.com/xplico/xplico/archive/v${_xplicover}.tar.gz"
-	https://github.com/xplico/xplico/commit/1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
+	"xplico::git+https://github.com/xplico/xplico"
 	capanalysis.service
-	capana.conf)
+capana.conf)
 install=capanalysis.install
 
 prepare() {
-    cd $srcdir
-    ln -s xplico-${_xplicover} xplico
-    ln -s xplico/include .
-    cd xplico
-    patch -Np1 -i ../1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
-    make -j1
-    cd ../CapAnalysis-$pkgver
-    msg2 "Compiling CapAnalysis..."
-    make pkgbin
-    make
+	cd $srcdir
+	ln -sf xplico/include .
+	cd xplico
+	# Fix some headers paths
+	find . -name "*.c" -exec sed -i "s|libndpi\/|ndpi\/|g" {} +
+	find . -name "*.h" -exec sed -i "s|libndpi\/|ndpi\/|g" {} +
+	find . -name "*.c" -exec sed -i "s|json_object_private|json_object|g" {} +
+}
+
+build() {
+	cd $srcdir
+	cd xplico
+	make -j1
+	cd ../CapAnalysis-$pkgver
+	msg2 "Compiling CapAnalysis..."
+	make pkgbin
+	make
 }
 
 package() {
-    cd $srcdir/CapAnalysis-$pkgver
-    make INSTALL_DIR=$pkgdir/opt/capanalysis install
-    mkdir -p $pkgdir/etc/httpd/conf/extra
-    cp ../capana.conf $pkgdir/etc/httpd/conf/extra/httpd-capana.conf
-    install -Dm644 ../capanalysis.service "${pkgdir}"/usr/lib/systemd/system/capanalysis.service
+	cd $srcdir/CapAnalysis-$pkgver
+	make INSTALL_DIR=$pkgdir/opt/capanalysis install
+	mkdir -p $pkgdir/etc/httpd/conf/extra
+	cp ../capana.conf $pkgdir/etc/httpd/conf/extra/httpd-capana.conf
+	install -Dm644 ../capanalysis.service "${pkgdir}"/usr/lib/systemd/system/capanalysis.service
 }
 
-md5sums=('aea82f79f1c42f6ce6dbacef1fdf3a1c'
-         'b16b1f1dc8520b3bbc5c3cd9439ca38a'
-         '813a0ca8e13f674d3458173f90ac2e94'
-         '9c33942e477795f97539cc7e57e404cf'
-         '9c8e3ca78f5dd0b8616b6c8b1e5e4e1e')
+md5sums=('bebf4b7fa8cdf11ff75c9b105a405159'
+	'SKIP'
+	'9c33942e477795f97539cc7e57e404cf'
+'9c8e3ca78f5dd0b8616b6c8b1e5e4e1e')