summaryrefslogtreecommitdiff
path: root/net-print/foo2zjs/files
authorMichael Krelin <hacker@klever.net>2007-04-20 23:44:38 (UTC)
committer Michael Krelin <hacker@klever.net>2007-04-22 23:41:45 (UTC)
commit2a2f6308d8575dc0154719b0824076f796c40190 (patch) (unidiff)
treec9945eb6f2572a76aa7705241c6ae9715ab2fd32 /net-print/foo2zjs/files
parent6c4a919cb263461d070662d1b54474093aae4616 (diff)
downloadmisc-2a2f6308d8575dc0154719b0824076f796c40190.zip
misc-2a2f6308d8575dc0154719b0824076f796c40190.tar.gz
misc-2a2f6308d8575dc0154719b0824076f796c40190.tar.bz2
netprint/foo2zjs: rest of the commit
Diffstat (limited to 'net-print/foo2zjs/files') (more/less context) (ignore whitespace changes)
-rw-r--r--net-print/foo2zjs/files/digest-foo2zjs-2007020430
-rw-r--r--net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff161
-rw-r--r--net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff191
3 files changed, 0 insertions, 382 deletions
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20070204 b/net-print/foo2zjs/files/digest-foo2zjs-20070204
deleted file mode 100644
index 0672f8a..0000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20070204
+++ b/dev/null
@@ -1,30 +0,0 @@
1MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
2RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
3SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
4MD5 29530f6815fe3268e00ebe2a3523de43 foo2zjs-20070204.tar.gz 936419
5RMD160 4e6160fed4e642106ff62bff64e5a4cf637d9f0b foo2zjs-20070204.tar.gz 936419
6SHA256 9dc978b208ee7762b6b16ff445103722f45c341457014fa9b3bad7dd2a0bd5d3 foo2zjs-20070204.tar.gz 936419
7MD5 72179915334290762193db0be09fceff hpclj2600n.tar.gz 573660
8RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d hpclj2600n.tar.gz 573660
9SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a hpclj2600n.tar.gz 573660
10MD5 f15687042e468cabed2e277bf313bbc8 km2430.tar.gz 929112
11RMD160 ddd2d5375611a41d62e436ed6f3b3d62356b90a5 km2430.tar.gz 929112
12SHA256 59b559d5f885e0e8870148795674366b527782a062c6cac1dc2048c2759a356b km2430.tar.gz 929112
13MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
14RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
15SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
16MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
17RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
18SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
19MD5 5d47d54f9cc19225c6ad07763bd02801 sihp1000.tar.gz 50423
20RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 sihp1000.tar.gz 50423
21SHA256 7bdb5387419a880e32c9280b8d3878b08eb8fbd614237f164a9ae1e81bc2cff6 sihp1000.tar.gz 50423
22MD5 10937cc743b03ea9776a9f6eb35159a0 sihp1005.tar.gz 52301
23RMD160 5ebc04fadafb2033cba9665840897c48eb0d0f70 sihp1005.tar.gz 52301
24SHA256 55820298cc441893b19d28ff82ff1c8438fb53bad24c2db40b06f24c356cb320 sihp1005.tar.gz 52301
25MD5 89bc9a1199abc2bd304694f0273a248a sihp1018.tar.gz 70547
26RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea sihp1018.tar.gz 70547
27SHA256 d95f26f302e4a6580aa83fd13b99911fe8ad7a1de88fd1545c1f2e384b1d2af7 sihp1018.tar.gz 70547
28MD5 290c2a03d665ceb4dfbbd60b471ebb3d sihp1020.tar.gz 68877
29RMD160 39e998123ad074231c6333ff70ccabbe513ea90f sihp1020.tar.gz 68877
30SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704 sihp1020.tar.gz 68877
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
deleted file mode 100644
index 0770d1c..0000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
+++ b/dev/null
@@ -1,161 +0,0 @@
1diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
2 --- foo2zjs.orig/Makefile2007-02-19 23:27:10.000000000 +0100
3 +++ foo2zjs/Makefile2007-02-19 23:26:56.000000000 +0100
4@@ -7,7 +7,7 @@
5
6 # Installation prefix...
7 PREFIX=/usr/local
8-PREFIX=/usr
9+PREFIX=$(DESTDIR)/usr
10
11 # Pathnames for this package...
12 BIN=$(PREFIX)/bin
13@@ -20,7 +20,7 @@
14 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
15
16 # Pathnames for referenced packages...
17-FOODB=/usr/share/foomatic/db/source
18+FOODB=$(PREFIX)/share/foomatic/db/source
19
20 # User ID's
21 LPuid=-olp
22@@ -180,7 +180,7 @@
23 endif
24
25 # Compiler flags
26 -CFLAGS +=-O2 -Wall
27+CFLAGS ?= -O2 -Wall
28
29 #
30 # Rules to create test documents
31@@ -368,12 +368,14 @@
32
33
34 install-prog:
35 +[ -d $(BIN) ] || install -d -m 755 $(BIN)/
36 +[ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/
37 #
38 # Install driver, wrapper, and development tools
39 #
40 install -c $(PROGS) $(SHELLS) $(BIN)/
41 if [ "$(BINPROGS)" != "" ]; then \
42 - install -c $(BINPROGS) /bin/; \
43 + install -c $(BINPROGS) $(DESTDIR)/bin/; \
44 fi
45 #
46 # Install gamma correction files. These are just templates,
47@@ -401,6 +403,7 @@
48 #
49 @if [ -d $(FOODB) ]; then \
50 for dir in driver printer opt; do \
51 + [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
52 echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
53 install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
54 done \
55@@ -418,10 +421,10 @@
56 #
57 # Clear foomatic cache and rebuild database if needed
58 #
59 -rm -rf /var/cache/foomatic/*/*
60 -rm -f /var/cache/foomatic/printconf.pickle
61 -if [ -d /var/cache/foomatic/compiled ]; then \
62 - cd /var/cache/foomatic/compiled; \
63 +rm -rf $(DESTDIR)/var/cache/foomatic/*/*
64 +rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle
65 +if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
66 + cd $(DESTDIR)/var/cache/foomatic/compiled; \
67 foomatic-combo-xml -O >overview.xml; \
68 fi
69
70@@ -492,18 +495,12 @@
71 fi; \
72 done
73
74-MODEL=/usr/share/cups/model
75-LOCALMODEL=/usr/local/share/cups/model
76+MODEL=$(PREFIX)/share/cups/model
77+#LOCALMODEL=/usr/local/share/cups/model
78 install-ppd:
79 #
80 # Install PPD files for CUPS
81 #
82 -if [ -d /usr/share/ppd/ ]; then \
83 - find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \
84 - find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \
85 - find /usr/share/ppd/ -name '*foo2xqx*' | xargs rm -f; \
86 - find /usr/share/ppd/ -name '*foo2lava*' | xargs rm -f; \
87 -fi
88 if [ -d $(MODEL) ]; then \
89 cd PPD; \
90 for ppd in *.ppd; do \
91@@ -516,10 +513,8 @@
92 done; \
93 fi
94
95-USBDIR=/etc/hotplug/usb
96-UDEVDIR=/etc/udev/rules.d
97-RULES=hplj10xx.rules
98-install-hotplug: install-hotplug-test install-hotplug-prog
99+USBDIR=$(DESTDIR)/etc/hotplug/usb
100+install-hotplug: install-hotplug-test install-udev
101
102 install-hotplug-test:
103 #
104@@ -537,18 +532,18 @@
105 #
106
107 install-hotplug-prog:
108 -if [ -d $(UDEVDIR) ]; then \
109 - install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
110 -fi
111 [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/
112 install -c -m 755 hplj1000 $(USBDIR)/
113 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
114 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
115 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
116 -$(USBDIR)/hplj1000 install-usermap
117 -$(USBDIR)/hplj1005 install-usermap
118 -$(USBDIR)/hplj1018 install-usermap
119 -$(USBDIR)/hplj1020 install-usermap
120 +install -c -m 644 hplj.usermap $(USBDIR)/
121+
122+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
123+RULES=hplj10xx.rules
124+install-udev:
125 +[ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
126 +install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
127
128 cups:FRC
129 if [ -x /etc/init.d/cups ]; then \
130@@ -862,7 +857,6 @@
131 install -c -m 644 README $(DOCDIR)
132 install -c -m 644 ChangeLog $(DOCDIR)
133
134-GROFF=/usr/local/test/bin/groff
135 GROFF=groff
136 manual.pdf: $(MANPAGES)
137 -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
138diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
139 --- foo2zjs.orig/hplj.usermap1970-01-01 01:00:00.000000000 +0100
140 +++ foo2zjs/hplj.usermap2007-02-19 23:26:08.000000000 +0100
141@@ -0,0 +1,4 @@
142+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
143+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
144+hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
145+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
146diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
147 --- foo2zjs.orig/icc2ps/Makefile2007-02-19 23:27:10.000000000 +0100
148 +++ foo2zjs/icc2ps/Makefile2007-02-19 23:26:08.000000000 +0100
149@@ -1,10 +1,10 @@
150 -PREFIX=/usr
151 +PREFIX=$(DESTDIR)/usr
152 BIN=$(PREFIX)/bin
153 SRC=icc2ps.c xgetopt.c
154 LIB=cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
155 cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
156 cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
157 -CFLAGS=-O3
158 +CFLAGS?=-O3
159
160 all: foo2zjs-icc2ps
161
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff
deleted file mode 100644
index 5935d5e..0000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff
+++ b/dev/null
@@ -1,191 +0,0 @@
1diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
2 --- foo2zjs.orig/Makefile2007-02-11 11:08:50.000000000 +0100
3 +++ foo2zjs/Makefile2007-02-11 11:12:11.000000000 +0100
4@@ -9,6 +9,10 @@
5 PREFIX=/usr/local
6 PREFIX=$(DESTDIR)/usr
7
8+# USB_PRINTERID is also installed there because it is needed by the FWloader
9+FWLOADERDIR=$(DESTDIR)/sbin
10+FIRMWAREDIR=$(DESTDIR)/lib/firmware
11+
12 # Pathnames for this package...
13 BIN=$(PREFIX)/bin
14 SHAREZJS=$(PREFIX)/share/foo2zjs
15@@ -470,12 +474,12 @@
16 fi; \
17 done
18 # foo2zjs Firmware files (if any)
19 -install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
20 +install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
21 for i in sihp*.img; do \
22 if [ -f $$i ]; then \
23 base=`basename $$i .img`; \
24 ./arm2hpdl $$i >$$base.dl; \
25 - install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
26 + install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
27 fi; \
28 done
29 # foo2oak ICM files (if any)
30@@ -548,6 +552,8 @@
31 UDEVDIR=$(DESTDIR)/etc/udev/rules.d
32 RULES=hplj10xx.rules
33 install-udev:
34 +[ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
35 +install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
36 [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
37 install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
38
39diff -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
40 --- foo2zjs.orig/foo2zjs-loadfw1970-01-01 01:00:00.000000000 +0100
41 +++ foo2zjs/foo2zjs-loadfw2007-02-11 11:12:11.000000000 +0100
42@@ -0,0 +1,121 @@
43+#!/bin/sh
44+
45 +#foo2zjs-loadfw:
46+#
47 +#Hotplug script for HP1000/1005/1020 USB laser printers. The model number
48 +#that this script deals with is determined from the udev env.
49+#
50 +#Used to download firmware automatically into the printer when it
51 +#is powered up or plugged into the USB port.
52+#
53 +#The inspiration fo this script is from:
54 +# Oscar Santacreu. Alicante-Spain (2002)
55 +# Mike Morgan (2004)
56 +#Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
57+
58+#
59+# Directory to find downloadable HP firmware files sihpMMMM.dl
60+#
61+FWDIR=/lib/firmware
62+
63+#
64+# Program used to determine USB id information
65+#
66+USBID=/bin/usb_printerid
67+
68+#
69 +#Figure out how to log our messages
70+#
71+if [ -t 1 ]; then
72+ # Running from a tty...
73+ log() {
74 +echo "$0: $@"
75+ }
76+elif [ -x /usr/bin/logger ]; then
77+ # Have logger...
78+ log() {
79 +logger -t "$0" -- "$@"
80+ }
81+else
82+ # No logger...
83+ log() {
84 +echo "$0: $@" >> /var/log/messages
85+ }
86+fi
87+
88+#
89 +#Figure out the model number from the name of this script
90+#
91+case "$1" in
92+1000)
93+ MODEL=1000
94+ MODELNAME="hp LaserJet $MODEL"
95+ ;;
96+1005)
97+ MODEL=1005
98+ MODELNAME="hp LaserJet $MODEL"
99+ ;;
100+1018)
101+ MODEL=1018
102+ MODELNAME="HP LaserJet $MODEL"
103+ ;;
104+1020)
105+ MODEL=1020
106+ MODELNAME="HP LaserJet $MODEL"
107+ ;;
108+*)
109+ log "Only HP LaserJet 1000, 1005, 1018 and 1020 are supported"
110+ log "You need to supply one of these on the cmdline: $0 10**"
111+ exit
112+ ;;
113+esac
114+
115+if [ -z "$DEVNAME" ]; then
116+ if [ -n "$2" ]; then
117+ DEVNAME=$2
118+ else
119+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:"
120+ log "$0 10** /dev/usb/lp0"
121+ exit 1
122+ fi
123+fi
124+
125+#
126 +#Procedure to load a single device with firmware
127+#
128+load1() {
129+ fw="$FWDIR/sihp$MODEL.dl"
130+ if [ ! -f "$fw" ]; then
131 +log "Missing HP LaserJet $MODEL firmware file $fw"
132 +log "...read foo2zjs installation instructions and run ./getweb $MODEL"
133 +return 1
134+ fi
135+
136+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..."
137+ if cat $fw > $DEVNAME; then
138 +log "... download successful."
139+ else
140 +log "... download failed."
141+ fi
142+ return 0
143+}
144+
145+#
146 +#OK, now download firmware to any printers that need it
147+#
148+if [ -x $USBID ]; then
149 +if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then
150 + # This is a LaserJet 100x
151 + if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then
152 + log "HP LaserJet $MODEL firmware already loaded into $DEVNAME"
153 + else
154 + # Firmware is not yet loaded
155 + load1 "$DEVNAME"
156 + fi
157 +else
158 + log "No supported printer found."
159 +fi
160+else
161+ log "HP LaserJet $MODEL firmware was not downloaded..."
162+ log "...couldn't find $USBID"
163+fi
164diff -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
165 --- foo2zjs.orig/hplj10002007-02-11 11:02:46.000000000 +0100
166 +++ foo2zjs/hplj10002007-02-11 11:12:11.000000000 +0100
167@@ -35,7 +35,7 @@
168 #
169 # Directory to find downloadable HP firmware files sihpMMMM.dl
170 #
171-FWDIR=/usr/share/foo2zjs/firmware
172+FWDIR=/lib/firmware
173
174 #
175 # Program used to determine USB id information
176diff -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
177 --- foo2zjs.orig/hplj10xx.rules2007-02-11 11:02:46.000000000 +0100
178 +++ foo2zjs/hplj10xx.rules2007-02-11 11:12:11.000000000 +0100
179@@ -1,8 +1,8 @@
180 #Own udev rule for HP Laserjet 1000
181-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
182+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1000"
183 #Own udev rule for HP Laserjet 1005
184-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
185+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1005"
186 #Own udev rule for HP Laserjet 1018
187-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018"
188+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4117", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1018"
189 #Own udev rule for HP Laserjet 1020
190-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020"
191+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1020"