Download zoiper tar directly

* upgpkg: zoiper 5.5.6-2

Download zoiper tar.xz directly

* upgpkg: zoiper 5.5.6-2

Use DLAGENTS

3 files changed, 9 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3fc2e42656d..0030ec7f8ea5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zoiper
 	pkgdesc = a SIP and IAX2 VoIP softphone
 	pkgver = 5.5.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.zoiper.com/
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = zoiper
 	depends = v4l-utils
 	noextract = Zoiper5_5.5.6_x86_64.tar.xz
 	options = !strip
-	source = manual://Zoiper5_5.5.6_x86_64.tar.xz
+	source = Zoiper5_5.5.6_x86_64.tar.xz::https://www.zoiper.com/en/voip-softphone/download/zoiper5/for/linux
 	source = LICENSE
 	source = zoiper.desktop
 	source = zoiper.png
@@ -20,7 +20,6 @@ pkgbase = zoiper
 	source = zoiper-48.png
 	source = zoiper-96.png
 	source = zoipdl.sh
-	source = readme.sh
 	md5sums = e6d821a3b47542bd5ba3e79c8e315293
 	md5sums = af44d50f7be21acccbb3f70e831b57b9
 	md5sums = 1c77ec64b25899d3b027153da9a0a598
@@ -29,7 +28,6 @@ pkgbase = zoiper
 	md5sums = a2b638b39dd25ae029ec80ade53cd48b
 	md5sums = b03e6d65d8b5e22566c20b9a34eb5b95
 	md5sums = 5ab0d7bbefdfc83470dedff4f5c51182
-	md5sums = fd42ad359f60c60d757e3e162c291879
 	sha256sums = 15381acf015a2feeb3db198c6a9a57fd330aec02c3a1537fff92c6776f46fb0a
 	sha256sums = 4ed406e6786163514ff0714af7417e680c56cbe1edcb297196d6dbee2ffa798b
 	sha256sums = 8d449a3f15d0a1f6307106bcb5f62ec8f921ba2279d5d42042bd0d2beb08f103
@@ -38,6 +36,5 @@ pkgbase = zoiper
 	sha256sums = 5a795b8248a576a7166e7f4d773f83a41a640d698917a35eb8bfa7eef7c4bfcc
 	sha256sums = 619466b96c560fbd2511c04120810f0cb30a58aa12d5bcca2af977bcd527fb41
 	sha256sums = 68627904f73617d145a91439f267f5c43d95f9dac10a3d4a8069b5460ddb3c8c
-	sha256sums = 112b1528f30537e4374f94af822c61f382269a5b6e6bd55dc5df1ee9bfe38ea9
 
 pkgname = zoiper
diff --git a/PKGBUILD b/PKGBUILD
index 3fcc24c2ac1f..cbb6c8e40756 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 set -u
 pkgname='zoiper'
 pkgver='5.5.6'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='a SIP and IAX2 VoIP softphone'
 arch=('i686' 'x86_64')
 url='https://www.zoiper.com/'
@@ -14,11 +14,13 @@ license=('custom')
 depends=('gtk2' 'libnotify' 'libxss' 'v4l-utils')
 options=('!strip')
 _srcfil="${pkgname^}${pkgver%%.*}_${pkgver}_${CARCH:-}.tar.xz"
+_url='https://www.zoiper.com/en/voip-softphone/download/zoiper5/for/linux'
+DLAGENTS=("https::/usr/bin/curl --header Cookie:\ PHPSESSID= -fLJ --retry 3 --retry-delay 3 -o %o %u")
 source=(
-  "manual://${_srcfil}"
+  "${_srcfil}"::"${_url}"
   'LICENSE' "${pkgname}.desktop" "${pkgname}.png" "${pkgname}-24.png" "${pkgname}-48.png" "${pkgname}-96.png"
 )
-source+=('zoipdl.sh' 'readme.sh')
+source+=('zoipdl.sh')
 noextract=("${_srcfil}")
 
 md5sums=('e6d821a3b47542bd5ba3e79c8e315293'
@@ -28,8 +30,7 @@ md5sums=('e6d821a3b47542bd5ba3e79c8e315293'
          'd2a00d37c81be11e43c273b5b18e1c09'
          'a2b638b39dd25ae029ec80ade53cd48b'
          'b03e6d65d8b5e22566c20b9a34eb5b95'
-         '5ab0d7bbefdfc83470dedff4f5c51182'
-         'fd42ad359f60c60d757e3e162c291879')
+         '5ab0d7bbefdfc83470dedff4f5c51182')
 sha256sums=('15381acf015a2feeb3db198c6a9a57fd330aec02c3a1537fff92c6776f46fb0a'
             '4ed406e6786163514ff0714af7417e680c56cbe1edcb297196d6dbee2ffa798b'
             '8d449a3f15d0a1f6307106bcb5f62ec8f921ba2279d5d42042bd0d2beb08f103'
@@ -37,28 +38,9 @@ sha256sums=('15381acf015a2feeb3db198c6a9a57fd330aec02c3a1537fff92c6776f46fb0a'
             '79bac289dba2ed8bc65886643ba6aaf1a5057ed1ff5605a0eac166d7f4afd0b8'
             '5a795b8248a576a7166e7f4d773f83a41a640d698917a35eb8bfa7eef7c4bfcc'
             '619466b96c560fbd2511c04120810f0cb30a58aa12d5bcca2af977bcd527fb41'
-            '68627904f73617d145a91439f267f5c43d95f9dac10a3d4a8069b5460ddb3c8c'
-            '112b1528f30537e4374f94af822c61f382269a5b6e6bd55dc5df1ee9bfe38ea9')
+            '68627904f73617d145a91439f267f5c43d95f9dac10a3d4a8069b5460ddb3c8c')
 PKGEXT='.pkg.tar.gz'
 
-# from oracle-sqldeveloper
-_url='https://www.zoiper.com/en/voip-softphone/download/zoiper5/for/linux'
-DLAGENTS+=("manual::./readme.sh ${_url} %o %u")
-if [ -s ~/"Downloads/${_srcfil}" ] && [ ! -e "${_srcfil}" ]; then
-  if type msg > /dev/null 2>&1; then
-    set +u
-    msg "Scooping files from ~/Downloads"
-    msg2 "${_srcfil}"
-    set -u
-    ln -sr ~/"Downloads/${_srcfil}"
-  fi
-fi
-if ! :; then
-  source[0]="${_srcfil}::zoipdl://zoipdl.tgz"
-  # DLAGENTS requires an executable file and cannot call PKGBUILD functions
-  #DLAGENTS=("zoipdl::${startdir}/zoipdl.sh %o %u") # does not work with spaces in folder names, printf %q doesn't work any better
-  DLAGENTS+=("zoipdl::./zoipdl.sh %o %u") # will a relative path work for every AUR helper?
-fi
 
 package() {
   set -u
diff --git a/readme.sh b/readme.sh
deleted file mode 100755
index 07bfc15301d0..000000000000
--- a/readme.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/bash
-
-echo "There is no longer a direct download link for the Zoiper tarball."
-echo "Get it manually from:"
-echo "  $1"
-echo 'and put'
-echo "  ${2%.part}"
-echo 'in your ~/Downloads folder or in with the PKGBUILD.'
-echo
-echo "Or use the supplied zoipdl.sh"
-exit 1