upgpkg: 7.5.758

3 files changed, 38 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08790933b781..79f1bddf84aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,16 @@
-# Generated by makepkg 4.2.0
-# Mon Jan 12 05:17:32 UTC 2015
 pkgbase = netextender
 	pkgdesc = SonicWALL SSL VPN Client
-	pkgver = 7.0.741
-	pkgrel = 4
+	pkgver = 7.5.758
+	pkgrel = 1
 	url = http://www.sonicwall.com/us/en/products/324.html
 	install = netextender.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	depends = jre7-openjdk
-	depends = net-tools
-	depends = openssl
-	depends = ppp
-	source = https://dl.dropboxusercontent.com/u/23491566/NetExtender.Linux.7.0.741.zip
-	md5sums = 3f10fbd2202439effef0e26b9d0b7d09
-	sha256sums = f94ad0e95964f5a61c2bb926f51e85c8f156bb20882a0a7d183282e0d3ef622f
+	depends = java-environment
+	depends = bash
+	source = http://realtime.demo.sonicwall.com/applications.zip
+	sha256sums = 39233ba3f2768ceaaebb2539b7b6c2f5f8c21516abdcede5ef6e68d1ea118df0
 
 pkgname = netextender
 
diff --git a/PKGBUILD b/PKGBUILD
index cc61f7b525dc..ddb2b6e4d2d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,47 @@
-# Maintainer: Jeff Sharpe <jeff@impcode.com>
-# Adopted package from
-# Contributor: Roman Pearah <roman.pearah@gmail.com>
-
+# Maintainer: Ainola
+# Contributor: Jeff Sharpe
+# Contributor: Roman Pearah
 
 pkgname=netextender
-pkgver=7.0.741
-pkgrel=4
+pkgver=7.5.758
+pkgrel=1
 pkgdesc="SonicWALL SSL VPN Client"
 arch=('i686' 'x86_64')
 url="http://www.sonicwall.com/us/en/products/324.html"
 license=('custom')
-depends=('jre7-openjdk' 'net-tools' 'openssl' 'ppp')
-source=("https://dl.dropboxusercontent.com/u/23491566/NetExtender.Linux.$pkgver.zip")
-install="netextender.install"
-md5sums=('3f10fbd2202439effef0e26b9d0b7d09')
-sha256sums=('f94ad0e95964f5a61c2bb926f51e85c8f156bb20882a0a7d183282e0d3ef622f')
-
-prepare() {
-  cd "$srcdir"
-
-  msg "Using arch $CARCH"
-  [[ $CARCH == 'i686' ]] && bsdtar xf NetExtender.Linux.$pkgver.i386.tgz
-  [[ $CARCH == 'x86_64' ]] && bsdtar xf NetExtender.Linux.$pkgver.x86_64.tgz
-}
+depends=('java-environment' 'bash')
+source=("http://realtime.demo.sonicwall.com/applications.zip")
+install="${pkgname}.install"
+sha256sums=('39233ba3f2768ceaaebb2539b7b6c2f5f8c21516abdcede5ef6e68d1ea118df0')
 
 package() {
-  cd "$srcdir/netExtenderClient"
-
-  msg "Installing..."
-  
+  mv "${srcdir}/applications/NetExtender/Linux/${pkgver}"/* "${srcdir}/"
+  [[ "$CARCH" == 'i686' ]]   && bsdtar -xf "${srcdir}/NetExtender.tgz"
+  [[ "$CARCH" == 'x86_64' ]] && bsdtar -xf "${srcdir}/NetExtender64.tgz"
   mkdir -p "$pkgdir/usr/share/netExtender/icons"
+  cd "$srcdir/netExtenderClient"
 
-  install -D -m 644 sslvpn "$pkgdir/etc/ppp/peers/sslvpn"
-  install -D -m 755 netExtender "$pkgdir/usr/bin/netExtender"
-  install -D -m 755 netExtenderGui "$pkgdir/usr/bin/netExtenderGui"
-  install -D -m 744 nxMonitor "$pkgdir/usr/bin/nxMonitor"
-  install -D -m 4755 uninstallNetExtender "$pkgdir/usr/bin/uninstallNetExtender"
+  install -Dm 644 sslvpn "$pkgdir/etc/ppp/peers/sslvpn"
+  install -Dm 755 netExtender "$pkgdir/usr/bin/netExtender"
+  install -Dm 755 netExtenderGui "$pkgdir/usr/bin/netExtenderGui"
+  install -Dm 744 nxMonitor "$pkgdir/usr/bin/nxMonitor"
 
-  install -D -m 757 sslvpnroute "$pkgdir/etc/ppp/ip-up.d/sslvpnroute"
-  install -D -m 757 sslvpnroute6 "$pkgdir/etc/ppp/ipv6-up.d/sslvpnroute6"
   mkdir -p "$pkgdir/etc/ppp/ip-down.d"
   mkdir -p "$pkgdir/etc/ppp/ipv6-down.d"
   touch "$pkgdir/etc/ppp/ip-down.d/sslvpnroutecleanup"
   touch "$pkgdir/etc/ppp/ipv6-down.d/sslvpnroute6cleanup"
   chmod 757 "$pkgdir/etc/ppp/ip-down.d/sslvpnroutecleanup"
   chmod 757 "$pkgdir/etc/ppp/ipv6-down.d/sslvpnroute6cleanup"
-  ln -s sslvpnroute "$pkgdir/etc/ppp/ip-up.d/sslvpnroute.sh"
-  ln -s sslvpnroute6 "$pkgdir/etc/ppp/ipv6-up.d/sslvpnroute6.sh"
-  ln -s sslvpnroutecleanup "$pkgdir/etc/ppp/ip-down.d/sslvpnroutecleanup.sh"
-  ln -s sslvpnroutecleanup6 "$pkgdir/etc/ppp/ipv6-down.d/sslvpnroute6cleanup.sh"
 
-  install -D -m 007 sslvpn.pid "$pkgdir/etc/ppp/sslvpn.pid"
-  install -D -m 007 sslvpn.pid2 "$pkgdir/etc/ppp/sslvpn.pid2"
-  install -D -m 644 netExtender.1 "$pkgdir/usr/share/man/man1/netExtender.1"
-  install -D -m 755 libNetExtender.so "$pkgdir/usr/lib/libNetExtender.so"
-  install -D -m 644 ca-bundle.crt "$pkgdir/usr/share/netExtender/ca-bundle.crt"
+  install -Dm 644 netExtender.1 "$pkgdir/usr/share/man/man1/netExtender.1"
+  install -Dm 755 libNetExtender.so "$pkgdir/usr/lib/libNetExtender.so"
+  install -Dm 644 ca-bundle.crt "$pkgdir/usr/share/netExtender/ca-bundle.crt"
 
-  install -D -m 644 NetExtender.jar "$pkgdir/usr/lib/NetExtender.jar"
-  install -D -m 644 icons/* "$pkgdir/usr/share/netExtender/icons"
-  install -D -m 664 NetExtender.desktop "$pkgdir/usr/share/netExtender/NetExtender.desktop"
-  install -D -m 664 NetExtender.desktop "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
+  # netExtenderGui is hard-coded to check in /usr/lib
+  install -Dm 644 NetExtender.jar "$pkgdir/usr/lib/NetExtender.jar"
+  install -Dm 644 icons/* "$pkgdir/usr/share/netExtender/icons"
+  install -Dm 664 NetExtender.desktop "$pkgdir/usr/share/netExtender/NetExtender.desktop"
+  install -Dm 664 NetExtender.desktop "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
 
-  chown -f root "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
-  chgrp -f root "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
-  chmod -f 644 "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
+  chown -f root:root "$pkgdir/usr/share/applications/sonicwall-netextender.desktop"
 }
diff --git a/netextender.install b/netextender.install
index 96279bacc9cb..149e0f76a0ef 100755
--- a/netextender.install
+++ b/netextender.install
@@ -1,8 +1,10 @@
 post_install() {
-  echo
-  echo "To allow non-root users to use NetExtender, run chmod -v u+s /usr/sbin/pppd"
+    # NetExtender needs to edit pppd script to automatically add route to sslvpn.
+    /usr/sbin/netExtender -i
+    echo
+    echo "To allow non-root users to use NetExtender, run chmod -v u+s /usr/sbin/pppd"
 }
 post_remove() {
-  echo
-  echo "If you had allowed non-root users to use NetExtender, you may wish to run chmod -v u-s /usr/sbin/pppd"
+    echo
+    echo "If you had allowed non-root users to use NetExtender, you may wish to run chmod -v u-s /usr/sbin/pppd"
 }