Attempt to support empty serial numbers in the new hotplug mechanism #2

5 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f784627c6e46..07f0e2a28938 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  2 21:56:22 UTC 2016
+# Wed Nov  2 23:14:38 UTC 2016
 pkgbase = foo2zjs
 	pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
 	pkgver = 20161021
-	pkgrel = 4.1
+	pkgrel = 5
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
 	arch = i686
@@ -29,9 +29,9 @@ pkgbase = foo2zjs
 	sha256sums = 55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3
 	sha256sums = b964aea4706f3cb0e908a5e85ee8b890f7ef424e570eaa65e8411a4d0a94b301
 	sha256sums = 882c15e2bde1d32ef659ec2629f315a7814b405a078c4413151dcac5d30b341d
-	sha256sums = e828daef29531683603f004bed9b59046ba708192ccd50c549dbe790e3748e09
-	sha256sums = 0ae70b88d51eda523db301f0f277c1bf7a68cfcc58c775d9c70c1114f28b8753
-	sha256sums = f8f38470154f72e37677f008dd4b4a7deffa96d0f3739097b169a7faefddded0
+	sha256sums = e7d6ad7e3c7d16146fe0bf2b59c7a72621f690db08952d565b02dd4d63d32d20
+	sha256sums = 8408f3aa6247445fa8da75f829bbf4b922b95667c8c8c59dcd2ab2cf89b7d896
+	sha256sums = a27f262c9680a0fbe13c10c7e009b5d560dd8c5f81d8b7376f79e3419ecdc8d3
 
 pkgname = foo2zjs
 
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index 3baa4e67acbe..38d0cd21c030 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,15 +1,15 @@
-From f07d23f3b7f3438d81d6ac403204db79d429f4e5 Mon Sep 17 00:00:00 2001
+From 2fc12fd1f3abd8c098cad5b27a263016b5fdb86d Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 10:18:08 +0300
 Subject: [PATCH 3/5] Rework firmware loading
 
 ---
- Makefile                   |  99 +++++++++++-----------------------
- foo2zjs-loadfw.in          | 132 +++++++++++++++++++++++++++++++++++++++++++++
- foo2zjs-loadfw@.service.in |   6 +++
- hplj10xx.rules             |  60 ++++++++-------------
+ Makefile                   |  99 ++++++++++----------------------
+ foo2zjs-loadfw.in          | 138 +++++++++++++++++++++++++++++++++++++++++++++
+ foo2zjs-loadfw@.service.in |   6 ++
+ hplj10xx.rules             |  60 +++++++-------------
  usblp.conf                 |   1 +
- 5 files changed, 190 insertions(+), 108 deletions(-)
+ 5 files changed, 196 insertions(+), 108 deletions(-)
  create mode 100644 foo2zjs-loadfw.in
  create mode 100644 foo2zjs-loadfw@.service.in
  create mode 100644 usblp.conf
@@ -163,10 +163,10 @@ index 6b707a9..2f546f9 100644
  	cd osx-hotplug; $(MAKE) PREFIX=$(PREFIX) install-hotplug
 diff --git a/foo2zjs-loadfw.in b/foo2zjs-loadfw.in
 new file mode 100644
-index 0000000..3e5484e
+index 0000000..115e734
 --- /dev/null
 +++ b/foo2zjs-loadfw.in
-@@ -0,0 +1,132 @@
+@@ -0,0 +1,138 @@
 +#!/bin/bash
 +
 +# foo2zjs-loadfw:
@@ -288,9 +288,15 @@ index 0000000..3e5484e
 +	}
 +fi
 +
-+$USB_BACKEND 2>/dev/null | while read direct uri model1 model2 deviceid; do
++$USB_BACKEND 2>/dev/null | while read line; do
++	# word-split the line
++	eval "line=( $line )"
++	direct="${line[0]}"
++	uri="${line[1]}"
++	deviceid="${line[4]}"
++
 +	if [[ $direct == direct && $uri == usb://* ]] && match "$uri" "$deviceid"; then
-+		log "Got printer: URI='$uri' ieee1284='$deviceid'"
++		log "Got printer: URI='$uri' deviceid='$deviceid'"
 +
 +		if DEVICE_URI="$uri" $USB_BACKEND 1 1 1 1 '' "$FW" 2>/dev/null; then
 +			log "Firmware download OK"
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index e1b40f2f7f75..fc8dc3e584f9 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,4 +1,4 @@
-From beaaf127bafe730b785899553e30ad124f0a2082 Mon Sep 17 00:00:00 2001
+From 7d2d860369e65df970176117433c04479ab77ee7 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 01:01:17 +0300
 Subject: [PATCH 4/5] Makefile: fix generating *.ppd in-place
diff --git a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
index 14c5c4a8c2bb..dfa0b547f3bf 100644
--- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,4 +1,4 @@
-From 98a06c8206289795fc0fe5d7d964285a5915a6af Mon Sep 17 00:00:00 2001
+From d3eb4a59f73931796ff57d0d4e6fd8fddfa4ec3a Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 01:01:59 +0300
 Subject: [PATCH 5/5] Makefile: leverage default rules as much as possible to
diff --git a/PKGBUILD b/PKGBUILD
index 801e6abe2542..7891d872e83e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=foo2zjs
 pkgver=20161021
-pkgrel=4.1
+pkgrel=5
 pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
 license=('GPL' 'custom')
@@ -26,9 +26,9 @@ source=("foo2zjs-$pkgver.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
 sha256sums=('55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3'
             'b964aea4706f3cb0e908a5e85ee8b890f7ef424e570eaa65e8411a4d0a94b301'
             '882c15e2bde1d32ef659ec2629f315a7814b405a078c4413151dcac5d30b341d'
-            'e828daef29531683603f004bed9b59046ba708192ccd50c549dbe790e3748e09'
-            '0ae70b88d51eda523db301f0f277c1bf7a68cfcc58c775d9c70c1114f28b8753'
-            'f8f38470154f72e37677f008dd4b4a7deffa96d0f3739097b169a7faefddded0')
+            'e7d6ad7e3c7d16146fe0bf2b59c7a72621f690db08952d565b02dd4d63d32d20'
+            '8408f3aa6247445fa8da75f829bbf4b922b95667c8c8c59dcd2ab2cf89b7d896'
+            'a27f262c9680a0fbe13c10c7e009b5d560dd8c5f81d8b7376f79e3419ecdc8d3')
 
 prepare() {
   cd "${pkgname}"