update to v6.5.8

5 files changed, 24 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7681675caa06..b9394b341739 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xctu
 	pkgdesc = Next Generation Configuration Platform for XBee/RF Solutions.
-	pkgver = 6.5.5
+	pkgver = 6.5.8
 	pkgrel = 0
 	url = http://www.digi.com/products/xbee-rf-solutions/xctu-software/xctu
 	arch = i686
@@ -16,14 +16,13 @@ pkgbase = xctu
 	depends = libnet
 	depends = libxt
 	options = !strip
-	source = http://ftp1.digi.com/support/utilities/40002881_AB.run
+	source = http://ftp1.digi.com/support/utilities/40002881_AD.run
 	source = launcher.sh
 	source = xctu.desktop
 	source = fix.patch
-	md5sums = 379afc4b4da77f410615bf834ff9cdfa
+	md5sums = 35e4352fac134e356f82e7ecc89894d3
 	md5sums = 9ebb584444f6e9417bb74c1f4c5792cd
-	md5sums = 8268deecea042c3d4d557d6a47f1f004
-	md5sums = 1e0ebe726f6d5304091d6e10d01de7be
+	md5sums = 0b28e4ea6952a74a4fb06403a4ea7dde
+	md5sums = 92698e7e64cfcfbc8aae271ff904def6
 
 pkgname = xctu
-
diff --git a/.gitignore b/.gitignore
index 40e1a52bc4fa..3fe3747c2b30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /src
 /pkg
+*.run
 *.tar
 *.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 6ae06976c5d0..adea92611392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Nils Van Zuijlen <nils.van-zuijlen@mailo.com>
-# Contributor: Manoel Brunnen <manoel.brunnen@gmail.com>
+# Maintainer: Michael Wigham <michael@wigham.net>
+# Contributor:  Nils Van Zuijlen <nils.van-zuijlen@mailo.com>, Manoel Brunnen <manoel.brunnen@gmail.com>
 
 pkgname=xctu
-pkgver=6.5.5
+pkgver=6.5.8
 pkgrel=0
 pkgdesc="Next Generation Configuration Platform for XBee/RF Solutions."
 arch=('i686' 'x86_64')
@@ -10,31 +10,28 @@ url="http://www.digi.com/products/xbee-rf-solutions/xctu-software/xctu"
 license=('custom')
 depends=('gtk2' 'java-runtime' 'libxtst' 'alsa-lib' 'gconf' 'nss' 'libglvnd' 'libnet' 'libxt')
 options=('!strip')
-# install=$pkgname.install
+
 if [[ $CARCH == 'i686' ]]; then
-    _setup_file=40002880_AB.run
-    md5sums=('b81d444a279d37392a8578c8bbf5ea1a')
+    _setup_file=40002880_AD.run
+    md5sums=('a256f85f694557cecc5de2679e7027bf')
 elif [[ $CARCH == 'x86_64' ]]; then
-    _setup_file=40002881_AB.run
-    md5sums=('379afc4b4da77f410615bf834ff9cdfa')
+    _setup_file=40002881_AD.run
+    md5sums=('35e4352fac134e356f82e7ecc89894d3')
 fi
 source=("http://ftp1.digi.com/support/utilities/$_setup_file"
         'launcher.sh'
         'xctu.desktop'
         'fix.patch')
 md5sums+=('9ebb584444f6e9417bb74c1f4c5792cd'
-         '8268deecea042c3d4d557d6a47f1f004'
-         '1e0ebe726f6d5304091d6e10d01de7be')
+         '0b28e4ea6952a74a4fb06403a4ea7dde'
+         '92698e7e64cfcfbc8aae271ff904def6')
 noextract=()
 
 prepare() {
     chmod u+x $_setup_file
-    # ./$_setup_file --prefix $srcdir --mode unattended --unattendedmodeui none
-    # prefix option not working:
-    printf "\n\n\n\n\ny\n\n$srcdir\n\n\nn\nn\n" | ./$_setup_file --mode text || true
+    ./$_setup_file --installdir $srcdir --mode unattended --unattendedmodeui none
     mv $srcdir/XCTU-NG $srcdir/$pkgname
     echo $pkgver > $srcdir/$pkgname/version.txt
-    # change XCTU's config folder to ~/.config/xctu:
     patch -p1 -N < $srcdir/fix.patch
 }
 
@@ -51,6 +48,7 @@ package() {
 
     # Desktop file
     install -Dm644 $srcdir/$pkgname/icon.xpm $pkgdir/usr/share/icons/hicolor/256x256/apps/xctu.xpm
-    install -Dm644 $srcdir/xctu.desktop $pkgdir/usr/share/applications/xctu.desktop
+    install -Dm755 $srcdir/xctu.desktop $pkgdir/usr/share/applications/xctu.desktop
+    install -Dm755 $srcdir/xctu.desktop $pkgdir/opt/$pkgname/XCTU.desktop
 }
 # vim:set ft=sh:
diff --git a/fix.patch b/fix.patch
index c8c79e43958e..bc3331b6ad47 100644
--- a/fix.patch
+++ b/fix.patch
@@ -1,9 +1,9 @@
 diff -Naur a/xctu/configuration/config.ini b/xctu/configuration/config.ini
---- a/xctu/configuration/config.ini	2016-09-07 19:05:45.151674115 +0200
-+++ b/xctu/configuration/config.ini	2016-09-07 19:06:45.132030148 +0200
-@@ -9,5 +9,6 @@
+--- a/xctu/configuration/config.ini
++++ b/xctu/configuration/config.ini
+@@ -9,5 +9,6 @@ eclipse.product=com.digi.xctung.product
  osgi.splashPath=platform\:/base/plugins/com.digi.xctung
- osgi.framework.extensions=
+ osgi.framework.extensions=reference\:file\:org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar
  osgi.bundles.defaultStartLevel=4
 -eclipse.p2.data.area=@config.dir/../p2
 +eclipse.p2.data.area.ReadOnly=@config.dir/../p2
diff --git a/xctu.desktop b/xctu.desktop
index 2542864252bb..6393ee0f3187 100644
--- a/xctu.desktop
+++ b/xctu.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=6.3.2.3
+Version=6.5.8
 Name=XCTU
 Comment=Configuration and Test Utiity
 Icon=xctu.xpm