rpms/cups/devel cups-lspp.patch,1.44,1.45 cups.spec,1.536,1.537
Jiří Popelka
jpopelka at fedoraproject.org
Wed Nov 11 09:51:45 UTC 2009
Author: jpopelka
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9246
Modified Files:
cups-lspp.patch cups.spec
Log Message:
* Wed Nov 11 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-3
- Fixed lspp-patch to avoid memory leak (bug #536741).
cups-lspp.patch:
Makedefs.in | 4
config-scripts/cups-lspp.m4 | 36 +++
config.h.in | 7
configure.in | 2
cups/cups.h | 9
data/Makefile | 5
data/mls | 261 +++++++++++++++++++++++++
data/selinux | 261 +++++++++++++++++++++++++
data/te | 261 +++++++++++++++++++++++++
filter/common.c | 139 +++++++++++++
filter/pstops.c | 133 ++++++++++++
scheduler/client.c | 171 ++++++++++++++++
scheduler/client.h | 14 +
scheduler/conf.c | 56 +++++
scheduler/conf.h | 9
scheduler/ipp.c | 456 ++++++++++++++++++++++++++++++++++++++++++++
scheduler/job.c | 303 ++++++++++++++++++++++++++++-
scheduler/job.h | 11 +
scheduler/main.c | 32 +++
scheduler/printers.c | 53 +++++
20 files changed, 2215 insertions(+), 8 deletions(-)
Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- cups-lspp.patch 14 Sep 2009 17:03:47 -0000 1.44
+++ cups-lspp.patch 11 Nov 2009 09:51:45 -0000 1.45
@@ -1740,7 +1740,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
+
+ printerfile = strstr(printer->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
-+ printerfile = strdup(printer->device_uri + strlen("file:/"));
++ printerfile = printer->device_uri + strlen("file:");
+
+ if (printerfile != NULL)
+ {
@@ -2546,7 +2546,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
+ */
+ printerfile = strstr(printer->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
-+ printerfile = strdup(printer->device_uri + strlen("file:/"));
++ printerfile = printer->device_uri + strlen("file:");
+
+ if (printerfile != NULL)
+ {
@@ -2776,7 +2776,7 @@ diff -up cups-1.4.1/scheduler/printers.c
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2296,6 +2309,42 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2296,6 +2309,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
@@ -2788,12 +2788,15 @@ diff -up cups-1.4.1/scheduler/printers.c
+ printercon = 0;
+ printerfile = strstr(p->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0))
-+ printerfile = strdup(p->device_uri + strlen("file:/"));
++ printerfile = p->device_uri + strlen("file:");
+
+ if (printerfile != NULL)
+ {
+ if (getfilecon(printerfile, &devcon) == -1)
-+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
++ {
++ if(is_selinux_enabled())
++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
++ }
+ else
+ {
+ printercon = context_new(devcon);
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -p -r1.536 -r1.537
--- cups.spec 10 Nov 2009 16:56:21 -0000 1.536
+++ cups.spec 11 Nov 2009 09:51:45 -0000 1.537
@@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -506,6 +506,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Wed Nov 11 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-3
+- Fixed lspp-patch to avoid memory leak (bug #536741).
+
* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-2
- Added explicit version dependency on cups-libs to cups-lpd
(bug #502205).
More information about the fedora-extras-commits
mailing list