rpms/cups/F-8 cups-CVE-2007-4045.patch, 1.1, 1.2 cups.spec, 1.372, 1.373

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27645

Modified Files:
	cups-CVE-2007-4045.patch cups.spec 
Log Message:
* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-3
- Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
  are linked with gnutls.


cups-CVE-2007-4045.patch:

Index: cups-CVE-2007-4045.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups-CVE-2007-4045.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-CVE-2007-4045.patch	7 Nov 2007 21:18:33 -0000	1.1
+++ cups-CVE-2007-4045.patch	12 Nov 2007 18:54:03 -0000	1.2
@@ -16,8 +16,8 @@
 +       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));
++    if (c->http.tls)
++      BIO_ctrl(SSL_get_wbio(c->http.tls), BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
 +  }
 +  cupsArrayRestore (Clients);
 +#endif


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- cups.spec	12 Nov 2007 18:46:44 -0000	1.372
+++ cups.spec	12 Nov 2007 18:54:03 -0000	1.373
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -451,7 +451,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com>
+* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-3
+- Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
+  are linked with gnutls.
 - Temporarily undo STR #2537 change so that non-UTF-8 requests are not
   rejected (bug #378211).
 - LSPP cupsdSetString/ClearString fixes (bug #378451).