[gentoo-commits] gentoo-x86 commit in net-print/foo2zjs/files: foo2zjs-udevfwld-20071105.diff digest-foo2zjs-20071103 foo2zjs-Makefile-20071105.diff foo2zjs-udevfwld-20070424.diff digest-foo2zjs-20071012 foo2zjs-Makefile-20070424.diff digest-foo2zjs-20070424

[Stefan Schweizer (genstef)]

genstef     07/11/05 11:08:34

  Added:                foo2zjs-udevfwld-20071105.diff
                        digest-foo2zjs-20071103
                        foo2zjs-Makefile-20071105.diff
  Removed:              foo2zjs-udevfwld-20070424.diff
                        digest-foo2zjs-20071012
                        foo2zjs-Makefile-20070424.diff
                        digest-foo2zjs-20070424
  Log:
  version bump also solving bug 198122, changed uris
  (Portage version: 2.1.3.18)

Revision  Changes    Path
1.1                  net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff?rev=1.1&content-type=text/plain

Index: foo2zjs-udevfwld-20071105.diff
===================================================================
diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
--- foo2zjs.orig/Makefile	2007-11-05 11:12:09.000000000 +0100
+++ foo2zjs/Makefile	2007-11-05 11:13:51.000000000 +0100
@@ -10,6 +10,10 @@
 PREFIX=/usr/local
 PREFIX=$(DESTDIR)/usr
 
+# USB_PRINTERID is also installed there because it is needed by the FWloader
+FWLOADERDIR=$(DESTDIR)/sbin
+FIRMWAREDIR=$(DESTDIR)/lib/firmware
+
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
 SHAREZJS=$(PREFIX)/share/foo2zjs
@@ -588,12 +592,12 @@
 	    fi; \
 	done
 	# foo2zjs Firmware files (if any)
-	install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
+	install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
 	for i in sihp*.img; do \
 	    if [ -f $$i ]; then \
 		base=`basename $$i .img`; \
 		./arm2hpdl $$i >$$base.dl; \
-		install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
+		install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
 	    fi; \
 	done
 	# foo2oak ICM files (if any)
@@ -687,6 +691,8 @@
 UDEVDIR=$(DESTDIR)/etc/udev/rules.d
 RULES=hplj10xx.rules
 install-udev:
+	[ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
+	install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
 	[ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
 	install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
 
diff -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
--- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
+++ foo2zjs/foo2zjs-loadfw	2007-11-05 11:13:51.000000000 +0100
@@ -0,0 +1,127 @@
+#!/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
+#
+FWDIR=/lib/firmware
+
+#
+# Program used to determine USB id information
+#
+USBID=/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
+1000)
+    MODEL=1000
+    MODELNAME="hp LaserJet $MODEL"
+    ;;
+1005)
+    MODEL=1005
+    MODELNAME="hp LaserJet $MODEL"
+    ;;
+1018)
+    MODEL=1018
+    MODELNAME="HP LaserJet $MODEL"
+    ;;
+1020)
+    MODEL=1020
+    MODELNAME="HP LaserJet $MODEL"
+    ;;
+*)
+    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$MODEL.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 -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
--- foo2zjs.orig/hplj1000	2007-11-05 11:12:09.000000000 +0100
+++ foo2zjs/hplj1000	2007-11-05 11:13:51.000000000 +0100
@@ -35,7 +35,7 @@
 #
 # Directory to find downloadable HP firmware files sihpMMMM.dl
 #
-FWDIR=/usr/share/foo2zjs/firmware
+FWDIR=/lib/firmware
 
 #
 # Program used to determine USB id information
diff -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
--- foo2zjs.orig/hplj10xx.rules	2007-11-05 11:12:09.000000000 +0100
+++ foo2zjs/hplj10xx.rules	2007-11-05 11:13:57.000000000 +0100
@@ -1,16 +1,8 @@
-#Own udev rule for HP Laserjet 1000
-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" 
-#Own udev rule for HP Laserjet 1005
-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" 
-#Own udev rule for HP Laserjet 1018
-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" 
-#Own udev rule for HP Laserjet 1020
-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" 
+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
+	ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
+	ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
+	ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
+	ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"



1.1                  net-print/foo2zjs/files/digest-foo2zjs-20071103

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/digest-foo2zjs-20071103?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/digest-foo2zjs-20071103?rev=1.1&content-type=text/plain

Index: digest-foo2zjs-20071103
===================================================================
MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
MD5 2e9c6854c7cc1f7467ebdf37536134e9 foo2zjs-20071103.tar.gz 1517521
RMD160 3dc2cddfea0494b60ebeb3d24957ce303c931b7b foo2zjs-20071103.tar.gz 1517521
SHA256 c747a25021c519c77e7a2410857a7d4e09ae6482ca36718e22b8e7a61d46d817 foo2zjs-20071103.tar.gz 1517521
MD5 01edbad2a3343cb12a45a8d295cf8ae7 hpclj2600n.tar.gz 573660
RMD160 f646d2cad075231fd1be985911975dcb47fb68ea hpclj2600n.tar.gz 573660
SHA256 6d2c37fd73c1a247895c58e119927de7ca636df800bec576513f04b325e1667b hpclj2600n.tar.gz 573660
MD5 49898af795806e5d55283657f2bfa2fe km2430.tar.gz 929112
RMD160 44990f1bb63eec6cbb7fb4f5f1615d5705d8740a km2430.tar.gz 929112
SHA256 bb0151661a37b12496cfe3495dbf473a57a24b496f2b4d0e9221c297059b1ce5 km2430.tar.gz 929112
MD5 3e49d51aa1ec1f93c84509c3ac4973d4 km2530.tar.gz 2045958
RMD160 708ed0ef48b864823b9c91e0ec975e8bbcb80794 km2530.tar.gz 2045958
SHA256 8f6d3786061c99ba014376ef8fc81e7954bddb1bdcc105b33488df92787cd2a4 km2530.tar.gz 2045958
MD5 4c2091333d8154b0d48fe1c3d371ca10 lexc500.tar.gz 239577
RMD160 4eb7b79cd706024e302c9226b6e8b946b687837c lexc500.tar.gz 239577
SHA256 7a8ed9b0c7c6f0a505ee75daf7239dd61e84ab6f6edc032a463104ffecfdfb5c lexc500.tar.gz 239577
MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
MD5 f9eedd5bcb2e86bd3441cf6fe271d878 samclp300.tar.gz 427584
RMD160 d82e0ee3c2b7989ef8524a35cc03129cdd9a8a1a samclp300.tar.gz 427584
SHA256 515de8c844ed7310b79f6ec2b5424cda2ba09b3584c9975b2957bc95d4d3520e samclp300.tar.gz 427584
MD5 3ed374be45e0ecf516524d1776fe8431 sihp1000.tar.gz 50416
RMD160 971a6342986b23e464b6ae7649c0fd6b0c12729f sihp1000.tar.gz 50416
SHA256 72d10197a005a595ef2e963f15e0fb34d850f7f064d1da9cc9ae30bcec8fb233 sihp1000.tar.gz 50416
MD5 538a7b90baf9673001ffe35b1e8bafda sihp1005.tar.gz 52297
RMD160 96cb431d55b69245fcb9ece3e1f6757eac46c7e5 sihp1005.tar.gz 52297
SHA256 7947ba980f223e216566ec5af25e302ae279251bdf3f6e34df5775ab4c76e8aa sihp1005.tar.gz 52297
MD5 c555091cf6f02d404a8ad3a15497291b sihp1018.tar.gz 70544
RMD160 0a814be797047129ae0d67cd316c8cdb5007a7dc sihp1018.tar.gz 70544
SHA256 c772930cae4fc5c0b2a796d709e2df37aac6b3d03202372161ee3feae8d84d81 sihp1018.tar.gz 70544
MD5 974b1b9ec7d083873706c10bc5cdea86 sihp1020.tar.gz 70139
RMD160 7dc8c68ecaf736b5a3029eeb8891485b5d7d3654 sihp1020.tar.gz 70139
SHA256 7982f476d72247a7e3f0bcd1939e0b4e80a1e2ed45a970477bdf19c9063ee856 sihp1020.tar.gz 70139



1.1                  net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff?rev=1.1&content-type=text/plain

Index: foo2zjs-Makefile-20071105.diff
===================================================================
diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
--- foo2zjs.orig/Makefile	2007-11-05 11:08:51.000000000 +0100
+++ foo2zjs/Makefile	2007-11-05 11:10:49.000000000 +0100
@@ -8,7 +8,7 @@
 
 # Installation prefix...
 PREFIX=/usr/local
-PREFIX=/usr
+PREFIX=$(DESTDIR)/usr
 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
@@ -23,7 +23,7 @@
 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
 
 # Pathnames for referenced packages...
-FOODB=/usr/share/foomatic/db/source
+FOODB=$(PREFIX)/share/foomatic/db/source
 
 # User ID's
 LPuid=-olp
@@ -210,7 +210,7 @@
 endif
 
 # Compiler flags
-CFLAGS +=	-O2 -Wall
+CFLAGS ?=	-O2 -Wall
 #CFLAGS +=	-g
 
 #
@@ -478,12 +478,14 @@
     
 
 install-prog:
+	[ -d $(BIN) ] || install -d -m 755 $(BIN)/
+	[ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/
 	#
 	# Install driver, wrapper, and development tools
 	#
 	install -c $(PROGS) $(SHELLS) $(BIN)/
 	if [ "$(BINPROGS)" != "" ]; then \
-	    install -c $(BINPROGS) /bin/; \
+	    install -c $(BINPROGS) $(DESTDIR)/bin/; \
 	fi
 	#
 	# Install gamma correction files.  These are just templates,
@@ -511,6 +513,7 @@
 	#
 	@if [ -d $(FOODB) ]; then \
 	    for dir in driver printer opt; do \
+		[ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
 		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
 	    done \
@@ -528,10 +531,10 @@
 	#
 	# Clear foomatic cache and rebuild database if needed
 	#
-	rm -rf /var/cache/foomatic/*/*
-	rm -f /var/cache/foomatic/printconf.pickle
-	if [ -d /var/cache/foomatic/compiled ]; then \
-	    cd /var/cache/foomatic/compiled; \
+	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
+	rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle
+	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
+	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
 	    foomatic-combo-xml -O >overview.xml; \
 	fi
 
@@ -629,20 +632,14 @@
 	    fi; \
 	done
 
-MODEL=/usr/share/cups/model
+MODEL=$(PREFIX)/share/cups/model
 LOCALMODEL=/usr/local/share/cups/model
-PPD=/usr/share/ppd
+PPD=$(PREFIX)/share/ppd
 install-ppd:
 	#
 	# Install PPD files for CUPS
 	#
 	if [ -d $(PPD) ]; then \
-	    find $(PPD) -name '*foo2zjs*' | xargs rm -f; \
-	    find $(PPD) -name '*foo2hp*' | xargs rm -f; \
-	    find $(PPD) -name '*foo2xqx*' | xargs rm -f; \
-	    find $(PPD) -name '*foo2lava*' | xargs rm -f; \
-	    find $(PPD) -name '*foo2qpdl*' | xargs rm -f; \
-	    find $(PPD) -name '*foo2slx*' | xargs rm -f; \
             [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
 	    cd PPD; \
 	    for ppd in *.ppd; do \
@@ -661,10 +658,8 @@
 	    done; \
 	fi
 
-USBDIR=/etc/hotplug/usb
-UDEVDIR=/etc/udev/rules.d
-RULES=hplj10xx.rules
-install-hotplug: install-hotplug-test install-hotplug-prog
+USBDIR=$(DESTDIR)/etc/hotplug/usb
+install-hotplug: install-hotplug-test install-udev
 
 install-hotplug-test:
 	#
@@ -682,18 +677,18 @@
 	#
 
 install-hotplug-prog:
-	if [ -d $(UDEVDIR) ]; then \
-	    install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
-	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
-	$(USBDIR)/hplj1000 install-usermap
-	$(USBDIR)/hplj1005 install-usermap
-	$(USBDIR)/hplj1018 install-usermap
-	$(USBDIR)/hplj1020 install-usermap
+	install -c -m 644 hplj.usermap $(USBDIR)/
+  
+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
+RULES=hplj10xx.rules
+install-udev:
+	[ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
+	install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
 
 cups:	FRC
 	if [ -x /etc/init.d/cups ]; then \
@@ -1033,7 +1028,6 @@
 	install -c -m 644 README $(DOCDIR)
 	install -c -m 644 ChangeLog $(DOCDIR)
 
-GROFF=/usr/local/test/bin/groff
 GROFF=groff
 manual.pdf: $(MANPAGES)
 	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
--- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
+++ foo2zjs/hplj.usermap	2007-11-05 11:09:10.000000000 +0100
@@ -0,0 +1,4 @@
+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
--- foo2zjs.orig/icc2ps/Makefile	2007-11-05 11:08:51.000000000 +0100
+++ foo2zjs/icc2ps/Makefile	2007-11-05 11:09:10.000000000 +0100
@@ -1,10 +1,10 @@
-PREFIX=	/usr
+PREFIX=	$(DESTDIR)/usr
 BIN=	$(PREFIX)/bin
 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
-CFLAGS=	-O3
+CFLAGS?=	-O3
 
 all: foo2zjs-icc2ps
 



-- 
gentoo-commits@g.o mailing list