[hplip/f16: 2/2] Merge branch 'f15' into f16
Jiří Popelka
jpopelka at fedoraproject.org
Mon Dec 19 16:49:53 UTC 2011
commit 1eed8ce5bafe4bcb78a66aadbb40f12916526111
Merge: 2808bbe 5b6365d
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Mon Dec 19 17:39:07 2011 +0100
Merge branch 'f15' into f16
.gitignore | 1 +
hplip-3.11.10.tar.gz.asc | 7 -
hplip-3.11.12.tar.gz.asc | 7 +
hplip-clear-old-state-reasons.patch | 29 +-
hplip-dbglog-newline.patch | 113 +++---
hplip-dbus-threads.patch | 16 -
hplip-deviceIDs-drv.patch | 700 ++++++++++++++++----------------
hplip-emit-SIGNAL.patch | 25 --
hplip-fab-root-crash.patch | 33 --
hplip-hpaio-localonly.patch | 2 +-
hplip-hpaio-segfault.patch | 11 -
hplip-makefile-chgrp.patch | 16 +
hplip-mucks-with-spooldir.patch | 60 ++--
hplip-newline.patch | 12 -
hplip-top-margins-not-respected.patch | 22 -
hplip-udev-rules.patch | 26 +-
hplip.spec | 79 ++---
sources | 2 +-
18 files changed, 512 insertions(+), 649 deletions(-)
---
diff --cc hplip-hpaio-localonly.patch
index 44e3fc3,0000000..0a315ba
mode 100644,000000..100644
--- a/hplip-hpaio-localonly.patch
+++ b/hplip-hpaio-localonly.patch
@@@ -1,45 -1,0 +1,45 @@@
+diff -up hplip-3.11.10/scan/sane/hpaio.c~ hplip-3.11.10/scan/sane/hpaio.c
+--- hplip-3.11.10/scan/sane/hpaio.c~ 2011-10-02 04:04:48.000000000 +0100
++++ hplip-3.11.10/scan/sane/hpaio.c 2011-10-20 16:00:38.016534755 +0100
+@@ -272,25 +272,28 @@ static int DevDiscovery(int localOnly)
+ }
+ }
+
+- /* Ignore localOnly flag (used by saned) and always look for network all-in-one scan devices (defined by cups). */
+- cnt = GetCupsPrinters(&cups_printer);
+- for (i=0; i<cnt; i++)
++ /* Check localOnly flag (used by saned) to decide whether to look for network all-in-one scan devices (defined by cups). */
++ if (!localOnly)
+ {
+- hpmud_query_model(cups_printer[i], &ma);
+- if (ma.scantype > 0)
+- {
++ cnt = GetCupsPrinters(&cups_printer);
++ for (i=0; i<cnt; i++)
++ {
++ hpmud_query_model(cups_printer[i], &ma);
++ if (ma.scantype > 0)
++ {
+ hpmud_get_uri_model(cups_printer[i], model, sizeof(model));
+ AddDeviceList(cups_printer[i], model, &DeviceList);
+ total++;
+- }
+- else
+- {
++ }
++ else
++ {
- DBG6("unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]);
++ DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]);
+- }
+- free(cups_printer[i]);
++ }
++ free(cups_printer[i]);
++ }
++ if (cups_printer)
++ free(cups_printer);
+ }
+- if (cups_printer)
+- free(cups_printer);
+
+ bugout:
+ return total;
diff --cc hplip-udev-rules.patch
index 6b79b06,592cf13..f13189b
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@@ -1,29 -1,11 +1,23 @@@
- diff -up hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.7/data/rules/56-hpmud_support.rules
- --- hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules 2011-07-24 21:04:13.000000000 +0200
- +++ hplip-3.11.7/data/rules/56-hpmud_support.rules 2011-07-25 13:52:09.379058787 +0200
- @@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+ diff -up hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.12/data/rules/56-hpmud_support.rules
+ --- hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules 2011-12-09 12:19:54.000000000 +0100
-+++ hplip-3.11.12/data/rules/56-hpmud_support.rules 2011-12-19 12:12:13.205617985 +0100
+++++ hplip-3.11.12/data/rules/56-hpmud_support.rules 2011-12-19 17:23:29.769128810 +0100
+ @@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
LABEL="pid_test"
+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
# Check for LaserJet products (0x03f0xx17).
- -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
- +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
+ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
# Check for LaserJet products (0x03f0xx2a).
- -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
- +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
- ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
-
- LABEL="hpmud_rules_end"
- diff -up hplip-3.11.10/Makefile.in.udev-rules hplip-3.11.10/Makefile.in
- --- hplip-3.11.10/Makefile.in.udev-rules 2011-10-02 05:11:49.000000000 +0200
- +++ hplip-3.11.10/Makefile.in 2011-10-24 14:23:17.336002785 +0200
- @@ -4093,7 +4093,7 @@ cups_drv = prnt/drv/hpcups.drv
++diff -up hplip-3.11.12/Makefile.in.udev-rules hplip-3.11.12/Makefile.in
++--- hplip-3.11.12/Makefile.in.udev-rules 2011-12-09 12:23:55.000000000 +0100
+++++ hplip-3.11.12/Makefile.in 2011-12-19 17:24:14.204573291 +0100
++@@ -4106,7 +4106,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE at hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+
+ # hpmud.rules
+- at HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
++ at HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d
+ @HPLIP_BUILD_TRUE at dist_rules_DATA = data/rules/56-hpmud_support.rules \
++ @HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \
+ @HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)
- @HPLIP_BUILD_TRUE at halpredir = /usr/share/hal/fdi/preprobe/10osvendor
diff --cc hplip.spec
index e81adab,3c566b1..1eedb08
--- a/hplip.spec
+++ b/hplip.spec
@@@ -34,21 -34,15 +34,16 @@@ Patch17: hplip-deviceIDs-ppd.patc
Patch18: hplip-skip-blank-lines.patch
Patch19: hplip-dbglog-newline.patch
Patch20: hplip-no-system-tray.patch
- Patch22: hplip-ppd-ImageableArea.patch
- Patch25: hplip-raw_deviceID-traceback.patch
- Patch26: hplip-UnicodeDecodeError.patch
- Patch27: hplip-emit-SIGNAL.patch
- Patch28: hplip-fab-root-crash.patch
- Patch29: hplip-addprinter.patch
- Patch30: hplip-dbus-exception.patch
- Patch31: hplip-hpaio-segfault.patch
- Patch32: hplip-newline.patch
- Patch33: hplip-dbus-threads.patch
- Patch34: hplip-notification-exception.patch
- Patch35: hplip-CVE-2010-4267.patch
- Patch36: hplip-wifisetup.patch
- Patch37: hplip-hpaio-localonly.patch
- Patch38: hplip-top-margins-not-respected.patch
+ Patch21: hplip-ppd-ImageableArea.patch
+ Patch22: hplip-raw_deviceID-traceback.patch
+ Patch23: hplip-UnicodeDecodeError.patch
+ Patch24: hplip-addprinter.patch
+ Patch25: hplip-dbus-exception.patch
+ Patch26: hplip-notification-exception.patch
+ Patch27: hplip-CVE-2010-4267.patch
+ Patch28: hplip-wifisetup.patch
+ Patch29: hplip-makefile-chgrp.patch
++Patch30: hplip-hpaio-localonly.patch
Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig
@@@ -300,17 -279,14 +280,18 @@@ don
# Applied patch to fix CVE-2010-4267, remote stack overflow
# vulnerability (bug #670252).
- %patch35 -p1 -b .CVE-2010-4267
+ %patch27 -p1 -b .CVE-2010-4267
# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
- %patch36 -p1 -b .wifisetup
+ %patch28 -p1 -b .wifisetup
+
+ # Don't run 'chgrp lp /var/log/hp' in makefile
+ %patch29 -p1 -b .chgrp
+# Pay attention to the SANE localOnly flag in hpaio (bug #743593).
- %patch37 -p1 -b .hpaio-localonly
++%patch30 -p1 -b .hpaio-localonly
+
- # revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
- %patch38 -p1 -b .top-margins-not-respected
+
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@@@ -537,27 -518,21 +523,30 @@@ f
%postun libs -p /sbin/ldconfig
%changelog
+ * Mon Dec 19 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.12-1
+ - 3.11.12
+
-* Mon Nov 21 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-8
+* Mon Nov 21 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-11
- Added IEEE 1284 Device ID for Designjet T770 (bug #747957).
-* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
+* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-10
- Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139).
-* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
+* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-9
- revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
-* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.10-8
+- Rebuilt for glibc bug#747377
+
+* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
- Catch DBusException in hp-systray (bug #746024).
+* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
+- Move udev rules to /lib/udev/rules.d (bug #748208).
+
+* Thu Oct 20 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
+- Pay attention to the SANE localOnly flag in hpaio (bug #743593).
+
* Mon Oct 17 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-4
- Corrected IEEE 1284 Device ID for LaserJet M1319f MFP (bug #746614)
More information about the scm-commits
mailing list