From 2998ae3a4a7c596ad2aa493eea73f0dfbaa245eff7790b5870fbcfb0778da169 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 3 Jan 2018 10:26:31 +0000
Subject: [PATCH] Accepting request 560920 from home:avindra

- update to 0.1.7
  * Fixed segfault in yaml_string_write_handler
  * Fixed invalid simple key assertion (CVE-2014-9130)
  * Fixed error handling in some examples
- remove CVE-2014-9130.patch
  - fixed upstream in 946596172d140497b560e016e581accb0a92cca4
- cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/560920
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=17
---
 CVE-2014-9130.patch | 16 ----------------
 libyaml.changes     | 11 +++++++++++
 libyaml.spec        | 28 +++++++++++-----------------
 yaml-0.1.6.tar.gz   |  3 ---
 yaml-0.1.7.tar.gz   |  3 +++
 5 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 CVE-2014-9130.patch
 delete mode 100644 yaml-0.1.6.tar.gz
 create mode 100644 yaml-0.1.7.tar.gz

diff --git a/CVE-2014-9130.patch b/CVE-2014-9130.patch
deleted file mode 100644
index 96e14d2..0000000
--- a/CVE-2014-9130.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/scanner.c b/src/scanner.c
-index 88d4fa5..c5f3d2f 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -1110,7 +1110,9 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
-      * line.  Therefore it is always allowed.  But we add a check anyway.
-      */
- 
--    assert(parser->simple_key_allowed || !required);    /* Impossible. */
-+    /* XXX This caused:
-+     * https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-+    assert(parser->simple_key_allowed || !required); */    /* Impossible. */
- 
-     /*
-      * If the current position may start a simple key, save it.
-
diff --git a/libyaml.changes b/libyaml.changes
index d8ebd2f..ff0c994 100644
--- a/libyaml.changes
+++ b/libyaml.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Dec 31 22:20:11 UTC 2017 - avindra@opensuse.org
+
+- update to 0.1.7
+  * Fixed segfault in yaml_string_write_handler
+  * Fixed invalid simple key assertion (CVE-2014-9130)
+  * Fixed error handling in some examples
+- remove CVE-2014-9130.patch
+  - fixed upstream in 946596172d140497b560e016e581accb0a92cca4
+- cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Dec  3 12:49:34 UTC 2014 - jmassaguerpla@suse.com
 
diff --git a/libyaml.spec b/libyaml.spec
index 9f77f21..4cc2dfd 100644
--- a/libyaml.spec
+++ b/libyaml.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libyaml
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,14 @@
 
 
 Name:           libyaml
-Version:        0.1.6
+Version:        0.1.7
 Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://pyyaml.org/wiki/LibYAML
-Source:         http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
-Patch0:         CVE-2014-9130.patch 
-BuildRequires:  pkg-config
 Summary:        A YAML 1.1 parser and emitter written in C
 License:        MIT
 Group:          Development/Libraries/C and C++
+Url:            http://pyyaml.org/wiki/LibYAML
+Source:         http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
+BuildRequires:  pkgconfig
 
 %description
 A YAML 1.1 parser and emitter written in C
@@ -43,9 +41,9 @@ A YAML 1.1 parser and emitter written in C
 This package holds the shared library of libyaml.
 
 %package devel
-Requires:       %{lib_name} = %{version}
 Summary:        Development files for libyaml
 Group:          Development/Libraries/C and C++
+Requires:       %{lib_name} = %{version}
 
 %description devel
 A YAML 1.1 parser and emitter written in C
@@ -53,31 +51,27 @@ A YAML 1.1 parser and emitter written in C
 This package holds the development files for libyaml.
 
 %prep
-%setup -n yaml-%{version}
-%patch0 -p1
+%setup -q -n yaml-%{version}
 
 %build
 %configure --with-pic --disable-static
-make %{?_smp_flags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-find %{buildroot} -name \*.la -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make check
+make %{?_smp_mflags} check
 
 %post   -n %{lib_name} -p /sbin/ldconfig
-
 %postun -n %{lib_name} -p /sbin/ldconfig
 
 %files -n %{lib_name}
-%defattr(-,root,root,-)
 %{_libdir}/libyaml-0.so.2
 %{_libdir}/libyaml-0.so.2.0.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/yaml.h
 %{_libdir}/libyaml.so
 %{_libdir}/pkgconfig/yaml-0.1.pc
diff --git a/yaml-0.1.6.tar.gz b/yaml-0.1.6.tar.gz
deleted file mode 100644
index fd577d0..0000000
--- a/yaml-0.1.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749
-size 503012
diff --git a/yaml-0.1.7.tar.gz b/yaml-0.1.7.tar.gz
new file mode 100644
index 0000000..7e6467c
--- /dev/null
+++ b/yaml-0.1.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729
+size 527518