From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 5 Jan 2015 03:03:54 +0000 (-0500)
Subject: Upgrade to foo2zjs-2014.12.21
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=40ab340516699e3c1cc4de16be1896b6e32a63ae;p=hvlinux.git

Upgrade to foo2zjs-2014.12.21
---

diff --git a/config/packages-list b/config/packages-list
index ce62e8b..5f0063b 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -100,7 +100,7 @@ FLAC="flac-1.3.1"
 FLEX="flex-2.5.37"
 FONTCONFIG="fontconfig-2.11.1"
 FONTFORGE="FontForge-2014.11.26"
-FOO2ZJS="foo2zjs"
+FOO2ZJS="foo2zjs-2014.12.21"
 FOOMATIC_FILTERS="foomatic-filters-4.0.17"
 FREEGLUT="freeglut-2.8.1"
 FREETYPE="freetype-2.5.4"
diff --git a/stage5/patches/common/foo2zjs-2014.12.21-hvlinux-hp1020.patch b/stage5/patches/common/foo2zjs-2014.12.21-hvlinux-hp1020.patch
new file mode 100644
index 0000000..e5bbfae
--- /dev/null
+++ b/stage5/patches/common/foo2zjs-2014.12.21-hvlinux-hp1020.patch
@@ -0,0 +1,95 @@
+Submitted By: Hugo Villeneuve <hugo at hugovil dot com>
+Date: 2013-02-27
+Initial Package Version:
+Upstream Status: Not sent
+Origin: Hugo Villeneuve
+Description:
+  - Remove ex dependency.
+  - Added automatic unloading of usblp module after firmware download
+
+diff -Naur foo2zjs.orig/Makefile foo2zjs.new/Makefile
+--- foo2zjs.orig/Makefile	2013-02-20 19:05:38.000000000 -0500
++++ foo2zjs.new/Makefile	2013-02-27 19:30:03.000000000 -0500
+@@ -912,14 +912,6 @@
+ 	#
+ 	# Hotplug Installation Dependencies...
+ 	#
+-	@if ! type ex >/dev/null 2>&1; then \
+-	    echo "      ***"; \
+-	    echo "      *** Error: "ex" is not installed!"; \
+-	    echo "      ***"; \
+-	    echo "      *** Install "vim" package(s) for your OS"; \
+-	    echo "      ***"; \
+-	    exit 1; \
+-	fi
+ 	@if test -r $(LIBUDEVDIR)/*-printers.rules; then \
+ 	    echo "      ***"; \
+ 	    echo "      *** Error: system-config-printer-udev is installed!"; \
+@@ -959,6 +951,8 @@
+ 	    rm -f $(LIBUDEVDIR)/*-hplj10xx.rules; \
+ 	    if [ -x /sbin/udevd ]; then \
+ 		version=`/sbin/udevd --version 2>/dev/null`; \
++	    elif [ -x /lib/udev/udevd ]; then \
++		version=`/lib/udev/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 \
+diff -Naur foo2zjs.orig/hplj1000 foo2zjs.new/hplj1000
+--- foo2zjs.orig/hplj1000	2013-01-11 11:20:04.000000000 -0500
++++ foo2zjs.new/hplj1000	2013-02-27 22:59:52.000000000 -0500
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ #	hplj1000:
+ #	hplj1005:
+@@ -69,7 +69,7 @@
+     log() {
+ 	echo "$PROGNAME: foo2zjs: $@"
+     }
+-elif [ -x /usr/bin/logger ]; then
++elif [ -x /bin/logger ]; then
+     # Have logger...
+     log() {
+ 	logger -t "$PROGNAME" -- "foo2zjs: $@"
+@@ -176,14 +176,7 @@
+ 		exit
+ 	fi
+ 	chmod 664 $USERMAP
+-	ex - $USERMAP <<-EOF
+-	g/^hplj$MODEL/d
+-	\$a
+-	hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+-	.
+-	w
+-	q
+-	EOF
++	echo "hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000" >> $USERMAP
+     else
+ 	log "I don't know the USB info for this model yet.  Please run"
+ 	log "usb_printerid on the usb device and send the output to:"
+diff -Naur foo2zjs.orig/hplj10xx.rules foo2zjs.new/hplj10xx.rules
+--- foo2zjs.orig/hplj10xx.rules	2010-04-09 16:53:09.000000000 -0400
++++ foo2zjs.new/hplj10xx.rules	2013-02-27 22:36:18.000000000 -0500
+@@ -13,10 +13,21 @@
+ 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" 
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
++	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/bin/sleep 8"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
++	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/sbin/rmmod usblp"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
++	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/rc.d/init.d/cups restart"
++
+ #Own udev rule for HP Laserjet P1005
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \
diff --git a/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch b/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch
deleted file mode 100644
index e5bbfae..0000000
--- a/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Submitted By: Hugo Villeneuve <hugo at hugovil dot com>
-Date: 2013-02-27
-Initial Package Version:
-Upstream Status: Not sent
-Origin: Hugo Villeneuve
-Description:
-  - Remove ex dependency.
-  - Added automatic unloading of usblp module after firmware download
-
-diff -Naur foo2zjs.orig/Makefile foo2zjs.new/Makefile
---- foo2zjs.orig/Makefile	2013-02-20 19:05:38.000000000 -0500
-+++ foo2zjs.new/Makefile	2013-02-27 19:30:03.000000000 -0500
-@@ -912,14 +912,6 @@
- 	#
- 	# Hotplug Installation Dependencies...
- 	#
--	@if ! type ex >/dev/null 2>&1; then \
--	    echo "      ***"; \
--	    echo "      *** Error: "ex" is not installed!"; \
--	    echo "      ***"; \
--	    echo "      *** Install "vim" package(s) for your OS"; \
--	    echo "      ***"; \
--	    exit 1; \
--	fi
- 	@if test -r $(LIBUDEVDIR)/*-printers.rules; then \
- 	    echo "      ***"; \
- 	    echo "      *** Error: system-config-printer-udev is installed!"; \
-@@ -959,6 +951,8 @@
- 	    rm -f $(LIBUDEVDIR)/*-hplj10xx.rules; \
- 	    if [ -x /sbin/udevd ]; then \
- 		version=`/sbin/udevd --version 2>/dev/null`; \
-+	    elif [ -x /lib/udev/udevd ]; then \
-+		version=`/lib/udev/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 \
-diff -Naur foo2zjs.orig/hplj1000 foo2zjs.new/hplj1000
---- foo2zjs.orig/hplj1000	2013-01-11 11:20:04.000000000 -0500
-+++ foo2zjs.new/hplj1000	2013-02-27 22:59:52.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- #	hplj1000:
- #	hplj1005:
-@@ -69,7 +69,7 @@
-     log() {
- 	echo "$PROGNAME: foo2zjs: $@"
-     }
--elif [ -x /usr/bin/logger ]; then
-+elif [ -x /bin/logger ]; then
-     # Have logger...
-     log() {
- 	logger -t "$PROGNAME" -- "foo2zjs: $@"
-@@ -176,14 +176,7 @@
- 		exit
- 	fi
- 	chmod 664 $USERMAP
--	ex - $USERMAP <<-EOF
--	g/^hplj$MODEL/d
--	\$a
--	hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
--	.
--	w
--	q
--	EOF
-+	echo "hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000" >> $USERMAP
-     else
- 	log "I don't know the USB info for this model yet.  Please run"
- 	log "usb_printerid on the usb device and send the output to:"
-diff -Naur foo2zjs.orig/hplj10xx.rules foo2zjs.new/hplj10xx.rules
---- foo2zjs.orig/hplj10xx.rules	2010-04-09 16:53:09.000000000 -0400
-+++ foo2zjs.new/hplj10xx.rules	2013-02-27 22:36:18.000000000 -0500
-@@ -13,10 +13,21 @@
- 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" 
-+KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
-+	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/bin/sleep 8"
-+KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
-+	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/sbin/rmmod usblp"
-+KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
-+	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/rc.d/init.d/cups restart"
-+
- #Own udev rule for HP Laserjet P1005
- KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
- 	ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \