rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Tim Waugh 2010-11-12 16:34:59 +00:00
commit 37fa8adaa3
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hplip-addprinter.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up hplip-3.10.9/prnt/cupsext/cupsext.c~ hplip-3.10.9/prnt/cupsext/cupsext.c
--- hplip-3.10.9/prnt/cupsext/cupsext.c~ 2010-11-12 10:35:59.316957426 +0000
+++ hplip-3.10.9/prnt/cupsext/cupsext.c 2010-11-12 15:58:27.467044126 +0000
@@ -510,6 +510,7 @@ PyObject * addPrinter( PyObject * self,
strcpy( info, name );
/* Connect to the HTTP server */
+ cupsSetUser ("root");
if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
{
r = 0;

33
hplip-fab-root-crash.patch Normal file
View File

@ -0,0 +1,33 @@
diff -up hplip-3.10.9/fax/fax.py.fab-root-crash hplip-3.10.9/fax/fax.py
--- hplip-3.10.9/fax/fax.py.fab-root-crash 2010-11-12 10:36:30.504796972 +0000
+++ hplip-3.10.9/fax/fax.py 2010-11-12 10:38:39.906166234 +0000
@@ -203,17 +203,19 @@ class FaxAddressBook(object): # Pickle b
self.load()
def load(self):
- self._fab = os.path.join(prop.user_dir, "fab.pickle")
- #old_fab = os.path.join(prop.user_dir, "fab.db")
+ self._fab = "/dev/null"
+ if prop.user_dir != None:
+ self._fab = os.path.join(prop.user_dir, "fab.pickle")
+ #old_fab = os.path.join(prop.user_dir, "fab.db")
+
+ # Load the existing pickle if present
+ if os.path.exists(self._fab):
+ pickle_file = open(self._fab, "r")
+ self._data = cPickle.load(pickle_file)
+ pickle_file.close()
- # Load the existing pickle if present
- if os.path.exists(self._fab):
- pickle_file = open(self._fab, "r")
- self._data = cPickle.load(pickle_file)
- pickle_file.close()
-
- else:
- self.save() # save the empty file to create the file
+ else:
+ self.save() # save the empty file to create the file
def set(self, name, title, firstname, lastname, fax, groups, notes):

16
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.9
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -38,6 +38,8 @@ Patch24: hplip-addgroup.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -246,6 +248,13 @@ done
# Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834).
%patch27 -p1 -b .emit-SIGNAL
# Prevent hp-fab traceback when run as root.
%patch28 -p1 -b .fab-root-crash
# Call cupsSetUser in cupsext's addPrinter method before connecting so
# that we can get an authentication callback (bug #538352).
%patch29 -p1 -b .addprinter
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -472,6 +481,11 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Fri Nov 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-6
- Call cupsSetUser in cupsext's addPrinter method before connecting so
that we can get an authentication callback (bug #538352).
- Prevent hp-fab traceback when run as root.
* Thu Nov 1 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-5
- Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834).