diff --git a/.gitignore b/.gitignore index 9597898..6728bf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ yaml-0.1.3.tar.gz /yaml-0.1.4.tar.gz +/yaml-0.1.5.tar.gz diff --git a/libyaml.spec b/libyaml.spec index e5db913..a11ef7a 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -3,8 +3,8 @@ #====================================================================# Name: libyaml -Version: 0.1.4 -Release: 6%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -13,12 +13,6 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# CVE-2013-6393 -# https://bugzilla.redhat.com/show_bug.cgi?id=1033990 -Patch0: libyaml-CVE-2013-6393-string-overflow.patch -Patch1: libyaml-CVE-2013-6393-node-id-hardening.patch -Patch2: libyaml-CVE-2013-6393-indent-column-overflow-v2.patch - %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and @@ -38,9 +32,6 @@ developing applications that use LibYAML. %prep %setup -q -n %{tarballname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure @@ -82,6 +73,11 @@ rm -rf %{buildroot} %changelog +* Tue Feb 4 2014 John Eckersberg - 0.1.5-1 +- New upstream release 0.1.5 (bz1061087) +- Removed patches for CVE-2013-6393; they are included in 0.1.5 + upstream + * Wed Jan 29 2014 John Eckersberg - 0.1.4-6 - Add patches for CVE-2013-6393 (bz1033990) diff --git a/sources b/sources index cd981dd..ad4b6ce 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b8ab9064e8e0330423fe640de76608cd yaml-0.1.3.tar.gz -36c852831d02cf90508c29852361d01b yaml-0.1.4.tar.gz +24f6093c1e840ca5df2eb09291a1dbf1 yaml-0.1.5.tar.gz