From 020d6ef369d8bb91bd0dcc6ff437537a9b58e3dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:45:28 +0000 Subject: [PATCH 01/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 2835732..824c1dd 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Aug 29 2016 John Eckersberg - 0.1.7-1 - New upstream release 0.1.7 (RHBZ#1371154) From 7faa7b4df282043f093dde652a7a39a5f853af60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 20:03:02 +0000 Subject: [PATCH 02/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 824c1dd..761cbfc 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4c630b8f3cc50ba317c9522e70baa5098a17b4e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:34:32 +0000 Subject: [PATCH 03/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 761cbfc..59b5950 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4589a726d6f8e9f24cdebd7eae20aed0098c87c7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 16:31:36 +0100 Subject: [PATCH 04/39] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- libyaml.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libyaml.spec b/libyaml.spec index 59b5950..831d549 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -53,26 +53,16 @@ echo "INPUT($soname)" > %{buildroot}%{_libdir}/libyaml.so make check -%clean -rm -rf %{buildroot} - - -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README %{_libdir}/%{name}*.so.* %files devel -%defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/pkgconfig/yaml-0.1.pc @@ -80,6 +70,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 03 2018 Igor Gnatenko - 0.1.7-5 +- Switch to %%ldconfig_scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 0.1.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 21e49eccdf8a72c53f3acb97b3dfacd92f2d6dab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:47:52 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 831d549..1a8f1e3 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -70,6 +70,9 @@ make check %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 0.1.7-5 - Switch to %%ldconfig_scriptlets From c9bfce9d6a994ec4e7eb8d00ee06011604142498 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:44:41 +0100 Subject: [PATCH 06/39] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- libyaml.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 1a8f1e3..d8b003e 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -11,7 +11,6 @@ Group: System Environment/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and From c1bfbb6d367bc123932447133cfcec72b4ebc865 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:07:46 +0000 Subject: [PATCH 07/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index d8b003e..14a3eca 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -69,6 +69,9 @@ make check %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.1.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 88e48354c3015d3254b5e949dcb3cfae56fc6a92 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 16 Jul 2018 10:27:51 -0400 Subject: [PATCH 08/39] Add BuildRequires for gcc --- libyaml.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 14a3eca..c36cdad 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.1.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -12,6 +12,8 @@ License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz +BuildRequires: gcc + %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and @@ -69,6 +71,10 @@ make check %changelog +* Mon Jul 16 2018 John Eckersberg - 0.1.7-8 +- Add BuildRequires for gcc + See: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot + * Fri Jul 13 2018 Fedora Release Engineering - 0.1.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 70ea558fc690924fc41fdaae8db09a6226fa7583 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 16 Jul 2018 10:45:46 -0400 Subject: [PATCH 09/39] New upstream release 0.2.1 (rhbz#1598611) --- .gitignore | 1 + libyaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3a846ad..9f43fea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ yaml-0.1.3.tar.gz /yaml-0.1.5.tar.gz /yaml-0.1.6.tar.gz /yaml-0.1.7.tar.gz +/yaml-0.2.1.tar.gz diff --git a/libyaml.spec b/libyaml.spec index c36cdad..83b20c4 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -3,8 +3,8 @@ #====================================================================# Name: libyaml -Version: 0.1.7 -Release: 8%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -71,6 +71,9 @@ make check %changelog +* Mon Jul 16 2018 John Eckersberg - 0.2.1-1 +- New upstream release 0.2.1 (rhbz#1598611) + * Mon Jul 16 2018 John Eckersberg - 0.1.7-8 - Add BuildRequires for gcc See: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot diff --git a/sources b/sources index 0bce782..a97e113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1abf45bd3a96374fa55ca63b32f9f2f9 yaml-0.1.7.tar.gz +SHA512 (yaml-0.2.1.tar.gz) = 97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 From bf22ca6dc264f564dfd7c5a6bcadb9633c93e141 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 14 Aug 2018 16:17:27 +0200 Subject: [PATCH 10/39] rebuild against latest fixed binutils --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 83b20c4..b2f5f2c 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: System Environment/Libraries @@ -71,6 +71,9 @@ make check %changelog +* Tue Aug 7 2018 Jens Petersen - 0.2.1-2 +- rebuild against fixed binutils to fix missing symbols (#1613350) + * Mon Jul 16 2018 John Eckersberg - 0.2.1-1 - New upstream release 0.2.1 (rhbz#1598611) From a6fe3172638750b7d37682c3eccc26445b8deea7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 11/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libyaml.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libyaml.spec b/libyaml.spec index b2f5f2c..b0f5258 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -7,7 +7,6 @@ Version: 0.2.1 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C -Group: System Environment/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz @@ -22,7 +21,6 @@ emitter written in C. %package devel Summary: Development files for LibYAML applications -Group: Development/Libraries Requires: libyaml = %{version}-%{release}, pkgconfig From 850a0da6358ad867bc7d95f166b6dfa3fa246f5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:39:23 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index b0f5258..78c8939 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 7 2018 Jens Petersen - 0.2.1-2 - rebuild against fixed binutils to fix missing symbols (#1613350) From 5edda5a593652fc9f4ecfde0e56778a775406bf5 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 5 Feb 2019 10:43:02 -0500 Subject: [PATCH 13/39] Add patch: Don't emit document-end marker at the end of stream (rhbz#1672670) --- ...ment-end-marker-at-the-end-of-stream.patch | 35 +++++++++++++++++++ libyaml.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch diff --git a/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch b/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch new file mode 100644 index 0000000..90ec44a --- /dev/null +++ b/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch @@ -0,0 +1,35 @@ +From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tina=20M=C3=BCller?= +Date: Fri, 29 Jun 2018 23:16:26 +0200 +Subject: [PATCH] Don't emit document-end marker at the end of stream + +(only when explicitly requested) + +@jrtc27++ for the patch. + +See #60 +--- + src/emitter.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/emitter.c b/src/emitter.c +index 32fe07c..2744495 100644 +--- a/src/emitter.c ++++ b/src/emitter.c +@@ -649,13 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, + + else if (event->type == YAML_STREAM_END_EVENT) + { +- if (emitter->open_ended) +- { +- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) +- return 0; +- if (!yaml_emitter_write_indent(emitter)) +- return 0; +- } + + if (!yaml_emitter_flush(emitter)) + return 0; +-- +2.20.1 + diff --git a/libyaml.spec b/libyaml.spec index 78c8939..23e300b 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -13,6 +13,9 @@ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz BuildRequires: gcc +# https://github.com/yaml/libyaml/issues/60 +Patch0: 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch + %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and @@ -31,6 +34,7 @@ developing applications that use LibYAML. %prep %setup -q -n %{tarballname}-%{version} +%patch0 -p1 %build @@ -69,6 +73,9 @@ make check %changelog +* Tue Feb 5 2019 John Eckersberg - 0.2.1-4 +- Add patch: Don't emit document-end marker at the end of stream (rhbz#1672670) + * Fri Feb 01 2019 Fedora Release Engineering - 0.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From cec5d188158eb7b5356b0c596dbb5a64c581696e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 5 Feb 2019 11:23:04 -0500 Subject: [PATCH 14/39] Add patch: Revert removing of open_ended after top level plain scalar (rhbz#1672670) --- ...of-open_ended-after-top-level-plain-.patch | 32 +++++++++++++++++++ libyaml.spec | 10 ++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch diff --git a/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch b/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch new file mode 100644 index 0000000..75de86d --- /dev/null +++ b/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch @@ -0,0 +1,32 @@ +From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tina=20M=C3=BCller?= +Date: Fri, 29 Jun 2018 21:44:19 +0200 +Subject: [PATCH] Revert removing of open_ended after top level plain scalar + +See also issue #60 + +Revert "This code is not needed and breaks tests" + +This reverts commit 56400d976a1999156b1abfd674c3122843980260. +--- + src/emitter.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/emitter.c b/src/emitter.c +index d31e075..32fe07c 100644 +--- a/src/emitter.c ++++ b/src/emitter.c +@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter, + + emitter->whitespace = 0; + emitter->indention = 0; ++ if (emitter->root_context) ++ { ++ emitter->open_ended = 1; ++ } + + return 1; + } +-- +2.20.1 + diff --git a/libyaml.spec b/libyaml.spec index 23e300b..25c7f0d 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -4,7 +4,7 @@ Name: libyaml Version: 0.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -13,8 +13,10 @@ Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz BuildRequires: gcc -# https://github.com/yaml/libyaml/issues/60 +# https://bugzilla.redhat.com/show_bug.cgi?id=1672670 +# https://github.com/yaml/libyaml/pull/122/ Patch0: 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch +Patch1: 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch %description YAML is a data serialization format designed for human readability and @@ -35,6 +37,7 @@ developing applications that use LibYAML. %prep %setup -q -n %{tarballname}-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -73,6 +76,9 @@ make check %changelog +* Tue Feb 5 2019 John Eckersberg - 0.2.1-5 +- Add patch: Revert removing of open_ended after top level plain scalar (rhbz#1672670) + * Tue Feb 5 2019 John Eckersberg - 0.2.1-4 - Add patch: Don't emit document-end marker at the end of stream (rhbz#1672670) From 9bafb5922f699c15c83fafa8c607fd743651686d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 26 Mar 2019 11:07:20 -0400 Subject: [PATCH 15/39] New upstream release (rhbz#1692750) --- .gitignore | 1 + ...ment-end-marker-at-the-end-of-stream.patch | 35 ------------------- ...of-open_ended-after-top-level-plain-.patch | 32 ----------------- libyaml.spec | 29 +++++++-------- sources | 2 +- 5 files changed, 15 insertions(+), 84 deletions(-) delete mode 100644 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch delete mode 100644 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch diff --git a/.gitignore b/.gitignore index 9f43fea..188725d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ yaml-0.1.3.tar.gz /yaml-0.1.6.tar.gz /yaml-0.1.7.tar.gz /yaml-0.2.1.tar.gz +/libyaml-0.2.2.tar.gz diff --git a/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch b/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch deleted file mode 100644 index 90ec44a..0000000 --- a/0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tina=20M=C3=BCller?= -Date: Fri, 29 Jun 2018 23:16:26 +0200 -Subject: [PATCH] Don't emit document-end marker at the end of stream - -(only when explicitly requested) - -@jrtc27++ for the patch. - -See #60 ---- - src/emitter.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/emitter.c b/src/emitter.c -index 32fe07c..2744495 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -649,13 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, - - else if (event->type == YAML_STREAM_END_EVENT) - { -- if (emitter->open_ended) -- { -- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) -- return 0; -- if (!yaml_emitter_write_indent(emitter)) -- return 0; -- } - - if (!yaml_emitter_flush(emitter)) - return 0; --- -2.20.1 - diff --git a/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch b/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch deleted file mode 100644 index 75de86d..0000000 --- a/0001-Revert-removing-of-open_ended-after-top-level-plain-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tina=20M=C3=BCller?= -Date: Fri, 29 Jun 2018 21:44:19 +0200 -Subject: [PATCH] Revert removing of open_ended after top level plain scalar - -See also issue #60 - -Revert "This code is not needed and breaks tests" - -This reverts commit 56400d976a1999156b1abfd674c3122843980260. ---- - src/emitter.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/emitter.c b/src/emitter.c -index d31e075..32fe07c 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter, - - emitter->whitespace = 0; - emitter->indention = 0; -+ if (emitter->root_context) -+ { -+ emitter->open_ended = 1; -+ } - - return 1; - } --- -2.20.1 - diff --git a/libyaml.spec b/libyaml.spec index 25c7f0d..a5caf15 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,22 +1,17 @@ -%define tarballname yaml - -#====================================================================# - Name: libyaml -Version: 0.2.1 -Release: 5%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT URL: http://pyyaml.org/ -Source0: http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz +Source0: http://pyyaml.org/download/libyaml/%{name}-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: doxygen BuildRequires: gcc - -# https://bugzilla.redhat.com/show_bug.cgi?id=1672670 -# https://github.com/yaml/libyaml/pull/122/ -Patch0: 0001-Don-t-emit-document-end-marker-at-the-end-of-stream.patch -Patch1: 0001-Revert-removing-of-open_ended-after-top-level-plain-.patch +BuildRequires: libtool %description YAML is a data serialization format designed for human readability and @@ -35,14 +30,13 @@ developing applications that use LibYAML. %prep -%setup -q -n %{tarballname}-%{version} -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{version} %build +./bootstrap %configure -make %{?_smp_mflags} +make all html %{?_smp_mflags} %install @@ -76,6 +70,9 @@ make check %changelog +* Tue Mar 26 2019 John Eckersberg - 0.2.2-1 +- New upstream release (rhbz#1692750) + * Tue Feb 5 2019 John Eckersberg - 0.2.1-5 - Add patch: Revert removing of open_ended after top level plain scalar (rhbz#1672670) diff --git a/sources b/sources index a97e113..b61bfb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-0.2.1.tar.gz) = 97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 +SHA512 (libyaml-0.2.2.tar.gz) = 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06 From efa11f4834ac970c848c8aa5b3d1ccf9fb73e93a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:50:05 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index a5caf15..c01b20e 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -70,6 +70,9 @@ make check %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Mar 26 2019 John Eckersberg - 0.2.2-1 - New upstream release (rhbz#1692750) From 52944402d2449186b7f6aa85251d9225dd106ac7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 10:54:16 +0000 Subject: [PATCH 17/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index c01b20e..53fe387 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -70,6 +70,9 @@ make check %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 550edfb3048ace20c11e29e2d3ff261d80477521 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 13 Apr 2020 09:57:16 -0400 Subject: [PATCH 18/39] New upstream release (rhbz#1823108) --- .gitignore | 1 + libyaml.spec | 18 ++++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 188725d..9c7f1de 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ yaml-0.1.3.tar.gz /yaml-0.1.7.tar.gz /yaml-0.2.1.tar.gz /libyaml-0.2.2.tar.gz +/dist-0.2.3.tar.gz diff --git a/libyaml.spec b/libyaml.spec index 53fe387..fa7f58b 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,11 +1,11 @@ Name: libyaml -Version: 0.2.2 -Release: 3%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT -URL: http://pyyaml.org/ -Source0: http://pyyaml.org/download/libyaml/%{name}-%{version}.tar.gz +URL: https://github.com/yaml/libyaml +Source0: https://github.com/yaml/libyaml/archive/dist-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake @@ -30,11 +30,10 @@ developing applications that use LibYAML. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-dist-%{version} %build -./bootstrap %configure make all html %{?_smp_mflags} @@ -57,8 +56,8 @@ make check %files -%license LICENSE -%doc README +%license License +%doc ReadMe.md %{_libdir}/%{name}*.so.* @@ -70,6 +69,9 @@ make check %changelog +* Mon Apr 13 2020 John Eckersberg - 0.2.3-1 +- New upstream release (rhbz#1823108) + * Wed Jan 29 2020 Fedora Release Engineering - 0.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index b61bfb4..d48ff70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libyaml-0.2.2.tar.gz) = 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06 +SHA512 (dist-0.2.3.tar.gz) = d1a99c85ba2735890deb33b9583a98ed658fe3b7d833a76115aa5c672687c396400e38734d1aa646c6597174c931ecf0b556ef586bd547cebbe4c51c51f9046c From b848393978ce849c86602c7601f193a4a89de85a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Sun, 19 Apr 2020 12:58:21 -0400 Subject: [PATCH 19/39] New upstream release (rhbz#1825622) --- .gitignore | 1 + libyaml.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9c7f1de..c7258d5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ yaml-0.1.3.tar.gz /yaml-0.2.1.tar.gz /libyaml-0.2.2.tar.gz /dist-0.2.3.tar.gz +/dist-0.2.4.tar.gz diff --git a/libyaml.spec b/libyaml.spec index fa7f58b..2897a68 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,5 +1,5 @@ Name: libyaml -Version: 0.2.3 +Version: 0.2.4 Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C @@ -69,6 +69,10 @@ make check %changelog +* Sun Apr 19 2020 John Eckersberg - 0.2.4-1 +- New upstream release (rhbz#1825622) +- Fixes document end before directive (rhbz#1824226) + * Mon Apr 13 2020 John Eckersberg - 0.2.3-1 - New upstream release (rhbz#1823108) diff --git a/sources b/sources index d48ff70..a721aeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-0.2.3.tar.gz) = d1a99c85ba2735890deb33b9583a98ed658fe3b7d833a76115aa5c672687c396400e38734d1aa646c6597174c931ecf0b556ef586bd547cebbe4c51c51f9046c +SHA512 (dist-0.2.4.tar.gz) = bc1d744daf02f02810affe0b5c501923196462461dcbe0731c0daf948a14bb89790fd2de1720c67a2db76e0a86d7b7de44877771a0a4c2d4da952893e210eaa3 From 730c1ae4312015b3915aa386080f9bc3071f23bf Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 2 Jun 2020 09:49:11 -0400 Subject: [PATCH 20/39] New upstream release (rhbz#1842769) --- .gitignore | 2 ++ libyaml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7258d5..a79b177 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ yaml-0.1.3.tar.gz /libyaml-0.2.2.tar.gz /dist-0.2.3.tar.gz /dist-0.2.4.tar.gz +/0.2.5.tar.gz +/yaml-0.2.5.tar.gz diff --git a/libyaml.spec b/libyaml.spec index 2897a68..128edb2 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,11 +1,11 @@ Name: libyaml -Version: 0.2.4 +Version: 0.2.5 Release: 1%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT URL: https://github.com/yaml/libyaml -Source0: https://github.com/yaml/libyaml/archive/dist-%{version}.tar.gz +Source0: https://github.com/yaml/libyaml/releases/download/%{version}/yaml-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake @@ -30,7 +30,7 @@ developing applications that use LibYAML. %prep -%setup -q -n %{name}-dist-%{version} +%setup -q -n yaml-%{version} %build @@ -69,6 +69,9 @@ make check %changelog +* Tue Jun 2 2020 John Eckersberg - 0.2.5-1 +- New upstream release (rhbz#1842769) + * Sun Apr 19 2020 John Eckersberg - 0.2.4-1 - New upstream release (rhbz#1825622) - Fixes document end before directive (rhbz#1824226) diff --git a/sources b/sources index a721aeb..b65aae2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-0.2.4.tar.gz) = bc1d744daf02f02810affe0b5c501923196462461dcbe0731c0daf948a14bb89790fd2de1720c67a2db76e0a86d7b7de44877771a0a4c2d4da952893e210eaa3 +SHA512 (yaml-0.2.5.tar.gz) = dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02 From ee031d3ed12d4ed3d4edfd35bc5b6fd56e1e7e79 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 22:44:54 +0000 Subject: [PATCH 21/39] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libyaml.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libyaml.spec b/libyaml.spec index 128edb2..b05d890 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -35,12 +35,12 @@ developing applications that use LibYAML. %build %configure -make all html %{?_smp_mflags} +%make_build all html %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} INSTALL="install -p" install +%make_install rm -f %{buildroot}%{_libdir}/*.{la,a} soname=$(readelf -d %{buildroot}%{_libdir}/libyaml.so | awk '$2 == "(SONAME)" {print $NF}' | tr -d '[]') @@ -69,6 +69,10 @@ make check %changelog +* Mon Jul 13 2020 Tom Stellard - 0.2.5-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Tue Jun 2 2020 John Eckersberg - 0.2.5-1 - New upstream release (rhbz#1842769) From b8a705c08bac46a0457dcbea2f520b2127581b64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:00:07 +0000 Subject: [PATCH 22/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index b05d890..1e33728 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Tom Stellard - 0.2.5-2 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From a064c28f374f27d1dcb66d5801dd2611cfee5d8e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 1 Dec 2020 09:32:22 -0500 Subject: [PATCH 23/39] Add BuildRequires for make --- libyaml.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 1e33728..8a1a068 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -12,6 +12,7 @@ BuildRequires: automake BuildRequires: doxygen BuildRequires: gcc BuildRequires: libtool +BuildRequires: make %description YAML is a data serialization format designed for human readability and @@ -69,6 +70,10 @@ make check %changelog +* Tue Dec 1 2020 John Eckersberg - 0.2.5-4 +- Add BuildRequires for make + (re: https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot) + * Tue Jul 28 2020 Fedora Release Engineering - 0.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 268459690fd5e1b5b7402ebeaabc66125e77b159 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 01:29:55 +0000 Subject: [PATCH 24/39] Spec file cleanup --- libyaml.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libyaml.spec b/libyaml.spec index 8a1a068..5f77e45 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -22,7 +22,7 @@ emitter written in C. %package devel Summary: Development files for LibYAML applications -Requires: libyaml = %{version}-%{release}, pkgconfig +Requires: libyaml%{?_isa} = %{version}-%{release}, pkgconfig %description devel @@ -40,7 +40,6 @@ developing applications that use LibYAML. %install -rm -rf %{buildroot} %make_install rm -f %{buildroot}%{_libdir}/*.{la,a} From 0f1d0b3604b587d14ee6a2de7b82234f4eabb5c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:25:02 +0000 Subject: [PATCH 25/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 5f77e45..d01741a 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 1 2020 John Eckersberg - 0.2.5-4 - Add BuildRequires for make (re: https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot) From b7bb17400c55d30b6d19b6f8e7d805be0b22ad96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:50:25 +0000 Subject: [PATCH 26/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index d01741a..d1a601e 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.2.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 06227bd6a9635858734e987ea240f3a77180d72d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:43:51 +0000 Subject: [PATCH 27/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index d1a601e..2498fcd 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.2.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 85169a3ef0e5b5c41c686594eef6ee991b9da9e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:30:49 +0000 Subject: [PATCH 28/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 2498fcd..dfc27ae 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.2.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fbf13835887f1095885a9a9a75bb995657f8a379 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:56:05 +0000 Subject: [PATCH 29/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index dfc27ae..5a2b0cc 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -69,6 +69,9 @@ make check %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.2.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.2.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2c8d33312a32a23f6a1606974db6b642e36dd1a1 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 17 May 2023 18:15:37 +0200 Subject: [PATCH 30/39] Review the license tag for docs according to the SPDX standard --- libyaml.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 5a2b0cc..4e7fc54 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -24,6 +24,10 @@ emitter written in C. Summary: Development files for LibYAML applications Requires: libyaml%{?_isa} = %{version}-%{release}, pkgconfig +# docs contain files generated by doxygen which are licensed as follows: +# dynsections.js and menu.js are GPL-2.0-or-later +# jquery.js is MIT +License: GPL-2.0-or-later AND MIT %description devel The %{name}-devel package contains libraries and header files for @@ -69,6 +73,9 @@ make check %changelog +* Wed May 17 2023 Karolina Surma - 0.2.5-10 +- Review the license tag according to the SPDX standard, declare the docs license + * Thu Jan 19 2023 Fedora Release Engineering - 0.2.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6550f506cf88cf8acebd668b27f96c5814413977 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:39:12 +0000 Subject: [PATCH 31/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 4e7fc54..5c5a411 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,6 @@ Name: libyaml Version: 0.2.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -73,6 +73,9 @@ make check %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.2.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 Karolina Surma - 0.2.5-10 - Review the license tag according to the SPDX standard, declare the docs license From 6dd8b68ee9e75f190bee5eefe197ad9a3cf2ccd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 26 Jul 2023 15:28:14 +0400 Subject: [PATCH 32/39] Add MinGW packages --- libyaml.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/libyaml.spec b/libyaml.spec index 5c5a411..a9a505c 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -1,6 +1,12 @@ +%global with_mingw 0 + +%if 0%{?fedora} +%global with_mingw 1 +%endif + Name: libyaml Version: 0.2.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -14,6 +20,13 @@ BuildRequires: gcc BuildRequires: libtool BuildRequires: make +%if %{with_mingw} +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc-c++ +%endif + %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and @@ -33,18 +46,52 @@ License: GPL-2.0-or-later AND MIT The %{name}-devel package contains libraries and header files for developing applications that use LibYAML. +%if %{with_mingw} +%package -n mingw32-libyaml +Summary: MinGW YAML 1.1 parser and emitter written in C +BuildArch: noarch + +%description -n mingw32-libyaml +YAML is a data serialization format designed for human readability and +interaction with scripting languages. LibYAML is a YAML parser and +emitter written in C. + +%package -n mingw64-libyaml +Summary: MinGW YAML 1.1 parser and emitter written in C +BuildArch: noarch + +%description -n mingw64-libyaml +YAML is a data serialization format designed for human readability and +interaction with scripting languages. LibYAML is a YAML parser and +emitter written in C. +%endif %prep %setup -q -n yaml-%{version} %build +%define _configure ../configure +mkdir build +pushd build %configure %make_build all html +popd +%if %{with_mingw} +%mingw_configure +%mingw_make_build +%endif %install +pushd build %make_install +popd + +%if %{with_mingw} +%mingw_make_install +%endif + rm -f %{buildroot}%{_libdir}/*.{la,a} soname=$(readelf -d %{buildroot}%{_libdir}/libyaml.so | awk '$2 == "(SONAME)" {print $NF}' | tr -d '[]') @@ -53,8 +100,9 @@ echo "INPUT($soname)" > %{buildroot}%{_libdir}/libyaml.so %check +pushd build make check - +popd %ldconfig_scriptlets @@ -72,7 +120,29 @@ make check %{_includedir}/yaml.h +%if %{with_mingw} +%files -n mingw32-libyaml +%license License +%{mingw32_bindir}/libyaml-0-2.dll +%{mingw32_includedir}/yaml.h +%{mingw32_libdir}/libyaml.a +%{mingw32_libdir}/libyaml.dll.a +%{mingw32_libdir}/pkgconfig/yaml-0.1.pc + +%files -n mingw64-libyaml +%license License +%{mingw64_bindir}/libyaml-0-2.dll +%{mingw64_includedir}/yaml.h +%{mingw64_libdir}/libyaml.a +%{mingw64_libdir}/libyaml.dll.a +%{mingw64_libdir}/pkgconfig/yaml-0.1.pc +%endif + + %changelog +* Wed Jul 26 2023 Marc-André Lureau - 0.2.5-12 +- Add MinGW packages. + * Thu Jul 20 2023 Fedora Release Engineering - 0.2.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d660d140aaf709f9d4d5e0b8d9a801cc464cf155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:51:12 +0000 Subject: [PATCH 33/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index a9a505c..145d6ea 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -6,7 +6,7 @@ Name: libyaml Version: 0.2.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -140,6 +140,9 @@ popd %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.2.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 26 2023 Marc-André Lureau - 0.2.5-12 - Add MinGW packages. From 64202a7ed39442eabbb54ce42c4d0dec14ebf72a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:08:50 +0000 Subject: [PATCH 34/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 145d6ea..44720e2 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -6,7 +6,7 @@ Name: libyaml Version: 0.2.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -140,6 +140,9 @@ popd %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.2.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.2.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f1ba5cdc1dbc09610e47aad31799557f13d99d3c Mon Sep 17 00:00:00 2001 From: Lukas Zachar Date: Fri, 10 May 2024 13:50:43 +0200 Subject: [PATCH 35/39] Import CI tests from RHEL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is from RHEL distgit tests/libyaml, directory Sanity/smoke. The original commit hash: 03647450fb247d1304a8f372c63db2bca5273bb4 Only necessary files were kept (and simplified). Co-Authored-By: Miro Hrončok --- .fmf/version | 1 + plan.fmf | 4 ++ tests/smoke/main.fmf | 12 ++++++ tests/smoke/regression_1033990.yaml | 4 ++ tests/smoke/regression_1063866.yaml | 6 +++ tests/smoke/run-parser.c | 63 +++++++++++++++++++++++++++++ tests/smoke/runtest.sh | 39 ++++++++++++++++++ 7 files changed, 129 insertions(+) create mode 100644 .fmf/version create mode 100644 plan.fmf create mode 100644 tests/smoke/main.fmf create mode 100644 tests/smoke/regression_1033990.yaml create mode 100644 tests/smoke/regression_1063866.yaml create mode 100644 tests/smoke/run-parser.c create mode 100755 tests/smoke/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..e6427de --- /dev/null +++ b/plan.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..0331d09 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,12 @@ +summary: Run examples +description: | + Runs simple examples which already caused problems while fixing CVE. + run-parser is taken from the source +component: + - libyaml +test: ./runtest.sh +framework: beakerlib +require: + - libyaml-devel + - gcc +duration: 5m diff --git a/tests/smoke/regression_1033990.yaml b/tests/smoke/regression_1033990.yaml new file mode 100644 index 0000000..6f25454 --- /dev/null +++ b/tests/smoke/regression_1033990.yaml @@ -0,0 +1,4 @@ +%YAML 1.1 +--- +{Backoff: 1} +... diff --git a/tests/smoke/regression_1063866.yaml b/tests/smoke/regression_1063866.yaml new file mode 100644 index 0000000..68f23a0 --- /dev/null +++ b/tests/smoke/regression_1063866.yaml @@ -0,0 +1,6 @@ +%YAML 1.1 +--- # Indented Block + name: John Smith + age: 33 +--- # Inline Block +{name: John Smith, age: 33} diff --git a/tests/smoke/run-parser.c b/tests/smoke/run-parser.c new file mode 100644 index 0000000..1303112 --- /dev/null +++ b/tests/smoke/run-parser.c @@ -0,0 +1,63 @@ +#include + +#include +#include + +#ifdef NDEBUG +#undef NDEBUG +#endif +#include + +int +main(int argc, char *argv[]) +{ + int number; + + if (argc < 2) { + printf("Usage: %s file1.yaml ...\n", argv[0]); + return 0; + } + + for (number = 1; number < argc; number ++) + { + FILE *file; + yaml_parser_t parser; + yaml_event_t event; + int done = 0; + int count = 0; + int error = 0; + + printf("[%d] Parsing '%s': ", number, argv[number]); + fflush(stdout); + + file = fopen(argv[number], "rb"); + assert(file); + + assert(yaml_parser_initialize(&parser)); + + yaml_parser_set_input_file(&parser, file); + + while (!done) + { + if (!yaml_parser_parse(&parser, &event)) { + error = 1; + break; + } + + done = (event.type == YAML_STREAM_END_EVENT); + + yaml_event_delete(&event); + + count ++; + } + + yaml_parser_delete(&parser); + + assert(!fclose(file)); + + printf("%s (%d events)\n", (error ? "FAILURE" : "SUCCESS"), count); + } + + return 0; +} + diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100755 index 0000000..e1540ed --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/libyaml/Sanity/smoke +# Description: What the test does +# Author: Lukas Zachar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2014 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartTest + rlRun "gcc -O2 -Wall -W -g run-parser.c -lyaml -o run-parser" + rlRun "./run-parser regression_1063866.yaml" + rlRun "./run-parser regression_1033990.yaml" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From 8831ece8e320141dfdf5bc07c020e09dcf8233ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:36:42 +0000 Subject: [PATCH 36/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 44720e2..5110cab 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -6,7 +6,7 @@ Name: libyaml Version: 0.2.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: YAML 1.1 parser and emitter written in C License: MIT @@ -140,6 +140,9 @@ popd %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.2.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.2.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d1c17317afc769e7859a835f6560adaaf8b31f91 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 1 Aug 2024 14:17:17 +0200 Subject: [PATCH 37/39] Mark the license in specfile as SPDX --- libyaml.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libyaml.spec b/libyaml.spec index 5110cab..d79544d 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -9,6 +9,7 @@ Version: 0.2.5 Release: 15%{?dist} Summary: YAML 1.1 parser and emitter written in C +# SPDX License: MIT URL: https://github.com/yaml/libyaml Source0: https://github.com/yaml/libyaml/releases/download/%{version}/yaml-%{version}.tar.gz From 27ef5073dd2681c47a066637296e17f24d375453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:31:22 +0000 Subject: [PATCH 38/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index d79544d..38699b3 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -6,7 +6,7 @@ Name: libyaml Version: 0.2.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: YAML 1.1 parser and emitter written in C # SPDX @@ -141,6 +141,9 @@ popd %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.2.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.2.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 866e1217169247473ad626eecd88772eef9dd679 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:38:55 +0000 Subject: [PATCH 39/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libyaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libyaml.spec b/libyaml.spec index 38699b3..5bf1f66 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -6,7 +6,7 @@ Name: libyaml Version: 0.2.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: YAML 1.1 parser and emitter written in C # SPDX @@ -141,6 +141,9 @@ popd %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.2.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.2.5-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild