rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix last fix (bug #447200).

Browse Source
This commit is contained in:
Tim Waugh 2008-05-29 16:01:05 +00:00
parent cfa11f79c7
commit 10b0471e63
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-lspp.patch
View File

@ -1156,7 +1156,7 @@ diff -up cups-1.3.7/scheduler/ipp.c.lspp cups-1.3.7/scheduler/ipp.c
fchmod(cupsFileNumber(out), 0640); fchmod(cupsFileNumber(out), 0640);
fchown(cupsFileNumber(out), RunUser, Group); fchown(cupsFileNumber(out), RunUser, Group);
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+ if (con->scon != NULL && + if (con != NULL && con->scon != NULL &&
+ strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
+ { + {
+ if (getfilecon(filename, &spoolcon) == -1) + if (getfilecon(filename, &spoolcon) == -1)

5
cups.spec
View File

@ -7,7 +7,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.3.7 Version: 1.3.7
Release: 3%{?svn:.svn%{svn}}%{?dist} Release: 4%{?svn:.svn%{svn}}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@ -442,6 +442,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Thu May 29 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.7-4
- Fix last fix (bug #447200).
* Wed May 28 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.7-3 * Wed May 28 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.7-3
- If cupsdTimeoutJob is called when the originating connection is still - If cupsdTimeoutJob is called when the originating connection is still
known, pass that to the function so that copy_banner can get at it if known, pass that to the function so that copy_banner can get at it if