- Re-enabled SSL support by using OpenSSL instead of gnutls.

This commit is contained in:
Tim Waugh 2010-06-18 13:49:55 +00:00
parent 8399d834ef
commit a51b847f8c

View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.4 Version: 1.4.4
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -95,7 +95,7 @@ Provides: cupsddk-drivers = 1.2.3-7
Conflicts: kdelibs < 6:3.5.2-6 Conflicts: kdelibs < 6:3.5.2-6
BuildRequires: pam-devel pkgconfig BuildRequires: pam-devel pkgconfig
BuildRequires: gnutls-devel libacl-devel BuildRequires: openssl-devel libacl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: make >= 1:3.80 BuildRequires: make >= 1:3.80
BuildRequires: php-devel, pcre-devel BuildRequires: php-devel, pcre-devel
@ -144,7 +144,7 @@ Summary: Common Unix Printing System - development environment
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: gnutls-devel Requires: openssl-devel
Requires: krb5-devel Requires: krb5-devel
Requires: zlib-devel Requires: zlib-devel
Obsoletes: cupsddk-devel < 1.2.3-7 Obsoletes: cupsddk-devel < 1.2.3-7
@ -576,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Jun 18 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-2
- Re-enabled SSL support by using OpenSSL instead of gnutls.
* Fri Jun 18 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-1 * Fri Jun 18 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-1
- 1.4.4. Fixes several security vulnerabilities (bug #605399): - 1.4.4. Fixes several security vulnerabilities (bug #605399):
CVE-2010-0540, CVE-2010-0542, CVE-2010-1748. No longer need str3503, CVE-2010-0540, CVE-2010-0542, CVE-2010-1748. No longer need str3503,