Bump to 20171202, disable blacklisting usblp as requested

8 files changed, 126 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9bc052b5d24..02cd0dd7f352 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Apr 15 02:59:57 UTC 2017
+# Fri Dec  8 11:55:55 UTC 2017
 pkgbase = foo2zjs-nightly
 	pkgdesc = foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
-	pkgver = 20170412
+	pkgver = 20171202
 	pkgrel = 1
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
@@ -22,18 +22,20 @@ pkgbase = foo2zjs-nightly
 	replaces = foo2zjs
 	options = !emptydirs
 	options = !ccache
-	source = foo2zjs-20170412.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+	source = foo2zjs-20171202.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
-	sha256sums = SKIP
-	sha256sums = 5bb596a33c74d80a4efbc654ee57cfa5d7fa745f46880b116247e0938a3005b0
-	sha256sums = be38f1d49290ffdd75e1b692268f0cafed97f29fc9800d2f6f0a63e93d9a8874
-	sha256sums = ab45df3afe8e25699904be6b2dc709fb4bdd0dd5e348c4f180678e27ec866177
-	sha256sums = df6c992c5efbb8f30cfbb249a7444564b27a40ad5e43b4c1975b714a56b9a90b
-	sha256sums = 1961671d931a542a438377a56eae42d414f07cde25296565d0099a0d46e3ac98
+	source = 0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
+	sha256sums = b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182
+	sha256sums = 620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756
+	sha256sums = 4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb
+	sha256sums = 50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9
+	sha256sums = 4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3
+	sha256sums = c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb
+	sha256sums = 32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e
 
 pkgname = foo2zjs-nightly
 
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch
index a6aed3a81730..d865e82cd762 100644
--- a/0001-Makefile-DESTDIR-support.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -1,14 +1,14 @@
-From 8f1dc9498cb4f7969d5700904d4b19d8517c9679 Mon Sep 17 00:00:00 2001
+From 0deabbd1bd926c10b83776251262e7ae2707b455 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/5] Makefile: DESTDIR support
+Subject: [PATCH 1/6] Makefile: DESTDIR support
 
 ---
  Makefile | 27 ++++++++++++++-------------
  1 file changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 051dc66..8079ddf 100644
+index 450ad58..bcbb4a3 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -39,7 +39,7 @@ INSTALL=install
@@ -20,7 +20,7 @@ index 051dc66..8079ddf 100644
  
  # User ID's
  LPuid=-oroot
-@@ -251,8 +251,9 @@ FILES	=	\
+@@ -253,8 +253,9 @@ FILES	=	\
  
  # CUPS vars
  CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null)
@@ -32,7 +32,7 @@ index 051dc66..8079ddf 100644
  
  # hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
  # sihp1000.img sihp1005.img sihp1020.img sihp1018.img
-@@ -676,7 +677,7 @@ install-prog:
+@@ -679,7 +680,7 @@ install-prog:
  	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
  	if [ "$(BINPROGS)" != "" ]; then \
  	    $(INSTALL) -d $(UDEVBIN); \
@@ -41,7 +41,7 @@ index 051dc66..8079ddf 100644
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -730,10 +731,10 @@ install-foo:
+@@ -733,10 +734,10 @@ install-foo:
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
@@ -56,7 +56,7 @@ index 051dc66..8079ddf 100644
  	    foomatic-combo-xml -O >overview.xml; \
  	fi
  
-@@ -863,7 +864,7 @@ install-extra:
+@@ -873,7 +874,7 @@ install-extra:
  	done
  
  MODEL=$(PREFIX)/share/cups/model
@@ -65,7 +65,7 @@ index 051dc66..8079ddf 100644
  MACMODEL=/Library/Printers/PPDs/Contents/Resources
  PPD=$(PREFIX)/share/ppd
  VARPPD=/var/lp/ppd
-@@ -923,9 +924,9 @@ install-ppd:
+@@ -934,9 +935,9 @@ install-ppd:
  	    done; \
  	fi
  
@@ -78,7 +78,7 @@ index 051dc66..8079ddf 100644
  
  install-desktop:
  	#
-@@ -949,7 +950,7 @@ install-gui:
+@@ -960,7 +961,7 @@ install-gui:
  	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
  	
  
@@ -88,5 +88,5 @@ index 051dc66..8079ddf 100644
  LIBUDEVDIR=/lib/udev/rules.d
  RULES=hplj10xx.rules
 -- 
-2.12.1
+2.15.1
 
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
index 31af4214bb3f..050be4ae8822 100644
--- a/0002-Makefile-general-fixes.patch
+++ b/0002-Makefile-general-fixes.patch
@@ -1,14 +1,14 @@
-From cb30c146369a1397491272653cab9a5190d50041 Mon Sep 17 00:00:00 2001
+From 1e082c4ed1be48954ff9f61384789525e5bda80e Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 10:21:54 +0300
-Subject: [PATCH 2/5] Makefile: general fixes
+Subject: [PATCH 2/6] Makefile: general fixes
 
 ---
  Makefile | 58 +++++++++++++++++++++++++++++-----------------------------
  1 file changed, 29 insertions(+), 29 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8079ddf..022f072 100644
+index bcbb4a3..09388c1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -43,7 +43,7 @@ FOODB=$(PREFIX)/share/foomatic/db/source
@@ -20,7 +20,7 @@ index 8079ddf..022f072 100644
  ifeq ($(UNAME),Darwin)
      LPuid=-oroot
      LPgid=-gwheel
-@@ -392,8 +392,8 @@ JBGOPTS=-m 16 -d 0 -p 92	# Equivalent options for pbmtojbg
+@@ -395,8 +395,8 @@ JBGOPTS=-m 16 -d 0 -p 92	# Equivalent options for pbmtojbg
  #
  # The usual build rules
  #
@@ -31,7 +31,7 @@ index 8079ddf..022f072 100644
  	all-done
  
  all-test:
-@@ -626,8 +626,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
+@@ -629,8 +629,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
  #
  # Installation rules
  #
@@ -42,7 +42,7 @@ index 8079ddf..022f072 100644
  	    install-gui install-desktop install-filter \
  	    install-man install-doc
  	#
-@@ -676,8 +676,8 @@ install-prog:
+@@ -679,8 +679,8 @@ install-prog:
  	$(INSTALL) -d $(BIN)
  	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
  	if [ "$(BINPROGS)" != "" ]; then \
@@ -53,7 +53,7 @@ index 8079ddf..022f072 100644
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -757,7 +757,7 @@ install-crd:
+@@ -760,7 +760,7 @@ install-crd:
  	# Install prebuilt CRD files (from m2300w project)
  	#
  	$(INSTALL) -d $(SHAREZJS)/
@@ -62,7 +62,7 @@ index 8079ddf..022f072 100644
  	for i in crd/zjs/*.*; do \
  	    $(INSTALL) -c -m 644 $$i $(SHAREZJS)/crd/; \
  	done
-@@ -765,7 +765,7 @@ install-crd:
+@@ -768,7 +768,7 @@ install-crd:
  	# Install prebuilt CRD files for CLP-300/CLP-600
  	#
  	$(INSTALL) -d $(SHAREQPDL)/
@@ -71,7 +71,7 @@ index 8079ddf..022f072 100644
  	for i in crd/qpdl/*cms* crd/qpdl/*.ps; do \
  	    $(INSTALL) -c -m 644 $$i $(SHAREQPDL)/crd/; \
  	done
-@@ -775,7 +775,7 @@ install-psfiles:
+@@ -778,7 +778,7 @@ install-psfiles:
  	# Install prebuilt psfiles files (from m2300w project)
  	#
  	$(INSTALL) -d $(SHAREHP)/
@@ -80,7 +80,7 @@ index 8079ddf..022f072 100644
  	for i in psfiles/*.*; do \
  	    $(INSTALL) -c -m 644 $$i $(SHAREHP)/psfiles/; \
  	done
-@@ -789,14 +789,14 @@ install-extra:
+@@ -792,14 +792,14 @@ install-extra:
  	#
  	$(INSTALL) -d $(SHAREZJS)/
  	# foo2zjs ICM files (if any)
@@ -97,7 +97,7 @@ index 8079ddf..022f072 100644
  	for i in sihp1*.img; do \
  	    if [ -f $$i ]; then \
  		base=`basename $$i .img`; \
-@@ -805,7 +805,7 @@ install-extra:
+@@ -808,7 +808,7 @@ install-extra:
  	    fi; \
  	done
  	# foo2xqx Firmware files (if any)
@@ -106,7 +106,7 @@ index 8079ddf..022f072 100644
  	for i in sihpP*.img; do \
  	    if [ -f $$i ]; then \
  		base=`basename $$i .img`; \
-@@ -814,49 +814,49 @@ install-extra:
+@@ -817,49 +817,49 @@ install-extra:
  	    fi; \
  	done
  	# foo2oak ICM files (if any)
@@ -163,7 +163,7 @@ index 8079ddf..022f072 100644
  	for i in hbpl*.icm; do \
  	    if [ -f $$i ]; then \
  		$(INSTALL) -c -m 644 $$i $(SHAREHBPL)/icm/; \
-@@ -873,14 +873,14 @@ install-ppd:
+@@ -883,14 +883,14 @@ install-ppd:
  	# Install PPD files for CUPS
  	#
  	export PATH=$$PATH:`pwd`:; \
@@ -180,7 +180,7 @@ index 8079ddf..022f072 100644
  	    done; \
  	    ppdmgr -u; \
  	elif [ -d $(PPD) ]; then \
-@@ -896,7 +896,7 @@ install-ppd:
+@@ -907,7 +907,7 @@ install-ppd:
  	    cd PPD; \
  	    for ppd in *.ppd; do \
  		modify-ppd <$$ppd | gzip > $(PPD)/foo2zjs/$$ppd.gz; \
@@ -189,7 +189,7 @@ index 8079ddf..022f072 100644
  	    done; \
  	fi
  	#
-@@ -906,21 +906,21 @@ install-ppd:
+@@ -917,21 +917,21 @@ install-ppd:
  	    cd PPD; \
  	    for ppd in *.ppd; do \
  		modify-ppd <$$ppd | gzip > $(MODEL)/$$ppd.gz; \
@@ -214,7 +214,7 @@ index 8079ddf..022f072 100644
  	    done; \
  	fi
  
-@@ -961,7 +961,7 @@ DEVDDIR=/etc/devd
+@@ -972,7 +972,7 @@ DEVDDIR=/etc/devd
  ifeq ($(UNAME),Darwin)
  install-hotplug: install-hotplug-test install-hotplug-osx
  else
@@ -223,7 +223,7 @@ index 8079ddf..022f072 100644
  endif
  
  install-hotplug-test:
-@@ -1064,8 +1064,8 @@ install-hotplug-osx:
+@@ -1075,8 +1075,8 @@ install-hotplug-osx:
  
  install-filter:
  	if [ "$(CUPS_SERVERBIN)" != "" ]; then \
@@ -235,5 +235,5 @@ index 8079ddf..022f072 100644
  
  CUPSDCONF=/etc/cups/cupsd.conf
 -- 
-2.12.1
+2.15.1
 
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index 2ff987228867..8be92be65e18 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,7 +1,7 @@
-From 91820f100be14b1c9db30bcf315537f346e0db62 Mon Sep 17 00:00:00 2001
+From 30bf1a17b94d95e550fa5528260c63f745d74c20 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
+Subject: [PATCH 3/6] Rework firmware loading
 
 ---
  Makefile                   | 101 ++++++++++-----------------------
@@ -15,10 +15,10 @@ Subject: [PATCH 3/5] Rework firmware loading
  create mode 100644 usblp.conf
 
 diff --git a/Makefile b/Makefile
-index 022f072..ca39cf3 100644
+index 09388c1..429b842 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -172,6 +172,7 @@ FILES	=	\
+@@ -173,6 +173,7 @@ FILES	=	\
  		ddst.h \
  		ddstdecode.c \
  		ddstdecode.1in \
@@ -26,7 +26,7 @@ index 022f072..ca39cf3 100644
  		foo2zjs-wrapper.in \
  		foo2zjs-wrapper.1in \
  		foo2hp2600-wrapper.in \
-@@ -295,10 +296,7 @@ MANPAGES+=	foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
+@@ -298,10 +299,7 @@ MANPAGES+=	foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
  MANPAGES+=	printer-profile.1
  LIBJBG	=	jbig.o jbig_ar.o
  BINPROGS=
@@ -38,7 +38,7 @@ index 022f072..ca39cf3 100644
  
  # Compiler flags
  #CFLAGS +=	-O2 -Wall -Wno-unused-but-set-variable
-@@ -392,7 +390,7 @@ JBGOPTS=-m 16 -d 0 -p 92	# Equivalent options for pbmtojbg
+@@ -395,7 +393,7 @@ JBGOPTS=-m 16 -d 0 -p 92	# Equivalent options for pbmtojbg
  #
  # The usual build rules
  #
@@ -47,7 +47,7 @@ index 022f072..ca39cf3 100644
  	all-icc2ps man doc \
  	all-done
  
-@@ -495,6 +493,18 @@ foo2xqx: foo2xqx.o $(LIBJBG)
+@@ -498,6 +496,18 @@ foo2xqx: foo2xqx.o $(LIBJBG)
  foo2zjs: foo2zjs.o $(LIBJBG)
  	$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
  
@@ -66,7 +66,7 @@ index 022f072..ca39cf3 100644
  
  foo2ddst-wrapper: foo2ddst-wrapper.in Makefile
  	[ ! -f $@ ] || chmod +w $@
-@@ -950,13 +960,15 @@ install-gui:
+@@ -961,13 +971,15 @@ install-gui:
  	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
  	
  
@@ -87,7 +87,7 @@ index 022f072..ca39cf3 100644
  
  ifeq ($(UNAME),Darwin)
  install-hotplug: install-hotplug-test install-hotplug-osx
-@@ -997,67 +1009,14 @@ install-hotplug-test:
+@@ -1008,67 +1020,14 @@ install-hotplug-test:
  	#
  
  install-hotplug-prog:
@@ -392,5 +392,5 @@ index 0000000..5a604bf
 @@ -0,0 +1 @@
 +blacklist usblp
 -- 
-2.12.1
+2.15.1
 
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index c10ad3d4787e..b506928090e9 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,17 +1,17 @@
-From f19fd5874e59a91553fb8efc3e540d716db71326 Mon Sep 17 00:00:00 2001
+From 01eb8e0e1fd6447d7931f33718da760f050fdb34 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
+Subject: [PATCH 4/6] Makefile: fix generating *.ppd in-place
 
 ---
  Makefile | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ca39cf3..cb5bde5 100644
+index 429b842..6282bda 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1436,10 +1436,8 @@ ppd:
+@@ -1452,10 +1452,8 @@ ppd:
  	    *)                  driver=foo2zjs;; \
  	    esac; \
  	    echo $$driver - $$printer; \
@@ -25,5 +25,5 @@ index ca39cf3..cb5bde5 100644
  		> PPD/$$printer.ppd; \
  	done
 -- 
-2.12.1
+2.15.1
 
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 5589ef5f2d4a..fc53bbcbf8f2 100644
--- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,7 +1,7 @@
-From 6c6f0708f7c26b75e1f7bf3eda8c4503c0eaf5bf Mon Sep 17 00:00:00 2001
+From 2fe5c4fe3103d63b4d2f26168316fa746d6e4b2a 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
+Subject: [PATCH 5/6] Makefile: leverage default rules as much as possible to
  fix behavior wrt user compile flags
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 5/5] Makefile: leverage default rules as much as possible to
  2 files changed, 33 insertions(+), 80 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index cb5bde5..6272778 100644
+index 6282bda..c724547 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -463,35 +463,17 @@ all-done:
+@@ -466,35 +466,17 @@ all-done:
  	@echo "yourself."
  
  
@@ -60,7 +60,7 @@ index cb5bde5..6272778 100644
  
  foo2zjs-loadfw: foo2zjs-loadfw.in Makefile
  	[ ! -f $@ ] || chmod +w $@
-@@ -581,57 +563,27 @@ getweb: getweb.in Makefile
+@@ -584,57 +566,27 @@ getweb: getweb.in Makefile
  	chmod 555 $@
  
  all-icc2ps:
@@ -165,5 +165,5 @@ index f3abb99..5be5749 100644
  install: all
  	$(INSTALL) -c foo2zjs-icc2ps $(BIN)
 -- 
-2.12.1
+2.15.1
 
diff --git a/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch b/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
new file mode 100644
index 000000000000..d18080e203f2
--- /dev/null
+++ b/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
@@ -0,0 +1,48 @@
+From ceb2ab1395079c55723f3df6cb2b592dc00da459 Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Fri, 8 Dec 2017 14:54:15 +0300
+Subject: [PATCH 6/6] Makefile: do not blacklist usblp (seems unnecessary;
+ collateral damage reported)
+
+---
+ Makefile   | 4 ----
+ usblp.conf | 1 -
+ 2 files changed, 5 deletions(-)
+ delete mode 100644 usblp.conf
+
+diff --git a/Makefile b/Makefile
+index c724547..8a003d7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -924,12 +924,10 @@ install-gui:
+ 	
+ 
+ LIBUDEVDIR=$(PREFIX)/lib/udev/rules.d
+-LIBMODPROBEDIR=$(PREFIX)/lib/modprobe.d
+ UNITDIR=$(PREFIX)/lib/systemd/system
+ HOTPLUG_PROGS=foo2zjs-loadfw
+ HOTPLUG_RULES=hplj10xx.rules
+ HOTPLUG_UNITS=foo2zjs-loadfw@.service
+-HOTPLUG_USBLP=usblp.conf
+ #UDEVD=/sbin/udevd
+ # For FreeBSD 8.0
+ 
+@@ -976,8 +974,6 @@ install-hotplug-prog:
+ 	$(INSTALL) -c -m 755 $(HOTPLUG_PROGS) $(BIN)
+ 	$(INSTALL) -d -m 755 $(LIBUDEVDIR)
+ 	$(INSTALL) -c -m 644 $(HOTPLUG_RULES) $(LIBUDEVDIR)/71-$(HOTPLUG_RULES)
+-	$(INSTALL) -d -m 755 $(LIBMODPROBEDIR)
+-	$(INSTALL) -c -m 644 $(HOTPLUG_USBLP) $(LIBMODPROBEDIR)
+ 	$(INSTALL) -d -m 755 $(UNITDIR)
+ 	$(INSTALL) -c -m 644 $(HOTPLUG_UNITS) $(UNITDIR)
+ 
+diff --git a/usblp.conf b/usblp.conf
+deleted file mode 100644
+index 5a604bf..0000000
+--- a/usblp.conf
++++ /dev/null
+@@ -1 +0,0 @@
+-blacklist usblp
+-- 
+2.15.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 3dc7ae9f95cf..6e0e0e82be17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 #Contributor: Muhammed Uluyol <uluyol0@gmail.com>
 
 pkgname=foo2zjs-nightly
-pkgver=20170412
+pkgver=20171202
 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/"
@@ -20,7 +20,7 @@ options=('!emptydirs' '!ccache')
 install='foo2zjs.install'
 
 pkgver() {
-	local date=$(curl -s 'http://foo2zjs.rkkda.com' | sed -nre 's|.*Tarball last modified: <i>(.+)</i>.*|\1|p') # '
+	local date=$(curl -s 'http://foo2zjs.rkkda.com' | sed -nre 's|.*Tarball last modified: <i>(.+)</i>.*|\1|p')
 	if ! [[ "$date" ]]; then
 		error "Could not extract package last modification date '$date', please report this to the maintainer"
 		return 1
@@ -31,19 +31,23 @@ pkgver() {
 
 # `source` is evaluated before `pkgver()`, so a lazy downloader will not re-download the existing source file even if version changes.
 # 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')
+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'
+)
 
-sha256sums=('SKIP'
-            '5bb596a33c74d80a4efbc654ee57cfa5d7fa745f46880b116247e0938a3005b0'
-            'be38f1d49290ffdd75e1b692268f0cafed97f29fc9800d2f6f0a63e93d9a8874'
-            'ab45df3afe8e25699904be6b2dc709fb4bdd0dd5e348c4f180678e27ec866177'
-            'df6c992c5efbb8f30cfbb249a7444564b27a40ad5e43b4c1975b714a56b9a90b'
-            '1961671d931a542a438377a56eae42d414f07cde25296565d0099a0d46e3ac98')
+sha256sums=('b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182'
+            '620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756'
+            '4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb'
+            '50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9'
+            '4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3'
+            'c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb'
+            '32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e')
 
 prepare() {
   cd foo2zjs