Version bump

5 files changed, 60 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2f89018aea9..04ec17bdb62f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = armitage-git
 	pkgdesc = Metasploit GUI Front ened written in java
-	pkgver = 1248.c8ca6c0
-	pkgrel = 2
+	pkgver = 1.0.0.r1.gcf60646
+	pkgrel = 1
 	url = http://www.fastandeasyhacking.com/
 	install = armitage.install
 	arch = any
 	license = GPL
-	makedepends = apache-ant
 	depends = metasploit
 	depends = java-environment
 	depends = postgresql
 	provides = armitage
 	conflicts = armitage
-	source = armitage::git+https://github.com/rsmudge/armitage
+	source = armitage-git::git+https://github.com/r00t0v3rr1d3/armitage
 	source = armitage.install
 	source = armitage.desktop
 	source = metasploit.png
@@ -30,8 +29,7 @@ pkgbase = armitage-git
 	sha256sums = b4b4e77895712d16ab9d7402ee53fafcb34c667b7394ae7136d6686be8ee1a2f
 	sha256sums = ac521ad84eddf680c50c90bbeab3de5c3141da856702de8ac8c31e1ef66154e0
 	sha256sums = df69997f77fb6460d5f7aba0ff5b592eef5890ce52d2f9e2614e8836fc56eade
-	sha256sums = 7d7565a6095de77def21960409a3c57a1583246042af7e21bf6367f0bf23380e
-	sha256sums = 0aa46b5583ba21126eaa60279617af3e8380e6d927b5a836ae7bada7de31a94d
+	sha256sums = 83b3cdd5f5ca0d92f4a407700ca8eff716deb0459b557d85aa82d2c4646e5f65
+	sha256sums = b56531b052f3110a0928633974f1adcbe55b116b53d6c7e3e148ff1b1ec7d461
 
 pkgname = armitage-git
-
diff --git a/.gitignore b/.gitignore
index 56d02ed7f683..971835d3a5b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 src
 pkg
-armitage
-*pkg.tar.xz
+armitage-git
+*pkg.tar.*
 tags
diff --git a/PKGBUILD b/PKGBUILD
index 4096e095bb32..0c51b06782e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
 # Maintainer: Tony Lambiris <tony@libpcap.net>
 
 pkgname=armitage-git
-gitname=armitage
-pkgver=1248.c8ca6c0
-pkgrel=2
+_pkgname=${pkgname%-git}
+pkgver=1.0.0.r1.gcf60646
+pkgrel=1
 pkgdesc="Metasploit GUI Front ened written in java"
 url="http://www.fastandeasyhacking.com/"
 arch=('any')
 license=('GPL')
 depends=('metasploit' 'java-environment' 'postgresql')
-makedepends=('apache-ant')
 conflicts=('armitage')
 provides=('armitage')
 install='armitage.install'
 
-source=( "${gitname}::git+https://github.com/rsmudge/armitage"
-         'armitage.install' 'armitage.desktop' 'metasploit.png' 'metasploit.sh'
-         'database.yml' 'metasploit.service' 'metasploit.default'
-         'added-a-services-column-in-the-host-table-view-with-filter.patch'
-         'ui-change-menu-items-list-from-8-to-24.patch')
+source=("${pkgname}::git+https://github.com/r00t0v3rr1d3/armitage"
+        'armitage.install' 'armitage.desktop' 'metasploit.png' 'metasploit.sh'
+        'database.yml' 'metasploit.service' 'metasploit.default'
+        'added-a-services-column-in-the-host-table-view-with-filter.patch'
+        'ui-change-menu-items-list-from-8-to-24.patch')
 
 sha256sums=('SKIP'
             'd5a89e87e81e0169652147681a7c17657b8ced14f90e0e38fa15fac4b6ad5a8d'
@@ -28,54 +27,54 @@ sha256sums=('SKIP'
             'b4b4e77895712d16ab9d7402ee53fafcb34c667b7394ae7136d6686be8ee1a2f'
             'ac521ad84eddf680c50c90bbeab3de5c3141da856702de8ac8c31e1ef66154e0'
             'df69997f77fb6460d5f7aba0ff5b592eef5890ce52d2f9e2614e8836fc56eade'
-            '7d7565a6095de77def21960409a3c57a1583246042af7e21bf6367f0bf23380e'
-            '0aa46b5583ba21126eaa60279617af3e8380e6d927b5a836ae7bada7de31a94d')
+            '83b3cdd5f5ca0d92f4a407700ca8eff716deb0459b557d85aa82d2c4646e5f65'
+            'b56531b052f3110a0928633974f1adcbe55b116b53d6c7e3e148ff1b1ec7d461')
 
 pkgver() {
-  cd "${gitname}"
+    cd "${srcdir}/${pkgname}"
 
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
 prepare() {
-  cd "${gitname}"
+    cd "${srcdir}/${pkgname}"
 
-  patch -p1 -i "${srcdir}/added-a-services-column-in-the-host-table-view-with-filter.patch"
-  patch -p1 -i "${srcdir}/ui-change-menu-items-list-from-8-to-24.patch"
+    patch -p1 -i "${srcdir}/added-a-services-column-in-the-host-table-view-with-filter.patch"
+    patch -p1 -i "${srcdir}/ui-change-menu-items-list-from-8-to-24.patch"
 }
 
 build() {
-  cd "${gitname}"
+    cd "${srcdir}/${pkgname}"
 
-  ant clean
-  ant compile
-  cp -r resources/ bin/
-  cp -r scripts/ bin/
-  ant jar
+    ./package.sh
+    ./clean.sh
 }
 
 package() {
-  cd "${gitname}"
+    cd "${srcdir}/${pkgname}"
 
-  mkdir -p "${pkgdir}/opt/${gitname}" "${pkgdir}/usr/bin"
-  cp -rv armitage.jar cortana.jar readme.txt whatsnew.txt dist/unix/* \
-    "${pkgdir}/opt/${gitname}"
+    mkdir -p "${pkgdir}/opt/${_pkgname}" "${pkgdir}/usr/bin"
+    cp -r build/*.jar dist/unix/* "${pkgdir}/opt/${_pkgname}/"
 
-  cat > "${pkgdir}/opt/${gitname}/armitage" <<-EOF
+    cat > "${pkgdir}/opt/${_pkgname}/armitage" <<-EOF
 #!/bin/sh
 cd /opt/armitage
 java -XX:+UseParallelGC -jar armitage.jar $@
 EOF
 
-  ln -s -t "${pkgdir}/usr/bin" "/opt/${gitname}/armitage"
+    chmod +x "${pkgdir}/opt/${_pkgname}/armitage"
+    ln -s -t "${pkgdir}/usr/bin" "/opt/${_pkgname}/armitage"
 
-  install -Dm755 "${srcdir}/metasploit.sh" "${pkgdir}/etc/profile.d/metasploit.sh"
-  install -Dm644 "${srcdir}/armitage.desktop" "${pkgdir}/usr/share/applications/armitage.desktop"
-  install -Dm644 "${srcdir}/metasploit.png" "${pkgdir}/usr/share/icons/metasploit.png"
-  install -Dm755 "${srcdir}/metasploit.sh" "${pkgdir}/etc/profile.d/metasploit.sh"
-  install -Dm644 "${srcdir}/database.yml" "${pkgdir}/usr/share/metasploit/database.yml.sample"
-  install -Dm644 "${srcdir}/metasploit.service" "${pkgdir}/usr/lib/systemd/system/metasploit.service"
-  install -Dm644 "${srcdir}/metasploit.default" "${pkgdir}/etc/default/metasploit"
+    install -Dm755 "${srcdir}/metasploit.sh" "${pkgdir}/etc/profile.d/metasploit.sh"
+    install -Dm644 "${srcdir}/armitage.desktop" "${pkgdir}/usr/share/applications/armitage.desktop"
+    install -Dm644 "${srcdir}/metasploit.png" "${pkgdir}/usr/share/icons/metasploit.png"
+    install -Dm755 "${srcdir}/metasploit.sh" "${pkgdir}/etc/profile.d/metasploit.sh"
+    install -Dm644 "${srcdir}/database.yml" "${pkgdir}/usr/share/metasploit/database.yml.sample"
+    install -Dm644 "${srcdir}/metasploit.service" "${pkgdir}/usr/lib/systemd/system/metasploit.service"
+    install -Dm644 "${srcdir}/metasploit.default" "${pkgdir}/etc/default/metasploit"
+
+    install -Dm644 "license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "whatsnew.txt" "${pkgdir}/usr/share/doc/${pkgname}/whatsnew.txt"
+    install -Dm644 "readme.txt" "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
 }
 
-# vim:set ts=2 sw=2 et:
diff --git a/added-a-services-column-in-the-host-table-view-with-filter.patch b/added-a-services-column-in-the-host-table-view-with-filter.patch
index 4d64cdf768c4..c2f55c965e4c 100644
--- a/added-a-services-column-in-the-host-table-view-with-filter.patch
+++ b/added-a-services-column-in-the-host-table-view-with-filter.patch
@@ -1,7 +1,7 @@
-diff --git a/scripts/targets.sl b/scripts/targets.sl
+diff --git a/armitage/src/main/resources/scripts/targets.sl b/armitage/src/main/resources/scripts/targets.sl
 index 864f7518..b1e431f1 100644
---- a/scripts/targets.sl
-+++ b/scripts/targets.sl
+--- a/armitage/src/main/resources/scripts/targets.sl
++++ b/armitage/src/main/resources/scripts/targets.sl
 @@ -122,6 +122,12 @@ on sessions {
  		}
  	}
@@ -40,10 +40,10 @@ index 864f7518..b1e431f1 100644
  		}
  	}
  
-diff --git a/src/graph/NetworkGraph.java b/src/graph/NetworkGraph.java
+diff --git a/armitage/src/main/java/graph/NetworkGraph.java b/armitage/src/main/java/graph/NetworkGraph.java
 index 859b0ffe..3f3d0784 100644
---- a/src/graph/NetworkGraph.java
-+++ b/src/graph/NetworkGraph.java
+--- a/armitage/src/main/java/graph/NetworkGraph.java
++++ b/armitage/src/main/java/graph/NetworkGraph.java
 @@ -445,7 +445,7 @@ public void setRoutes(Route[] routes) {
  
  	protected Map tooltips = new HashMap();
@@ -53,10 +53,10 @@ index 859b0ffe..3f3d0784 100644
  		nodeImages.put(id, image);
  
  		if (label.length() > 0) {
-diff --git a/src/graph/RefreshGraph.java b/src/graph/RefreshGraph.java
+diff --git a/armitage/src/main/java/graph/RefreshGraph.java b/armitage/src/main/java/graph/RefreshGraph.java
 index 803b26c9..76fdea98 100644
---- a/src/graph/RefreshGraph.java
-+++ b/src/graph/RefreshGraph.java
+--- a/armitage/src/main/java/graph/RefreshGraph.java
++++ b/armitage/src/main/java/graph/RefreshGraph.java
 @@ -17,6 +17,7 @@
  
  	private static class Node {
@@ -86,10 +86,10 @@ index 803b26c9..76fdea98 100644
  			}
  
  			/* setup routes */
-diff --git a/src/graph/Refreshable.java b/src/graph/Refreshable.java
+diff --git a/armitage/src/main/java/graph/Refreshable.java b/armitage/src/main/java/graph/Refreshable.java
 index 47d740fe..6d1739d8 100644
---- a/src/graph/Refreshable.java
-+++ b/src/graph/Refreshable.java
+--- a/armitage/src/main/java/graph/Refreshable.java
++++ b/armitage/src/main/java/graph/Refreshable.java
 @@ -7,7 +7,7 @@
  	public void start();
  
@@ -99,10 +99,10 @@ index 47d740fe..6d1739d8 100644
  
  	/* setup all of our routes in one fell swoop */
  	public void setRoutes(Route[] routes);
-diff --git a/src/table/NetworkTable.java b/src/table/NetworkTable.java
+diff --git a/armitage/src/main/java/table/NetworkTable.java b/armitage/src/main/java/table/NetworkTable.java
 index da265458..c29811a9 100644
---- a/src/table/NetworkTable.java
-+++ b/src/table/NetworkTable.java
+--- a/armitage/src/main/java/table/NetworkTable.java
++++ b/armitage/src/main/java/table/NetworkTable.java
 @@ -15,6 +15,7 @@
  import graph.Route;
  import graph.GraphPopup;
diff --git a/ui-change-menu-items-list-from-8-to-24.patch b/ui-change-menu-items-list-from-8-to-24.patch
index 8d36a50c6105..0f21cc6e9d64 100644
--- a/ui-change-menu-items-list-from-8-to-24.patch
+++ b/ui-change-menu-items-list-from-8-to-24.patch
@@ -1,7 +1,7 @@
-diff --git a/scripts/attacks.sl b/scripts/attacks.sl
+diff --git a/armitage/src/main/resources/scripts/attacks.sl b/armitage/src/main/resources/scripts/attacks.sl
 index 9771d0c..8a65057 100644
---- a/scripts/attacks.sl
-+++ b/scripts/attacks.sl
+--- a/armitage/src/main/resources/scripts/attacks.sl
++++ b/armitage/src/main/resources/scripts/attacks.sl
 @@ -625,7 +625,7 @@ sub host_attack_items {
  				}, \$exploit, $hosts => $2));