From 3e91a794f7e02502a456676983bf06e4bf21fd8f Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mon, 14 Jul 2014 16:20:20 +0200
Subject: [PATCH] 1.7.4: CVE-2014-3537

---
 .gitignore                    |   1 +
 cups-1.7.3-source.tar.bz2.sig | Bin 543 -> 0 bytes
 cups-1.7.4-source.tar.bz2.sig | Bin 0 -> 543 bytes
 cups.spec                     |   5 ++++-
 sources                       |   2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 cups-1.7.3-source.tar.bz2.sig
 create mode 100644 cups-1.7.4-source.tar.bz2.sig

diff --git a/.gitignore b/.gitignore
index e755438..15db994 100644
--- 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
diff --git a/cups-1.7.3-source.tar.bz2.sig b/cups-1.7.3-source.tar.bz2.sig
deleted file mode 100644
index 1a888e0fbf15639df600dc014967de4e0ce221d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0SW*H1p-rq+JFEG2@u<(r>h9pVk5wL5C2X+Y7*tR@qjaMuiw8B
zs!#>QO&w*}os~%11)EBNq8Ruy0sCW%ML2j;dLy9|HEij~v8MHs3*Hr&mWCpWeJy6$
zP@hIhmnjK5C=O|mv$;rn&psm=EZ%tY=H%w)V%Ul@fA-kK@iLCpQoM;;$6B`8HLqGI
zoOqf)vIswXDY#N5>r<Vpas%EW-k-WM*s}0wyz6dK^{T9ZdOV{}9x7tDqcz}!CaQx&
z9Ejo4wz%4Em&a*qU?Bc^TcT??fb}RJ+AC9qQYynji(!9#gHM*2g&Ef>9wZ9WhT%)V
zGbkA{$uOjs;W%Y89H!Mx^~(8*2xw=N5eEr#Ot67v{O|O;^7p}l#h^~Vo6))=ptf>Z
zUVG8;=;od~DrXIFmcIGoGz|=i4qIfdQ$k}Pso)L~h@O#ehZ7Rkhi#N<vqZgW+%eL5
zQPvkwBtjNx`Sjh1dqA$yrKS}U%-~rz%0ze6sEV(wK+-$MYED_47#c>GXijt}#0^$z
z^4=D#dKe`XOzx)5Je<Rvz>|(<T>U-~)rLo|nQBHI^D7*hVuSO+)YjlC6;X^dx;pS)
zH7DLI(IMK6WT<$y^%=r=m3Gq|Beswfk|RKPELHLYVX&?}*j>P#9{D1tLB$a)(Tpc9
hpdfL`hr|f(v|NNqAJ6)!;9bJK>JJ#6zm&}9Ekb$&1+4%8

diff --git a/cups-1.7.4-source.tar.bz2.sig b/cups-1.7.4-source.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000..52c02ac9aec1929b54e7df099a9c715e68e92ed9
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SW*H1p-sU&dUG_2@u<(r>h9pVj~wH5CE9mmJQS8jliR~{KSk^
z9}p+0*Z!f!OZGF@Q&>x9yU!UlLpuX$F*ZWm{k-qD!HrO-j*@tSSoH$)@+(Y~H4pH(
zqJQEF*s^+Go=Wl%%Db!p6;^sn@ZqjR&dF_#LnND~4W1*<h$h2vj)If3&gwPbj?4${
zvZzAO%c?xXgL3~h1R!%|yi`{GzO#ITy%pYv!~cg<+wEW(ZnXdF)CZ}YWSukey&K@)
zM!tXre><kvJaB$NC>y;VS3JNQNk-D^iSgLOUKE`A#bXknlYAVD`6L>WXVaH{ZbIaG
z2WfTh>e|4Q8%b(znWcrHVeJ^aPz&koWW<!h_TMS!>FZJ6Vk<zbxuH24_`!4xXRzc(
zc<$eWx`lw?ce9zSQn@`O*zP|g3FvXMy@_Z}TRJ!7mpDcUUDiDvEzCy|@?j}(25-+~
z4j}twb}3L#vo(I@kh+~xfv?=sCYG8#jB`W99SK4}ZuETU#AhceiIcmksXEwSR%<S_
zru}lOh!<?L0%R<;lU>B{ICNWT`}zF$W|e7Q%^MM!C8~@0>K&lCah^+jOiBn$mXBSf
z!K6~Kw1klnU|Ev#Y%M7GGBxQiD_a#^vBWY$tl4u$`^cfcv{-fzI5h20d~R1hq4ueX
hd84n<FEimrjdJ9^Xl3bnUidFhhuiT8`V}~a@w};m5bpp0

literal 0
HcmV?d00001

diff --git a/cups.spec b/cups.spec
index 42f6ac0..4b57885 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,7 +10,7 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 1.7.3
+Version: 1.7.4
 Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
@@ -640,6 +640,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
+
 * Wed May 28 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.3-1
 - 1.7.3
 - str4386.patch merged upstream in STR #4403
diff --git a/sources b/sources
index bcab508..9310299 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d498c3020acda0904ab0c13b6389a1ec  cups-1.7.3-source.tar.bz2
+1a2295c2b2d2f422db2e50f40ed2fb99  cups-1.7.4-source.tar.bz2