summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shapovalov2016-10-23 02:58:45 +0300
committerIvan Shapovalov2016-10-23 02:58:45 +0300
commitc30b39fe0a82e43930ea0c281f01bc46f959a3a4 (patch)
tree1633dab61973fd581e14cabbf75c9a6413b690a1
parent381a16a1731cc03be19aeff75204ce4bbf30d5a3 (diff)
downloadaur-c30b39fe0a82e43930ea0c281f01bc46f959a3a4.tar.gz
Bump to 20161021; regenerate patches and completely rework firmware loading
Diffstat
-rw-r--r--.SRCINFO36
-rw-r--r--0001-Makefile-DESTDIR-support.patch (renamed from destdir-support-20140329-1.patch)28
-rw-r--r--0002-Makefile-general-fixes.patch216
-rw-r--r--0003-Rework-firmware-loading.patch338
-rw-r--r--0004-Makefile-skip-installing-Foomatic-files.patch25
-rw-r--r--0005-Makefile-fix-generating-.ppd-in-place.patch29
-rw-r--r--0006-Makefile-leverage-default-rules-as-much-as-possible-.patch (renamed from compile-flags-20161004-1.patch)38
-rw-r--r--PKGBUILD34
-rw-r--r--firmware-loader-20130602-1.patch278
-rw-r--r--gen-fixes-20140329-1.patch66
-rw-r--r--make-ppd-20161003-2.patch15
-rw-r--r--skip-foomatic-db-20161003-1.patch11
-rw-r--r--udev-firmware-loading-ruleset-20130601-1.patch166
13 files changed, 690 insertions, 590 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8d6e603f3be..01d0ae138851 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Oct 5 05:50:18 UTC 2016
+# Sat Oct 22 23:56:51 UTC 2016
pkgbase = foo2zjs
pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
- pkgver = 20161004
- pkgrel = 2
+ pkgver = 20161021
+ pkgrel = 1
url = http://foo2zjs.rkkda.com/
install = foo2zjs.install
arch = i686
@@ -20,22 +20,20 @@ pkgbase = foo2zjs
conflicts = foo2zjs-testing
options = !emptydirs
options = !ccache
- source = foo2zjs-20161004.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
- source = destdir-support-20140329-1.patch
- source = gen-fixes-20140329-1.patch
- source = firmware-loader-20130602-1.patch
- source = udev-firmware-loading-ruleset-20130601-1.patch
- source = skip-foomatic-db-20161003-1.patch
- source = make-ppd-20161003-2.patch
- source = compile-flags-20161004-1.patch
- sha256sums = c4e0d182102c340b094e87203423a80561ddfaad2f5f6d57bea44edd15e7267e
- sha256sums = 6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a
- sha256sums = 2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05
- sha256sums = 5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1
- sha256sums = 32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d
- sha256sums = ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801
- sha256sums = bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407
- sha256sums = 37bd36ce5712e1e007c78200f0bb8681eaf4236646d8221018bc71dad08caae3
+ source = foo2zjs-20161021.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-skip-installing-Foomatic-files.patch
+ source = 0005-Makefile-fix-generating-.ppd-in-place.patch
+ source = 0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
+ sha256sums = 55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3
+ sha256sums = 2c0e40294c3f77a33e242280e280a98ed834a16584072b2d0f5fa95d0c44503f
+ sha256sums = 33c1c7bd31ddee2b27ef06f726684da503bc165873f10db68e7435a1e3690756
+ sha256sums = 320a7d5d1e10474e8e11e201a05e741d6a7786ca1c1b5ebbe668f63ac6d5b765
+ sha256sums = cfaa38ea47afbd89b0d85a944d336a2ef30e2964beefb6a3cfc312b1d2b6ab2b
+ sha256sums = cc6befb039909ee8a09e2ef47ef10c72d4bbe59df52d35687506cfd2ad484e62
+ sha256sums = 0d7dd404b84e354bdad579820e0fbe334e553a561ab0986aabd528a22628eecf
pkgname = foo2zjs
diff --git a/destdir-support-20140329-1.patch b/0001-Makefile-DESTDIR-support.patch
index 972bcb3ef43e..a591aa322eef 100644
--- a/destdir-support-20140329-1.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -1,6 +1,17 @@
+From 90b8910997b272afb346ceec050b6313fb91e054 Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sat, 22 Oct 2016 12:35:14 +0300
+Subject: [PATCH 1/6] Makefile: DESTDIR support
+
+---
+ Makefile | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 969cf6f..387b221 100644
--- a/Makefile
+++ b/Makefile
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ INSTALL=install
ROOT=root
# Pathnames for referenced packages...
@@ -9,7 +20,7 @@
# User ID's
LPuid=-oroot
-@@ -245,8 +245,9 @@
+@@ -245,8 +245,9 @@ FILES = \
# CUPS vars
CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null)
@@ -21,7 +32,7 @@
# hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
# sihp1000.img sihp1005.img sihp1020.img sihp1018.img
-@@ -652,7 +653,7 @@
+@@ -654,7 +655,7 @@ install-prog:
$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
if [ "$(BINPROGS)" != "" ]; then \
$(INSTALL) -d $(UDEVBIN); \
@@ -30,7 +41,7 @@
fi
#
# Install gamma correction files. These are just templates,
-@@ -706,10 +707,10 @@
+@@ -708,10 +709,10 @@ install-foo:
#
# Clear foomatic cache and rebuild database if needed
#
@@ -45,7 +56,7 @@
foomatic-combo-xml -O >overview.xml; \
fi
-@@ -839,7 +840,7 @@
+@@ -841,7 +842,7 @@ install-extra:
done
MODEL=$(PREFIX)/share/cups/model
@@ -54,7 +65,7 @@
MACMODEL=/Library/Printers/PPDs/Contents/Resources
PPD=$(PREFIX)/share/ppd
VARPPD=/var/lp/ppd
-@@ -899,9 +900,9 @@
+@@ -901,9 +902,9 @@ install-ppd:
done; \
fi
@@ -67,7 +78,7 @@
install-desktop:
#
-@@ -925,7 +926,7 @@
+@@ -927,7 +928,7 @@ install-gui:
$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
@@ -76,3 +87,6 @@
UDEVDIR=/etc/udev/rules.d
LIBUDEVDIR=/lib/udev/rules.d
RULES=hplj10xx.rules
+--
+2.10.0
+
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
new file mode 100644
index 000000000000..cdd60133b424
--- /dev/null
+++ b/0002-Makefile-general-fixes.patch
@@ -0,0 +1,216 @@
+From 5c15a87c73885eb81ee67d066b7c0fea347b7dbb Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 23 Oct 2016 00:56:42 +0300
+Subject: [PATCH 2/6] Makefile: general fixes
+
+---
+ Makefile | 56 ++++++++++++++++++++++----------------------------------
+ 1 file changed, 22 insertions(+), 34 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 387b221..6d3a0a7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -382,7 +382,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent options for pbmtojbg
+ # The usual build rules
+ #
+ all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \
+- all-icc2ps all-osx-hotplug man doc \
++ all-icc2ps man doc \
+ all-done
+
+ all-test:
+@@ -554,11 +554,6 @@ getweb: getweb.in Makefile
+ all-icc2ps:
+ cd icc2ps; $(MAKE) all
+
+-all-osx-hotplug:
+-ifeq ($(UNAME),Darwin)
+- cd osx-hotplug; $(MAKE) all
+-endif
+-
+ ok: ok.o $(LIBJBG)
+ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
+
+@@ -735,7 +730,7 @@ install-crd:
+ # Install prebuilt CRD files (from m2300w project)
+ #
+ $(INSTALL) -d $(SHAREZJS)/
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/crd/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREZJS)/crd/
+ for i in crd/zjs/*.*; do \
+ $(INSTALL) -c -m 644 $$i $(SHAREZJS)/crd/; \
+ done
+@@ -743,7 +738,7 @@ install-crd:
+ # Install prebuilt CRD files for CLP-300/CLP-600
+ #
+ $(INSTALL) -d $(SHAREQPDL)/
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREQPDL)/crd/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREQPDL)/crd/
+ for i in crd/qpdl/*cms* crd/qpdl/*.ps; do \
+ $(INSTALL) -c -m 644 $$i $(SHAREQPDL)/crd/; \
+ done
+@@ -753,7 +748,7 @@ install-psfiles:
+ # Install prebuilt psfiles files (from m2300w project)
+ #
+ $(INSTALL) -d $(SHAREHP)/
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHP)/psfiles/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREHP)/psfiles/
+ for i in psfiles/*.*; do \
+ $(INSTALL) -c -m 644 $$i $(SHAREHP)/psfiles/; \
+ done
+@@ -767,14 +762,14 @@ install-extra:
+ #
+ $(INSTALL) -d $(SHAREZJS)/
+ # foo2zjs ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREZJS)/icm/
+ for i in DL*.icm CP*.icm km2430*.icm hp-cp1025*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREZJS)/icm/; \
+ fi; \
+ done
+ # foo2zjs Firmware files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREZJS)/firmware/
+ for i in sihp1*.img; do \
+ if [ -f $$i ]; then \
+ base=`basename $$i .img`; \
+@@ -783,7 +778,7 @@ install-extra:
+ fi; \
+ done
+ # foo2xqx Firmware files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREXQX)/firmware/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREXQX)/firmware/
+ for i in sihpP*.img; do \
+ if [ -f $$i ]; then \
+ base=`basename $$i .img`; \
+@@ -792,49 +787,49 @@ install-extra:
+ fi; \
+ done
+ # foo2oak ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREOAK)/icm/
+ for i in hpclj2[56]*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREOAK)/icm/; \
+ fi; \
+ done
+ # foo2hp ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHP)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREHP)/icm/
+ for i in hpclj26*.icm km2430*.icm hp1215*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREHP)/icm/; \
+ fi; \
+ done
+ # foo2lava ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHARELAVA)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHARELAVA)/icm/
+ for i in km-1600*.icm km2530*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHARELAVA)/icm/; \
+ fi; \
+ done
+ # foo2qpdl ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREQPDL)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREQPDL)/icm/
+ for i in samclp*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREQPDL)/icm/; \
+ fi; \
+ done
+ # foo2slx ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHARESLX)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHARESLX)/icm/
+ for i in lex*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHARESLX)/icm/; \
+ fi; \
+ done
+ # foo2hiperc ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHC)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREHC)/icm/
+ for i in OK*.icm C3400*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREHC)/icm/; \
+ fi; \
+ done
+ # foo2hbpl ICM files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHBPL)/icm/
++ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREHBPL)/icm/
+ for i in hbpl*.icm; do \
+ if [ -f $$i ]; then \
+ $(INSTALL) -c -m 644 $$i $(SHAREHBPL)/icm/; \
+@@ -851,30 +846,22 @@ install-ppd:
+ # Install PPD files for CUPS
+ #
+ export PATH=$$PATH:`pwd`:; \
+- if [ -x /usr/sbin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
++ if [ -x /usr/bin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
+ $(INSTALL) $(LPgid) -d $(VARPPD)/user; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+ manuf=`echo "$$ppd" | sed 's/-.*//'`; \
+ $(INSTALL) $(LPgid) -d $(VARPPD)/user/$$manuf; \
+ modify-ppd <$$ppd | gzip > $(VARPPD)/user/$$manuf/$$ppd.gz; \
+- chmod 664 $(VARPPD)/user/$$manuf/$$ppd.gz; \
++ chmod 644 $(VARPPD)/user/$$manuf/$$ppd.gz; \
+ done; \
+ ppdmgr -u; \
+ elif [ -d $(PPD) ]; then \
+- find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hbpl*' | xargs rm -rf; \
+ [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+ modify-ppd <$$ppd | gzip > $(PPD)/foo2zjs/$$ppd.gz; \
+- chmod 664 $(PPD)/foo2zjs/$$ppd.gz; \
++ chmod 644 $(PPD)/foo2zjs/$$ppd.gz; \
+ done; \
+ fi
+ #
+@@ -884,21 +871,21 @@ install-ppd:
+ cd PPD; \
+ for ppd in *.ppd; do \
+ modify-ppd <$$ppd | gzip > $(MODEL)/$$ppd.gz; \
+- chmod 664 $(MODEL)/$$ppd.gz; \
++ chmod 644 $(MODEL)/$$ppd.gz; \
+ done; \
+ elif [ -d $(LOCALMODEL) ]; then \
+ rm -f $(LOCALMODEL)/KonicaMinolta*; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+ modify-ppd <$$ppd | gzip > $(LOCALMODEL)/$$ppd.gz; \
+- chmod 664 $(LOCALMODEL)/$$ppd.gz; \
++ chmod 644 $(LOCALMODEL)/$$ppd.gz; \
+ done; \
+ elif [ -d $(MACMODEL) ]; then \
+ rm -f $(MACMODEL)/KonicaMinolta*; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+ modify-ppd <$$ppd | gzip > $(MACMODEL)/$$ppd.gz; \
+- chmod 664 $(MACMODEL)/$$ppd.gz; \
++ chmod 644 $(MACMODEL)/$$ppd.gz; \
+ done; \
+ fi
+
+@@ -1040,7 +1027,8 @@ install-hotplug-osx:
+
+ install-filter:
+ if [ "$(CUPS_SERVERBIN)" != "" ]; then \
+- ln -sf $(BIN)/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \
++ install -d -m 755 $(CUPS_SERVERBIN)/filter; \
++ ln -sf ../../../bin/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \
+ fi
+
+ CUPSDCONF=/etc/cups/cupsd.conf
+--
+2.10.0
+
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
new file mode 100644
index 000000000000..61c11fc80193
--- /dev/null
+++ b/0003-Rework-firmware-loading.patch
@@ -0,0 +1,338 @@
+From d5970af826ef467904096c48d9868c93133d55ac Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 23 Oct 2016 00:59:32 +0300
+Subject: [PATCH 3/6] Rework firmware loading
+
+---
+ Makefile | 80 ++++++++-----------------------------
+ foo2zjs-loadfw.in | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ hplj10xx.rules | 59 ++++++++++-----------------
+ usblp.conf | 1 +
+ 4 files changed, 154 insertions(+), 102 deletions(-)
+ create mode 100644 foo2zjs-loadfw.in
+ create mode 100644 usblp.conf
+
+diff --git a/Makefile b/Makefile
+index 6d3a0a7..b66ded0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -167,6 +167,7 @@ FILES = \
+ gipddecode.1in \
+ hbpldecode.c \
+ hbpldecode.1in \
++ foo2zjs-loadfw.in \
+ foo2zjs-wrapper.in \
+ foo2zjs-wrapper.1in \
+ foo2hp2600-wrapper.in \
+@@ -271,7 +272,7 @@ endif
+ SHELLS= foo2zjs-wrapper foo2oak-wrapper foo2hp2600-wrapper \
+ foo2xqx-wrapper foo2lava-wrapper foo2qpdl-wrapper \
+ foo2slx-wrapper foo2hiperc-wrapper foo2hbpl2-wrapper
+-SHELLS+= foo2zjs-pstops
++SHELLS+= foo2zjs-loadfw foo2zjs-pstops
+ SHELLS+= printer-profile
+ MANPAGES= foo2zjs-wrapper.1 foo2zjs.1 zjsdecode.1
+ MANPAGES+= foo2oak-wrapper.1 foo2oak.1 oakdecode.1
+@@ -482,6 +483,12 @@ foo2hiperc: foo2hiperc.o $(LIBJBG)
+ foo2hbpl2: foo2hbpl2.o $(LIBJBG)
+ $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
+
++foo2zjs-loadfw: foo2zjs-loadfw.in Makefile
++ [ ! -f $@ ] || chmod +w $@
++ sed < $@.in > $@ \
++ -e 's:@FWDIR_ZJS@:$(SHAREZJS)/firmware:' \
++ -e 's:@FWDIR_XQX@:$(SHAREXQX)/firmware:' || (rm -f $@ && exit 1)
++ chmod 555 $@
+
+ foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
+ [ ! -f $@ ] || chmod +w $@
+@@ -915,18 +922,18 @@ install-gui:
+ $(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
+
+
+-USBDIR=$(DESTDIR)/etc/hotplug/usb
+ UDEVDIR=/etc/udev/rules.d
+ LIBUDEVDIR=/lib/udev/rules.d
++LIBMODPROBEDIR=/lib/modprobe.d
+ RULES=hplj10xx.rules
++USBLP=usblp.conf
+ #UDEVD=/sbin/udevd
+ # For FreeBSD 8.0
+-DEVDDIR=/etc/devd
+
+ ifeq ($(UNAME),Darwin)
+ install-hotplug: install-hotplug-test install-hotplug-osx
+ else
+-install-hotplug: install-hotplug-test install-hotplug-prog
++install-hotplug: install-hotplug-prog
+ endif
+
+ install-hotplug-test:
+@@ -962,65 +969,12 @@ install-hotplug-test:
+ #
+
+ install-hotplug-prog:
+- #
+- # remove HPLIP (proprietary) files and install our version
+- #
+- if [ -d $(UDEVDIR) ]; then \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_1000*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_1005*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_1018*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_1020*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_p1005*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_p1006*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_p1007*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_p1008*; \
+- rm -f $(UDEVDIR)/*hpmud*laserjet_p1505*; \
+- rm -f $(UDEVDIR)/*hpmud_support.rules; \
+- rm -f $(UDEVDIR)/*hpmud_plugin.rules; \
+- rm -f $(LIBUDEVDIR)/*hpmud_support.rules; \
+- rm -f $(LIBUDEVDIR)/*hpmud_plugin.rules; \
+- rm -f $(LIBUDEVDIR)/*-hplj10xx.rules; \
+- if [ -x /sbin/udevd ]; then \
+- version=`/sbin/udevd --version 2>/dev/null`; \
+- elif [ -x /usr/lib/udev/udevd ]; then \
+- version=`/usr/lib/udev/udevd --version 2>/dev/null`; \
+- elif [ -x /lib/systemd/systemd-udevd ]; then \
+- version=`/lib/systemd/systemd-udevd --version 2>/dev/null`; \
+- elif [ -x /usr/lib/systemd/systemd-udevd ]; then \
+- version=`/usr/lib/systemd/systemd-udevd --version 2>/dev/null`; \
+- fi; \
+- if [ "$$version" = "" ]; then version=0; fi; \
+- echo "*** udev version $$version"; \
+- if [ "$$version" -lt 148 ]; then \
+- $(INSTALL) -c -m 644 $(RULES).old $(UDEVDIR)/11-$(RULES); \
+- else \
+- $(INSTALL) -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
+- fi \
+- fi
+- if [ -d $(DEVDDIR) ]; then \
+- $(INSTALL) -c -m 644 hplj10xx.conf $(DEVDDIR)/; \
+- fi
+- [ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/
+- $(INSTALL) -c -m 755 hplj1000 $(USBDIR)/
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1005
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1006
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
+- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
+- $(USBDIR)/hplj1000 install-usermap
+- $(USBDIR)/hplj1005 install-usermap
+- $(USBDIR)/hplj1018 install-usermap
+- $(USBDIR)/hplj1020 install-usermap
+- $(USBDIR)/hpljP1005 install-usermap
+- $(USBDIR)/hpljP1006 install-usermap
+- $(USBDIR)/hpljP1007 install-usermap
+- $(USBDIR)/hpljP1008 install-usermap
+- $(USBDIR)/hpljP1505 install-usermap
+- # modprobe usblp
+- $(USBDIR)/hplj1000 install-usblp
++ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBUDEVDIR)
++ $(INSTALL) -c -m 644 $(RULES) $(DESTDIR)$(LIBUDEVDIR)/70-$(RULES)
++ $(INSTALL) -d -m 755 $(DESTDIR)/usr/bin
++ $(INSTALL) -c -m 755 foo2zjs-loadfw $(DESTDIR)/usr/bin
++ $(INSTALL) -d -m 755 $(DESTDIR)$(MODPROBEDIR)
++ $(INSTALL) -c -m 644 $(USBLP) $(DESTDIR)$(LIBMODPROBEDIR)
+
+ install-hotplug-osx:
+ cd osx-hotplug; $(MAKE) PREFIX=$(PREFIX) install-hotplug
+diff --git a/foo2zjs-loadfw.in b/foo2zjs-loadfw.in
+new file mode 100644
+index 0000000..c0f5ec0
+--- /dev/null
++++ b/foo2zjs-loadfw.in
+@@ -0,0 +1,116 @@
++#!/bin/bash
++
++# foo2zjs-loadfw:
++#
++# Firmware download script for HP1000/1005/1020 USB laser printers.
++# Works on udev- and CUPS-based systems.
++#
++# Used to download firmware automatically into the printer when it
++# is powered up or plugged into the USB port.
++#
++# The inspiration fo this script is from:
++# Oscar Santacreu. Alicante-Spain (2002)
++# Mike Morgan (2004)
++# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
++# Rewritten by Ivan Shapovalov <intelfx@intelfx.name> (2016) to work with CUPS
++
++#
++# Directory to find downloadable HP firmware files sihpMMMM.dl
++#
++FWDIR_ZJS=@FWDIR_ZJS@
++FWDIR_XQX=@FWDIR_XQX@
++
++#
++# The CUPS USB backend program
++#
++USB_BACKEND=/usr/lib/cups/backend/usb
++
++#
++# Figure out how to log our messages
++#
++log() {
++ echo "$0: $@" >&2
++}
++
++log "Firmware download script"
++
++#
++# Figure out the model number and firmware file from the arguments
++#
++MODEL="$1"
++SERIAL="$2"
++
++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)"
++ exit 1
++ ;;
++esac
++
++FW="$FWDIR/sihp$FWMODEL.dl"
++
++if [[ ! -f "$FW" ]]; then
++ log "Missing firmware file: $FW"
++ 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"; then
++ log "Firmware download OK"
++ exit 0
++ else
++ log "Firmware download failed"
++ exit 1
++ fi
++done
+diff --git a/hplj10xx.rules b/hplj10xx.rules
+index ee0295d..e5785d3 100644
+--- a/hplj10xx.rules
++++ b/hplj10xx.rules
+@@ -1,39 +1,20 @@
+-#
+-# hplj10xx.rules.old: udev equal or after 1.30
+-#
+-#Own udev rule for HP Laserjet 1000
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="hp LaserJet 1000", NAME="usb/%k", \
+- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
+-#Own udev rule for HP Laserjet 1005
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
+- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
+-#Own udev rule for HP Laserjet 1018
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018"
+-#Own udev rule for HP Laserjet 1020
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020"
+-#Own udev rule for HP Laserjet P1005
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005"
+-#Own udev rule for HP Laserjet P1006
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006"
+-#Own udev rule for HP Laserjet P1007
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet P1007", NAME="usb/%k", \
+- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007"
+-#Own udev rule for HP Laserjet P1008
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet P1008", NAME="usb/%k", \
+- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008"
+-#Own udev rule for HP Laserjet P1505
+-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+- ATTRS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="0517", RUN+="/usr/bin/foo2zjs-loadfw 1000 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="1317", RUN+="/usr/bin/foo2zjs-loadfw 1005 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4117", RUN+="/usr/bin/foo2zjs-loadfw 1018 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/foo2zjs-loadfw 1020 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/foo2zjs-loadfw P1005 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/foo2zjs-loadfw P1006 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4817", RUN+="/usr/bin/foo2zjs-loadfw P1007 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4917", RUN+="/usr/bin/foo2zjs-loadfw P1008 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/foo2zjs-loadfw P1505 $env{ID_SERIAL_SHORT}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4017", RUN+="/usr/bin/foo2zjs-loadfw P1505n $env{ID_SERIAL_SHORT}"
+diff --git a/usblp.conf b/usblp.conf
+new file mode 100644
+index 0000000..5a604bf
+--- /dev/null
++++ b/usblp.conf
+@@ -0,0 +1 @@
++blacklist usblp
+--
+2.10.0
+
diff --git a/0004-Makefile-skip-installing-Foomatic-files.patch b/0004-Makefile-skip-installing-Foomatic-files.patch
new file mode 100644
index 000000000000..03da0339c4eb
--- /dev/null
+++ b/0004-Makefile-skip-installing-Foomatic-files.patch
@@ -0,0 +1,25 @@
+From c9bc9f25190c2b1f502f20727817bd4f02ea6a1a Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 23 Oct 2016 01:00:36 +0300
+Subject: [PATCH 4/6] Makefile: skip installing Foomatic files
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b66ded0..f306448 100644
+--- a/Makefile
++++ b/Makefile
+@@ -607,7 +607,7 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
+ # Installation rules
+ #
+ install: all install-test install-prog install-icc2ps install-osx-hotplug \
+- install-extra install-crd install-foo install-ppd \
++ install-extra install-crd install-ppd \
+ install-gui install-desktop install-filter \
+ install-man install-doc
+ #
+--
+2.10.0
+
diff --git a/0005-Makefile-fix-generating-.ppd-in-place.patch b/0005-Makefile-fix-generating-.ppd-in-place.patch
new file mode 100644
index 000000000000..59b9c4b9c319
--- /dev/null
+++ b/0005-Makefile-fix-generating-.ppd-in-place.patch
@@ -0,0 +1,29 @@
+From 8745321e322393959c6ba1806a22c54f0653fd7e Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 23 Oct 2016 01:01:17 +0300
+Subject: [PATCH 5/6] Makefile: fix generating *.ppd in-place
+
+---
+ Makefile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f306448..1440cfd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1388,10 +1388,8 @@ ppd:
+ *) driver=foo2zjs;; \
+ esac; \
+ echo $$driver - $$printer; \
+- ENGINE=../foomatic/foomatic-db-engine; \
+- PERL5LIB=$$ENGINE/lib \
+- FOOMATICDB=foomatic-db \
+- $$ENGINE/foomatic-ppdfile \
++ FOOMATICDB=foomatic-db \
++ foomatic-ppdfile \
+ -d $$driver -p $$printer \
+ > PPD/$$printer.ppd; \
+ done
+--
+2.10.0
+
diff --git a/compile-flags-20161004-1.patch b/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
index 04385a969e10..c0cae22e71ec 100644
--- a/compile-flags-20161004-1.patch
+++ b/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,6 +1,19 @@
---- a/Makefile 2016-10-04 01:03:09.395540994 +0300
-+++ b/Makefile 2016-10-04 01:04:17.631046575 +0300
-@@ -455,33 +455,15 @@
+From c4573736aec2e242dcf833abc3747764de9d0f9b Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 23 Oct 2016 01:01:59 +0300
+Subject: [PATCH 6/6] Makefile: leverage default rules as much as possible to
+ fix behavior wrt user compile flags
+
+---
+ Makefile | 92 +++++++++++++++------------------------------------------
+ icc2ps/Makefile | 13 ++++----
+ 2 files changed, 30 insertions(+), 75 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1440cfd..794e914 100644
+--- a/Makefile
++++ b/Makefile
+@@ -455,33 +455,15 @@ all-done:
@echo "yourself."
@@ -43,12 +56,13 @@
foo2zjs-loadfw: foo2zjs-loadfw.in Makefile
[ ! -f $@ ] || chmod +w $@
-@@ -558,49 +540,21 @@
+@@ -559,49 +541,21 @@ getweb: getweb.in Makefile
chmod 555 $@
all-icc2ps:
- cd icc2ps; $(MAKE) all
--
++ $(MAKE) -C icc2ps all
+
-ok: ok.o $(LIBJBG)
- $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
-
@@ -87,8 +101,7 @@
-
-command2foo2lava-pjl: command2foo2lava-pjl.o
- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@
-+ $(MAKE) -C icc2ps all
-
+-
-command2foo2lava-pjl.o: command2foo2lava-pjl.c
- $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
+ok: $(LIBJBG)
@@ -107,9 +120,11 @@
#
# Installation rules
---- a/icc2ps/Makefile 2016-03-14 00:01:59.000000000 +0300
-+++ b/icc2ps/Makefile 2016-10-04 01:04:26.580995863 +0300
-@@ -9,19 +9,20 @@
+diff --git a/icc2ps/Makefile b/icc2ps/Makefile
+index fab1d01..f71c341 100644
+--- a/icc2ps/Makefile
++++ b/icc2ps/Makefile
+@@ -9,19 +9,20 @@ SRC= icc2ps.c xgetopt.c
LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
@@ -136,3 +151,6 @@
install: all
$(INSTALL) -c foo2zjs-icc2ps $(BIN)
+--
+2.10.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 78b1f446aa40..bc6493220c7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
#Contributor: Muhammed Uluyol <uluyol0@gmail.com>
pkgname=foo2zjs
-pkgver=20161004
-pkgrel=2
+pkgver=20161021
+pkgrel=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')
@@ -17,22 +17,20 @@ arch=('i686' 'x86_64')
options=('!emptydirs' '!ccache')
install='foo2zjs.install'
source=("foo2zjs-$pkgver.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
- 'destdir-support-20140329-1.patch'
- 'gen-fixes-20140329-1.patch'
- 'firmware-loader-20130602-1.patch'
- 'udev-firmware-loading-ruleset-20130601-1.patch'
- 'skip-foomatic-db-20161003-1.patch'
- 'make-ppd-20161003-2.patch'
- 'compile-flags-20161004-1.patch')
-
-sha256sums=('c4e0d182102c340b094e87203423a80561ddfaad2f5f6d57bea44edd15e7267e'
- '6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a'
- '2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05'
- '5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1'
- '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d'
- 'ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801'
- 'bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407'
- '37bd36ce5712e1e007c78200f0bb8681eaf4236646d8221018bc71dad08caae3')
+ '0001-Makefile-DESTDIR-support.patch'
+ '0002-Makefile-general-fixes.patch'
+ '0003-Rework-firmware-loading.patch'
+ '0004-Makefile-skip-installing-Foomatic-files.patch'
+ '0005-Makefile-fix-generating-.ppd-in-place.patch'
+ '0006-Makefile-leverage-default-rules-as-much-as-possible-.patch')
+
+sha256sums=('55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3'
+ '2c0e40294c3f77a33e242280e280a98ed834a16584072b2d0f5fa95d0c44503f'
+ '33c1c7bd31ddee2b27ef06f726684da503bc165873f10db68e7435a1e3690756'
+ '320a7d5d1e10474e8e11e201a05e741d6a7786ca1c1b5ebbe668f63ac6d5b765'
+ 'cfaa38ea47afbd89b0d85a944d336a2ef30e2964beefb6a3cfc312b1d2b6ab2b'
+ 'cc6befb039909ee8a09e2ef47ef10c72d4bbe59df52d35687506cfd2ad484e62'
+ '0d7dd404b84e354bdad579820e0fbe334e553a561ab0986aabd528a22628eecf')
prepare() {
cd "${pkgname}"
diff --git a/firmware-loader-20130602-1.patch b/firmware-loader-20130602-1.patch
deleted file mode 100644
index 7e1fc71a4605..000000000000
--- a/firmware-loader-20130602-1.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-Maintainer: Nicola Bignami <nicola@kernel-panic.dnsdojo.net>
-Contributor: Muhammed Uluyol <uluyol0@gmail.com>
-Subject: [PATCH] Firmware loader patch
-
---- a/Makefile
-+++ b/Makefile
-@@ -166,6 +166,7 @@ FILES = \
- gipddecode.1in \
- hbpldecode.c \
- hbpldecode.1in \
-+ foo2zjs-loadfw.in \
- foo2zjs-wrapper.in \
- foo2zjs-wrapper.1in \
- foo2hp2600-wrapper.in \
-@@ -267,7 +266,7 @@ endif
- SHELLS= foo2zjs-wrapper foo2oak-wrapper foo2hp2600-wrapper \
- foo2xqx-wrapper foo2lava-wrapper foo2qpdl-wrapper \
- foo2slx-wrapper foo2hiperc-wrapper foo2hbpl2-wrapper
--SHELLS+= foo2zjs-pstops
-+SHELLS+= foo2zjs-loadfw foo2zjs-pstops
- SHELLS+= printer-profile
- MANPAGES= foo2zjs-wrapper.1 foo2zjs.1 zjsdecode.1
- MANPAGES+= foo2oak-wrapper.1 foo2oak.1 oakdecode.1
-@@ -476,6 +467,11 @@ foo2slx: foo2slx.o $(LIBJBG)
- foo2hbpl2: foo2hbpl2.o $(LIBJBG)
- $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
-
-+foo2zjs-loadfw: foo2zjs-loadfw.in Makefile
-+ [ ! -f $@ ] || chmod +w $@
-+ sed < $@.in > $@ \
-+ -e 's:@ZJSFWDIR@:$(SHAREZJS)/firmware:' -e 's:@XQXFWDIR@:$(SHAREXQX)/firmware/:' || (rm -f $@ && exit 1)
-+ chmod 555 $@
-
- foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
- [ ! -f $@ ] || chmod +w $@
-@@ -953,70 +964,22@@ # ... OK!
- #
-
- install-hotplug-prog:
-- #
-- # remove HPLIP (proprietary) files and install our version
-- #
-- if [ -d $(UDEVDIR) ]; then \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_1000*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_1005*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_1018*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_1020*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_p1005*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_p1006*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_p1007*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_p1008*; \
-- rm -f $(UDEVDIR)/*hpmud*laserjet_p1505*; \
-- rm -f $(UDEVDIR)/*hpmud_support.rules; \
-- rm -f $(UDEVDIR)/*hpmud_plugin.rules; \
-- rm -f $(LIBUDEVDIR)/*hpmud_support.rules; \
-- rm -f $(LIBUDEVDIR)/*hpmud_plugin.rules; \
-- rm -f $(LIBUDEVDIR)/*-hplj10xx.rules; \
-- if [ -x /sbin/udevd ]; then \
-- version=`/sbin/udevd --version 2>/dev/null`; \
-- elif [ -x /usr/lib/udev/udevd ]; then \
-- version=`/usr/lib/udev/udevd --version 2>/dev/null`; \
-- elif [ -x /usr/lib/systemd/systemd-udevd ]; then \
-- version=`/usr/lib/systemd/systemd-udevd --version 2>/dev/null`; \
-- fi; \
-- if [ "$$version" = "" ]; then version=0; fi; \
-- echo "*** udev version $$version"; \
-- if [ "$$version" -lt 148 ]; then \
-- $(INSTALL) -c -m 644 $(RULES).old $(UDEVDIR)/11-$(RULES); \
-- else \
-- $(INSTALL) -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
-- fi \
-- fi
-+ install -d -m 755 $(DESTDIR)$(UDEVDIR)
-+ $(INSTALL) -c -m 644 $(RULES) $(DESTDIR)$(UDEVDIR)/11-$(RULES); \
- if [ -d $(DEVDDIR) ]; then \
- $(INSTALL) -c -m 644 hplj10xx.conf $(DEVDDIR)/; \
- fi
- [ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/
-- $(INSTALL) -c -m 755 hplj1000 $(USBDIR)/
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1005
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1006
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
-- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
-- $(USBDIR)/hplj1000 install-usermap
-- $(USBDIR)/hplj1005 install-usermap
-- $(USBDIR)/hplj1018 install-usermap
-- $(USBDIR)/hplj1020 install-usermap
-- $(USBDIR)/hpljP1005 install-usermap
-- $(USBDIR)/hpljP1006 install-usermap
-- $(USBDIR)/hpljP1007 install-usermap
-- $(USBDIR)/hpljP1008 install-usermap
-- $(USBDIR)/hpljP1505 install-usermap
-- # modprobe usblp
-- $(USBDIR)/hplj1000 install-usblp
-+ $(INSTALL) -d -m 755 $(DESTDIR)/usr/bin
-+ $(INSTALL) -c -m 755 foo2zjs-loadfw $(DESTDIR)/usr/bin
-
- install-hotplug-osx:
- cd osx-hotplug; $(MAKE) PREFIX=$(PREFIX) install-hotplug
-
- install-filter:
- if [ "$(CUPS_SERVERBIN)" != "" ]; then \
-+ install -d -m 755 $(CUPS_SERVERBIN)/filter; \
-- ln -sf $(BIN)/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \
-+ ln -sf ../../../bin/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \
- fi
-
- CUPSDCONF=/etc/cups/cupsd.conf
-
---- /dev/null
-+++ b/foo2zjs-loadfw.in
-@@ -0,0 +1,162 @@
-+#!/bin/sh
-+
-+# foo2zjs-loadfw:
-+#
-+# Hotplug script for HP1000/1005/1020 USB laser printers. The model number
-+# that this script deals with is determined from the udev env.
-+#
-+# Used to download firmware automatically into the printer when it
-+# is powered up or plugged into the USB port.
-+#
-+# The inspiration fo this script is from:
-+# Oscar Santacreu. Alicante-Spain (2002)
-+# Mike Morgan (2004)
-+# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
-+
-+#
-+# Directory to find downloadable HP firmware files sihpMMMM.dl
-+#
-+ZJSFW=@ZJSFWDIR@
-+XQXFW=@XQXFWDIR@
-+
-+#
-+# Program used to determine USB id information
-+#
-+USBID=/usr/bin/usb_printerid
-+
-+#
-+# Timeout to load firmware
-+#
-+TIMEOUT=6
-+
-+#
-+# Figure out how to log our messages
-+#
-+if [ -t 1 ]; then
-+ # Running from a tty...
-+ log() {
-+ echo "$0: $@"
-+ }
-+elif [ -x /usr/bin/logger ]; then
-+ # Have logger...
-+ log() {
-+ logger -t "$0" -- "$@"
-+ }
-+else
-+ # No logger...
-+ log() {
-+ echo "$0: $@" >> /var/log/messages
-+ }
-+fi
-+
-+#
-+# Figure out the model number from the name of this script
-+#
-+case "$1" in
-+P1005)
-+ MODEL=P1005; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+P1006)
-+ MODEL=P1006; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+P1007)
-+ MODEL=P1007; FWMODEL=P1005 # Alias
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+P1008)
-+ MODEL=P1008; FWMODEL=P1006 # Alias
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+P1505)
-+ MODEL=P1505; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+P1505n)
-+ MODEL=P1505n; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$XQXFW
-+ ;;
-+1000)
-+ MODEL=1000; FWMODEL=$MODEL
-+ MODELNAME="hp LaserJet $MODEL"
-+ FWDIR=$ZJSFW
-+ ;;
-+1005)
-+ MODEL=1005; FWMODEL=$MODEL
-+ MODELNAME="hp LaserJet $MODEL"
-+ FWDIR=$ZJSFW
-+ ;;
-+1018)
-+ MODEL=1018; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$ZJSFW
-+ ;;
-+1020)
-+ MODEL=1020; FWMODEL=$MODEL
-+ MODELNAME="HP LaserJet $MODEL"
-+ FWDIR=$ZJSFW
-+ ;;
-+*)
-+ log "Only HP LaserJet 1000, 1005, 1018 and 1020 are supported"
-+ log "You need to supply one of these on the cmdline: $0 10**"
-+ exit
-+ ;;
-+esac
-+
-+if [ -n "$2" ]; then
-+ DEVNAME=$2
-+elif [ -n "$DEVNAME" ]; then
-+ log 'using $DEVNAME'
-+else
-+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:"
-+ log "$0 10** /dev/usb/lp0"
-+ exit 1
-+fi
-+
-+#
-+# Procedure to load a single device with firmware
-+#
-+load1() {
-+ fw="$FWDIR/sihp$FWMODEL.dl"
-+ if [ ! -f "$fw" ]; then
-+ log "Missing HP LaserJet $MODEL firmware file $fw"
-+ log "...read foo2zjs installation instructions and run ./getweb $MODEL"
-+ return 1
-+ fi
-+
-+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..."
-+ if cat $fw > $DEVNAME; then
-+ sleep $TIMEOUT
-+ log "... download successful."
-+ else
-+ log "... download failed."
-+ fi
-+ return 0
-+}
-+
-+#
-+# OK, now download firmware to any printers that need it
-+#
-+if [ -x $USBID ]; then
-+ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then
-+ # This is a LaserJet 100x
-+ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then
-+ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME"
-+ else
-+ # Firmware is not yet loaded
-+ load1 "$DEVNAME"
-+ fi
-+ else
-+ log "No supported printer found."
-+ fi
-+else
-+ log "HP LaserJet $MODEL firmware was not downloaded..."
-+ log "...couldn't find $USBID"
-+fi
diff --git a/gen-fixes-20140329-1.patch b/gen-fixes-20140329-1.patch
deleted file mode 100644
index 5681e5e388bc..000000000000
--- a/gen-fixes-20140329-1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Maintainer: Nicola Bignami <nicola@kernel-panic.dnsdojo.net>
-Contributor: Muhammed Uluyol <uluyol0@gmail.com>
-Subject: [PATCH] General fixes patch
-
---- a/Makefile
-+++ b/Makefile
-@@ -381,6 +381,6 @@ # all:
- #
- all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \
-- all-icc2ps all-osx-hotplug man doc \
-+ all-icc2ps man doc \
- all-done
-
- all-test:
-@@ -561,9 +561,4 @@ # all-osx-hotplug:
- all-icc2ps:
- cd icc2ps; $(MAKE) all
--
--all-osx-hotplug:
--ifeq ($(UNAME),Darwin)
-- cd osx-hotplug; $(MAKE) all
--endif
-
- ok: ok.o $(LIBJBG)
-@@ -781,7 +776,7 @@ install-extra:
- fi; \
- done
- # foo2zjs Firmware files (if any)
-- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
-+ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREZJS)/firmware/
- for i in sihp1*.img; do \
- if [ -f $$i ]; then \
- base=`basename $$i .img`; \
-@@ -790,7 +785,7 @@ install-extra:
- fi; \
- done
- # foo2xqx Firmware files (if any)
-- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREXQX)/firmware/
-+ $(INSTALL) $(LPuid) $(LPgid) -m 755 -d $(SHAREXQX)/firmware/
- for i in sihpP*.img; do \
- if [ -f $$i ]; then \
- base=`basename $$i .img`; \
-@@ -857,7 +857,7 @@ install-ppd:
- #
- # Install PPD files for CUPS
- #
- export PATH=$$PATH:`pwd`:; \
-- if [ -x /usr/sbin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
-+ if [ -x /usr/bin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
- $(INSTALL) $(LPgid) -d $(VARPPD)/user; \
- cd PPD; \
-@@ -869,14 +864,6 @@ install-ppd:
- done; \
- ppdmgr -u; \
- elif [ -d $(PPD) ]; then \
-- find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
-- find $(PPD) -name '*foo2hbpl*' | xargs rm -rf; \
- [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
- cd PPD; \
- for ppd in *.ppd; do \
diff --git a/make-ppd-20161003-2.patch b/make-ppd-20161003-2.patch
deleted file mode 100644
index ed70230383af..000000000000
--- a/make-ppd-20161003-2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile 2016-10-03 16:57:22.842911250 +0300
-+++ b/Makefile 2016-10-03 16:59:11.368922611 +0300
-@@ -1389,10 +1389,8 @@
- *) driver=foo2zjs;; \
- esac; \
- echo $$driver - $$printer; \
-- ENGINE=../foomatic/foomatic-db-engine; \
-- PERL5LIB=$$ENGINE/lib \
-- FOOMATICDB=foomatic-db \
-- $$ENGINE/foomatic-ppdfile \
-+ FOOMATICDB=foomatic-db \
-+ foomatic-ppdfile \
- -d $$driver -p $$printer \
- > PPD/$$printer.ppd; \
- done
diff --git a/skip-foomatic-db-20161003-1.patch b/skip-foomatic-db-20161003-1.patch
deleted file mode 100644
index d8d6ca9e99ba..000000000000
--- a/skip-foomatic-db-20161003-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2016-10-03 16:56:19.036462531 +0300
-+++ b/Makefile 2016-10-03 16:56:30.413366038 +0300
-@@ -606,7 +606,7 @@
- # Installation rules
- #
- install: all install-test install-prog install-icc2ps install-osx-hotplug \
-- install-extra install-crd install-foo install-ppd \
-+ install-extra install-crd install-ppd \
- install-gui install-desktop install-filter \
- install-man install-doc
- #
diff --git a/udev-firmware-loading-ruleset-20130601-1.patch b/udev-firmware-loading-ruleset-20130601-1.patch
deleted file mode 100644
index 0b5848f3208c..000000000000
--- a/udev-firmware-loading-ruleset-20130601-1.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Maintainer: Nicola Bignami <nicola@kernel-panic.dnsdojo.net>
-Contributor: Muhammed Uluyol <uluyol0@gmail.com>
-Subject: [PATCH] udev firmware loading ruleset patch.
-
---- a/hplj10xx.rules
-+++ b/hplj10xx.rules
-@@ -1,39 +1,120 @@
--#
--# hplj10xx.rules.old: udev equal or after 1.30
--#
--#Own udev rule for HP Laserjet 1000
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="hp LaserJet 1000", NAME="usb/%k", \
-- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
--#Own udev rule for HP Laserjet 1005
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
-- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
--#Own udev rule for HP Laserjet 1018
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \
-- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018"
--#Own udev rule for HP Laserjet 1020
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
-- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020"
--#Own udev rule for HP Laserjet P1005
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \
-- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005"
--#Own udev rule for HP Laserjet P1006
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet P1006", NAME="usb/%k", \
-- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006"
--#Own udev rule for HP Laserjet P1007
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet P1007", NAME="usb/%k", \
-- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007"
--#Own udev rule for HP Laserjet P1008
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet P1008", NAME="usb/%k", \
-- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008"
--#Own udev rule for HP Laserjet P1505
--KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-- ATTRS{product}=="HP LaserJet P1505", NAME="usb/%k", \
-- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/foo2zjs-loadfw 1000 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/foo2zjs-loadfw 1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/foo2zjs-loadfw 1018 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/foo2zjs-loadfw 1020 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/foo2zjs-loadfw P1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/foo2zjs-loadfw P1006 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/foo2zjs-loadfw P1007 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/foo2zjs-loadfw P1008 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/foo2zjs-loadfw P1505 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/foo2zjs-loadfw P1505n $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/foo2zjs-loadfw 1000 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="0517", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/foo2zjs-loadfw 1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="1317", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/foo2zjs-loadfw 1018 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4117", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/foo2zjs-loadfw 1020 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="2b17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/foo2zjs-loadfw P1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3d17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/foo2zjs-loadfw P1006 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3e17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/foo2zjs-loadfw P1007 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4817", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/foo2zjs-loadfw P1008 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4917", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/foo2zjs-loadfw P1505 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="3f17", RUN+="/usr/bin/rmmod usblp"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/foo2zjs-loadfw P1505n $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/sleep 15"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="03f0", \
-+ ATTRS{idProduct}=="4017", RUN+="/usr/bin/rmmod usblp"