diff options
author | Ivan Lyapunov | 2015-10-10 19:51:16 +0300 |
---|---|---|
committer | Ivan Lyapunov | 2015-10-10 19:51:16 +0300 |
commit | 2450ebb6d30385543afb7c83a6792c666758c105 (patch) | |
tree | 363f8f3f5e8900c47360684b0b14061fbc33ff44 | |
download | aur-2450ebb6d30385543afb7c83a6792c666758c105.tar.gz |
- initial commit
-rw-r--r-- | .SRCINFO | 37 | ||||
-rw-r--r-- | PKGBUILD | 55 | ||||
-rw-r--r-- | destdir-support-20140329-1.patch | 102 | ||||
-rw-r--r-- | firmware-loader-20130602-1.patch | 278 | ||||
-rw-r--r-- | foo2zjs.install | 44 | ||||
-rw-r--r-- | gen-fixes-20140329-1.patch | 66 | ||||
-rw-r--r-- | udev-firmware-loading-ruleset-20130601-1.patch | 166 |
7 files changed, 748 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..13b3e269a885 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,37 @@ +# Generated by makepkg 4.2.1 +# Sat Oct 10 16:50:48 UTC 2015 +pkgbase = foo2zjs + pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers. + pkgver = 20150704 + pkgrel = 1 + url = http://foo2zjs.rkkda.com/ + install = foo2zjs.install + arch = i686 + arch = x86_64 + license = GPL + license = custom + makedepends = unzip + makedepends = bc + makedepends = wget + depends = psutils + depends = cups + depends = foomatic-db-engine + depends = foomatic-db-foo2zjs + optdepends = tix: required by hplj10xx_gui.tcl + provides = foo2zjs + conflicts = foo2zjs-testing + options = !emptydirs + options = !ccache + source = foo2zjs-20150704.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 + sha256sums = 6ba509fd20e70ec511f48e7627ffa1bb14d8cbe390a71923e00c10e649000e8b + sha256sums = 6dbbbc0632833f2ef142f90d176a45bbdbb6f38fc674f9582c5a2fde0480bcd5 + sha256sums = 2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05 + sha256sums = 5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1 + sha256sums = 32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d + +pkgname = foo2zjs + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..465c0742a281 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,55 @@ +#Maintainer: Nicola Bignami <nicola@kernel-panic.no-ip.net> +#Contributor: Muhammed Uluyol <uluyol0@gmail.com> + +pkgname=foo2zjs +pkgver=20150704 +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') +depends=('psutils' 'cups' 'foomatic-db-engine' 'foomatic-db-foo2zjs') +conflicts=('foo2zjs-testing') +provides=('foo2zjs') +makedepends=('unzip' 'bc' 'wget') +optdepends=('tix: required by hplj10xx_gui.tcl') +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') + +sha256sums=('6ba509fd20e70ec511f48e7627ffa1bb14d8cbe390a71923e00c10e649000e8b' + '6dbbbc0632833f2ef142f90d176a45bbdbb6f38fc674f9582c5a2fde0480bcd5' + '2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05' + '5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1' + '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d') + +build() { + cd "${srcdir}/${pkgname}" + patch -p1 -i ${srcdir}/${source[1]} + patch -p1 -i ${srcdir}/${source[2]} + patch -p1 -i ${srcdir}/${source[3]} + patch -p1 -i ${srcdir}/${source[4]} + make +} + +package() { + cd "${srcdir}/${pkgname}" + for model in $(grep 'getone ' getweb.in | \ + cut -d'#' -f1 | awk '{ print $2; }'); do + if [[ $model != '$i' ]]; then + ./getweb $model || true + fi + done + + install -d ${pkgdir}/usr/share/{applications,pixmaps,cups/model} + install -d ${pkgdir}/usr/share/foomatic/db/source/{driver,opt,printer} + + make DESTDIR=${pkgdir} install install-hotplug-prog + + install -m755 getweb ${pkgdir}/usr/bin + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/destdir-support-20140329-1.patch b/destdir-support-20140329-1.patch new file mode 100644 index 000000000000..408dd9ff594f --- /dev/null +++ b/destdir-support-20140329-1.patch @@ -0,0 +1,102 @@ +Maintainer: Nicola Bignami <nicola@kernel-panic.dnsdojo.net> +Contributor: Muhammed Uluyol <uluyol0@gmail.com> +Subject: [PATCH] Destdir support + +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,6 @@ VERSION=0.0 + + # Installation prefix... + PREFIX=/usr/local +-PREFIX=/usr + PREFIX=$(DESTDIR)/usr + + # Pathnames for this package... +@@ -38,7 +37,7 @@ INSTALL=install + ROOT=root + + # Pathnames for referenced packages... +-FOODB=$(DESTDIR)/usr/share/foomatic/db/source ++FOODB=$(PREFIX)/share/foomatic/db/source + + # User ID's + LPuid=-oroot +@@ -249,7 +250,7 @@ # CUPS vars + CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null) +-CUPS_DEVEL := $(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null) ++CUPS_DEVEL := $(DESTDIR)$(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null) +-CUPS_GOODAPI := $(shell cups-config --api-version 2>/dev/null | sed "s/1\.[0123].*//") ++CUPS_GOODAPI := $(DESTDIR)$(shell cups-config --api-version | sed "s/1\.[0123].*//" 2>/dev/null) + + # hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm + # sihp1000.img sihp1005.img sihp1020.img sihp1018.img + # sihpP1005.img sihpP1006.img sihpP1505.img +@@ -654,6 +657,8 @@ install-test: + UDEVBIN=$(DESTDIR)/bin/ + + install-prog: ++ [ -d $(BIN) ] || $(INSTALL) -d -m 755 $(BIN)/ ++ [ -d $(DESTDIR)/usr/bin/ ] || $(INSTALL) -d -m 755 $(DESTDIR)/usr/bin/ + # + # Install driver, wrapper, and development tools + # +@@ -661,7 +658,7 @@ install-prog: + $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ + if [ "$(BINPROGS)" != "" ]; then \ + $(INSTALL) -d $(UDEVBIN); \ +- $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \ ++ $(INSTALL) -c $(BINPROGS) $(DESTDIR)/usr/bin/; \ + fi + # + # Install gamma correction files. These are just templates, +@@ -715,10 +722,10 @@ install-foo: + # + # 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 + +@@ -847,10 +854,10 @@ install-extra: + fi; \ + done + +-MODEL=$(DESTDIR)/usr/share/cups/model ++MODEL=$(PREFIX)/share/cups/model +-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model ++LOCALMODEL=$(PREFIX)/usr/local/share/cups/model + MACMODEL=/Library/Printers/PPDs/Contents/Resources +-PPD=$(DESTDIR)/usr/share/ppd ++PPD=$(PREFIX)/share/ppd + VARPPD=/var/lp/ppd + install-ppd: + # +@@ -908,9 +908,9 @@ install-ppd: + done; \ + fi + +-APPL=$(DESTDIR)/usr/share/applications +-OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System +-PIXMAPS=$(DESTDIR)/usr/share/pixmaps ++APPL=$(PREFIX)/share/applications ++OLDAPPL=$(PREFIX)/share/gnome/apps/System ++PIXMAPS=$(PREFIX)/share/pixmaps + + install-desktop: + # +@@ -934,7 +934,7 @@ install-gui: + $(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS) + + +-USBDIR=/etc/hotplug/usb ++USBDIR=$(DESTDIR)/etc/hotplug/usb + UDEVDIR=/etc/udev/rules.d + LIBUDEVDIR=/lib/udev/rules.d + RULES=hplj10xx.rules diff --git a/firmware-loader-20130602-1.patch b/firmware-loader-20130602-1.patch new file mode 100644 index 000000000000..7e1fc71a4605 --- /dev/null +++ b/firmware-loader-20130602-1.patch @@ -0,0 +1,278 @@ +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/foo2zjs.install b/foo2zjs.install new file mode 100644 index 000000000000..5bf78f166547 --- /dev/null +++ b/foo2zjs.install @@ -0,0 +1,44 @@ +post_install() { + echo + echo + echo "-----------------------------------------------------------" + echo "- -" + echo "- Please restart CUPS!!! -" + echo "- -" + echo "- You need to add your user to the lp group. -" + echo "- -" + echo "- -" + echo "- Please refer to the table at http://foo2zjs.rkkda.com/ -" + echo "- -" + echo "- to choose the appropriate driver for your printer. -" + echo "- -" + echo "-----------------------------------------------------------" + echo +} + +post_upgrade() { + echo + echo + echo "-----------------------------------------------------------" + echo "- -" + echo "- Please restart CUPS!!! -" + echo "- -" + echo "-Remember to check for foomatic-db-foo2zjs updates as well-" + echo "- -" + echo "-----------------------------------------------------------" + echo +} + +post_remove() { + echo + echo + echo "-----------------------------------------------------------" + echo "- -" + echo "- Please restart CUPS!!! -" + echo "- -" + echo "- Remember to replace foomatic-db-foo2zjs with -" + echo "- foomatic-db from [extra]. -" + echo "- -" + echo "-----------------------------------------------------------" + echo +} diff --git a/gen-fixes-20140329-1.patch b/gen-fixes-20140329-1.patch new file mode 100644 index 000000000000..5681e5e388bc --- /dev/null +++ b/gen-fixes-20140329-1.patch @@ -0,0 +1,66 @@ +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/udev-firmware-loading-ruleset-20130601-1.patch b/udev-firmware-loading-ruleset-20130601-1.patch new file mode 100644 index 000000000000..0b5848f3208c --- /dev/null +++ b/udev-firmware-loading-ruleset-20130601-1.patch @@ -0,0 +1,166 @@ +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" |