Bump; download firmware via source=() and not via getweb in prepare()

4 files changed, 271 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f97f08553da..3146b71fdfce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar 30 14:53:51 UTC 2018
+# Fri May 11 14:26:09 UTC 2018
 pkgbase = foo2zjs-nightly
 	pkgdesc = foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
-	pkgver = 20180325
+	pkgver = 20180508
 	pkgrel = 1
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
@@ -20,22 +20,113 @@ pkgbase = foo2zjs-nightly
 	provides = foo2zjs
 	conflicts = foo2zjs
 	replaces = foo2zjs
+	noextract = sihp1000.tar.gz
+	noextract = sihp1005.tar.gz
+	noextract = sihpP1005.tar.gz
+	noextract = sihp1018.tar.gz
+	noextract = sihp1020.tar.gz
+	noextract = sihpP1005.tar.gz
+	noextract = sihpP1006.tar.gz
+	noextract = sihpP1505.tar.gz
+	noextract = dl2300.tar.gz
+	noextract = dl2300.tar.gz
+	noextract = km2430.tar.gz
+	noextract = hpclj2500.tar.gz
+	noextract = hpclj2600n.tar.gz
+	noextract = hpclj2600n.tar.gz
+	noextract = km2430.tar.gz
+	noextract = hp1215.tar.gz
+	noextract = hp-cp1025.tar.gz
+	noextract = km2530.tar.gz
+	noextract = km-1600.tar.gz
+	noextract = samclp300.tar.gz
+	noextract = samclp315.tar.gz
+	noextract = lexc500.tar.gz
+	noextract = okic301.tar.gz
+	noextract = okic310.tar.gz
+	noextract = okic511.tar.gz
+	noextract = okic810.tar.gz
+	noextract = okic3200.tar.gz
+	noextract = okic3400.tar.gz
+	noextract = okic5600.tar.gz
 	options = !emptydirs
 	options = !ccache
-	source = foo2zjs-20180325.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+	source = foo2zjs-20180508.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
 	source = 0001-Makefile-DESTDIR-support.patch
 	source = 0002-Makefile-general-fixes.patch
 	source = 0003-Rework-firmware-loading.patch
 	source = 0004-Makefile-fix-generating-.ppd-in-place.patch
 	source = 0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
 	source = 0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
-	sha256sums = SKIP
+	source = http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz
+	source = http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz
+	source = http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
+	source = http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
+	source = http://foo2zjs.rkkda.com/icm/km2430.tar.gz
+	source = http://foo2hp.rkkda.com/icm/hpclj2500.tar.gz
+	source = http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+	source = http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+	source = http://foo2zjs.rkkda.com/icm/km2430.tar.gz
+	source = http://foo2hp.rkkda.com/icm/hp1215.tar.gz
+	source = http://foo2zjs.rkkda.com/icm/hp-cp1025.tar.gz
+	source = http://foo2lava.rkkda.com/icm/km2530.tar.gz
+	source = http://foo2lava.rkkda.com/icm/km-1600.tar.gz
+	source = http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz
+	source = http://foo2qpdl.rkkda.com/icm/samclp315.tar.gz
+	source = http://foo2slx.rkkda.com/icm/lexc500.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic301.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic310.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic511.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic810.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz
+	source = http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz
+	source = listweb.patch
+	source = unweb.patch
+	sha256sums = 54d377b9c7d1f8c4d721265dc44e3096aa7fbced6b6eb3e215a33d286de9a7be
 	sha256sums = 620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756
 	sha256sums = 4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb
 	sha256sums = 50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9
 	sha256sums = 4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3
 	sha256sums = c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb
 	sha256sums = 32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e
+	sha256sums = 61a4ac9f94e9749a4e3c8971a7bb8d610608bea6bd2aedcb98a4f307553955f6
+	sha256sums = 42d6ab614d998a274ac3b8a4520595dcb251a9b051ba9f1e2a70e6ad54cce7b3
+	sha256sums = a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0
+	sha256sums = 1c24a8ab5c9921a1982387f52685779a5a7c911a54119352bcaa64f01830ec82
+	sha256sums = ec4665c6704c2db3cfaeb71bb06f1bbc9449c030504b04f533a84bdfae89f966
+	sha256sums = a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0
+	sha256sums = b9efe6926fc4cac578b18b5ef8adab13e87c80a25430309110e3f61ace5bcf8f
+	sha256sums = 2700916d01ebb693a9a4e34a1858fe44229a1bd3bc7abe08ce0e32be3659e58b
+	sha256sums = e0234217bfd84fec0404d2a90ad09c8269e3f7c263708ccd6d872b1f8e6858ab
+	sha256sums = e0234217bfd84fec0404d2a90ad09c8269e3f7c263708ccd6d872b1f8e6858ab
+	sha256sums = 3b4701d2309aca006fd295c0a208b72136591ccee812181429795e405991f04f
+	sha256sums = 28f3641472d50e713aaa7476954fef5b677901aef126ea0ac7958dfe7462bf10
+	sha256sums = 5ebb4cdcbc99d049a611cc398e4fbe35152e287e743b21b70a138d3b462479b9
+	sha256sums = 5ebb4cdcbc99d049a611cc398e4fbe35152e287e743b21b70a138d3b462479b9
+	sha256sums = 3b4701d2309aca006fd295c0a208b72136591ccee812181429795e405991f04f
+	sha256sums = c3d2262d0c37a3246fd51ca075808f9e97693fbcf623c5f689976809c5433617
+	sha256sums = f3784a3c297c37ae3f2404c7fe9a359a1171131d57bd0e4d2c7d7ce814664c6a
+	sha256sums = 03bf4153665162ab001096d70291a9657022e388ce7e6f347d859b41aa73bedd
+	sha256sums = 25a8bee2c02dbd659d3bdacb2e8aa2a2a0ee611af5bd157d3a6feaea6731bc01
+	sha256sums = 32ca771dd35b1fc3e753ff00f30aa3ce406f66059a591a5f8179f798a0c9ddbe
+	sha256sums = 7f64829348482561853a805ec1b3655fdc1976a028a95761c031f5d6bf975989
+	sha256sums = 774ccbfef108bec708bf71e15299a1120aa82d3bc39a921062dc76ee3d866ff2
+	sha256sums = f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029
+	sha256sums = 362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0
+	sha256sums = 733e1a7b117a06d078ac3fa7420a67aad66a2d3a8ff834ba8c0950ece4adba0a
+	sha256sums = e13fd19b492a938ea8d955ea56653eeabdc97c2ad7409a368f6bc511943e4877
+	sha256sums = 5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608
+	sha256sums = 38533c32155ee7f3288289fcb306929c5badba19ff2f493167077252d500f41a
+	sha256sums = cb8db01f18433d54cbddc466a2a6260d2c13fd8e1e100dde396e410231a65135
+	sha256sums = ac43210aafee388600979b88b6642b5f7a8cd8dd9dcdd7cfee0ab790867c16eb
+	sha256sums = bf007787256d55bcc468a0e77d244a3a6ab383e38a6849ddcf6b3647eb965c0e
 
 pkgname = foo2zjs-nightly
 
diff --git a/PKGBUILD b/PKGBUILD
index 95ea624c19fd..c149f7645bc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 #Contributor: Muhammed Uluyol <uluyol0@gmail.com>
 
 pkgname=foo2zjs-nightly
-pkgver=20180325
+pkgver=20180508
 pkgrel=1
 pkgdesc="foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
@@ -19,6 +19,47 @@ arch=('i686' 'x86_64')
 options=('!emptydirs' '!ccache')
 install='foo2zjs.install'
 
+_patches=(
+	'0001-Makefile-DESTDIR-support.patch'
+	'0002-Makefile-general-fixes.patch'
+	'0003-Rework-firmware-loading.patch'
+	'0004-Makefile-fix-generating-.ppd-in-place.patch'
+	'0005-Makefile-leverage-default-rules-as-much-as-possible-.patch'
+	'0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch'
+)
+
+_firmware=(
+	http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz
+	http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz
+	http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
+	http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
+	http://foo2zjs.rkkda.com/icm/km2430.tar.gz
+	http://foo2hp.rkkda.com/icm/hpclj2500.tar.gz
+	http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+	http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+	http://foo2zjs.rkkda.com/icm/km2430.tar.gz
+	http://foo2hp.rkkda.com/icm/hp1215.tar.gz
+	http://foo2zjs.rkkda.com/icm/hp-cp1025.tar.gz
+	http://foo2lava.rkkda.com/icm/km2530.tar.gz
+	http://foo2lava.rkkda.com/icm/km-1600.tar.gz
+	http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz
+	http://foo2qpdl.rkkda.com/icm/samclp315.tar.gz
+	http://foo2slx.rkkda.com/icm/lexc500.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic301.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic310.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic511.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic810.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz
+	http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz
+)
+
 pkgver() {
 	local date=$(curl -s 'http://foo2zjs.rkkda.com' | sed -nre 's|.*Tarball last modified: <i>(.+)</i>.*|\1|p')
 	if ! [[ "$date" ]]; then
@@ -33,33 +74,75 @@ pkgver() {
 # Hence, manually include `pkgver()` in the source file name so that it will be re-downloaded if version changes.
 source=(
 	"foo2zjs-$(pkgver).tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
-	'0001-Makefile-DESTDIR-support.patch'
-	'0002-Makefile-general-fixes.patch'
-	'0003-Rework-firmware-loading.patch'
-	'0004-Makefile-fix-generating-.ppd-in-place.patch'
-	'0005-Makefile-leverage-default-rules-as-much-as-possible-.patch'
-	'0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch'
+	"${_patches[@]}"
+	"${_firmware[@]}"
+	'listweb.patch'
+	'unweb.patch'
 )
-
-sha256sums=('SKIP'
+noextract=(
+	"${_firmware[@]##*/}"
+)
+sha256sums=('54d377b9c7d1f8c4d721265dc44e3096aa7fbced6b6eb3e215a33d286de9a7be'
             '620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756'
             '4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb'
             '50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9'
             '4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3'
             'c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb'
-            '32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e')
+            '32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e'
+            '61a4ac9f94e9749a4e3c8971a7bb8d610608bea6bd2aedcb98a4f307553955f6'
+            '42d6ab614d998a274ac3b8a4520595dcb251a9b051ba9f1e2a70e6ad54cce7b3'
+            'a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0'
+            '1c24a8ab5c9921a1982387f52685779a5a7c911a54119352bcaa64f01830ec82'
+            'ec4665c6704c2db3cfaeb71bb06f1bbc9449c030504b04f533a84bdfae89f966'
+            'a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0'
+            'b9efe6926fc4cac578b18b5ef8adab13e87c80a25430309110e3f61ace5bcf8f'
+            '2700916d01ebb693a9a4e34a1858fe44229a1bd3bc7abe08ce0e32be3659e58b'
+            'e0234217bfd84fec0404d2a90ad09c8269e3f7c263708ccd6d872b1f8e6858ab'
+            'e0234217bfd84fec0404d2a90ad09c8269e3f7c263708ccd6d872b1f8e6858ab'
+            '3b4701d2309aca006fd295c0a208b72136591ccee812181429795e405991f04f'
+            '28f3641472d50e713aaa7476954fef5b677901aef126ea0ac7958dfe7462bf10'
+            '5ebb4cdcbc99d049a611cc398e4fbe35152e287e743b21b70a138d3b462479b9'
+            '5ebb4cdcbc99d049a611cc398e4fbe35152e287e743b21b70a138d3b462479b9'
+            '3b4701d2309aca006fd295c0a208b72136591ccee812181429795e405991f04f'
+            'c3d2262d0c37a3246fd51ca075808f9e97693fbcf623c5f689976809c5433617'
+            'f3784a3c297c37ae3f2404c7fe9a359a1171131d57bd0e4d2c7d7ce814664c6a'
+            '03bf4153665162ab001096d70291a9657022e388ce7e6f347d859b41aa73bedd'
+            '25a8bee2c02dbd659d3bdacb2e8aa2a2a0ee611af5bd157d3a6feaea6731bc01'
+            '32ca771dd35b1fc3e753ff00f30aa3ce406f66059a591a5f8179f798a0c9ddbe'
+            '7f64829348482561853a805ec1b3655fdc1976a028a95761c031f5d6bf975989'
+            '774ccbfef108bec708bf71e15299a1120aa82d3bc39a921062dc76ee3d866ff2'
+            'f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029'
+            '362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0'
+            '733e1a7b117a06d078ac3fa7420a67aad66a2d3a8ff834ba8c0950ece4adba0a'
+            'e13fd19b492a938ea8d955ea56653eeabdc97c2ad7409a368f6bc511943e4877'
+            '5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608'
+            '38533c32155ee7f3288289fcb306929c5badba19ff2f493167077252d500f41a'
+            'cb8db01f18433d54cbddc466a2a6260d2c13fd8e1e100dde396e410231a65135'
+            'ac43210aafee388600979b88b6642b5f7a8cd8dd9dcdd7cfee0ab790867c16eb'
+            'bf007787256d55bcc468a0e77d244a3a6ab383e38a6849ddcf6b3647eb965c0e')
 
 prepare() {
   cd foo2zjs
 
-  for p in "${source[@]:1}"; do
+  for p in "${_patches[@]}"; do
     patch -Np1 -i "$srcdir/$p"
   done
 
-  msg "Building 'getweb' helper and downloading extras"
+  msg "Processing pre-downloaded 'getweb' firmware"
 
   make getweb
-  ./getweb all
+  chmod 755 getweb
+
+  patch -p1 -o listweb getweb "${srcdir}/listweb.patch"
+  chmod 755 listweb
+  readarray -t _new_firmware < <(./listweb all)
+  if [[ "${_new_firmware[*]}" != "${_firmware[*]}" ]]; then
+	  error "Firmware list changed in upstream:\n$(diff -u <(printf '%s\n' "${_firmware[@]}") <(printf '%s\n' "${_new_firmware[@]}"))\n\nPlease report this to the maintainer."
+	  return 1
+  fi
+
+  patch -p1 getweb "${srcdir}/unweb.patch"
+  srcdir="$srcdir" ./getweb all
 }
 
 build() {
diff --git a/listweb.patch b/listweb.patch
new file mode 100644
index 000000000000..c8b62f95df56
--- /dev/null
+++ b/listweb.patch
@@ -0,0 +1,52 @@
+diff --git a/getweb.in b/getweb.in
+index 5215e02..400c832 100755
+--- a/getweb.in
++++ b/getweb.in
+@@ -117,6 +117,10 @@ then
+     }
+ fi
+ 
++wget() {
++    error "wget must not be called, please report this to maintainer"
++}
++
+ #
+ #	Download a .EXE file from the web, unzip it, and extract the
+ #	files we want
+@@ -124,11 +128,9 @@ getexe() {
+     url="$1"
+     exefile="$2"
+     shift; shift
+-    
+-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
+-	error "Couldn't download $url/$exefile"
+-    unzip -oj $exefile "$@"
+-    rm $exefile
++
++    echo "$url/$exefile"
++    return
+ }
+ 
+ #
+@@ -138,17 +140,13 @@ gettgz() {
+     url="$1"
+     file="$2"
+     what="$3"
+-    
+-    wget $WGETOPTS -O $file "$url/$file" ||
+-	error "Couldn't download $url/$file"
+-    gunzip <$file | tar xvf - $what
+-    rm $file
++
++    echo "$url/$file"
++    return
+ }
+ 
+ copyright() {
+-    echo
+-    echo "$1"
+-    echo
++    return
+ }
+ 
+ getone() {
diff --git a/unweb.patch b/unweb.patch
new file mode 100644
index 000000000000..2574b4259363
--- /dev/null
+++ b/unweb.patch
@@ -0,0 +1,28 @@
+diff --git a/getweb.in b/getweb.in
+index 5215e02..244d97a 100755
+--- a/getweb.in
++++ b/getweb.in
+@@ -125,10 +125,7 @@ getexe() {
+     exefile="$2"
+     shift; shift
+     
+-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
+-	error "Couldn't download $url/$exefile"
+-    unzip -oj $exefile "$@"
+-    rm $exefile
++    unzip -oj $srcdir/$exefile "$@"
+ }
+ 
+ #
+@@ -139,10 +136,7 @@ gettgz() {
+     file="$2"
+     what="$3"
+     
+-    wget $WGETOPTS -O $file "$url/$file" ||
+-	error "Couldn't download $url/$file"
+-    gunzip <$file | tar xvf - $what
+-    rm $file
++    gunzip <$srcdir/$file | tar xvf - $what
+ }
+ 
+ copyright() {