[cups/f20] 1.7.5

[Jiří Popelka]

commit 540a30d1570a4896d62b305fd7f78ea99518e709
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Aug 1 10:31:06 2014 +0200

    1.7.5

 .gitignore                         |    1 +
 cups-1.7.4-source.tar.bz2.sig      |  Bin 543 -> 0 bytes
 cups-1.7.5-source.tar.bz2.sig      |  Bin 0 -> 543 bytes
 cups-CVE-2014-5029-5030-5031.patch |   99 ------------------------------------
 cups-cgi.patch                     |   17 ------
 cups.spec                          |   13 ++---
 sources                            |    2 +-
 7 files changed, 7 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15db994..38558af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.7.2-source.tar.bz2
 /cups-1.7.3-source.tar.bz2
 /cups-1.7.4-source.tar.bz2
+/cups-1.7.5-source.tar.bz2
diff --git a/cups-1.7.5-source.tar.bz2.sig b/cups-1.7.5-source.tar.bz2.sig
new file mode 100644
index 0000000..f165df5
Binary files /dev/null and b/cups-1.7.5-source.tar.bz2.sig differ
diff --git a/cups.spec b/cups.spec
index c7abc06..a0b5127 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,8 +10,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 1.7.4
-Release: 3%{?dist}
+Version: 1.7.5
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@ -65,8 +65,6 @@ Patch36: cups-web-devices-timeout.patch
 Patch37: cups-final-content-type.patch
 Patch38: cups-journal.patch
 Patch39: cups-synconclose.patch
-Patch40: cups-cgi.patch
-Patch41: cups-CVE-2014-5029-5030-5031.patch
 
 Patch100: cups-lspp.patch
 
@@ -254,10 +252,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch38 -p1 -b .journal
 # Set the default for SyncOnClose to Yes.
 %patch39 -p1 -b .synconclose
-# Fix CGI handling (STR #4454).
-%patch40 -p1 -b .cgi
-# CVE-2014-5029, CVE-2014-5030, CVE-2014-5031 (#1122601)
-%patch41 -p1 -b .CVE-2014-5029-5030-5031
 
 %if %lspp
 # LSPP support.
@@ -646,6 +640,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Aug 01 2014 Jiri Popelka <jpopelka at redhat.com> - 1:1.7.5-1
+- 1.7.5
+
 * Wed Jul 23 2014 Jiri Popelka <jpopelka at redhat.com> - 1:1.7.4-3
 - CVE-2014-5029, CVE-2014-5030, CVE-2014-5031 (#1122601)
 
diff --git a/sources b/sources
index 9310299..b992fc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a2295c2b2d2f422db2e50f40ed2fb99  cups-1.7.4-source.tar.bz2
+5d893edc2957005f78e2b2423fdace2e  cups-1.7.5-source.tar.bz2