This commit was manufactured by cvs2git to create tag 'auto-ac-cups-

1_3_7-3'.

Sprout from master 2008-05-14 13:59:18 UTC Karol Krenski <charles@pld-linux.org> '- fix CVE-2008-1722 (integer overflow in image filter - STR #2790)'
Cherrypick from master 2006-05-12 06:18:04 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- updated':
    cups-config.patch -> 1.6
Cherrypick from AC-branch 2008-05-14 13:56:54 UTC Karol Krenski <charles@pld-linux.org> '- CVE-2008-1722.patch':
    cups.spec -> 1.202.2.5

diff --git a/cups.spec b/cups.spec
index 0e3cd19156e0c0a3e9a6b427152c1def31289e07..857ba3d5d3717c57bd2105aabb742fed0b87d0b8 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -21,7 +21,7 @@ Summary(pl.UTF-8):    Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
 Version:       1.3.7
-Release:       2
+Release:       3
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:         Applications/Printing
@@ -44,6 +44,7 @@ Patch8:               %{name}-satisfy-any.patch
 Patch9:                %{name}-no-polluted-krb5config.patch
 Patch10:       %{name}-java-fix.patch
 Patch11:       %{name}-verbose-compilation.patch
+Patch12:       %{name}-CVE-2008-1722.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -52,10 +53,10 @@ BuildRequires:      automake
 BuildRequires: dbus-devel
 BuildRequires: glibc-headers
 %{?with_gnutls:BuildRequires:  gnutls-devel}
+BuildRequires: heimdal-devel
 %{?with_java:BuildRequires:    jar}
 %{?with_java:BuildRequires:    jdk}
 %{?with_java:BuildRequires:    jpackage-utils}
-BuildRequires: krb5-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
@@ -177,7 +178,7 @@ Requires:   %{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
 %{?with_gnutls:Requires:       gnutls-devel}
-Requires:      krb5-devel
+Requires:      heimdal-devel
 %{!?with_gnutls:Requires:      openssl-devel}
 Requires:      zlib-devel
 # for libcupsimage
@@ -344,6 +345,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 %{__aclocal} -I config-scripts