Package aarch64

Note that the latest known aarch64 mirror is 7245.2023.1006.1, not
7246.2024.0201.1 like x86_64 and armv7h.

4 files changed, 72 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 926afd9f0f5e..3b87a56bbd1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = f5vpn
 	pkgdesc = VPN client using the Point-to-Point Protocol to connect to F5Networks BIG-IP APM
 	pkgver = 7246.2024.0201.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://support.f5.com/csp/article/K32311645#link_04_05
+	arch = aarch64
 	arch = x86_64
 	license = commercial
 	depends = icu>=73.2-2
@@ -11,13 +12,19 @@ pkgbase = f5vpn
 	depends = qt5-webkit>=5.212.0alpha4-22
 	provides = f5vpn
 	source = LICENSE
-	source = no-desktop-file-dbus.patch
-	sha512sums = f2ca5fd5052b307c147ac315eb0cda45a6eaf071de30eef6841c74dac239c2d3bc5a0e1513e4bbd5b3057384676b346428609cb366c3d1086acda982acde7a61
-	sha512sums = 51ee6ca353685de98b5e87bf44de9605006190cc56ae4612c39f9f4e8b22d89b5bfab6cba09b740bb799fa74ce3a8054c533f807473b13c2c4da3683da4fef4c
+	source = no-desktop-file-dbus.aarch64.patch
+	source = no-desktop-file-dbus.x86_64.patch
+	sha256sums = 85f06be8b8e438c4cefdad9e8975d1c48fd53446fe35e95d4260ba14ac7f98fd
+	sha256sums = fadc7ae9c2297a93101a98c24ed63087a05a6e24bb33ba4b795bfd4339dba7cf
+	sha256sums = 3ecd8a10941a7d81b9d16aecdf6ac9caa1f957e32a2d2c65bde5181abd1fcb73
 	b2sums = c864e69799ffc4c13bf8af7d76bcc8beed195d9a41acb01d459aaa0c3cd5bae75290ef7be1fa6a0bfd6472e1c3f8df3a7f5d59767861ded0dc4a373a3ead447c
+	b2sums = d64f0d1a4d413701dd31464c086b84049fbf5919774f2440a8d9f139deedf8b9e83a229ad59cf5434c5ccd33a0151bb9621d941096b4cc1d641c86681f81eafa
 	b2sums = 5be3f5ebd0358e022c85081b45bc23b1e847542ae9035bece95c40fa5113a1fd9159ced013950d237206c2e6be94caa38b9d6414ea29ab65cd80043a2dfbfe5a
-	source_x86_64 = linux_f5vpn-7246.2024.0201.1-2.x86_64.rpm::https://vpn.chapman.edu/public/download/linux_f5vpn.x86_64.rpm
-	sha512sums_x86_64 = e12a05c888aa26757fa06d7c6a42dc0a5ebb0b40f75a1c28cc5120a60707e94856f1fc08e46320c187e23168a38a84ba6a1556aed2267c3e3238135cefde9ed0
-	b2sums_x86_64 = af50a692b28fba6fbfb47c69d7de418b876b6ae96736ceaa7c7b794034e9676d900c4d3d89c44c8baee9a51687b21f7052c6818f7a7eae9622fe7cd1c0b5e921
+	source_aarch64 = linux_f5vpn-7245.2023.1006.1.aarch64.deb::https://remote.abdn.ac.uk/public/download/linux_f5vpn.aarch64.deb
+	sha256sums_aarch64 = 56c3511bed396241210484a1e14c251e93ce156c89c8a5964439a4628505483c
+	b2sums_aarch64 = 56020ea5281c5c3305055dd88c5c378231765bdacc1c41d2539ff66ea94cfe82ec38bb482137a6aa20e9ff147c12163f3a81ec34b65590d6a3c67c012eaf9199
+	source_x86_64 = linux_f5vpn-7246.2024.0201.1.x86_64.deb::https://vpn.chapman.edu/public/download/linux_f5vpn.x86_64.deb
+	sha256sums_x86_64 = 5088f827a4e338f31588aa5b19823ebf40376fa043bee09b49c59bace112e6c5
+	b2sums_x86_64 = 7d101638f437bce3f309670765c2de8bdad47d4b01a0b24dd741aabf68625c55d39cf2a4700514f622a7ff8da3f88353e2013f9b463310e58e83408819dd687e
 
 pkgname = f5vpn
diff --git a/PKGBUILD b/PKGBUILD
index 7db557956577..f6732a01fddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,66 @@
-# Maintainer: Zach Hoffman <zrhoffman@apache.org>
+# Maintainer: Zach Hoffman <zach@zrhoffman.net>
 pkgname=f5vpn
 pkgver=7246.2024.0201.1
-pkgrel=2
+_pkgver_aarch64=7245.2023.1006.1
+pkgrel=3
 pkgdesc='VPN client using the Point-to-Point Protocol to connect to F5Networks BIG-IP APM'
-arch=('x86_64')
+arch=(aarch64 x86_64)
 mirror=vpn.chapman.edu
+mirror_aarch64=remote.abdn.ac.uk
 source=('LICENSE'
-        'no-desktop-file-dbus.patch')
-source_x86_64=("linux_${pkgname}-${pkgver}-${pkgrel}.${CARCH}.rpm::https://${mirror}/public/download/linux_${pkgname}.${CARCH}.rpm")
-b2sums_x86_64=('af50a692b28fba6fbfb47c69d7de418b876b6ae96736ceaa7c7b794034e9676d900c4d3d89c44c8baee9a51687b21f7052c6818f7a7eae9622fe7cd1c0b5e921')
+        'no-desktop-file-dbus.aarch64.patch'
+        'no-desktop-file-dbus.x86_64.patch')
+source_aarch64=("linux_${pkgname}-${_pkgver_aarch64}.aarch64.deb::https://${mirror_aarch64}/public/download/linux_${pkgname}.aarch64.deb")
+source_x86_64=("linux_${pkgname}-${pkgver}.x86_64.deb::https://${mirror}/public/download/linux_${pkgname}.x86_64.deb")
+b2sums_aarch64=('56020ea5281c5c3305055dd88c5c378231765bdacc1c41d2539ff66ea94cfe82ec38bb482137a6aa20e9ff147c12163f3a81ec34b65590d6a3c67c012eaf9199')
+b2sums_x86_64=('7d101638f437bce3f309670765c2de8bdad47d4b01a0b24dd741aabf68625c55d39cf2a4700514f622a7ff8da3f88353e2013f9b463310e58e83408819dd687e')
 b2sums=('c864e69799ffc4c13bf8af7d76bcc8beed195d9a41acb01d459aaa0c3cd5bae75290ef7be1fa6a0bfd6472e1c3f8df3a7f5d59767861ded0dc4a373a3ead447c'
+'d64f0d1a4d413701dd31464c086b84049fbf5919774f2440a8d9f139deedf8b9e83a229ad59cf5434c5ccd33a0151bb9621d941096b4cc1d641c86681f81eafa'
 '5be3f5ebd0358e022c85081b45bc23b1e847542ae9035bece95c40fa5113a1fd9159ced013950d237206c2e6be94caa38b9d6414ea29ab65cd80043a2dfbfe5a')
-sha512sums_x86_64=('e12a05c888aa26757fa06d7c6a42dc0a5ebb0b40f75a1c28cc5120a60707e94856f1fc08e46320c187e23168a38a84ba6a1556aed2267c3e3238135cefde9ed0')
-sha512sums=('f2ca5fd5052b307c147ac315eb0cda45a6eaf071de30eef6841c74dac239c2d3bc5a0e1513e4bbd5b3057384676b346428609cb366c3d1086acda982acde7a61'
-'51ee6ca353685de98b5e87bf44de9605006190cc56ae4612c39f9f4e8b22d89b5bfab6cba09b740bb799fa74ce3a8054c533f807473b13c2c4da3683da4fef4c')
+sha256sums_aarch64=('56c3511bed396241210484a1e14c251e93ce156c89c8a5964439a4628505483c')
+sha256sums_x86_64=('5088f827a4e338f31588aa5b19823ebf40376fa043bee09b49c59bace112e6c5')
+sha256sums=('85f06be8b8e438c4cefdad9e8975d1c48fd53446fe35e95d4260ba14ac7f98fd'
+'fadc7ae9c2297a93101a98c24ed63087a05a6e24bb33ba4b795bfd4339dba7cf'
+'3ecd8a10941a7d81b9d16aecdf6ac9caa1f957e32a2d2c65bde5181abd1fcb73')
 depends=('icu>=73.2-2' openssl qt5-base 'qt5-webkit>=5.212.0alpha4-22')
 provides=("${pkgname}")
 url='https://support.f5.com/csp/article/K32311645#link_04_05'
 license=('commercial')
 
+pkgver() {
+  tar -xf data.tar.gz
+  grep -oEm1 --text '([0-9]{4}\.){3}[0-9]+' opt/f5/vpn/svpn
+}
+
 package() {
-    (
-    cd "${srcdir}/opt/f5/vpn"
+  (
+  cd "${srcdir}/opt/f5/vpn"
 
-    patch -i "${srcdir}/no-desktop-file-dbus.patch" # Desktop file does not work with Dbus enabled
+  patch -i "${srcdir}/no-desktop-file-dbus.${CARCH}.patch" # Desktop file does not work with Dbus enabled
 
-    chmod u+s svpn # f5vpn should not be run as root, but it calls svpn which must be run as root
-    install -Dm644 "com.f5.${pkgname}.desktop" "${pkgdir}/usr/share/applications/com.f5.${pkgname}.desktop"
-    install -dm755 "${pkgdir}/usr/bin/"
-    install -dm755 "${pkgdir}/usr/local/lib/F5Networks/SSLVPN/var/run" # For svpn.pid
-    for executable in $pkgname tunnelserver; do
-        ln -s "/opt/f5/vpn/${executable}" "${pkgdir}"/usr/bin/${executable}
-    done
+  chmod u+s svpn # f5vpn should not be run as root, but it calls svpn which must be run as root
+  install -Dm644 "com.f5.${pkgname}.desktop" "${pkgdir}/usr/share/applications/com.f5.${pkgname}.desktop"
+  install -dm755 "${pkgdir}/usr/bin/"
+  install -dm755 "${pkgdir}/usr/local/lib/F5Networks/SSLVPN/var/run" # For svpn.pid
+  for executable in $pkgname tunnelserver; do
+      ln -s "/opt/f5/vpn/${executable}" "${pkgdir}"/usr/bin/${executable}
+  done
 
-    # Use system Qt libraries
-    for library in lib/*.so.*; do
-        ln -sf "/usr/${library%%.so.*}.so" "$library"
-    done
+  # Use system Qt libraries
+  for library in lib/*.so.*; do
+      ln -sf "/usr/${library%%.so.*}.so" "$library"
+  done
 
-    # Use system Qt libraries
-    for plugin in platforms/*.so; do
-        ln -sf "/usr/lib/qt/plugins/${plugin}" "$plugin"
-    done
+  # Use system Qt libraries
+  for plugin in platforms/*.so; do
+      ln -sf "/usr/lib/qt/plugins/${plugin}" "$plugin"
+  done
 
-    for resolution in 16 24 32 48 64 96 128 256 512 1024; do
-        install -Dm644 "logos/${resolution}x${resolution}.png" \
-                        "${pkgdir}/usr/share/icons/hicolor/${resolution}x${resolution}/apps/${pkgname}.png"
-    done
-    )
-    install -Dm644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    cp -a opt "${pkgdir}"
+  for resolution in 16 24 32 48 64 96 128 256 512 1024; do
+      install -Dm644 "logos/${resolution}x${resolution}.png" \
+                      "${pkgdir}/usr/share/icons/hicolor/${resolution}x${resolution}/apps/${pkgname}.png"
+  done
+  )
+  install -Dm644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cp -a opt "${pkgdir}"
 }
diff --git a/no-desktop-file-dbus.aarch64.patch b/no-desktop-file-dbus.aarch64.patch
new file mode 100644
index 000000000000..e14ae10ca6ef
--- /dev/null
+++ b/no-desktop-file-dbus.aarch64.patch
@@ -0,0 +1,11 @@
+--- a/com.f5.f5vpn.desktop
++++ b/com.f5.f5vpn.desktop
+@@ -6,7 +6,7 @@ Comment=F5 Networks Inc. network access application
+ Name=F5 VPN
+ Icon=f5vpn
+ Exec=/opt/f5/vpn/f5vpn_launch_helper.sh %u
+-DBusActivatable=true
++DBusActivatable=false
+ Categories=Network;
+ MimeType=x-scheme-handler/f5-vpn;
+ NoDisplay=false
diff --git a/no-desktop-file-dbus.patch b/no-desktop-file-dbus.x86_64.patch
index cb077a9e7024..cb077a9e7024 100644
--- a/no-desktop-file-dbus.patch
+++ b/no-desktop-file-dbus.x86_64.patch