rpms/cups/devel cups-CVE-2007-4045.patch, NONE, 1.1 cups-CVE-2007-4352, 5392, 5393.patch, NONE, 1.1 cups.spec, 1.368, 1.369
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Wed Nov 7 21:27:29 UTC 2007
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887
Modified Files:
cups.spec
Added Files:
cups-CVE-2007-4045.patch cups-CVE-2007-4352,5392,5393.patch
Log Message:
* Wed Nov 7 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-2
- Applied patch to fix CVE-2007-4045 (bug #250161).
- Applied patch to fix CVE-2007-4352, CVE-2007-5392 and
CVE-2007-5393 (bug #345101).
cups-CVE-2007-4045.patch:
--- NEW FILE cups-CVE-2007-4045.patch ---
diff -up cups-1.3.4/scheduler/client.c.CVE-2007-4045 cups-1.3.4/scheduler/client.c
--- cups-1.3.4/scheduler/client.c.CVE-2007-4045 2007-11-07 21:11:58.000000000 +0000
+++ cups-1.3.4/scheduler/client.c 2007-11-07 21:13:26.000000000 +0000
@@ -114,6 +114,25 @@ static int write_file(cupsd_client_t *c
static void write_pipe(cupsd_client_t *con);
+void
+_cupsdFixClientsBIO(void)
+{
+#ifdef HAVE_LIBSSL
+ cupsd_client_t *c;
+ BIO *bio;
+ cupsArraySave (Clients);
+ for (c = (cupsd_client_t *)cupsArrayFirst(Clients);
+ c;
+ c = (cupsd_client_t *)cupsArrayNext(Clients))
+ {
+ bio = SSL_get_wbio(c->http.tls);
+ BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
+ }
+ cupsArrayRestore (Clients);
+#endif
+}
+
+
/*
* 'cupsdAcceptClient()' - Accept a new client.
*/
@@ -451,6 +470,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)
}
cupsArrayAdd(Clients, con);
+ _cupsdFixClientsBIO();
cupsdLogMessage(CUPSD_LOG_DEBUG2,
"cupsdAcceptClient: %d connected to server on %s:%d",
@@ -735,6 +755,7 @@ cupsdCloseClient(cupsd_client_t *con) /*
*/
cupsArrayRemove(Clients, con);
+ _cupsdFixClientsBIO();
free(con);
}
diff -up cups-1.3.4/scheduler/main.c.CVE-2007-4045 cups-1.3.4/scheduler/main.c
***** Not enough context to create diffstat for file: cups-CVE-2007-4352,5392,5393.patch,NONE,1.1
***** Not enough context to create diff for file: cups-CVE-2007-4352,5392,5393.patch,NONE,1.1
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- cups.spec 1 Nov 2007 16:08:41 -0000 1.368
+++ cups.spec 7 Nov 2007 21:26:56 -0000 1.369
@@ -6,7 +6,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -44,6 +44,8 @@
Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch
Patch25: cups-usb-paperout.patch
+Patch26: cups-CVE-2007-4352,5392,5393.patch
+Patch27: cups-CVE-2007-4045.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -154,6 +156,8 @@
%patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout
%patch25 -p1 -b .usb-paperout
+%patch26 -p1 -b .CVE-2007-4352,5392,5393
+%patch27 -p1 -b .CVE-2007-4045
%if %lspp
%patch100 -p1 -b .lspp
@@ -445,6 +449,11 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Wed Nov 7 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-2
+- Applied patch to fix CVE-2007-4045 (bug #250161).
+- Applied patch to fix CVE-2007-4352, CVE-2007-5392 and
+ CVE-2007-5393 (bug #345101).
+
* Thu Nov 1 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-1
- 1.3.4 (bug #361681).
More information about the fedora-extras-commits
mailing list