capanalysis: 1.2.2

2 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d969ba9c48d5..06f0b7658514 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Nov 18 19:07:50 UTC 2017
+# Mon Nov 20 18:43:27 UTC 2017
 pkgbase = capanalysis
 	pkgdesc = PCAP files from another point of view
-	pkgver = v1.2.0.r45.gbc8e15d
+	pkgver = 1.2.2
 	pkgrel = 1
 	url = http://www.capanalysis.net/
 	install = capanalysis.install
@@ -23,12 +23,12 @@ pkgbase = capanalysis
 	depends = php-pgsql
 	depends = postgresql
 	depends = ndpi
-	source = capanalysis::git+https://github.com/M0Rf30/CapAnalysis.git
-	source = xplico::git+https://github.com/M0Rf30/xplico.git
+	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 = capanalysis.service
 	source = capana.conf
-	md5sums = SKIP
-	md5sums = SKIP
+	md5sums = aea82f79f1c42f6ce6dbacef1fdf3a1c
+	md5sums = b16b1f1dc8520b3bbc5c3cd9439ca38a
 	md5sums = 9c33942e477795f97539cc7e57e404cf
 	md5sums = 9c8e3ca78f5dd0b8616b6c8b1e5e4e1e
 
diff --git a/PKGBUILD b/PKGBUILD
index 441884328f0e..4f539bb95192 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Contributor: robertfoster
 
 pkgname=capanalysis
-pkgver=v1.2.0.r45.gbc8e15d
+pkgver=1.2.2
+_xplicover=1.2.1
 pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="PCAP files from another point of view"
@@ -9,37 +10,32 @@ url="http://www.capanalysis.net/"
 license=('GPL')
 depends=('glibc' 'libpcap' 'libpqxx' 'sqlite' 'openssl' 'zlib' 'wireshark-cli' 'apache' 'php-apache' 'php-sqlite' 'php-pgsql' 'postgresql' 'ndpi')
 makedepends=('xxd')
-source=('capanalysis::git+https://github.com/roberfoster/CapAnalysis.git'
-	'xplico::git+https://github.com/roberfoster/xplico.git'
+source=("https://github.com/xplico/CapAnalysis/archive/v$pkgver.tar.gz"
+	"https://github.com/xplico/xplico/archive/v${_xplicover}.tar.gz"
 	capanalysis.service
 	capana.conf)
 install=capanalysis.install
 
 prepare() {
     cd $srcdir
+    ln -s xplico-${_xplicover} xplico
     cd xplico
-    msg2 "Compiling xplico..."
-    make LOCAL_NDPI=1 -j1
+    make
+    cd ../CapAnalysis-$pkgver
     msg2 "Compiling CapAnalysis..."
-    cd ../capanalysis
     make pkgbin
     make
 }
+
 package() {
-    cd capanalysis
+    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
-
-}
-
-pkgver() {
-  cd capanalysis
-  echo $(git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }
 
-md5sums=('SKIP'
-         'SKIP'
+md5sums=('aea82f79f1c42f6ce6dbacef1fdf3a1c'
+         'b16b1f1dc8520b3bbc5c3cd9439ca38a'
          '9c33942e477795f97539cc7e57e404cf'
          '9c8e3ca78f5dd0b8616b6c8b1e5e4e1e')