rpms/hplip/devel hplip-no-root-config.patch, NONE, 1.1 hplip.spec, 1.127, 1.128
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Jun 8 11:36:59 UTC 2007
- Previous message (by thread): rpms/hplip/F-7 hplip.spec,1.128,1.129
- Next message (by thread): rpms/vnc/devel vnc-render.patch, 1.19, 1.20 vnc-s390.patch, 1.3, 1.4 vnc.spec, 1.172, 1.173 vnc-module_crash.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503
Modified Files:
hplip.spec
Added Files:
hplip-no-root-config.patch
Log Message:
* Fri Jun 8 2007 Tim Waugh <twaugh at redhat.com>
- Moved hp-setup to the ui package (bug #243273).
- Prevent SELinux audit message from the CUPS backends (bug #241776)
hplip-no-root-config.patch:
--- NEW FILE hplip-no-root-config.patch ---
--- hplip-1.7.2/base/g.py.no-root-config 2007-05-30 16:08:04.000000000 +0100
+++ hplip-1.7.2/base/g.py 2007-05-30 16:16:54.000000000 +0100
@@ -88,6 +88,16 @@
dict.__setattr__(self, "config_obj", ConfigParser.ConfigParser())
dict.__setattr__(self, "filename", filename)
+ if filename.startswith ("/root/"):
+ import sys, posixpath
+ argv0 = sys.argv[0]
+ name = posixpath.basename (argv0)
+ if name == "hp" or name == "hpfax":
+ # Don't try opening a file in root's home directory. We are
+ # running as a CUPS backend, and doing so would cause an
+ # SELinux AVC message (bug #241776).
+ return
+
try:
pathmode = os.stat(filename)[stat.ST_MODE]
if pathmode & 0022 != 0:
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- hplip.spec 10 May 2007 11:37:26 -0000 1.127
+++ hplip.spec 8 Jun 2007 11:36:24 -0000 1.128
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 1.7.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPL/MIT/BSD
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@
Patch9: hplip-media-empty.patch
Patch10: hplip-faxing-with-low-supplies.patch
Patch11: hplip-unload-traceback.patch
+Patch12: hplip-no-root-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires(post): /sbin/service
@@ -116,6 +117,9 @@
# Prevent a traceback when unloading a photo card (bug #238617).
%patch11 -p1 -b .unload-traceback
+# Prevent SELinux audit message from the CUPS backends (bug #241776)
+%patch12 -p1 -b .no-root-config
+
autoconf # for patch4
%build
@@ -192,7 +196,6 @@
%{_bindir}/hp-makeuri
%{_bindir}/hp-probe
%{_bindir}/hp-sendfax
-%{_bindir}/hp-setup
%{_bindir}/hp-testpage
%{_bindir}/hp-timedate
%{_bindir}/hp-unload
@@ -218,7 +221,6 @@
%{_datadir}/hplip/makecopies
%{_datadir}/hplip/makeuri
%{_datadir}/hplip/probe
-%{_datadir}/hplip/setup
%{_datadir}/hplip/sendfax
%{_datadir}/hplip/testpage
%{_datadir}/hplip/timedate
@@ -240,10 +242,12 @@
%files gui
%{_bindir}/hp-print
+%{_bindir}/hp-setup
%{_bindir}/hp-toolbox
# Files
%{_datadir}/hplip/data/images
%{_datadir}/hplip/print
+%{_datadir}/hplip/setup
%{_datadir}/hplip/toolbox
# Directories
%{_datadir}/hplip/ui
@@ -291,6 +295,10 @@
exit 0
%changelog
+* Fri Jun 8 2007 Tim Waugh <twaugh at redhat.com>
+- Moved hp-setup to the ui package (bug #243273).
+- Prevent SELinux audit message from the CUPS backends (bug #241776)
+
* Thu May 10 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-10
- Prevent a traceback when unloading a photo card (bug #238617).
- Previous message (by thread): rpms/hplip/F-7 hplip.spec,1.128,1.129
- Next message (by thread): rpms/vnc/devel vnc-render.patch, 1.19, 1.20 vnc-s390.patch, 1.3, 1.4 vnc.spec, 1.172, 1.173 vnc-module_crash.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list