Merge branch 'f20' into f21

2014-07-14 16:22:53 +02:00 · 2014-07-14 16:22:53 +02:00 · 2f16865a8f
commit 2f16865a8f
parent f01be03466 3e91a794f7
5 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -60,3 +60,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.7.1-source.tar.bz2
 /cups-1.7.2-source.tar.bz2
 /cups-1.7.3-source.tar.bz2
+/cups-1.7.4-source.tar.bz2
--- a/cups-1.7.3-source.tar.bz2.sig
+++ b/cups-1.7.3-source.tar.bz2.sig
--- a/cups-1.7.4-source.tar.bz2.sig
+++ b/cups-1.7.4-source.tar.bz2.sig
--- a/cups.spec
+++ b/cups.spec
@ -10,8 +10,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 1.7.3
-Release: 2%{?dist}
+Version: 1.7.4
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -671,6 +671,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz

 %changelog
+* Mon Jul 14 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.4-1
+- 1.7.4: CVE-2014-3537
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-d498c3020acda0904ab0c13b6389a1ec  cups-1.7.3-source.tar.bz2
+1a2295c2b2d2f422db2e50f40ed2fb99  cups-1.7.4-source.tar.bz2