Attempt to support empty serial numbers in the new hotplug mechanism

7 files changed, 56 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 924dc58ab55b..f784627c6e46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Oct 23 07:38:52 UTC 2016
+# Wed Nov  2 21:56:22 UTC 2016
 pkgbase = foo2zjs
 	pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
 	pkgver = 20161021
-	pkgrel = 4
+	pkgrel = 4.1
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
 	arch = i686
@@ -27,11 +27,11 @@ pkgbase = foo2zjs
 	source = 0004-Makefile-fix-generating-.ppd-in-place.patch
 	source = 0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
 	sha256sums = 55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3
-	sha256sums = f13c6a2308df53d7ed5636f6d77aae7616fc0e8437ca5f4f79ed4361c92eb709
-	sha256sums = cf40a20898b9619545bdcf2a59e72e0018c47d81b965b8a781e01688faa1abae
-	sha256sums = dd049ccd362c098515d3873c17b9f09b2d78da697e89d2022f537d7587874861
-	sha256sums = ef76d05b549e2c5875eabe7f526fda3caa5151824000ef582a869601edfbf690
-	sha256sums = 83c37616c37887df933910b5dee30cedb118e4c3e4b08d7ab6dd7813466441f2
+	sha256sums = b964aea4706f3cb0e908a5e85ee8b890f7ef424e570eaa65e8411a4d0a94b301
+	sha256sums = 882c15e2bde1d32ef659ec2629f315a7814b405a078c4413151dcac5d30b341d
+	sha256sums = e828daef29531683603f004bed9b59046ba708192ccd50c549dbe790e3748e09
+	sha256sums = 0ae70b88d51eda523db301f0f277c1bf7a68cfcc58c775d9c70c1114f28b8753
+	sha256sums = f8f38470154f72e37677f008dd4b4a7deffa96d0f3739097b169a7faefddded0
 
 pkgname = foo2zjs
 
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch
index d858e138dc54..f070e3947b5c 100644
--- a/0001-Makefile-DESTDIR-support.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -88,5 +88,5 @@ index 969cf6f..387b221 100644
  LIBUDEVDIR=/lib/udev/rules.d
  RULES=hplj10xx.rules
 -- 
-2.10.0
+2.10.2
 
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
index d2e3236c074e..797c909f9739 100644
--- a/0002-Makefile-general-fixes.patch
+++ b/0002-Makefile-general-fixes.patch
@@ -234,5 +234,5 @@ index 387b221..6b707a9 100644
  
  CUPSDCONF=/etc/cups/cupsd.conf
 -- 
-2.10.0
+2.10.2
 
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index b297352df2e3..3baa4e67acbe 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,15 +1,15 @@
-From c2829ff4264a3bccb49d63f032d798fbaca54150 Mon Sep 17 00:00:00 2001
+From f07d23f3b7f3438d81d6ac403204db79d429f4e5 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          | 128 +++++++++++++++++++++++++++++++++++++++++++++
+ Makefile                   |  99 +++++++++++-----------------------
+ foo2zjs-loadfw.in          | 132 +++++++++++++++++++++++++++++++++++++++++++++
  foo2zjs-loadfw@.service.in |   6 +++
  hplj10xx.rules             |  60 ++++++++-------------
  usblp.conf                 |   1 +
- 5 files changed, 186 insertions(+), 108 deletions(-)
+ 5 files changed, 190 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..911fe0a
+index 0000000..3e5484e
 --- /dev/null
 +++ b/foo2zjs-loadfw.in
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,132 @@
 +#!/bin/bash
 +
 +# foo2zjs-loadfw:
@@ -211,69 +211,54 @@ index 0000000..911fe0a
 +
 +log "Downloading firmware for printer model '$MODEL' serial '$SERIAL' at devpath '$DEVPATH'"
 +
-+if ! [[ "$FOO2ZJS_FW_MODEL" ]]; then
-+	log "Model number is empty -- borked udev configuration?"
-+	exit 1
-+fi
-+
-+if ! [[ "$SERIAL" ]]; then
-+	log "Serial number is empty -- borked udev configuration?"
++if ! [[ "$MODEL" ]]; then
++	log "Model number is empty (borked udev configuration?)"
 +	exit 1
 +fi
 +
 +case "$MODEL" in
 +P1005)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +P1006)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +P1007)
 +	FWMODEL=P1005		# Alias
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +P1008)
 +	FWMODEL=P1006		# Alias
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +P1505)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +P1505n)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_XQX
 +	;;
 +1000)
 +	FWMODEL=$MODEL
-+	MODELNAME="hp LaserJet $MODEL"
 +	FWDIR=$FWDIR_ZJS
 +	;;
 +1005)
 +	FWMODEL=$MODEL
-+	MODELNAME="hp LaserJet $MODEL"
 +	FWDIR=$FWDIR_ZJS
 +	;;
 +1018)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_ZJS
 +	;;
 +1020)
 +	FWMODEL=$MODEL
-+	MODELNAME="HP LaserJet $MODEL"
 +	FWDIR=$FWDIR_ZJS
 +	;;
 +*)
-+	log "Unsupported model: $MODEL (serial: $SERIAL)"
++	log "Unsupported model tag: $MODEL (borked udev configuration?)"
 +	exit 1
 +	;;
 +esac
@@ -285,14 +270,33 @@ index 0000000..911fe0a
 +	exit 1
 +fi
 +
-+$USB_BACKEND 2>/dev/null | grep "\<usb://" | grep "serial=$SERIAL" | while read direct uri model1 model2 params; do
-+	log "Got printer: URI='$uri'"
-+	if DEVICE_URI="$uri" $USB_BACKEND 1 1 1 1 '' "$FW" 2>/dev/null; then
-+		log "Firmware download OK"
-+		exit 0
-+	else
-+		log "Firmware download failed"
-+		exit 1
++#
++# Now detect the printer URI. In theory, each USB device provides a "serial number",
++# which is included in the CUPS URI... If only it was so easy. Not all devices provide a serial number.
++#
++
++if [[ "$SERIAL" ]]; then
++	function match() {
++		[[ $1 == *serial=$SERIAL* ]]
++	}
++else
++	# in case serial number is not provided, match by model number
++	# and check absence of FWVER tag in the IEEE1284 descriptor string
++	log "Serial number is empty, working around"
++	function match() {
++		[[ $2 == *$MODEL* && ! $2 == *FWVER:* ]]
++	}
++fi
++
++$USB_BACKEND 2>/dev/null | while read direct uri model1 model2 deviceid; do
++	if [[ $direct == direct && $uri == usb://* ]] && match "$uri" "$deviceid"; then
++		log "Got printer: URI='$uri' ieee1284='$deviceid'"
++
++		if DEVICE_URI="$uri" $USB_BACKEND 1 1 1 1 '' "$FW" 2>/dev/null; then
++			log "Firmware download OK"
++		else
++			log "Firmware download failed"
++		fi
 +	fi
 +done
 diff --git a/foo2zjs-loadfw@.service.in b/foo2zjs-loadfw@.service.in
@@ -380,5 +384,5 @@ index 0000000..5a604bf
 @@ -0,0 +1 @@
 +blacklist usblp
 -- 
-2.10.0
+2.10.2
 
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index 60ea711cab53..e1b40f2f7f75 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,4 +1,4 @@
-From 3dc1ff8f60500f79956a7ded38dfb160fe6d6aff Mon Sep 17 00:00:00 2001
+From beaaf127bafe730b785899553e30ad124f0a2082 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
@@ -25,5 +25,5 @@ index 2f546f9..fcca27e 100644
  		> PPD/$$printer.ppd; \
  	done
 -- 
-2.10.0
+2.10.2
 
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 df480c0de007..14c5c4a8c2bb 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 170a4d0f10107f40eaca97ba6b3ad46effe66e7a Mon Sep 17 00:00:00 2001
+From 98a06c8206289795fc0fe5d7d964285a5915a6af 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
@@ -157,5 +157,5 @@ index fab1d01..f71c341 100644
  install: all
  	$(INSTALL) -c foo2zjs-icc2ps $(BIN)
 -- 
-2.10.0
+2.10.2
 
diff --git a/PKGBUILD b/PKGBUILD
index d383288bf0dd..801e6abe2542 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=foo2zjs
 pkgver=20161021
-pkgrel=4
+pkgrel=4.1
 pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
 license=('GPL' 'custom')
@@ -24,11 +24,11 @@ source=("foo2zjs-$pkgver.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
 	'0005-Makefile-leverage-default-rules-as-much-as-possible-.patch')
 
 sha256sums=('55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3'
-            'f13c6a2308df53d7ed5636f6d77aae7616fc0e8437ca5f4f79ed4361c92eb709'
-            'cf40a20898b9619545bdcf2a59e72e0018c47d81b965b8a781e01688faa1abae'
-            'dd049ccd362c098515d3873c17b9f09b2d78da697e89d2022f537d7587874861'
-            'ef76d05b549e2c5875eabe7f526fda3caa5151824000ef582a869601edfbf690'
-            '83c37616c37887df933910b5dee30cedb118e4c3e4b08d7ab6dd7813466441f2')
+            'b964aea4706f3cb0e908a5e85ee8b890f7ef424e570eaa65e8411a4d0a94b301'
+            '882c15e2bde1d32ef659ec2629f315a7814b405a078c4413151dcac5d30b341d'
+            'e828daef29531683603f004bed9b59046ba708192ccd50c549dbe790e3748e09'
+            '0ae70b88d51eda523db301f0f277c1bf7a68cfcc58c775d9c70c1114f28b8753'
+            'f8f38470154f72e37677f008dd4b4a7deffa96d0f3739097b169a7faefddded0')
 
 prepare() {
   cd "${pkgname}"