[jasper/f20: 2/2] Merge branch 'f19' into f20

[Jiří Popelka]

commit a7d18e2cf1cdd9855d0bf9c27604fa1947bdbc37
Merge: 37202df 85a20e3
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Dec 4 15:55:11 2014 +0100

    Merge branch 'f19' into f20

 jasper-CVE-2014-9029.patch |   29 +++++++++++++++++++++++++++++
 jasper.spec                |    9 ++++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --cc jasper.spec
index bcf7d7e,13672a2..253918b
--- a/jasper.spec
+++ b/jasper.spec
@@@ -7,7 -7,7 +7,7 @@@ Summary: Implementation of the JPEG-200
  Name:    jasper
  Group:   System Environment/Libraries
  Version: 1.900.1
--Release: 25%{?dist}
++Release: 26%{?dist}
  
  License: JasPer
  URL:     http://www.ece.uvic.ca/~frodo/jasper/
@@@ -170,9 -173,10 +173,13 @@@ make chec
  
  
  %changelog
 -* Thu Dec 04 2014 Jiri Popelka <jpopelka at redhat.com> - 1.900.1-25
++* Thu Dec 04 2014 Jiri Popelka <jpopelka at redhat.com> - 1.900.1-26
+ - CVE-2014-9029 - incorrect component number check in COC, RGN and QCC
+                   marker segment decoders (#1170650)
+ 
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-25
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Mon Mar 25 2013 Jiri Popelka <jpopelka at redhat.com> - 1.900.1-24
  - added --force option to autoreconf (#925604)