rpms/cups/F-11 cups-str3197.patch,1.1,1.2 cups.spec,1.474,1.475
Tim Waugh
twaugh at fedoraproject.org
Fri May 15 09:17:07 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv332
Modified Files:
cups-str3197.patch cups.spec
Log Message:
* Fri May 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.18
- More complete fix for STR #3197 (bug #500859).
cups-str3197.patch:
Index: cups-str3197.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3197.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3197.patch 14 May 2009 15:14:31 -0000 1.1
+++ cups-str3197.patch 15 May 2009 09:17:04 -0000 1.2
@@ -1,13 +1,12 @@
diff -up cups-1.4b2-svn8404/cups/ipp.c.str3197 cups-1.4b2-svn8404/cups/ipp.c
--- cups-1.4b2-svn8404/cups/ipp.c.str3197 2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/cups/ipp.c 2009-05-14 16:08:22.329366931 +0100
-@@ -1431,7 +1431,8 @@ ippReadIO(void *src, /* I - Data
++++ cups-1.4b2-svn8404/cups/ipp.c 2009-05-15 09:56:48.558436055 +0100
+@@ -1431,7 +1431,7 @@ ippReadIO(void *src, /* I - Data
case IPP_TAG_NOTSETTABLE :
case IPP_TAG_DELETEATTR :
case IPP_TAG_ADMINDEFINE :
- if (attr->value_tag == IPP_TAG_NOVALUE)
-+ if (attr->value_tag == IPP_TAG_NOVALUE ||
-+ attr->value_tag == IPP_TAG_DELETEATTR)
++ if (attr->value_tag == tag)
{
if (n == 0)
break;
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -p -r1.474 -r1.475
--- cups.spec 14 May 2009 15:14:31 -0000 1.474
+++ cups.spec 15 May 2009 09:17:04 -0000 1.475
@@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
-Release: 0.%{pre}.17%{?dist}
+Release: 0.%{pre}.18%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -480,6 +480,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/php/modules/*.so
%changelog
+* Fri May 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.18
+- More complete fix for STR #3197 (bug #500859).
+
* Thu May 14 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.17
- Prevent cupsd crash when handling IPP_TAG_DELETEATTR requests
(STR #3197, bug #500859).
More information about the scm-commits
mailing list