Update to 2.0.7

3 files changed, 30 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7aebd959dbf5..93cdc7d5d0cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
-# Generated by mksrcinfo v8
-# Thu Dec 28 01:58:47 UTC 2017
 pkgbase = cuckoo
-	pkgdesc = A malware analysis system
-	pkgver = 2.0.4.4
+	pkgdesc = Cuckoo Sandbox is an automated dynamic malware analysis system
+	pkgver = 2.0.7
 	pkgrel = 1
 	url = http://cuckoosandbox.org/
 	install = cuckoo.install
 	arch = any
-	license = GPL3
+	license = GPL-3.0
+	makedepends = python-setuptools
+	makedepends = gendesk
 	depends = python2
 	depends = python2-sqlalchemy
 	depends = python2-dpkt
@@ -15,7 +15,7 @@ pkgbase = cuckoo
 	depends = python2-django
 	depends = volatility
 	depends = python2-maec
-	depends = python2-magic
+	depends = python-magic
 	depends = libvirt
 	depends = python2-bottle
 	depends = python2-pefile
@@ -27,10 +27,8 @@ pkgbase = cuckoo
 	optdepends = python2-pydeep
 	optdepends = python2-yara
 	options = !emptydirs
-	source = https://downloads.cuckoosandbox.org/cuckoo-current.tar.gz
-	source = cuckoo.desktop
-	sha512sums = a2853abcb7a8af9a197423b899f07fbb44763cfc8cd8415e42a0703bed59a1517fa8941417f92abdeff57222f1e5e671c9131a0a14f7df8546dc2900c9358399
-	sha512sums = fde1e6d9c4bea273d848b9dbee09027f6eb7e8b48116ee4bcaddef314c7c22f8bca5a3e7e9dabe06d007fe603fe7c1cd518b2c707b41866945b0adf83dcc42a4
+	source = https://github.com/cuckoosandbox/cuckoo/archive/2.0.7.tar.gz
+	md5sums = 82c69e491c552d265065eee169a217d0
 
 pkgname = cuckoo
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ebd35dd1f68..5c4a48d7f332 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,42 @@
-# Maintainer GI_Jack <iamjacksemail@hackermail.com>
-# Imported from ArchStrike
-# Original: ArchStrike <team@archstrike.org>
-
-buildarch=1
+# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Contributor: GI_Jack <iamjacksemail@hackermail.com>
 
 pkgname=cuckoo
-pkgver=2.0.4.4
+pkgver=2.0.7
 pkgrel=1
-pkgdesc="A malware analysis system"
+pkgdesc="Cuckoo Sandbox is an automated dynamic malware analysis system"
 url="http://cuckoosandbox.org/"
 arch=('any')
-license=('GPL3')
+license=('GPL-3.0')
 install='cuckoo.install'
 options=('!emptydirs')
 depends=('python2' 'python2-sqlalchemy' 'python2-dpkt' 'python2-jinja'
-         'python2-django' 'volatility' 'python2-maec' 'python2-magic'
+         'python2-django' 'volatility' 'python2-maec' 'python-magic'
          'libvirt' 'python2-bottle' 'python2-pefile' 'python2-pymongo'
          'tcpdump' 'python2-chardet' 'python2-requests' 'python2-dateutil')
 optdepends=('python2-pydeep' 'python2-yara')
-source=("https://downloads.cuckoosandbox.org/cuckoo-current.tar.gz"
-  'cuckoo.desktop')
-sha512sums=('a2853abcb7a8af9a197423b899f07fbb44763cfc8cd8415e42a0703bed59a1517fa8941417f92abdeff57222f1e5e671c9131a0a14f7df8546dc2900c9358399'
-            'fde1e6d9c4bea273d848b9dbee09027f6eb7e8b48116ee4bcaddef314c7c22f8bca5a3e7e9dabe06d007fe603fe7c1cd518b2c707b41866945b0adf83dcc42a4')
+makedepends=('python-setuptools' 'gendesk')
+source=("https://github.com/cuckoosandbox/cuckoo/archive/${pkgver}.tar.gz")
+md5sums=('82c69e491c552d265065eee169a217d0')
 
 prepare() {
-  cd ${pkgname}
+  cd ${pkgname}-${pkgver}
   find "${srcdir}" -type f -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-  sed -i 's|^version_check =.*|version_check = off|' conf/cuckoo.conf
-  sed -i 's|^platform =.*|platform = linux|' conf/{kvm.conf,virtualbox.conf,vmware.conf,esx.conf}
+  python2 stuff/monitor.py
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+  python2 setup.py build
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --exec="${pkgname}" --categories=Application\;Development --icon "${pkgname}"
 }
 
 package() {
-  cd ${pkgname}
-  install -dm755 "${pkgdir}/usr/bin/"
-  install -dm755 "${pkgdir}/usr/share/cuckoo"
+  cd ${pkgname}-${pkgver}
+  python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
   install -Dm644 docs/LICENSE "${pkgdir}/usr/share/licenses/cuckoo/LICENSE"
-  install -Dm644 ${srcdir}/cuckoo.desktop "${pkgdir}/usr/share/applications/cuckoo.desktop"
-  cp --no-preserve=ownership -a * "${pkgdir}/usr/share/cuckoo"
-  chmod u+rwX,g+rwX,o+rX -R "${pkgdir}/usr/share/cuckoo"
-
-cat > "${pkgdir}/usr/bin/cuckoo" <<EOF
+  install -Dm644 cuckoo.desktop "${pkgdir}/usr/share/applications/cuckoo.desktop"
+  cat > "${pkgdir}/usr/bin/cuckoo" <<EOF
 #!/usr/bin/env bash
 if ! id | grep -q '(cuckoo)' && ! [ \$EUID -eq 0 ] ; then
   echo "==> Add yourself to the cuckoo group to use cuckoo as an unprivledged user."
@@ -49,6 +45,5 @@ fi
 cd /usr/share/${pkgname}
 python2 cuckoo.py "\$@"
 EOF
-chmod 755 "${pkgdir}/usr/bin/${pkgname}"
-}
-
+  chmod 755 "${pkgdir}/usr/bin/${pkgname}"
+}
\ No newline at end of file
diff --git a/cuckoo.desktop b/cuckoo.desktop
deleted file mode 100644
index 100c79805c52..000000000000
--- a/cuckoo.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Cuckoo
-Comment=A malware analyze system
-Exec=/usr/bin/cuckoo
-Icon=cuckoo
-Terminal=false
-StartupNotify=false
-Categories=Application;