autu: Update to 5.3.4-1

4 files changed, 76 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50d596732085..f3aed3ce71d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Thu Apr  4 01:44:24 UTC 2019
+# Fri Oct 18 00:34:16 UTC 2019
 pkgbase = zoiper
 	pkgdesc = a SIP and IAX2 VoIP softphone
-	pkgver = 5.2.28
+	pkgver = 5.3.4
 	pkgrel = 1
-	url = http://www.zoiper.com/
+	url = https://www.zoiper.com/
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -13,7 +13,9 @@ pkgbase = zoiper
 	depends = libnotify
 	depends = libxss
 	depends = v4l-utils
+	noextract = zoiper5_5.3.4_.tar.xz
 	options = !strip
+	source = manual://zoiper5_5.3.4_.tar.xz
 	source = LICENSE
 	source = zoiper.desktop
 	source = zoiper.png
@@ -21,20 +23,25 @@ pkgbase = zoiper
 	source = zoiper-48.png
 	source = zoiper-96.png
 	source = zoipdl.sh
-	sha1sums = 645d0003fe2e0975c53e008aa31106cceb0d8dad
-	sha1sums = ec8e948442bd0d010004420f7338ccfb08985007
-	sha1sums = c1eea005beb7587b24b0a0d242eebc49a67f9026
-	sha1sums = 1a0f4c83c6b538584865df327702f800689493b0
-	sha1sums = 7fef1f81c32fc4be2d876fadf34178f60ea0a29e
-	sha1sums = 11fb63a8353353d28288a644aeb4cdf9a3ab3e8c
-	sha1sums = e3235992f6367a598a97fe288ae663035ac18b16
+	source = readme.sh
+	md5sums = 7b96f26388231f3558d6310e37c945b5
+	md5sums = af44d50f7be21acccbb3f70e831b57b9
+	md5sums = 1c77ec64b25899d3b027153da9a0a598
+	md5sums = c11462ef768e78964c9771ef8ba9490f
+	md5sums = d2a00d37c81be11e43c273b5b18e1c09
+	md5sums = a2b638b39dd25ae029ec80ade53cd48b
+	md5sums = b03e6d65d8b5e22566c20b9a34eb5b95
+	md5sums = 5b8ff14d5b35553775f43db264630109
+	md5sums = fd42ad359f60c60d757e3e162c291879
+	sha256sums = a1423cfb7999a0b728d7f2918b22604ece9e6d6e24efb461690112e178f1fa96
 	sha256sums = 4ed406e6786163514ff0714af7417e680c56cbe1edcb297196d6dbee2ffa798b
 	sha256sums = 8d449a3f15d0a1f6307106bcb5f62ec8f921ba2279d5d42042bd0d2beb08f103
 	sha256sums = b3dd0f8bb4314444177b122d032142459cba606b8f7812a8489d3cbbf83f2b3b
 	sha256sums = 79bac289dba2ed8bc65886643ba6aaf1a5057ed1ff5605a0eac166d7f4afd0b8
 	sha256sums = 5a795b8248a576a7166e7f4d773f83a41a640d698917a35eb8bfa7eef7c4bfcc
 	sha256sums = 619466b96c560fbd2511c04120810f0cb30a58aa12d5bcca2af977bcd527fb41
-	sha256sums = 566a2008a28df0d1ceeff4b935490b9a9ce7bd959b4c21df27daa9adcbb999a0
+	sha256sums = 9081235eda1c4020b578b43414071ee64a50552bcd7ac16acd0507899e5a90e2
+	sha256sums = 112b1528f30537e4374f94af822c61f382269a5b6e6bd55dc5df1ee9bfe38ea9
 
 pkgname = zoiper
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c145499704d..aedecc0101e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,61 +4,66 @@
 
 set -u
 pkgname='zoiper'
-pkgver='5.2.28'
+pkgver='5.3.4'
 pkgrel='1'
 pkgdesc='a SIP and IAX2 VoIP softphone'
 arch=('i686' 'x86_64')
-url='http://www.zoiper.com/'
+url='https://www.zoiper.com/'
 license=('custom')
 depends=('gtk2' 'gconf' 'libnotify' 'libxss' 'v4l-utils')
 options=('!strip')
-source=('LICENSE' "${pkgname}.desktop" "${pkgname}.png" "${pkgname}-24.png" "${pkgname}-48.png" "${pkgname}-96.png")
-source+=('zoipdl.sh')
-_srcfile="${pkgname}${pkgver%%.*}_${pkgver}_${CARCH:-}.tar.xz"
-sha1sums=('645d0003fe2e0975c53e008aa31106cceb0d8dad'
-          'ec8e948442bd0d010004420f7338ccfb08985007'
-          'c1eea005beb7587b24b0a0d242eebc49a67f9026'
-          '1a0f4c83c6b538584865df327702f800689493b0'
-          '7fef1f81c32fc4be2d876fadf34178f60ea0a29e'
-          '11fb63a8353353d28288a644aeb4cdf9a3ab3e8c'
-          'e3235992f6367a598a97fe288ae663035ac18b16')
-sha256sums=('4ed406e6786163514ff0714af7417e680c56cbe1edcb297196d6dbee2ffa798b'
+_srcfil="${pkgname}${pkgver%%.*}_${pkgver}_${CARCH:-}.tar.xz"
+source=(
+  "manual://${_srcfil}"
+  'LICENSE' "${pkgname}.desktop" "${pkgname}.png" "${pkgname}-24.png" "${pkgname}-48.png" "${pkgname}-96.png"
+)
+source+=('zoipdl.sh' 'readme.sh')
+noextract=("${_srcfil}")
+md5sums=('7b96f26388231f3558d6310e37c945b5'
+         'af44d50f7be21acccbb3f70e831b57b9'
+         '1c77ec64b25899d3b027153da9a0a598'
+         'c11462ef768e78964c9771ef8ba9490f'
+         'd2a00d37c81be11e43c273b5b18e1c09'
+         'a2b638b39dd25ae029ec80ade53cd48b'
+         'b03e6d65d8b5e22566c20b9a34eb5b95'
+         '5b8ff14d5b35553775f43db264630109'
+         'fd42ad359f60c60d757e3e162c291879')
+sha256sums=('a1423cfb7999a0b728d7f2918b22604ece9e6d6e24efb461690112e178f1fa96'
+            '4ed406e6786163514ff0714af7417e680c56cbe1edcb297196d6dbee2ffa798b'
             '8d449a3f15d0a1f6307106bcb5f62ec8f921ba2279d5d42042bd0d2beb08f103'
             'b3dd0f8bb4314444177b122d032142459cba606b8f7812a8489d3cbbf83f2b3b'
             '79bac289dba2ed8bc65886643ba6aaf1a5057ed1ff5605a0eac166d7f4afd0b8'
             '5a795b8248a576a7166e7f4d773f83a41a640d698917a35eb8bfa7eef7c4bfcc'
             '619466b96c560fbd2511c04120810f0cb30a58aa12d5bcca2af977bcd527fb41'
-            '566a2008a28df0d1ceeff4b935490b9a9ce7bd959b4c21df27daa9adcbb999a0')
+            '9081235eda1c4020b578b43414071ee64a50552bcd7ac16acd0507899e5a90e2'
+            '112b1528f30537e4374f94af822c61f382269a5b6e6bd55dc5df1ee9bfe38ea9')
 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+=("${_srcfile}::https://zoipdl.tgz")
+  source[0]="${_srcfil}::zoipdl://zoipdl.tgz"
   # DLAGENTS requires an executable file and cannot call PKGBUILD functions
-  #DLAGENTS=("https::${startdir}/zoipdl.sh %o %u") # does not work with spaces in folder names, printf %q doesn't work any better
-  DLAGENTS=("https::./zoipdl.sh %o %u") # will a relative path work for every AUR helper?
-  noextract=("${_srcfile}")
+  #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
 
-# Should be in prepare() but pacaur suppresses the message text from prepare() and does not halt on prepare() failure.
-build() {
-  set -u
-  if ! test -e "${startdir}/${_srcfile}"; then
-    set +u
-    local _url='https://www.zoiper.com/en/voip-softphone/download/zoiper5/for/linux'
-    warning "There is no longer a direct download link for the Zoiper tarball."
-    warning "Get it manually from: ${_url}"
-    warning "Or use the supplied ${startdir}/zoipdl.sh"
-    false
-  fi
-  set +u
-}
-
 package() {
   set -u
   install -d "${pkgdir}/usr/lib"
   pushd "${pkgdir}/usr/lib" > /dev/null
-  set +u; msg2 "Unpack ${_srcfile}"; set -u
-  bsdtar --no-same-owner -xf "${startdir}/${_srcfile}"
+  set +u; msg2 "Unpack ${_srcfil}"; set -u
+  bsdtar --no-same-owner -xf "${startdir}/${_srcfil}"
   mv "Zoiper${pkgver%%.*}" "${pkgname}"
   pushd "${pkgname}" > /dev/null
   chmod 755 "${pkgname}"
diff --git a/readme.sh b/readme.sh
new file mode 100755
index 000000000000..07bfc15301d0
--- /dev/null
+++ b/readme.sh
@@ -0,0 +1,11 @@
+#!/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
diff --git a/zoipdl.sh b/zoipdl.sh
index a95e2a96a24b..f45d6b6a6096 100755
--- a/zoipdl.sh
+++ b/zoipdl.sh
@@ -11,10 +11,7 @@ set -e
 
 echo "${0##*/}: $@"
 
-if [ ! -z "${1:-}" ] && [ "${2:-}" != 'https://zoipdl.tgz' ]; then
-  # from makepkg.conf DLAGENTS https
-  /usr/bin/curl -fLC - --retry '3' --retry-delay '3' -o "$1" "$2"
-else
+_fn_zoip() {
   _cookie='/tmp/zoiper_cookies.txt'
   _url1='https://www.zoiper.com/en/voip-softphone/download/current'
   _url2='https://www.zoiper.com/en/voip-softphone/download/zoiper5/for/linux'
@@ -38,4 +35,10 @@ else
     wget --content-disposition --load-cookies "${_cookie}" "${_opts[@]}" --continue "${_url2}"
   fi
   rm -f "${_cookie}"
-fi
+  # This makes updpkgsums and makepkg work in one step
+  if [ ! -z "${1:-}" ] && [ "${1}" != "${1%.part}" ] && [ -f "${1%.part}" ]; then
+    mv "${1%.part}" "${1}"
+  fi
+}
+
+_fn_zoip