From 7d90220a131ef5972aae77c0232c9b718a513569 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Mon, 19 Oct 2009 16:12:14 +0000 Subject: [PATCH 01/77] - Remove duplicate file Wed Oct 14 2009 Guido Grazioli - 0.2.2-1 - Initial packaging --- .cvsignore | 1 + import.log | 1 + sources | 1 + yaml-cpp.spec | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 import.log create mode 100644 yaml-cpp.spec diff --git a/.cvsignore b/.cvsignore index e69de29..6536bcb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +yaml-cpp-0.2.2.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..f851088 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +yaml-cpp-0_2_2-2_fc11:HEAD:yaml-cpp-0.2.2-2.fc11.src.rpm:1255968695 diff --git a/sources b/sources index e69de29..78a06fe 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +80863a39b967af3275aa3b88a8c7a12e yaml-cpp-0.2.2.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec new file mode 100644 index 0000000..06bea68 --- /dev/null +++ b/yaml-cpp.spec @@ -0,0 +1,76 @@ +Name: yaml-cpp +Version: 0.2.2 +Release: 2%{?dist} +Summary: A YAML parser and emitter for C++ +Group: Development/Libraries +License: MIT +URL: http://code.google.com/p/yaml-cpp/ +Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cmake + +%description +yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +License: MIT +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q -c +# Fix eol +sed -i 's/\r//' license.txt +# Fix cmake config +sed -i 's/set(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")/set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra ${CMAKE_CXX_FLAGS}")/g' CMakeLists.txt + + +%build +# ask cmake to not strip binaries +%cmake . +make VERBOSE=1 %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +find %{buildroot} -name '*.la' -exec rm -f {} ';' + + +%clean +rm -rf %{buildroot} + + +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc license.txt +%{_libdir}/*.so.* + + +%files devel +%defattr(-,root,root,-) +%{_includedir}/yaml-cpp/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + + +%changelog +* Sat Oct 17 2009 Guido Grazioli - 0.2.2-2 +- Remove duplicate file + +* Wed Oct 14 2009 Guido Grazioli - 0.2.2-1 +- Initial packaging From 695377ff16ff7b261dcd31d1507e5a85158ce739 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:34 +0000 Subject: [PATCH 02/77] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f668217..c3afcbf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := yaml-cpp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From afed607f5f10e853955d19180757c5343f3976eb Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Mon, 18 Jan 2010 10:07:56 +0000 Subject: [PATCH 03/77] - Upstream 0.2.4 --- .cvsignore | 2 +- sources | 2 +- yaml-cpp.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6536bcb..f5c6960 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yaml-cpp-0.2.2.tar.gz +yaml-cpp-0.2.4.tar.gz diff --git a/sources b/sources index 78a06fe..232e4fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80863a39b967af3275aa3b88a8c7a12e yaml-cpp-0.2.2.tar.gz +84bb4109df5ea2e1d0b52b6f845bfa26 yaml-cpp-0.2.4.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 06bea68..67c7edb 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp -Version: 0.2.2 -Release: 2%{?dist} +Version: 0.2.4 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -26,11 +26,9 @@ developing applications that use %{name}. %prep -%setup -q -c +%setup -q # Fix eol sed -i 's/\r//' license.txt -# Fix cmake config -sed -i 's/set(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")/set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra ${CMAKE_CXX_FLAGS}")/g' CMakeLists.txt %build @@ -69,6 +67,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 15 2010 Guido Grazioli - 0.2.4-1 +- Upstream 0.2.4 + * Sat Oct 17 2009 Guido Grazioli - 0.2.2-2 - Remove duplicate file From 989e0cb2f6b9d151ff9b77b52c43e87d36ee35c1 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Fri, 2 Apr 2010 11:30:43 +0000 Subject: [PATCH 04/77] - Upstream 0.2.5 --- .cvsignore | 2 +- sources | 2 +- yaml-cpp.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5c6960..6d3463d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yaml-cpp-0.2.4.tar.gz +yaml-cpp-0.2.5.tar.gz diff --git a/sources b/sources index 232e4fe..f0c37bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84bb4109df5ea2e1d0b52b6f845bfa26 yaml-cpp-0.2.4.tar.gz +b17dc36055cd2259c88b2602601415d9 yaml-cpp-0.2.5.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 67c7edb..901eedd 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,5 +1,5 @@ Name: yaml-cpp -Version: 0.2.4 +Version: 0.2.5 Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries @@ -67,6 +67,9 @@ rm -rf %{buildroot} %changelog +* Fri Apr 02 2010 Guido Grazioli - 0.2.5-1 +- Upstream 0.2.5 + * Fri Jan 15 2010 Guido Grazioli - 0.2.4-1 - Upstream 0.2.4 From f04e06ff0b15bb1c2ab74a798950b7b02db6fa34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:18:50 +0000 Subject: [PATCH 05/77] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c3afcbf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yaml-cpp -# $Id$ -NAME := yaml-cpp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index f851088..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -yaml-cpp-0_2_2-2_fc11:HEAD:yaml-cpp-0.2.2-2.fc11.src.rpm:1255968695 From d3cc924fd884f59d6ee93c8c9fd4749c43ba282c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 01:19:39 -0600 Subject: [PATCH 06/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 901eedd..e45f02b 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -67,6 +67,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Apr 02 2010 Guido Grazioli - 0.2.5-1 - Upstream 0.2.5 From 5eefe9c85a504417633b88eed8151725ad54ac20 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Mon, 9 May 2011 14:13:44 +0200 Subject: [PATCH 07/77] * Mon May 09 2011 Guido Grazioli - 0.2.6-1 - Upstream 0.2.6 --- .gitignore | 1 + 001_yaml-cpp_fixbuildgcc46.patch | 22 ++++++++++++++++++++++ sources | 2 +- yaml-cpp.spec | 14 ++++++++++---- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 001_yaml-cpp_fixbuildgcc46.patch diff --git a/.gitignore b/.gitignore index 6d3463d..77055e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ yaml-cpp-0.2.5.tar.gz +/yaml-cpp-0.2.6.tar.gz diff --git a/001_yaml-cpp_fixbuildgcc46.patch b/001_yaml-cpp_fixbuildgcc46.patch new file mode 100644 index 0000000..e5b6ad2 --- /dev/null +++ b/001_yaml-cpp_fixbuildgcc46.patch @@ -0,0 +1,22 @@ +diff -ru yaml-cpp-0.2.6//src/ptr_stack.h yaml-cpp//src/ptr_stack.h +--- a/src/ptr_stack.h 2011-03-03 09:11:14.000000000 +0100 ++++ b/src/ptr_stack.h 2011-05-09 13:59:18.039965165 +0200 +@@ -8,6 +8,7 @@ + #include "yaml-cpp/noncopyable.h" + #include + #include ++#include + + template + class ptr_stack: private YAML::noncopyable +diff -ru yaml-cpp-0.2.6//src/ptr_vector.h yaml-cpp//src/ptr_vector.h +--- a/src/ptr_vector.h 2011-03-16 02:13:41.000000000 +0100 ++++ b/src/ptr_vector.h 2011-05-09 13:58:46.607892700 +0200 +@@ -8,6 +8,7 @@ + #include "yaml-cpp/noncopyable.h" + #include + #include ++#include + + namespace YAML { + diff --git a/sources b/sources index f0c37bf..643253b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b17dc36055cd2259c88b2602601415d9 yaml-cpp-0.2.5.tar.gz +ddfa5e8d409d9dafbeb6d190cd68dbcb yaml-cpp-0.2.6.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index e45f02b..4ab9fed 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,11 +1,13 @@ Name: yaml-cpp -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT URL: http://code.google.com/p/yaml-cpp/ Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz +# fix build with g++ 4.6; notified upstream +Patch0: 001_yaml-cpp_fixbuildgcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -26,14 +28,15 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n yaml-cpp +%patch0 -p1 # Fix eol sed -i 's/\r//' license.txt %build # ask cmake to not strip binaries -%cmake . +%cmake . -DYAML_CPP_BUILD_TOOLS=0 make VERBOSE=1 %{?_smp_mflags} @@ -67,6 +70,9 @@ rm -rf %{buildroot} %changelog +* Mon May 09 2011 Guido Grazioli - 0.2.6-1 +- Upstream 0.2.6 + * Tue Feb 08 2011 Fedora Release Engineering - 0.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 8901c52b7d764f6a9f3b5f9765cd4f5505bf5f20 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Fri, 30 Sep 2011 14:24:48 +1000 Subject: [PATCH 08/77] Update to 0.2.7 Remove gcc 4.6 patch fixed upstream --- .gitignore | 1 + 001_yaml-cpp_fixbuildgcc46.patch | 22 ---------------------- sources | 2 +- yaml-cpp.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 001_yaml-cpp_fixbuildgcc46.patch diff --git a/.gitignore b/.gitignore index 77055e9..6d8a679 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.6.tar.gz +/yaml-cpp-0.2.7.tar.gz diff --git a/001_yaml-cpp_fixbuildgcc46.patch b/001_yaml-cpp_fixbuildgcc46.patch deleted file mode 100644 index e5b6ad2..0000000 --- a/001_yaml-cpp_fixbuildgcc46.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru yaml-cpp-0.2.6//src/ptr_stack.h yaml-cpp//src/ptr_stack.h ---- a/src/ptr_stack.h 2011-03-03 09:11:14.000000000 +0100 -+++ b/src/ptr_stack.h 2011-05-09 13:59:18.039965165 +0200 -@@ -8,6 +8,7 @@ - #include "yaml-cpp/noncopyable.h" - #include - #include -+#include - - template - class ptr_stack: private YAML::noncopyable -diff -ru yaml-cpp-0.2.6//src/ptr_vector.h yaml-cpp//src/ptr_vector.h ---- a/src/ptr_vector.h 2011-03-16 02:13:41.000000000 +0100 -+++ b/src/ptr_vector.h 2011-05-09 13:58:46.607892700 +0200 -@@ -8,6 +8,7 @@ - #include "yaml-cpp/noncopyable.h" - #include - #include -+#include - - namespace YAML { - diff --git a/sources b/sources index 643253b..bde26e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddfa5e8d409d9dafbeb6d190cd68dbcb yaml-cpp-0.2.6.tar.gz +6878e14bad90c69a8f2caca273eb24c2 yaml-cpp-0.2.7.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4ab9fed..eccf2fb 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,13 +1,11 @@ Name: yaml-cpp -Version: 0.2.6 +Version: 0.2.7 Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT URL: http://code.google.com/p/yaml-cpp/ Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz -# fix build with g++ 4.6; notified upstream -Patch0: 001_yaml-cpp_fixbuildgcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -28,8 +26,7 @@ developing applications that use %{name}. %prep -%setup -q -n yaml-cpp -%patch0 -p1 +%setup -q # Fix eol sed -i 's/\r//' license.txt @@ -70,6 +67,10 @@ rm -rf %{buildroot} %changelog +* Fri Sep 30 2011 Guido Grazioli - 0.2.7-1 +- Update to 0.2.7 +- Remove gcc 4.6 patch fixed upstream + * Mon May 09 2011 Guido Grazioli - 0.2.6-1 - Upstream 0.2.6 From 5934acb74e73fdda145063af936588da4a076707 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:24:47 -0600 Subject: [PATCH 09/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index eccf2fb..0007604 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -67,6 +67,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Sep 30 2011 Guido Grazioli - 0.2.7-1 - Update to 0.2.7 - Remove gcc 4.6 patch fixed upstream From 2b235e84c29258523337cdad6ea1868b9e23a7b1 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Fri, 10 Feb 2012 10:26:07 -0600 Subject: [PATCH 10/77] Update to latest release. --- .gitignore | 1 + sources | 2 +- yaml-cpp.spec | 23 +++++++++-------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6d8a679..80cb5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.6.tar.gz /yaml-cpp-0.2.7.tar.gz +/yaml-cpp-0.3.0.tar.gz diff --git a/sources b/sources index bde26e1..8453a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6878e14bad90c69a8f2caca273eb24c2 yaml-cpp-0.2.7.tar.gz +9aa519205a543f9372bf4179071c8ac6 yaml-cpp-0.3.0.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 0007604..acbd820 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,14 +1,15 @@ Name: yaml-cpp -Version: 0.2.7 -Release: 2%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT URL: http://code.google.com/p/yaml-cpp/ Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: cmake + %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -26,7 +27,7 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n %{name} # Fix eol sed -i 's/\r//' license.txt @@ -38,36 +39,30 @@ make VERBOSE=1 %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} find %{buildroot} -name '*.la' -exec rm -f {} ';' -%clean -rm -rf %{buildroot} - - %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc license.txt %{_libdir}/*.so.* - %files devel -%defattr(-,root,root,-) %{_includedir}/yaml-cpp/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 0.2.7-2 +* Fri Feb 10 2012 Richard Shaw - 0.3.0-1 +- Update to latest release. + +* Sat Jan 14 2012 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Fri Sep 30 2011 Guido Grazioli - 0.2.7-1 From 5f67a12b0c350da64cd5ee44dd1254a710c99f02 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:33:23 -0500 Subject: [PATCH 11/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index acbd820..5e10e38 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Feb 10 2012 Richard Shaw - 0.3.0-1 - Update to latest release. From fd2adfd1ea3978e11d2f0e90d342b06d8cc716bf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:09:02 -0600 Subject: [PATCH 12/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 5e10e38..1a5c058 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From ae11fb8f79b0f7c520460f69546552c404b7b11e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:28:32 -0500 Subject: [PATCH 13/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 1a5c058..98085d4 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 55a75fba565fee4c711af405b7653c47f5977c81 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 31 Oct 2013 09:03:58 -0500 Subject: [PATCH 14/77] Update to latest upstream release. --- .gitignore | 1 + sources | 2 +- yaml-cpp.spec | 17 ++++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 80cb5b1..9989916 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.6.tar.gz /yaml-cpp-0.2.7.tar.gz /yaml-cpp-0.3.0.tar.gz +/yaml-cpp-0.5.1.tar.gz diff --git a/sources b/sources index 8453a58..210cc7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9aa519205a543f9372bf4179071c8ac6 yaml-cpp-0.3.0.tar.gz +0fa47a5ed8fedefab766592785c85ee7 yaml-cpp-0.5.1.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 98085d4..abd8881 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp -Version: 0.3.0 -Release: 4%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -8,7 +8,7 @@ URL: http://code.google.com/p/yaml-cpp/ Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz BuildRequires: cmake - +BuildRequires: boost-devel %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -18,8 +18,9 @@ yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. Summary: Development files for %{name} Group: Development/Libraries License: MIT -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +Requires: boost-devel %description devel The %{name}-devel package contains libraries and header files for @@ -27,7 +28,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{name} +%setup -q # Fix eol sed -i 's/\r//' license.txt @@ -39,8 +40,7 @@ make VERBOSE=1 %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -find %{buildroot} -name '*.la' -exec rm -f {} ';' +%make_install %post -p /sbin/ldconfig @@ -59,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Fri Sep 27 2013 Richard Shaw - 0.5.1-1 +- Update to latest upstream release. + * Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From c6dbed3a68fbe0a7392d2886778be255af25a439 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 14 Nov 2013 09:41:31 -0600 Subject: [PATCH 15/77] Update changelog. --- yaml-cpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index abd8881..eb18a73 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -59,7 +59,7 @@ make VERBOSE=1 %{?_smp_mflags} %changelog -* Fri Sep 27 2013 Richard Shaw - 0.5.1-1 +* Thu Nov 14 2013 Richard Shaw - 0.5.1-1 - Update to latest upstream release. * Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-4 From ea2d319655685334185c598eb796f62bb1b2adf5 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 01:28:07 +0200 Subject: [PATCH 16/77] Rebuild for boost 1.55.0 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index eb18a73..27f303c 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Fri May 23 2014 Petr Machata - 0.5.1-2 +- Rebuild for boost 1.55.0 + * Thu Nov 14 2013 Richard Shaw - 0.5.1-1 - Update to latest upstream release. From f5340cf6ccf39bd22eb4a9bf26604c50d35cc4c3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:41:13 -0500 Subject: [PATCH 17/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 27f303c..39cf438 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 0.5.1-2 - Rebuild for boost 1.55.0 From 9f9b6e0c0b6bf06af4908d315ca7c4c9c854857d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:17:14 +0000 Subject: [PATCH 18/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 39cf438..46cc0c1 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From bc8a112a1664c48eab3a931b7f970d8a53dfdae6 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 01:41:25 +0100 Subject: [PATCH 19/77] Rebuild for boost 1.57.0 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 46cc0c1..0db7513 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Tue Jan 27 2015 Petr Machata - 0.5.1-5 +- Rebuild for boost 1.57.0 + * Mon Aug 18 2014 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From abaa3a973b9858a2254abfe9d26cb9cb285c4f35 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Thu, 26 Feb 2015 13:16:45 +1100 Subject: [PATCH 20/77] Rebuild for gcc switching default to -std=gnu11 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 0db7513..594a4bc 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Thu Feb 26 2015 Guido Grazioli - 0.5.1-6 +- Rebuild for gcc switching default to -std=gnu11 + * Tue Jan 27 2015 Petr Machata - 0.5.1-5 - Rebuild for boost 1.57.0 From c47ddbe3be884e0776919367671060464de0c34e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:49:41 +0200 Subject: [PATCH 21/77] Rebuilt for GCC 5 C++11 ABI change --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 594a4bc..0448c26 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Sat May 02 2015 Kalev Lember - 0.5.1-7 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Feb 26 2015 Guido Grazioli - 0.5.1-6 - Rebuild for gcc switching default to -std=gnu11 From 55169acbe1ebbe082813afe0ac8ce630ca346850 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:34:13 +0000 Subject: [PATCH 22/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 0448c26..e1b1fb6 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 0.5.1-7 - Rebuilt for GCC 5 C++11 ABI change From 8438f4e755fe70494e0110fbb02ba8e68f1aecbf Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 22:40:01 +0200 Subject: [PATCH 23/77] rebuild for Boost 1.58 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index e1b1fb6..a6af82f 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Wed Jul 22 2015 David Tardon - 0.5.1-9 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 0.5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3ee24097767e3e095161813b132bfc6c9e6ad38b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:38:19 -0500 Subject: [PATCH 24/77] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index a6af82f..15a8976 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 0.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 0.5.1-9 - rebuild for Boost 1.58 From 67dfae6477db5db05f327e2124496cd37bbe887d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 16:42:10 +0100 Subject: [PATCH 25/77] Rebuilt for Boost 1.59 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 15a8976..2bc7fba 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Thu Aug 27 2015 Jonathan Wakely - 0.5.1-11 +- Rebuilt for Boost 1.59 + * Wed Jul 29 2015 Fedora Release Engineering - 0.5.1-10 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 40f11b91d6967e3160df47d5ecf8846f7eb44b63 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 04:46:33 +0000 Subject: [PATCH 26/77] Rebuilt for Boost 1.60 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 2bc7fba..9ed6750 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Sat Jan 16 2016 Jonathan Wakely - 0.5.1-12 +- Rebuilt for Boost 1.60 + * Thu Aug 27 2015 Jonathan Wakely - 0.5.1-11 - Rebuilt for Boost 1.59 From 14989d9a72df4643065747e0faa08296032cfaa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:55:39 +0000 Subject: [PATCH 27/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 9ed6750..ccbae65 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 0.5.1-12 - Rebuilt for Boost 1.60 From 7133c3092f090ef2e655387e74e9e3ed5d5d54e5 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Tue, 23 Aug 2016 08:00:48 -0500 Subject: [PATCH 28/77] Update to latest upstream release. --- .gitignore | 1 + sources | 2 +- yaml-cpp.spec | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9989916..40f43da 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.7.tar.gz /yaml-cpp-0.3.0.tar.gz /yaml-cpp-0.5.1.tar.gz +/yaml-cpp-0.5.3.tar.gz diff --git a/sources b/sources index 210cc7a..3959291 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fa47a5ed8fedefab766592785c85ee7 yaml-cpp-0.5.1.tar.gz +64200ca0bf5e0af065804d8d3e8f6d42 yaml-cpp-0.5.3.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index ccbae65..990bee4 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,13 +1,12 @@ Name: yaml-cpp -Version: 0.5.1 -Release: 13%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT -URL: http://code.google.com/p/yaml-cpp/ -Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz - -BuildRequires: cmake +URL: https://github.com/jbeder/yaml-cpp +Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz +BuildRequires: cmake gcc-c++ BuildRequires: boost-devel %description @@ -28,9 +27,7 @@ developing applications that use %{name}. %prep -%setup -q -# Fix eol -sed -i 's/\r//' license.txt +%setup -qn %{name}-release-%{version} %build @@ -49,7 +46,8 @@ make VERBOSE=1 %{?_smp_mflags} %files -%doc license.txt +%doc CONTRIBUTING.md README.md +%license LICENSE %{_libdir}/*.so.* %files devel @@ -59,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Tue Aug 23 2016 Richard Shaw - 0.5.3-1 +- Update to latest upstream release. + * Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 2204f63256799dd74cf92f9983cd24a16934d0f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 09:35:03 +0000 Subject: [PATCH 29/77] Rebuilt for Boost 1.63 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 990bee4..bb78e2b 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 +- Rebuilt for Boost 1.63 + * Tue Aug 23 2016 Richard Shaw - 0.5.3-1 - Update to latest upstream release. From e44a6a4956ab97483a7782ab37fb8d8554a1b8aa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 16:47:12 +0000 Subject: [PATCH 30/77] Rebuilt for Boost 1.63 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index bb78e2b..238eed2 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 +- Rebuilt for Boost 1.63 + * Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 - Rebuilt for Boost 1.63 From 3304525182997ba5524dba594ee67c3a2761362c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:14:17 +0000 Subject: [PATCH 31/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 238eed2..09100ee 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 - Rebuilt for Boost 1.63 From ea899c089ce8c94a9cf4780ab87d8b8309fad034 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 4 Jul 2017 14:28:15 +0100 Subject: [PATCH 32/77] Rebuilt for Boost 1.64 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 09100ee..bbe222a 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Tue Jul 04 2017 Jonathan Wakely - 0.5.3-5 +- Rebuilt for Boost 1.64 + * Sat Feb 11 2017 Fedora Release Engineering - 0.5.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9b0b050bf8396e1786a58ad24cebd39af7a078b1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 19 Jul 2017 17:36:53 +0100 Subject: [PATCH 33/77] Rebuilt for s390x binutils bug --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index bbe222a..47a322d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Wed Jul 19 2017 Jonathan Wakely - 0.5.3-6 +- Rebuilt for s390x binutils bug + * Tue Jul 04 2017 Jonathan Wakely - 0.5.3-5 - Rebuilt for Boost 1.64 From 90888ad77328ce485e3eb633a483a5c0827824e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:32:22 +0000 Subject: [PATCH 34/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 47a322d..4b243ec 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.5.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 19 2017 Jonathan Wakely - 0.5.3-6 - Rebuilt for s390x binutils bug From c47e3d49b154d323bf2f5ac938791132b88cdee9 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 01:07:28 +0000 Subject: [PATCH 35/77] Rebuilt for Boost 1.66 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4b243ec..cc27fb5 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -57,6 +57,9 @@ make VERBOSE=1 %{?_smp_mflags} %changelog +* Tue Jan 23 2018 Jonathan Wakely - 0.5.3-8 +- Rebuilt for Boost 1.66 + * Thu Jul 27 2017 Fedora Release Engineering - 0.5.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 39910f27939f9f216826ba0f8c269ad99b008c5e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 30 Jan 2018 20:18:34 -0600 Subject: [PATCH 36/77] Install yaml cmake files, fixes RHBZ#1509421. Boost is no longer needed since 0.5.3. --- yaml-cpp.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index cc27fb5..51fe03b 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,13 +1,14 @@ Name: yaml-cpp Version: 0.5.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries + License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz + BuildRequires: cmake gcc-c++ -BuildRequires: boost-devel %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -19,7 +20,6 @@ Group: Development/Libraries License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -Requires: boost-devel %description devel The %{name}-devel package contains libraries and header files for @@ -39,6 +39,11 @@ make VERBOSE=1 %{?_smp_mflags} %install %make_install +# Install cmake devel files +mkdir -p %{buildroot}%{_libdir}/cmake/%{name} +install -pm 0644 yaml-cpp-config{,-version}.cmake \ + %{buildroot}%{_libdir}/cmake/%{name}/ + %post -p /sbin/ldconfig @@ -54,9 +59,14 @@ make VERBOSE=1 %{?_smp_mflags} %{_includedir}/yaml-cpp/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{_libdir}/cmake/%{name}/ %changelog +* Wed Jan 31 2018 Richard Shaw - 0.5.3-9 +- Install yaml cmake files, fixes RHBZ#1509421. +- Boost is no longer needed since 0.5.3. + * Tue Jan 23 2018 Jonathan Wakely - 0.5.3-8 - Rebuilt for Boost 1.66 From 6e82d94a891378575b58df97cfa5592a6e077615 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 30 Jan 2018 20:26:23 -0600 Subject: [PATCH 37/77] Boost headers are used... --- yaml-cpp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 51fe03b..20e9139 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -9,6 +9,7 @@ URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz BuildRequires: cmake gcc-c++ +BuildRequires: boost-devel %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -20,6 +21,7 @@ Group: Development/Libraries License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +Requires: boost-devel %description devel The %{name}-devel package contains libraries and header files for @@ -65,7 +67,6 @@ install -pm 0644 yaml-cpp-config{,-version}.cmake \ %changelog * Wed Jan 31 2018 Richard Shaw - 0.5.3-9 - Install yaml cmake files, fixes RHBZ#1509421. -- Boost is no longer needed since 0.5.3. * Tue Jan 23 2018 Jonathan Wakely - 0.5.3-8 - Rebuilt for Boost 1.66 From f2f5a7c112edfbcb7ed59204b00703576ebd881e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:13:43 +0000 Subject: [PATCH 38/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 20e9139..253663d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,6 +1,6 @@ Name: yaml-cpp Version: 0.5.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries @@ -65,6 +65,9 @@ install -pm 0644 yaml-cpp-config{,-version}.cmake \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.5.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 31 2018 Richard Shaw - 0.5.3-9 - Install yaml cmake files, fixes RHBZ#1509421. From 45ce59b7fafa8bb7e9a8ed369ca81d14e4b6a8d0 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 11 Feb 2018 12:04:55 -0600 Subject: [PATCH 39/77] Update to 0.6.0. Add static library subpackage. --- .gitignore | 1 + sources | 2 +- yaml-cpp-static.patch | 150 ++++++++++++++++++++++++++++++++++++++++++ yaml-cpp.spec | 49 +++++++++----- 4 files changed, 186 insertions(+), 16 deletions(-) create mode 100644 yaml-cpp-static.patch diff --git a/.gitignore b/.gitignore index 40f43da..8cfa603 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.3.0.tar.gz /yaml-cpp-0.5.1.tar.gz /yaml-cpp-0.5.3.tar.gz +/yaml-cpp-0.6.0.tar.gz diff --git a/sources b/sources index 3959291..e16f804 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64200ca0bf5e0af065804d8d3e8f6d42 yaml-cpp-0.5.3.tar.gz +SHA512 (yaml-cpp-0.6.0.tar.gz) = 186886201277a5d452801fd8f71e51434a31538af0443d0ab7ce8bb584e1171d083b28e21d29755bada9192e75b319e5e20a047325600045b1060385a307ab24 diff --git a/yaml-cpp-static.patch b/yaml-cpp-static.patch new file mode 100644 index 0000000..ffcb732 --- /dev/null +++ b/yaml-cpp-static.patch @@ -0,0 +1,150 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,6 +47,11 @@ option(YAML_CPP_BUILD_CONTRIB "Enable co + # see http://www.cmake.org/cmake/help/cmake2.6docs.html#variable:BUILD_SHARED_LIBS + # http://www.cmake.org/cmake/help/cmake2.6docs.html#command:add_library + option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) ++option(BUILD_STATIC_LIBS "Build Static Libraries" ON) ++ ++if(NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) ++ message(FATAL_ERROR "At least one library must be built.") ++endif() + + # --> Apple + option(APPLE_UNIVERSAL_BIN "Apple: Build universal binary" OFF) +@@ -274,16 +279,24 @@ set(_INSTALL_DESTINATIONS + ### + ### Library + ### +-add_library(yaml-cpp ${library_sources}) +-set_target_properties(yaml-cpp PROPERTIES +- COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" +-) ++if(BUILD_SHARED_LIBS) ++ add_library(yaml-cpp SHARED ${library_sources}) ++ set_target_properties(yaml-cpp PROPERTIES ++ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" ++ ) + +-set_target_properties(yaml-cpp PROPERTIES ++ set_target_properties(yaml-cpp PROPERTIES + VERSION "${YAML_CPP_VERSION}" + SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" + PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" +-) ++ ) ++endif() ++if(BUILD_STATIC_LIBS) ++ add_library(yaml-cpp-static STATIC ${library_sources}) ++ set_target_properties(yaml-cpp-static PROPERTIES ++ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" ++ OUTPUT_NAME yaml-cpp) ++endif() + + if(IPHONE) + set_target_properties(yaml-cpp PROPERTIES +@@ -303,48 +316,70 @@ if(MSVC) + endif() + endif() + +-install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS}) + install( + DIRECTORY ${header_directory} + DESTINATION ${INCLUDE_INSTALL_DIR} + FILES_MATCHING PATTERN "*.h" + ) + +-export( +- TARGETS yaml-cpp +- FILE "${PROJECT_BINARY_DIR}/yaml-cpp-targets.cmake") +-export(PACKAGE yaml-cpp) +-set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") +- +-set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) ++if(BUILD_SHARED_LIBS) ++ install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS}) ++ list(APPEND YAML_TARGETS "yaml-cpp") ++ list(APPEND EXPORT_TARGETS "yaml-cpp-targets") ++endif() ++if(BUILD_STATIC_LIBS) ++ install(TARGETS yaml-cpp-static EXPORT yaml-cpp-static-targets ${_INSTALL_DESTINATIONS}) ++ list(APPEND YAML_TARGETS "yaml-cpp-static") ++ list(APPEND EXPORT_TARGETS "yaml-cpp-static-targets") ++endif() ++ ++foreach(YAML_TARGET ${YAML_TARGETS}) ++ export(TARGETS ${YAML_TARGET} ++ FILE "${PROJECT_BINARY_DIR}/${YAML_TARGET}-targets.cmake") ++ export(PACKAGE yaml-cpp) ++ set(EXPORT_TARGETS ${YAML_TARGET} CACHE INTERNAL "export targets") ++ set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config.cmake" @ONLY) ++endforeach() + ++if(NOT INSTALL_CMAKE_DIR) + if(WIN32 AND NOT CYGWIN) + set(INSTALL_CMAKE_DIR CMake) + else() +- set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) ++ set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/) ++endif() + endif() + + file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") + set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in +- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY) +- +-install(FILES +- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) +-install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR}) ++foreach(YAML_TARGET ${YAML_TARGETS}) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) ++ ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" @ONLY) ++ ++ install(FILES ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" ++ DESTINATION "${INSTALL_CMAKE_DIR}${YAML_TARGET}" COMPONENT dev) ++ install(EXPORT ${YAML_TARGET}-targets DESTINATION ${INSTALL_CMAKE_DIR}${YAML_TARGET}) ++endforeach() + + if(UNIX) +- set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) ++if(BUILD_SHARED_LIBS) ++ list(APPEND PC_FILES ${CMAKE_BINARY_DIR}/yaml-cpp.pc) ++endif() ++if(BUILD_STATIC_LIBS) ++ list(APPEND PC_FILES ${CMAKE_BINARY_DIR}/yaml-cpp-static.pc) ++endif() ++foreach(PC_FILE ${PC_FILES}) + configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) + install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +-endif() ++endforeach() ++endif(UNIX) + + + ### +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -8,7 +8,7 @@ get_filename_component(YAML_CPP_CMAKE_DI + set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") ++include("${YAML_CPP_CMAKE_DIR}/@YAML_TARGET@-targets.cmake") + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 253663d..e09869d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,15 +1,15 @@ Name: yaml-cpp -Version: 0.5.3 -Release: 10%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries - License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz +Patch0: yaml-cpp-static.patch + BuildRequires: cmake gcc-c++ -BuildRequires: boost-devel %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -28,24 +28,33 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package static +Summary: Static library for %{name} +Group: Development/Libraries +License: MIT +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +The %{name}-static package contains the static library for %{name}. + + %prep -%setup -qn %{name}-release-%{version} +%autosetup -p1 -n %{name}-%{name}-%{version} %build # ask cmake to not strip binaries -%cmake . -DYAML_CPP_BUILD_TOOLS=0 -make VERBOSE=1 %{?_smp_mflags} +%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=ON \ + -DYAML_CPP_BUILD_TESTS=OFF \ + ./ +%make_build %install %make_install -# Install cmake devel files -mkdir -p %{buildroot}%{_libdir}/cmake/%{name} -install -pm 0644 yaml-cpp-config{,-version}.cmake \ - %{buildroot}%{_libdir}/cmake/%{name}/ - %post -p /sbin/ldconfig @@ -60,11 +69,21 @@ install -pm 0644 yaml-cpp-config{,-version}.cmake \ %files devel %{_includedir}/yaml-cpp/ %{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_libdir}/cmake/%{name}/ +%{_libdir}/cmake/%{name} +%{_libdir}/pkgconfig/%{name}.pc + +%files static +%license LICENSE +%{_libdir}/*.a +%{_libdir}/cmake/%{name}-static +%{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sun Feb 11 2018 Richard Shaw - 0.6.0-1 +- Update to 0.6.0. +- Add static library subpackage. + * Fri Feb 09 2018 Fedora Release Engineering - 0.5.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -88,7 +107,7 @@ install -pm 0644 yaml-cpp-config{,-version}.cmake \ * Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 - Rebuilt for Boost 1.63 - + * Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 - Rebuilt for Boost 1.63 From ac7b8cfffb62ee221fd2e74d074a82d8588b372e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 18 Feb 2018 06:48:44 -0600 Subject: [PATCH 40/77] Update to 0.6.1. --- .gitignore | 1 + sources | 2 +- yaml-cpp.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8cfa603..8fcb28b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.5.1.tar.gz /yaml-cpp-0.5.3.tar.gz /yaml-cpp-0.6.0.tar.gz +/yaml-cpp-0.6.1.tar.gz diff --git a/sources b/sources index e16f804..c839b43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.6.0.tar.gz) = 186886201277a5d452801fd8f71e51434a31538af0443d0ab7ce8bb584e1171d083b28e21d29755bada9192e75b319e5e20a047325600045b1060385a307ab24 +SHA512 (yaml-cpp-0.6.1.tar.gz) = 606482d1d38c6747e22604a24c119adb4b70287da7deadb94cc20d70df47122f1714ec9bfc8f566ecf075b94d48771df17430c50039cb984bdf1980f3b445791 diff --git a/yaml-cpp.spec b/yaml-cpp.spec index e09869d..8e3ab8a 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,5 +1,7 @@ +%global sover 0.6 + Name: yaml-cpp -Version: 0.6.0 +Version: 0.6.1 Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries @@ -9,7 +11,7 @@ Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.ta Patch0: yaml-cpp-static.patch -BuildRequires: cmake gcc-c++ +BuildRequires: cmake gcc gcc-c++ %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -64,7 +66,7 @@ The %{name}-static package contains the static library for %{name}. %files %doc CONTRIBUTING.md README.md %license LICENSE -%{_libdir}/*.so.* +%{_libdir}/*.so.%{sover}* %files devel %{_includedir}/yaml-cpp/ @@ -80,6 +82,9 @@ The %{name}-static package contains the static library for %{name}. %changelog +* Sun Feb 18 2018 Richard Shaw - 0.6.1-1 +- Update to 0.6.1. + * Sun Feb 11 2018 Richard Shaw - 0.6.0-1 - Update to 0.6.0. - Add static library subpackage. From 5be39b2a2f578eb56f4f0983c87f6b83f34f3dd2 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 9 Apr 2018 07:16:06 -0500 Subject: [PATCH 41/77] Fixes improperly generated cmake config files, RHBZ#1558637. --- yaml-cpp-include_dir.patch | 12 ++++ yaml-cpp-static.patch | 112 +++++++++++++------------------------ yaml-cpp.spec | 26 +++++++-- 3 files changed, 73 insertions(+), 77 deletions(-) create mode 100644 yaml-cpp-include_dir.patch diff --git a/yaml-cpp-include_dir.patch b/yaml-cpp-include_dir.patch new file mode 100644 index 0000000..4de7320 --- /dev/null +++ b/yaml-cpp-include_dir.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -335,8 +335,7 @@ else() + endif() + endif() + +-file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") +-set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") ++set(CONFIG_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}") + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in + "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) diff --git a/yaml-cpp-static.patch b/yaml-cpp-static.patch index ffcb732..5ae46f4 100644 --- a/yaml-cpp-static.patch +++ b/yaml-cpp-static.patch @@ -1,18 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -47,6 +47,11 @@ option(YAML_CPP_BUILD_CONTRIB "Enable co - # see http://www.cmake.org/cmake/help/cmake2.6docs.html#variable:BUILD_SHARED_LIBS - # http://www.cmake.org/cmake/help/cmake2.6docs.html#command:add_library - option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) -+option(BUILD_STATIC_LIBS "Build Static Libraries" ON) -+ -+if(NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) -+ message(FATAL_ERROR "At least one library must be built.") -+endif() - - # --> Apple - option(APPLE_UNIVERSAL_BIN "Apple: Build universal binary" OFF) -@@ -274,16 +279,24 @@ set(_INSTALL_DESTINATIONS +@@ -274,16 +274,20 @@ set(_INSTALL_DESTINATIONS ### ### Library ### @@ -20,30 +8,26 @@ -set_target_properties(yaml-cpp PROPERTIES - COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" -) +- +-set_target_properties(yaml-cpp PROPERTIES +if(BUILD_SHARED_LIBS) + add_library(yaml-cpp SHARED ${library_sources}) -+ set_target_properties(yaml-cpp PROPERTIES -+ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" -+ ) - --set_target_properties(yaml-cpp PROPERTIES + set_target_properties(yaml-cpp PROPERTIES VERSION "${YAML_CPP_VERSION}" SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" --) -+ ) -+endif() -+if(BUILD_STATIC_LIBS) -+ add_library(yaml-cpp-static STATIC ${library_sources}) -+ set_target_properties(yaml-cpp-static PROPERTIES + COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" -+ OUTPUT_NAME yaml-cpp) + ) ++else() ++ add_library(yaml-cpp STATIC ${library_sources}) ++ set_target_properties(yaml-cpp PROPERTIES ++ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" ++ ) +endif() if(IPHONE) set_target_properties(yaml-cpp PROPERTIES -@@ -303,48 +316,70 @@ if(MSVC) +@@ -303,48 +307,56 @@ if(MSVC) endif() endif() @@ -59,30 +43,20 @@ - FILE "${PROJECT_BINARY_DIR}/yaml-cpp-targets.cmake") -export(PACKAGE yaml-cpp) -set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") -- --set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) +if(BUILD_SHARED_LIBS) -+ install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS}) -+ list(APPEND YAML_TARGETS "yaml-cpp") -+ list(APPEND EXPORT_TARGETS "yaml-cpp-targets") ++ set(YAML_TARGET "yaml-cpp") ++else() ++ set(YAML_TARGET "yaml-cpp-static") +endif() -+if(BUILD_STATIC_LIBS) -+ install(TARGETS yaml-cpp-static EXPORT yaml-cpp-static-targets ${_INSTALL_DESTINATIONS}) -+ list(APPEND YAML_TARGETS "yaml-cpp-static") -+ list(APPEND EXPORT_TARGETS "yaml-cpp-static-targets") -+endif() -+ -+foreach(YAML_TARGET ${YAML_TARGETS}) -+ export(TARGETS ${YAML_TARGET} -+ FILE "${PROJECT_BINARY_DIR}/${YAML_TARGET}-targets.cmake") -+ export(PACKAGE yaml-cpp) -+ set(EXPORT_TARGETS ${YAML_TARGET} CACHE INTERNAL "export targets") -+ set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config.cmake" @ONLY) -+endforeach() + ++install(TARGETS yaml-cpp EXPORT ${YAML_TARGET}-targets ${_INSTALL_DESTINATIONS}) ++export(TARGETS yaml-cpp ++ FILE "${PROJECT_BINARY_DIR}/${YAML_TARGET}-targets.cmake") ++set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") + set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config.cmake" @ONLY) +if(NOT INSTALL_CMAKE_DIR) if(WIN32 AND NOT CYGWIN) @@ -98,41 +72,33 @@ -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY) - --install(FILES ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" @ONLY) + install(FILES - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) -install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR}) -+foreach(YAML_TARGET ${YAML_TARGETS}) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) -+ -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" @ONLY) -+ -+ install(FILES -+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" -+ DESTINATION "${INSTALL_CMAKE_DIR}${YAML_TARGET}" COMPONENT dev) -+ install(EXPORT ${YAML_TARGET}-targets DESTINATION ${INSTALL_CMAKE_DIR}${YAML_TARGET}) -+endforeach() ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" ++ DESTINATION "${INSTALL_CMAKE_DIR}${YAML_TARGET}" COMPONENT dev) ++install(EXPORT ${YAML_TARGET}-targets DESTINATION ${INSTALL_CMAKE_DIR}${YAML_TARGET}) if(UNIX) - set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) +- configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) +- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +if(BUILD_SHARED_LIBS) -+ list(APPEND PC_FILES ${CMAKE_BINARY_DIR}/yaml-cpp.pc) -+endif() -+if(BUILD_STATIC_LIBS) -+ list(APPEND PC_FILES ${CMAKE_BINARY_DIR}/yaml-cpp-static.pc) -+endif() -+foreach(PC_FILE ${PC_FILES}) - configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) - install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) --endif() -+endforeach() ++ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) ++else() ++ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp-static.pc) + endif() ++configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) ++install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +endif(UNIX) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 8e3ab8a..1291ccc 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -10,6 +10,7 @@ URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz Patch0: yaml-cpp-static.patch +Patch1: yaml-cpp-include_dir.patch BuildRequires: cmake gcc gcc-c++ @@ -45,17 +46,31 @@ The %{name}-static package contains the static library for %{name}. %build -# ask cmake to not strip binaries +rm -rf build_shared && mkdir build_shared +rm -rf build_static && mkdir build_static + +pushd build_shared %cmake -DYAML_CPP_BUILD_TOOLS=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=ON \ -DYAML_CPP_BUILD_TESTS=OFF \ - ./ + ../ +%make_build +popd + +pushd build_static +%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DYAML_CPP_BUILD_TESTS=OFF \ + ../ %make_build %install +pushd build_shared %make_install +popd +pushd build_static +%make_install yaml-cpp %post -p /sbin/ldconfig @@ -82,6 +97,9 @@ The %{name}-static package contains the static library for %{name}. %changelog +* Mon Apr 09 2018 Richard Shaw - 0.6.1-2 +- Fixes improperly generated cmake config files, RHBZ#1558637. + * Sun Feb 18 2018 Richard Shaw - 0.6.1-1 - Update to 0.6.1. From d7068eb7d86a9e2ea65b2e29345b8e2153b18909 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:40:20 +0000 Subject: [PATCH 42/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 1291ccc..e902487 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT @@ -97,6 +97,9 @@ pushd build_static %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 09 2018 Richard Shaw - 0.6.1-2 - Fixes improperly generated cmake config files, RHBZ#1558637. From 748443a9cd23b87e3ae85273bb341d07592765a5 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 16 Sep 2018 07:20:56 -0500 Subject: [PATCH 43/77] Add patch for CVE-2017-5950. --- CVE-2017-5950.patch | 383 ++++++++++++++++++++++++++++++++++++++++++++ yaml-cpp.spec | 9 +- 2 files changed, 388 insertions(+), 4 deletions(-) create mode 100644 CVE-2017-5950.patch diff --git a/CVE-2017-5950.patch b/CVE-2017-5950.patch new file mode 100644 index 0000000..3a96432 --- /dev/null +++ b/CVE-2017-5950.patch @@ -0,0 +1,383 @@ +From d540476e31b080aa1f903ad20ec0426dd3838be7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= +Date: Tue, 25 Apr 2017 20:10:20 -0400 +Subject: [PATCH 1/4] fix stack overflow in HandleNode() (CVE-2017-5950) + +simply set a hardcoded recursion limit to 2000 (inspired by Python's) +to avoid infinitely recursing into arbitrary data structures + +assert() the depth. unsure if this is the right approach, but given +that HandleNode() is "void", I am not sure how else to return an +error. the problem with this approach of course is that it will still +crash the caller, unless they have proper exception handling in place. + +Closes: #459 +--- + src/singledocparser.cpp | 2 ++ + src/singledocparser.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp +index a27c1c3b..1b4262ee 100644 +--- a/src/singledocparser.cpp ++++ b/src/singledocparser.cpp +@@ -46,6 +46,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { + } + + void SingleDocParser::HandleNode(EventHandler& eventHandler) { ++ assert(depth < depth_limit); ++ depth++; + // an empty node *is* a possibility + if (m_scanner.empty()) { + eventHandler.OnNull(m_scanner.mark(), NullAnchor); +diff --git a/src/singledocparser.h b/src/singledocparser.h +index 2b92067c..7046f1e2 100644 +--- a/src/singledocparser.h ++++ b/src/singledocparser.h +@@ -51,6 +51,8 @@ class SingleDocParser : private noncopyable { + anchor_t LookupAnchor(const Mark& mark, const std::string& name) const; + + private: ++ int depth = 0; ++ int depth_limit = 2000; + Scanner& m_scanner; + const Directives& m_directives; + std::unique_ptr m_pCollectionStack; + +From ac00ef937702598aa27739c8c46be37ac5699039 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= +Date: Wed, 26 Apr 2017 10:25:43 -0400 +Subject: [PATCH 2/4] throw an exception instead of using assert() + +assert() may be compiled out in production and is clunkier to catch. + +some ParserException are already thrown elsewhere in the code and it +seems to make sense to reuse the primitive, although it may still +crash improperly configured library consumers, those who do not handle +exceptions explicitly. + +we use the BAD_FILE error message because at this point we do not +exactly know which specific data structure led to the recursion. +--- + src/singledocparser.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp +index 1b4262ee..1af13f49 100644 +--- a/src/singledocparser.cpp ++++ b/src/singledocparser.cpp +@@ -46,7 +46,9 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { + } + + void SingleDocParser::HandleNode(EventHandler& eventHandler) { +- assert(depth < depth_limit); ++ if (depth > depth_limit) { ++ throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); ++ } + depth++; + // an empty node *is* a possibility + if (m_scanner.empty()) { + +From e78e3bf6a6d61ca321af90d213dc4435ed5cf602 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= +Date: Wed, 26 Apr 2017 10:39:45 -0400 +Subject: [PATCH 3/4] increase and decrease depth properly on subhandlers + +the original implementation couldn't parse a document with more than +depth_limit entries. now we explicitly increase *and* decrease the +depth on specific handlers like maps, sequences and so on - any +handler that may in turn callback into HandleNode(). + +this is a little clunky - I would have prefered to increment and +decrement the counter in only one place, but there are many different +return points and this is not Golang so I can't think of a better way +to to this. +--- + src/singledocparser.cpp | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp +index 1af13f49..89234867 100644 +--- a/src/singledocparser.cpp ++++ b/src/singledocparser.cpp +@@ -49,7 +49,6 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { + if (depth > depth_limit) { + throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); + } +- depth++; + // an empty node *is* a possibility + if (m_scanner.empty()) { + eventHandler.OnNull(m_scanner.mark(), NullAnchor); +@@ -61,9 +60,11 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { + + // special case: a value node by itself must be a map, with no header + if (m_scanner.peek().type == Token::VALUE) { ++ depth++; + eventHandler.OnMapStart(mark, "?", NullAnchor, EmitterStyle::Default); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); ++ depth--; + return; + } + +@@ -98,32 +99,42 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { + m_scanner.pop(); + return; + case Token::FLOW_SEQ_START: ++ depth++; + eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Flow); + HandleSequence(eventHandler); + eventHandler.OnSequenceEnd(); ++ depth--; + return; + case Token::BLOCK_SEQ_START: ++ depth++; + eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Block); + HandleSequence(eventHandler); + eventHandler.OnSequenceEnd(); ++ depth--; + return; + case Token::FLOW_MAP_START: ++ depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); ++ depth--; + return; + case Token::BLOCK_MAP_START: ++ depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Block); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); ++ depth--; + return; + case Token::KEY: + // compact maps can only go in a flow sequence + if (m_pCollectionStack->GetCurCollectionType() == + CollectionType::FlowSeq) { ++ depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); ++ depth--; + return; + } + break; + +From 1690cacb3ff6d927286ded92b8fedd37b4045c7c Mon Sep 17 00:00:00 2001 +From: Keith Bennett +Date: Thu, 29 Mar 2018 16:45:11 -0500 +Subject: [PATCH 4/4] use RAII type class to guard against stack depth + recursion instead of error-prone manual increment/check/decrement + +--- + include/yaml-cpp/depthguard.h | 74 +++++++++++++++++++++++++++++++++++ + src/depthguard.cpp | 14 +++++++ + src/singledocparser.cpp | 18 ++------- + src/singledocparser.h | 4 +- + 4 files changed, 94 insertions(+), 16 deletions(-) + create mode 100644 include/yaml-cpp/depthguard.h + create mode 100644 src/depthguard.cpp + +diff --git a/include/yaml-cpp/depthguard.h b/include/yaml-cpp/depthguard.h +new file mode 100644 +index 00000000..6aac81aa +--- /dev/null ++++ b/include/yaml-cpp/depthguard.h +@@ -0,0 +1,74 @@ ++#ifndef DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 ++#define DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 ++ ++#if defined(_MSC_VER) || \ ++ (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \ ++ (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 ++#pragma once ++#endif ++ ++#include "exceptions.h" ++ ++namespace YAML { ++ ++/** ++ * @brief The DeepRecursion class ++ * An exception class which is thrown by DepthGuard. Ideally it should be ++ * a member of DepthGuard. However, DepthGuard is a templated class which means ++ * that any catch points would then need to know the template parameters. It is ++ * simpler for clients to not have to know at the catch point what was the ++ * maximum depth. ++ */ ++class DeepRecursion : public ParserException { ++ int m_atDepth = 0; ++public: ++ // no custom dtor needed, but virtual dtor necessary to prevent slicing ++ virtual ~DeepRecursion() = default; ++ ++ // construct an exception explaining how deep you were ++ DeepRecursion(int at_depth, const Mark& mark_, const std::string& msg_); ++ ++ // query how deep you were when the exception was thrown ++ int AtDepth() const; ++}; ++ ++/** ++ * @brief The DepthGuard class ++ * DepthGuard takes a reference to an integer. It increments the integer upon ++ * construction of DepthGuard and decrements the integer upon destruction. ++ * ++ * If the integer would be incremented past max_depth, then an exception is ++ * thrown. This is ideally geared toward guarding against deep recursion. ++ * ++ * @param max_depth ++ * compile-time configurable maximum depth. ++ */ ++template ++class DepthGuard final /* final because non-virtual dtor */ { ++ int & m_depth; ++public: ++ DepthGuard(int & depth_, const Mark& mark_, const std::string& msg_) : m_depth(depth_) { ++ ++m_depth; ++ if ( max_depth <= m_depth ) { ++ throw DeepRecursion{m_depth, mark_, msg_}; ++ } ++ } ++ ++ // DepthGuard is neither copyable nor moveable. ++ DepthGuard(const DepthGuard & copy_ctor) = delete; ++ DepthGuard(DepthGuard && move_ctor) = delete; ++ DepthGuard & operator=(const DepthGuard & copy_assign) = delete; ++ DepthGuard & operator=(DepthGuard && move_assign) = delete; ++ ++ ~DepthGuard() { ++ --m_depth; ++ } ++ ++ int current_depth() const { ++ return m_depth; ++ } ++}; ++ ++} // namespace YAML ++ ++#endif // DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 +diff --git a/src/depthguard.cpp b/src/depthguard.cpp +new file mode 100644 +index 00000000..6d47eba3 +--- /dev/null ++++ b/src/depthguard.cpp +@@ -0,0 +1,14 @@ ++#include "yaml-cpp/depthguard.h" ++ ++namespace YAML { ++ ++DeepRecursion::DeepRecursion(int at_depth, const Mark& mark_, const std::string& msg_) ++ : ParserException(mark_, msg_), ++ m_atDepth(at_depth) { ++} ++ ++int DeepRecursion::AtDepth() const { ++ return m_atDepth; ++} ++ ++} // namespace YAML +diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp +index 89234867..37cc1f51 100644 +--- a/src/singledocparser.cpp ++++ b/src/singledocparser.cpp +@@ -7,6 +7,7 @@ + #include "singledocparser.h" + #include "tag.h" + #include "token.h" ++#include "yaml-cpp/depthguard.h" + #include "yaml-cpp/emitterstyle.h" + #include "yaml-cpp/eventhandler.h" + #include "yaml-cpp/exceptions.h" // IWYU pragma: keep +@@ -46,9 +47,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { + } + + void SingleDocParser::HandleNode(EventHandler& eventHandler) { +- if (depth > depth_limit) { +- throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); +- } ++ DepthGuard depthguard(depth, m_scanner.mark(), ErrorMsg::BAD_FILE); ++ + // an empty node *is* a possibility + if (m_scanner.empty()) { + eventHandler.OnNull(m_scanner.mark(), NullAnchor); +@@ -60,11 +60,9 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { + + // special case: a value node by itself must be a map, with no header + if (m_scanner.peek().type == Token::VALUE) { +- depth++; + eventHandler.OnMapStart(mark, "?", NullAnchor, EmitterStyle::Default); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); +- depth--; + return; + } + +@@ -99,42 +97,32 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { + m_scanner.pop(); + return; + case Token::FLOW_SEQ_START: +- depth++; + eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Flow); + HandleSequence(eventHandler); + eventHandler.OnSequenceEnd(); +- depth--; + return; + case Token::BLOCK_SEQ_START: +- depth++; + eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Block); + HandleSequence(eventHandler); + eventHandler.OnSequenceEnd(); +- depth--; + return; + case Token::FLOW_MAP_START: +- depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); +- depth--; + return; + case Token::BLOCK_MAP_START: +- depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Block); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); +- depth--; + return; + case Token::KEY: + // compact maps can only go in a flow sequence + if (m_pCollectionStack->GetCurCollectionType() == + CollectionType::FlowSeq) { +- depth++; + eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); + HandleMap(eventHandler); + eventHandler.OnMapEnd(); +- depth--; + return; + } + break; +diff --git a/src/singledocparser.h b/src/singledocparser.h +index 7046f1e2..f1676c43 100644 +--- a/src/singledocparser.h ++++ b/src/singledocparser.h +@@ -16,6 +16,8 @@ + + namespace YAML { + class CollectionStack; ++template class DepthGuard; // depthguard.h ++class DeepRecursion; // an exception which may be thrown from excessive call stack recursion, see depthguard.h + class EventHandler; + class Node; + class Scanner; +@@ -51,8 +53,8 @@ class SingleDocParser : private noncopyable { + anchor_t LookupAnchor(const Mark& mark, const std::string& name) const; + + private: ++ using DepthGuard = YAML::DepthGuard<2000>; + int depth = 0; +- int depth_limit = 2000; + Scanner& m_scanner; + const Directives& m_directives; + std::unique_ptr m_pCollectionStack; diff --git a/yaml-cpp.spec b/yaml-cpp.spec index e902487..d8bcb69 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,15 +2,15 @@ Name: yaml-cpp Version: 0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A YAML parser and emitter for C++ -Group: Development/Libraries License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz Patch0: yaml-cpp-static.patch Patch1: yaml-cpp-include_dir.patch +Patch2: CVE-2017-5950.patch BuildRequires: cmake gcc gcc-c++ @@ -20,7 +20,6 @@ yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. %package devel Summary: Development files for %{name} -Group: Development/Libraries License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -33,7 +32,6 @@ developing applications that use %{name}. %package static Summary: Static library for %{name} -Group: Development/Libraries License: MIT Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -97,6 +95,9 @@ pushd build_static %changelog +* Sun Sep 16 2018 Richard Shaw - 0.6.1-4 +- Add patch for CVE-2017-5950. + * Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 43f2f1914323126ffb4191c98e4d048a78f3ee74 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:23 +0100 Subject: [PATCH 44/77] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- yaml-cpp.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d8bcb69..552f857 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -71,9 +71,7 @@ pushd build_static %make_install yaml-cpp -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From f1a49c9a302a82ca036681626e1a0f894370552c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Jan 2019 21:42:58 +0000 Subject: [PATCH 45/77] Rebuilt for Boost 1.69 --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 552f857..c5a726b 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -93,6 +93,9 @@ pushd build_static %changelog +* Thu Jan 24 2019 Jonathan Wakely - 0.6.1-5 +- Rebuilt for Boost 1.69 + * Sun Sep 16 2018 Richard Shaw - 0.6.1-4 - Add patch for CVE-2017-5950. From 0361fa8ac2c0bf42c1c81670d74285e635b93313 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:56:00 +0000 Subject: [PATCH 46/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index c5a726b..de51012 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -93,6 +93,9 @@ pushd build_static %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 24 2019 Jonathan Wakely - 0.6.1-5 - Rebuilt for Boost 1.69 From df4ca2c81512200195d3453968f14b781928f3ea Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Sun, 9 Jun 2019 16:54:54 +0200 Subject: [PATCH 47/77] Update to 0.6.2 --- .gitignore | 1 + sources | 2 +- yaml-cpp.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8fcb28b..3fdb004 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.5.3.tar.gz /yaml-cpp-0.6.0.tar.gz /yaml-cpp-0.6.1.tar.gz +/yaml-cpp-0.6.2.tar.gz diff --git a/sources b/sources index c839b43..ac3f0c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.6.1.tar.gz) = 606482d1d38c6747e22604a24c119adb4b70287da7deadb94cc20d70df47122f1714ec9bfc8f566ecf075b94d48771df17430c50039cb984bdf1980f3b445791 +SHA512 (yaml-cpp-0.6.2.tar.gz) = fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4 diff --git a/yaml-cpp.spec b/yaml-cpp.spec index de51012..a1c8c8d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,8 +1,8 @@ %global sover 0.6 Name: yaml-cpp -Version: 0.6.1 -Release: 6%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -26,7 +26,7 @@ Requires: pkgconfig Requires: boost-devel %description devel -The %{name}-devel package contains libraries and header files for +The %{name}-deve package contains libraries and header files for developing applications that use %{name}. @@ -93,6 +93,9 @@ pushd build_static %changelog +* Sun Jun 09 2019 Till Hofmann - 0.6.2-1 +- Update to 0.6.2 + * Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f39db6ecf42e4661922023c81e997eee8d108b00 Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Sun, 9 Jun 2019 21:44:16 +0200 Subject: [PATCH 48/77] Remove unused boost dependency --- yaml-cpp.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index a1c8c8d..2b7762f 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -23,10 +23,9 @@ Summary: Development files for %{name} License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -Requires: boost-devel %description devel -The %{name}-deve package contains libraries and header files for +The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -93,6 +92,9 @@ pushd build_static %changelog +* Sun Jun 09 2019 Till Hofmann - 0.6.2-2 +- Remove unused boost dependency + * Sun Jun 09 2019 Till Hofmann - 0.6.2-1 - Update to 0.6.2 From 310c822826b87d45a77b8c15cba6bde1b5019a5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:45:52 +0000 Subject: [PATCH 49/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 2b7762f..c312851 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -92,6 +92,9 @@ pushd build_static %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jun 09 2019 Till Hofmann - 0.6.2-2 - Remove unused boost dependency From b8366223d176ca0bfe5d64f44f7d1b9fbf2ca71b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 14 Oct 2019 19:33:45 -0500 Subject: [PATCH 50/77] Update to 0.6.3. --- yaml-cpp.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index c312851..3840a88 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,16 +1,14 @@ %global sover 0.6 Name: yaml-cpp -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.6.3 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz -Patch0: yaml-cpp-static.patch -Patch1: yaml-cpp-include_dir.patch -Patch2: CVE-2017-5950.patch +Patch0: CVE-2017-5950.patch BuildRequires: cmake gcc gcc-c++ @@ -48,7 +46,7 @@ rm -rf build_static && mkdir build_static pushd build_shared %cmake -DYAML_CPP_BUILD_TOOLS=OFF \ - -DBUILD_SHARED_LIBS=ON \ + -DYAML_BUILD_SHARED_LIBS=ON \ -DYAML_CPP_BUILD_TESTS=OFF \ ../ %make_build @@ -56,19 +54,26 @@ popd pushd build_static %cmake -DYAML_CPP_BUILD_TOOLS=OFF \ - -DBUILD_SHARED_LIBS=OFF \ + -DYAML_BUILD_SHARED_LIBS=OFF \ -DYAML_CPP_BUILD_TESTS=OFF \ ../ %make_build %install -pushd build_shared -%make_install -popd pushd build_static %make_install yaml-cpp +popd +# Move files so they don't get trampled +mv %{buildroot}%{_libdir}/cmake/%{name} \ + %{buildroot}%{_libdir}/cmake/%{name}-static +mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ + %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc + + +pushd build_shared +%make_install %ldconfig_scriptlets @@ -92,6 +97,9 @@ pushd build_static %changelog +* Tue Oct 15 2019 Richard Shaw - 0.6.3-1 +- Update to 0.6.3. + * Sat Jul 27 2019 Fedora Release Engineering - 0.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6c474649f0ad10ad9bd1edffa9c091719bb66299 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 18 Oct 2019 09:14:15 -0500 Subject: [PATCH 51/77] Upload new sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3fdb004..99c1bde 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.6.0.tar.gz /yaml-cpp-0.6.1.tar.gz /yaml-cpp-0.6.2.tar.gz +/yaml-cpp-0.6.3.tar.gz diff --git a/sources b/sources index ac3f0c6..051b970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.6.2.tar.gz) = fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4 +SHA512 (yaml-cpp-0.6.3.tar.gz) = 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49 From fd76ebf327b99ccfee6d3eafc82deb75ab64849a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:03:35 +0000 Subject: [PATCH 52/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 3840a88..575c9f0 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -97,6 +97,9 @@ pushd build_shared %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 15 2019 Richard Shaw - 0.6.3-1 - Update to 0.6.3. From 7a624944f0c795c98d47ba4f7a0fbeedf088e221 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 4 Jul 2020 09:59:41 +0200 Subject: [PATCH 53/77] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- yaml-cpp.spec | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 575c9f0..fb2572c 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -41,29 +41,23 @@ The %{name}-static package contains the static library for %{name}. %build -rm -rf build_shared && mkdir build_shared -rm -rf build_static && mkdir build_static - -pushd build_shared -%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ +%cmake -B build_shared \ + -DYAML_CPP_BUILD_TOOLS=OFF \ -DYAML_BUILD_SHARED_LIBS=ON \ -DYAML_CPP_BUILD_TESTS=OFF \ - ../ -%make_build -popd + %{nil} +%make_build -C build_shared -pushd build_static -%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ +%cmake -B build_static \ + -DYAML_CPP_BUILD_TOOLS=OFF \ -DYAML_BUILD_SHARED_LIBS=OFF \ -DYAML_CPP_BUILD_TESTS=OFF \ - ../ -%make_build + %{nil} +%make_build -C build_static %install -pushd build_static -%make_install yaml-cpp -popd +%make_install -C build_static yaml-cpp # Move files so they don't get trampled mv %{buildroot}%{_libdir}/cmake/%{name} \ @@ -72,8 +66,7 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc -pushd build_shared -%make_install +%make_install -C build_shared %ldconfig_scriptlets From c0bf12db03b687aba6f251bab511a53b37f90307 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:11:16 +0000 Subject: [PATCH 54/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index fb2572c..278b06e 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -90,6 +90,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 787bbbb2bd83f8390e9edf27eefd487653f4e027 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:44:48 +0000 Subject: [PATCH 55/77] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- yaml-cpp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 278b06e..b748aad 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -10,6 +10,7 @@ Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.ta Patch0: CVE-2017-5950.patch +BuildRequires: make BuildRequires: cmake gcc gcc-c++ %description From b9820cf709596d9da31b3ae2e08216908b33a504 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:30:03 +0000 Subject: [PATCH 56/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index b748aad..a590130 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -91,6 +91,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.6.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From bcd37354c2d25d849d01043fb074a15b3c2089e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:05:10 +0000 Subject: [PATCH 57/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index a590130..818ee20 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -91,6 +91,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.6.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.6.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4239d4b590eab31c9d1ca1717d68f7f2f9783ed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:38:46 +0000 Subject: [PATCH 58/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 818ee20..a6f07ed 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -91,6 +91,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.6.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.6.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6840921f4d7b47baad027643e2708b10585c6912 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 18:15:13 -0800 Subject: [PATCH 59/77] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index f668217..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yaml-cpp -# $Id$ -NAME := yaml-cpp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 4bfe6c87bc9fe479097bbad975a9e3a2cbef40e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:41:32 +0000 Subject: [PATCH 60/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index a6f07ed..732c45a 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.6.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -91,6 +91,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.6.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e816cc7ed076b706f506d21e2391b67f8d02f48a Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 8 Nov 2022 15:14:57 -0600 Subject: [PATCH 61/77] Update to 0.7.0. --- .gitignore | 1 + CVE-2017-5950.patch | 383 ------------------------------------- sources | 2 +- yaml-cpp-include_dir.patch | 12 -- yaml-cpp-static.patch | 116 ----------- yaml-cpp.spec | 18 +- 6 files changed, 12 insertions(+), 520 deletions(-) delete mode 100644 CVE-2017-5950.patch delete mode 100644 yaml-cpp-include_dir.patch delete mode 100644 yaml-cpp-static.patch diff --git a/.gitignore b/.gitignore index 99c1bde..b7bc3bf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.6.1.tar.gz /yaml-cpp-0.6.2.tar.gz /yaml-cpp-0.6.3.tar.gz +/yaml-cpp-0.7.0.tar.gz diff --git a/CVE-2017-5950.patch b/CVE-2017-5950.patch deleted file mode 100644 index 3a96432..0000000 --- a/CVE-2017-5950.patch +++ /dev/null @@ -1,383 +0,0 @@ -From d540476e31b080aa1f903ad20ec0426dd3838be7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= -Date: Tue, 25 Apr 2017 20:10:20 -0400 -Subject: [PATCH 1/4] fix stack overflow in HandleNode() (CVE-2017-5950) - -simply set a hardcoded recursion limit to 2000 (inspired by Python's) -to avoid infinitely recursing into arbitrary data structures - -assert() the depth. unsure if this is the right approach, but given -that HandleNode() is "void", I am not sure how else to return an -error. the problem with this approach of course is that it will still -crash the caller, unless they have proper exception handling in place. - -Closes: #459 ---- - src/singledocparser.cpp | 2 ++ - src/singledocparser.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp -index a27c1c3b..1b4262ee 100644 ---- a/src/singledocparser.cpp -+++ b/src/singledocparser.cpp -@@ -46,6 +46,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { - } - - void SingleDocParser::HandleNode(EventHandler& eventHandler) { -+ assert(depth < depth_limit); -+ depth++; - // an empty node *is* a possibility - if (m_scanner.empty()) { - eventHandler.OnNull(m_scanner.mark(), NullAnchor); -diff --git a/src/singledocparser.h b/src/singledocparser.h -index 2b92067c..7046f1e2 100644 ---- a/src/singledocparser.h -+++ b/src/singledocparser.h -@@ -51,6 +51,8 @@ class SingleDocParser : private noncopyable { - anchor_t LookupAnchor(const Mark& mark, const std::string& name) const; - - private: -+ int depth = 0; -+ int depth_limit = 2000; - Scanner& m_scanner; - const Directives& m_directives; - std::unique_ptr m_pCollectionStack; - -From ac00ef937702598aa27739c8c46be37ac5699039 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= -Date: Wed, 26 Apr 2017 10:25:43 -0400 -Subject: [PATCH 2/4] throw an exception instead of using assert() - -assert() may be compiled out in production and is clunkier to catch. - -some ParserException are already thrown elsewhere in the code and it -seems to make sense to reuse the primitive, although it may still -crash improperly configured library consumers, those who do not handle -exceptions explicitly. - -we use the BAD_FILE error message because at this point we do not -exactly know which specific data structure led to the recursion. ---- - src/singledocparser.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp -index 1b4262ee..1af13f49 100644 ---- a/src/singledocparser.cpp -+++ b/src/singledocparser.cpp -@@ -46,7 +46,9 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { - } - - void SingleDocParser::HandleNode(EventHandler& eventHandler) { -- assert(depth < depth_limit); -+ if (depth > depth_limit) { -+ throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); -+ } - depth++; - // an empty node *is* a possibility - if (m_scanner.empty()) { - -From e78e3bf6a6d61ca321af90d213dc4435ed5cf602 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= -Date: Wed, 26 Apr 2017 10:39:45 -0400 -Subject: [PATCH 3/4] increase and decrease depth properly on subhandlers - -the original implementation couldn't parse a document with more than -depth_limit entries. now we explicitly increase *and* decrease the -depth on specific handlers like maps, sequences and so on - any -handler that may in turn callback into HandleNode(). - -this is a little clunky - I would have prefered to increment and -decrement the counter in only one place, but there are many different -return points and this is not Golang so I can't think of a better way -to to this. ---- - src/singledocparser.cpp | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp -index 1af13f49..89234867 100644 ---- a/src/singledocparser.cpp -+++ b/src/singledocparser.cpp -@@ -49,7 +49,6 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { - if (depth > depth_limit) { - throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); - } -- depth++; - // an empty node *is* a possibility - if (m_scanner.empty()) { - eventHandler.OnNull(m_scanner.mark(), NullAnchor); -@@ -61,9 +60,11 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { - - // special case: a value node by itself must be a map, with no header - if (m_scanner.peek().type == Token::VALUE) { -+ depth++; - eventHandler.OnMapStart(mark, "?", NullAnchor, EmitterStyle::Default); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -+ depth--; - return; - } - -@@ -98,32 +99,42 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { - m_scanner.pop(); - return; - case Token::FLOW_SEQ_START: -+ depth++; - eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Flow); - HandleSequence(eventHandler); - eventHandler.OnSequenceEnd(); -+ depth--; - return; - case Token::BLOCK_SEQ_START: -+ depth++; - eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Block); - HandleSequence(eventHandler); - eventHandler.OnSequenceEnd(); -+ depth--; - return; - case Token::FLOW_MAP_START: -+ depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -+ depth--; - return; - case Token::BLOCK_MAP_START: -+ depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Block); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -+ depth--; - return; - case Token::KEY: - // compact maps can only go in a flow sequence - if (m_pCollectionStack->GetCurCollectionType() == - CollectionType::FlowSeq) { -+ depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -+ depth--; - return; - } - break; - -From 1690cacb3ff6d927286ded92b8fedd37b4045c7c Mon Sep 17 00:00:00 2001 -From: Keith Bennett -Date: Thu, 29 Mar 2018 16:45:11 -0500 -Subject: [PATCH 4/4] use RAII type class to guard against stack depth - recursion instead of error-prone manual increment/check/decrement - ---- - include/yaml-cpp/depthguard.h | 74 +++++++++++++++++++++++++++++++++++ - src/depthguard.cpp | 14 +++++++ - src/singledocparser.cpp | 18 ++------- - src/singledocparser.h | 4 +- - 4 files changed, 94 insertions(+), 16 deletions(-) - create mode 100644 include/yaml-cpp/depthguard.h - create mode 100644 src/depthguard.cpp - -diff --git a/include/yaml-cpp/depthguard.h b/include/yaml-cpp/depthguard.h -new file mode 100644 -index 00000000..6aac81aa ---- /dev/null -+++ b/include/yaml-cpp/depthguard.h -@@ -0,0 +1,74 @@ -+#ifndef DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 -+#define DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 -+ -+#if defined(_MSC_VER) || \ -+ (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \ -+ (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 -+#pragma once -+#endif -+ -+#include "exceptions.h" -+ -+namespace YAML { -+ -+/** -+ * @brief The DeepRecursion class -+ * An exception class which is thrown by DepthGuard. Ideally it should be -+ * a member of DepthGuard. However, DepthGuard is a templated class which means -+ * that any catch points would then need to know the template parameters. It is -+ * simpler for clients to not have to know at the catch point what was the -+ * maximum depth. -+ */ -+class DeepRecursion : public ParserException { -+ int m_atDepth = 0; -+public: -+ // no custom dtor needed, but virtual dtor necessary to prevent slicing -+ virtual ~DeepRecursion() = default; -+ -+ // construct an exception explaining how deep you were -+ DeepRecursion(int at_depth, const Mark& mark_, const std::string& msg_); -+ -+ // query how deep you were when the exception was thrown -+ int AtDepth() const; -+}; -+ -+/** -+ * @brief The DepthGuard class -+ * DepthGuard takes a reference to an integer. It increments the integer upon -+ * construction of DepthGuard and decrements the integer upon destruction. -+ * -+ * If the integer would be incremented past max_depth, then an exception is -+ * thrown. This is ideally geared toward guarding against deep recursion. -+ * -+ * @param max_depth -+ * compile-time configurable maximum depth. -+ */ -+template -+class DepthGuard final /* final because non-virtual dtor */ { -+ int & m_depth; -+public: -+ DepthGuard(int & depth_, const Mark& mark_, const std::string& msg_) : m_depth(depth_) { -+ ++m_depth; -+ if ( max_depth <= m_depth ) { -+ throw DeepRecursion{m_depth, mark_, msg_}; -+ } -+ } -+ -+ // DepthGuard is neither copyable nor moveable. -+ DepthGuard(const DepthGuard & copy_ctor) = delete; -+ DepthGuard(DepthGuard && move_ctor) = delete; -+ DepthGuard & operator=(const DepthGuard & copy_assign) = delete; -+ DepthGuard & operator=(DepthGuard && move_assign) = delete; -+ -+ ~DepthGuard() { -+ --m_depth; -+ } -+ -+ int current_depth() const { -+ return m_depth; -+ } -+}; -+ -+} // namespace YAML -+ -+#endif // DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000 -diff --git a/src/depthguard.cpp b/src/depthguard.cpp -new file mode 100644 -index 00000000..6d47eba3 ---- /dev/null -+++ b/src/depthguard.cpp -@@ -0,0 +1,14 @@ -+#include "yaml-cpp/depthguard.h" -+ -+namespace YAML { -+ -+DeepRecursion::DeepRecursion(int at_depth, const Mark& mark_, const std::string& msg_) -+ : ParserException(mark_, msg_), -+ m_atDepth(at_depth) { -+} -+ -+int DeepRecursion::AtDepth() const { -+ return m_atDepth; -+} -+ -+} // namespace YAML -diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp -index 89234867..37cc1f51 100644 ---- a/src/singledocparser.cpp -+++ b/src/singledocparser.cpp -@@ -7,6 +7,7 @@ - #include "singledocparser.h" - #include "tag.h" - #include "token.h" -+#include "yaml-cpp/depthguard.h" - #include "yaml-cpp/emitterstyle.h" - #include "yaml-cpp/eventhandler.h" - #include "yaml-cpp/exceptions.h" // IWYU pragma: keep -@@ -46,9 +47,8 @@ void SingleDocParser::HandleDocument(EventHandler& eventHandler) { - } - - void SingleDocParser::HandleNode(EventHandler& eventHandler) { -- if (depth > depth_limit) { -- throw ParserException(m_scanner.mark(), ErrorMsg::BAD_FILE); -- } -+ DepthGuard depthguard(depth, m_scanner.mark(), ErrorMsg::BAD_FILE); -+ - // an empty node *is* a possibility - if (m_scanner.empty()) { - eventHandler.OnNull(m_scanner.mark(), NullAnchor); -@@ -60,11 +60,9 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { - - // special case: a value node by itself must be a map, with no header - if (m_scanner.peek().type == Token::VALUE) { -- depth++; - eventHandler.OnMapStart(mark, "?", NullAnchor, EmitterStyle::Default); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -- depth--; - return; - } - -@@ -99,42 +97,32 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { - m_scanner.pop(); - return; - case Token::FLOW_SEQ_START: -- depth++; - eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Flow); - HandleSequence(eventHandler); - eventHandler.OnSequenceEnd(); -- depth--; - return; - case Token::BLOCK_SEQ_START: -- depth++; - eventHandler.OnSequenceStart(mark, tag, anchor, EmitterStyle::Block); - HandleSequence(eventHandler); - eventHandler.OnSequenceEnd(); -- depth--; - return; - case Token::FLOW_MAP_START: -- depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -- depth--; - return; - case Token::BLOCK_MAP_START: -- depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Block); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -- depth--; - return; - case Token::KEY: - // compact maps can only go in a flow sequence - if (m_pCollectionStack->GetCurCollectionType() == - CollectionType::FlowSeq) { -- depth++; - eventHandler.OnMapStart(mark, tag, anchor, EmitterStyle::Flow); - HandleMap(eventHandler); - eventHandler.OnMapEnd(); -- depth--; - return; - } - break; -diff --git a/src/singledocparser.h b/src/singledocparser.h -index 7046f1e2..f1676c43 100644 ---- a/src/singledocparser.h -+++ b/src/singledocparser.h -@@ -16,6 +16,8 @@ - - namespace YAML { - class CollectionStack; -+template class DepthGuard; // depthguard.h -+class DeepRecursion; // an exception which may be thrown from excessive call stack recursion, see depthguard.h - class EventHandler; - class Node; - class Scanner; -@@ -51,8 +53,8 @@ class SingleDocParser : private noncopyable { - anchor_t LookupAnchor(const Mark& mark, const std::string& name) const; - - private: -+ using DepthGuard = YAML::DepthGuard<2000>; - int depth = 0; -- int depth_limit = 2000; - Scanner& m_scanner; - const Directives& m_directives; - std::unique_ptr m_pCollectionStack; diff --git a/sources b/sources index 051b970..a73bbfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.6.3.tar.gz) = 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49 +SHA512 (yaml-cpp-0.7.0.tar.gz) = 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5 diff --git a/yaml-cpp-include_dir.patch b/yaml-cpp-include_dir.patch deleted file mode 100644 index 4de7320..0000000 --- a/yaml-cpp-include_dir.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,8 +335,7 @@ else() - endif() - endif() - --file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") --set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") -+set(CONFIG_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}") - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) diff --git a/yaml-cpp-static.patch b/yaml-cpp-static.patch deleted file mode 100644 index 5ae46f4..0000000 --- a/yaml-cpp-static.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -274,16 +274,20 @@ set(_INSTALL_DESTINATIONS - ### - ### Library - ### --add_library(yaml-cpp ${library_sources}) --set_target_properties(yaml-cpp PROPERTIES -- COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" --) -- --set_target_properties(yaml-cpp PROPERTIES -+if(BUILD_SHARED_LIBS) -+ add_library(yaml-cpp SHARED ${library_sources}) -+ set_target_properties(yaml-cpp PROPERTIES - VERSION "${YAML_CPP_VERSION}" - SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" - PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" -+ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" - ) -+else() -+ add_library(yaml-cpp STATIC ${library_sources}) -+ set_target_properties(yaml-cpp PROPERTIES -+ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" -+ ) -+endif() - - if(IPHONE) - set_target_properties(yaml-cpp PROPERTIES -@@ -303,48 +307,56 @@ if(MSVC) - endif() - endif() - --install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS}) - install( - DIRECTORY ${header_directory} - DESTINATION ${INCLUDE_INSTALL_DIR} - FILES_MATCHING PATTERN "*.h" - ) - --export( -- TARGETS yaml-cpp -- FILE "${PROJECT_BINARY_DIR}/yaml-cpp-targets.cmake") --export(PACKAGE yaml-cpp) --set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") -+if(BUILD_SHARED_LIBS) -+ set(YAML_TARGET "yaml-cpp") -+else() -+ set(YAML_TARGET "yaml-cpp-static") -+endif() - -+install(TARGETS yaml-cpp EXPORT ${YAML_TARGET}-targets ${_INSTALL_DESTINATIONS}) -+export(TARGETS yaml-cpp -+ FILE "${PROJECT_BINARY_DIR}/${YAML_TARGET}-targets.cmake") -+set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") - set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config.cmake" @ONLY) - -+if(NOT INSTALL_CMAKE_DIR) - if(WIN32 AND NOT CYGWIN) - set(INSTALL_CMAKE_DIR CMake) - else() -- set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) -+ set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/) -+endif() - endif() - - file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") - set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) - -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in -+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in -- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY) -- -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" @ONLY) - install(FILES -- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" -- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) --install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR}) -+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" -+ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" -+ DESTINATION "${INSTALL_CMAKE_DIR}${YAML_TARGET}" COMPONENT dev) -+install(EXPORT ${YAML_TARGET}-targets DESTINATION ${INSTALL_CMAKE_DIR}${YAML_TARGET}) - - if(UNIX) -- set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) -- configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) -- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+if(BUILD_SHARED_LIBS) -+ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) -+else() -+ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp-static.pc) - endif() -+configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) -+install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+endif(UNIX) - - - ### ---- a/yaml-cpp-config.cmake.in -+++ b/yaml-cpp-config.cmake.in -@@ -8,7 +8,7 @@ get_filename_component(YAML_CPP_CMAKE_DI - set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") - - # Our library dependencies (contains definitions for IMPORTED targets) --include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") -+include("${YAML_CPP_CMAKE_DIR}/@YAML_TARGET@-targets.cmake") - - # These are IMPORTED targets created by yaml-cpp-targets.cmake - set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 732c45a..24b070d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,22 +1,22 @@ -%global sover 0.6 +%global sover 0.7 Name: yaml-cpp -Version: 0.6.3 -Release: 7%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz -Patch0: CVE-2017-5950.patch +# Install pkgconf and cmake files in LIBDIR instead of DATADIR +Patch0: yaml-cpp-cmake.patch -BuildRequires: make BuildRequires: cmake gcc gcc-c++ +BuildRequires: make %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. - %package devel Summary: Development files for %{name} License: MIT @@ -27,7 +27,6 @@ Requires: pkgconfig The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %package static Summary: Static library for %{name} License: MIT @@ -66,9 +65,9 @@ mv %{buildroot}%{_libdir}/cmake/%{name} \ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc - %make_install -C build_shared + %ldconfig_scriptlets @@ -91,6 +90,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Tue Sep 06 2022 Richard Shaw - 0.7.0-1 +- Update to 0.7.0. + * Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b5c56298eabc612fde94c1c2bd36f353bb0ec4eb Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 8 Nov 2022 15:15:19 -0600 Subject: [PATCH 62/77] Upload new patch. --- yaml-cpp-cmake.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 yaml-cpp-cmake.patch diff --git a/yaml-cpp-cmake.patch b/yaml-cpp-cmake.patch new file mode 100644 index 0000000..ff50364 --- /dev/null +++ b/yaml-cpp-cmake.patch @@ -0,0 +1,30 @@ +Index: yaml-cpp-yaml-cpp-0.7.0/CMakeLists.txt +=================================================================== +--- yaml-cpp-yaml-cpp-0.7.0.orig/CMakeLists.txt ++++ yaml-cpp-yaml-cpp-0.7.0/CMakeLists.txt +@@ -130,7 +130,7 @@ set_target_properties(yaml-cpp PROPERTIE + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + + write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + if(YAML_CPP_BUILD_TESTS) From 34d9b89325ae3c7dc95e844256112defae1e381b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:01:43 +0000 Subject: [PATCH 63/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 24b070d..078f77a 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp @@ -90,6 +90,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 06 2022 Richard Shaw - 0.7.0-1 - Update to 0.7.0. From fb9ae3b26f57c7fc6ab3c1b2bff6f6aae578a79e Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 19 Apr 2023 16:47:13 +0200 Subject: [PATCH 64/77] Fixed broken CMake configs (rhbz#2188009). --- yaml-cpp-cmake.patch | 241 ++++++++++++++++++++++++++++++++++++++++--- yaml-cpp.spec | 67 ++++++------ 2 files changed, 262 insertions(+), 46 deletions(-) diff --git a/yaml-cpp-cmake.patch b/yaml-cpp-cmake.patch index ff50364..218484c 100644 --- a/yaml-cpp-cmake.patch +++ b/yaml-cpp-cmake.patch @@ -1,30 +1,245 @@ -Index: yaml-cpp-yaml-cpp-0.7.0/CMakeLists.txt -=================================================================== ---- yaml-cpp-yaml-cpp-0.7.0.orig/CMakeLists.txt -+++ yaml-cpp-yaml-cpp-0.7.0/CMakeLists.txt -@@ -130,7 +130,7 @@ set_target_properties(yaml-cpp PROPERTIE +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b230b9e..6ef6e8a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,33 +9,39 @@ endif() + + project(YAML_CPP VERSION 0.7.0 LANGUAGES CXX) + ++set(YAML_CPP_MAIN_PROJECT OFF) ++if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) ++ set(YAML_CPP_MAIN_PROJECT ON) ++endif() ++ + include(CMakePackageConfigHelpers) + include(CMakeDependentOption) + include(CheckCXXCompilerFlag) + include(GNUInstallDirs) + include(CTest) + +-find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) +- + option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" ON) + option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON) + option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ${BUILD_SHARED_LIBS}) +- ++option(YAML_CPP_INSTALL "Enable generation of yaml-cpp install targets" ${YAML_CPP_MAIN_PROJECT}) ++option(YAML_CPP_FORMAT_SOURCE "Format source" ON) + cmake_dependent_option(YAML_CPP_BUILD_TESTS +- "Enable yaml-cpp tests" ON +- "BUILD_TESTING;CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) +-cmake_dependent_option(YAML_CPP_INSTALL +- "Enable generation of yaml-cpp install targets" ON +- "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) ++ "Enable yaml-cpp tests" OFF ++ "BUILD_TESTING;YAML_CPP_MAIN_PROJECT" OFF) + cmake_dependent_option(YAML_MSVC_SHARED_RT + "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON +- "MSVC" OFF) ++ "CMAKE_SYSTEM_NAME MATCHES Windows" OFF) ++ ++if (YAML_CPP_FORMAT_SOURCE) ++ find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) ++endif() + +-set(yaml-cpp-type STATIC) +-set(yaml-cpp-label-postfix "static") + if (YAML_BUILD_SHARED_LIBS) + set(yaml-cpp-type SHARED) + set(yaml-cpp-label-postfix "shared") ++else() ++ set(yaml-cpp-type STATIC) ++ set(yaml-cpp-label-postfix "static") + endif() + + set(build-shared $) +@@ -78,6 +84,10 @@ set_property(TARGET yaml-cpp + PROPERTY + CXX_STANDARD_REQUIRED ON) + ++if (NOT YAML_BUILD_SHARED_LIBS) ++ set_property(TARGET yaml-cpp PROPERTY POSITION_INDEPENDENT_CODE ON) ++endif() ++ + target_include_directories(yaml-cpp + PUBLIC + $ +@@ -91,11 +101,15 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) + CXX_STANDARD 11) + endif() + ++if(YAML_CPP_MAIN_PROJECT) ++ target_compile_options(yaml-cpp ++ PRIVATE ++ $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> ++ $<${not-msvc}:-pedantic -pedantic-errors>) ++endif() ++ + target_compile_options(yaml-cpp + PRIVATE +- $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> +- $<${not-msvc}:-pedantic -pedantic-errors> +- + $<$:-MTd> + $<$:-MT> + $<$:-MDd> +@@ -108,6 +122,8 @@ target_compile_options(yaml-cpp + $<$:/W3 /wd4127 /wd4355>) + + target_compile_definitions(yaml-cpp ++ PUBLIC ++ $<$>:YAML_CPP_STATIC_DEFINE> + PRIVATE + $<${build-windows-dll}:${PROJECT_NAME}_DLL> + $<$>:YAML_CPP_NO_CONTRIB>) +@@ -127,10 +143,14 @@ set_target_properties(yaml-cpp PROPERTIES + PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" + DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") + ++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") ++set(EXPORT_TARGETS yaml-cpp) configure_package_config_file( "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") ++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CONFIG_EXPORT_DIR YAML_BUILD_SHARED_LIBS) ++unset(EXPORT_TARGETS) write_basic_package_version_file( "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL) +@@ -139,36 +159,48 @@ write_basic_package_version_file( + configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) + + if (YAML_CPP_INSTALL) +- install(TARGETS yaml-cpp ++ install(TARGETS yaml-cpp + EXPORT yaml-cpp-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING PATTERN "*.h") +- FILES_MATCHING PATTERN "*.h") ++ FILES_MATCHING PATTERN "*.h") install(EXPORT yaml-cpp-targets - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") - install(FILES - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- install(FILES +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") ++ DESTINATION "${CONFIG_EXPORT_DIR}") ++ install(FILES ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" ++ DESTINATION "${CONFIG_EXPORT_DIR}") install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" - DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() ++unset(CONFIG_EXPORT_DIR) if(YAML_CPP_BUILD_TESTS) +- add_subdirectory(test) ++ add_subdirectory(test) + endif() + + if(YAML_CPP_BUILD_TOOLS) +- add_subdirectory(util) ++ add_subdirectory(util) + endif() + +-if (YAML_CPP_CLANG_FORMAT_EXE) ++if (YAML_CPP_FORMAT_SOURCE AND YAML_CPP_CLANG_FORMAT_EXE) + add_custom_target(format + COMMAND clang-format --style=file -i $ + COMMAND_EXPAND_LISTS + COMMENT "Running clang-format" + VERBATIM) + endif() ++ ++# uninstall target ++if(NOT TARGET uninstall) ++ configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" ++ IMMEDIATE @ONLY) ++ ++ add_custom_target(uninstall ++ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) ++endif() +diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in +new file mode 100644 +index 0000000..c2d34d4 +--- /dev/null ++++ b/cmake_uninstall.cmake.in +@@ -0,0 +1,21 @@ ++if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") ++ message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") ++endif() ++ ++file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) ++string(REGEX REPLACE "\n" ";" files "${files}") ++foreach(file ${files}) ++ message(STATUS "Uninstalling $ENV{DESTDIR}${file}") ++ if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") ++ exec_program( ++ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" ++ OUTPUT_VARIABLE rm_out ++ RETURN_VALUE rm_retval ++ ) ++ if(NOT "${rm_retval}" STREQUAL 0) ++ message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") ++ endif() ++ else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") ++ message(STATUS "File $ENV{DESTDIR}${file} does not exist.") ++ endif() ++endforeach() +diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in +index 7b41e3f..799b9b4 100644 +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -1,14 +1,22 @@ + # - Config file for the yaml-cpp package + # It defines the following variables +-# YAML_CPP_INCLUDE_DIR - include directory +-# YAML_CPP_LIBRARIES - libraries to link against ++# YAML_CPP_INCLUDE_DIR - include directory ++# YAML_CPP_LIBRARY_DIR - directory containing libraries ++# YAML_CPP_SHARED_LIBS_BUILT - whether we have built shared libraries or not ++# YAML_CPP_LIBRARIES - libraries to link against + +-# Compute paths +-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") ++@PACKAGE_INIT@ ++ ++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") ++set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") ++ ++# Are we building shared libraries? ++set(YAML_CPP_SHARED_LIBS_BUILT "@PACKAGE_YAML_BUILD_SHARED_LIBS@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") ++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") ++ ++check_required_components(@EXPORT_TARGETS@) +diff --git a/yaml-cpp.pc.in b/yaml-cpp.pc.in +index f713de6..d02dc9e 100644 +--- a/yaml-cpp.pc.in ++++ b/yaml-cpp.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: Yaml-cpp + Description: A YAML parser and emitter for C++ diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 078f77a..ed03cee 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,16 +2,18 @@ Name: yaml-cpp Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A YAML parser and emitter for C++ License: MIT URL: https://github.com/jbeder/yaml-cpp -Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz -# Install pkgconf and cmake files in LIBDIR instead of DATADIR -Patch0: yaml-cpp-cmake.patch +# CMake fixes from 0e6e28d1a38224fc8172fae0109ea7f673c096db commit +Patch100: yaml-cpp-cmake.patch -BuildRequires: cmake gcc gcc-c++ +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: make %description @@ -19,9 +21,8 @@ yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. %package devel Summary: Development files for %{name} -License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libstdc++-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -29,67 +30,67 @@ developing applications that use %{name}. %package static Summary: Static library for %{name} -License: MIT -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description static The %{name}-static package contains the static library for %{name}. - %prep -%autosetup -p1 -n %{name}-%{name}-%{version} - +%autosetup -n %{name}-%{name}-%{version} -p1 %build -%cmake -B build_shared \ - -DYAML_CPP_BUILD_TOOLS=OFF \ - -DYAML_BUILD_SHARED_LIBS=ON \ - -DYAML_CPP_BUILD_TESTS=OFF \ - %{nil} -%make_build -C build_shared - %cmake -B build_static \ - -DYAML_CPP_BUILD_TOOLS=OFF \ - -DYAML_BUILD_SHARED_LIBS=OFF \ - -DYAML_CPP_BUILD_TESTS=OFF \ - %{nil} + -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ + -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ + -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ + -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ + -DYAML_CPP_BUILD_TESTS:BOOL=OFF %make_build -C build_static +%cmake -B build_shared \ + -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ + -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ + -DYAML_CPP_INSTALL:BOOL=ON \ + -DYAML_BUILD_SHARED_LIBS:BOOL=ON \ + -DYAML_CPP_BUILD_TESTS:BOOL=OFF +%make_build -C build_shared %install %make_install -C build_static yaml-cpp # Move files so they don't get trampled mv %{buildroot}%{_libdir}/cmake/%{name} \ - %{buildroot}%{_libdir}/cmake/%{name}-static + %{buildroot}%{_libdir}/cmake/%{name}-static mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ - %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc + %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc %make_install -C build_shared - -%ldconfig_scriptlets - - %files %doc CONTRIBUTING.md README.md %license LICENSE -%{_libdir}/*.so.%{sover}* +%{_libdir}/lib%{name}*.so.%{sover}* %files devel %{_includedir}/yaml-cpp/ -%{_libdir}/*.so +%{_libdir}/lib%{name}.so %{_libdir}/cmake/%{name} %{_libdir}/pkgconfig/%{name}.pc %files static %license LICENSE -%{_libdir}/*.a +%{_libdir}/lib%{name}.a %{_libdir}/cmake/%{name}-static %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Wed Apr 19 2023 Vitaly Zaitsev - 0.7.0-3 +- Fixed broken CMake configs (rhbz#2188009). +- Backported CMake fixes from upstream. +- Converted license tag to SPDX. +- Performed minor SPEC cleanup. + * Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 79744c42cd42946847ef266cfe15dc6cb77d0de4 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 19 Apr 2023 16:48:41 +0200 Subject: [PATCH 65/77] SPEC autoformat. --- yaml-cpp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index ed03cee..a7da02b 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -3,8 +3,9 @@ Name: yaml-cpp Version: 0.7.0 Release: 3%{?dist} + +License: MIT Summary: A YAML parser and emitter for C++ -License: MIT URL: https://github.com/jbeder/yaml-cpp Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -83,7 +84,6 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/cmake/%{name}-static %{_libdir}/pkgconfig/%{name}-static.pc - %changelog * Wed Apr 19 2023 Vitaly Zaitsev - 0.7.0-3 - Fixed broken CMake configs (rhbz#2188009). From c516149d9c77b3aee389d36e3eeeb3480e14d51a Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 19 Apr 2023 16:53:19 +0200 Subject: [PATCH 66/77] Always build in Release configuration. --- yaml-cpp.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index a7da02b..90f6971 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -41,14 +41,16 @@ The %{name}-static package contains the static library for %{name}. %build %cmake -B build_static \ + -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ - -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ + -DYAML_CPP_INSTALL:BOOL=ON \ -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF %make_build -C build_static %cmake -B build_shared \ + -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ -DYAML_CPP_INSTALL:BOOL=ON \ From 01ff4c557bb0787b8145be540681958001af53e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:27:21 +0000 Subject: [PATCH 67/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 90f6971..32e4e29 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 19 2023 Vitaly Zaitsev - 0.7.0-3 - Fixed broken CMake configs (rhbz#2188009). - Backported CMake fixes from upstream. From bf9f6b8f680766934e1e374da471e6c13c436b71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:39:01 +0000 Subject: [PATCH 68/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 32e4e29..44534d9 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3803a9aa5be4a8767583d67e4da2b6718be57fe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:38:16 +0000 Subject: [PATCH 69/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 44534d9..5108133 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5e5009298fa904f80daee2304b3822e5c5c1f726 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 21 Oct 2024 20:42:02 -0600 Subject: [PATCH 70/77] Update to 0.8.0 --- .gitignore | 1 + sources | 2 +- yaml-cpp-cmake.patch | 245 ------------------------------------------- yaml-cpp.spec | 18 ++-- 4 files changed, 11 insertions(+), 255 deletions(-) delete mode 100644 yaml-cpp-cmake.patch diff --git a/.gitignore b/.gitignore index b7bc3bf..8721528 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.6.2.tar.gz /yaml-cpp-0.6.3.tar.gz /yaml-cpp-0.7.0.tar.gz +/yaml-cpp-0.8.0.tar.gz diff --git a/sources b/sources index a73bbfa..8cdbf36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.7.0.tar.gz) = 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5 +SHA512 (yaml-cpp-0.8.0.tar.gz) = aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e diff --git a/yaml-cpp-cmake.patch b/yaml-cpp-cmake.patch deleted file mode 100644 index 218484c..0000000 --- a/yaml-cpp-cmake.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b230b9e..6ef6e8a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,33 +9,39 @@ endif() - - project(YAML_CPP VERSION 0.7.0 LANGUAGES CXX) - -+set(YAML_CPP_MAIN_PROJECT OFF) -+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) -+ set(YAML_CPP_MAIN_PROJECT ON) -+endif() -+ - include(CMakePackageConfigHelpers) - include(CMakeDependentOption) - include(CheckCXXCompilerFlag) - include(GNUInstallDirs) - include(CTest) - --find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) -- - option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" ON) - option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON) - option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ${BUILD_SHARED_LIBS}) -- -+option(YAML_CPP_INSTALL "Enable generation of yaml-cpp install targets" ${YAML_CPP_MAIN_PROJECT}) -+option(YAML_CPP_FORMAT_SOURCE "Format source" ON) - cmake_dependent_option(YAML_CPP_BUILD_TESTS -- "Enable yaml-cpp tests" ON -- "BUILD_TESTING;CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) --cmake_dependent_option(YAML_CPP_INSTALL -- "Enable generation of yaml-cpp install targets" ON -- "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) -+ "Enable yaml-cpp tests" OFF -+ "BUILD_TESTING;YAML_CPP_MAIN_PROJECT" OFF) - cmake_dependent_option(YAML_MSVC_SHARED_RT - "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON -- "MSVC" OFF) -+ "CMAKE_SYSTEM_NAME MATCHES Windows" OFF) -+ -+if (YAML_CPP_FORMAT_SOURCE) -+ find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) -+endif() - --set(yaml-cpp-type STATIC) --set(yaml-cpp-label-postfix "static") - if (YAML_BUILD_SHARED_LIBS) - set(yaml-cpp-type SHARED) - set(yaml-cpp-label-postfix "shared") -+else() -+ set(yaml-cpp-type STATIC) -+ set(yaml-cpp-label-postfix "static") - endif() - - set(build-shared $) -@@ -78,6 +84,10 @@ set_property(TARGET yaml-cpp - PROPERTY - CXX_STANDARD_REQUIRED ON) - -+if (NOT YAML_BUILD_SHARED_LIBS) -+ set_property(TARGET yaml-cpp PROPERTY POSITION_INDEPENDENT_CODE ON) -+endif() -+ - target_include_directories(yaml-cpp - PUBLIC - $ -@@ -91,11 +101,15 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) - CXX_STANDARD 11) - endif() - -+if(YAML_CPP_MAIN_PROJECT) -+ target_compile_options(yaml-cpp -+ PRIVATE -+ $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> -+ $<${not-msvc}:-pedantic -pedantic-errors>) -+endif() -+ - target_compile_options(yaml-cpp - PRIVATE -- $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> -- $<${not-msvc}:-pedantic -pedantic-errors> -- - $<$:-MTd> - $<$:-MT> - $<$:-MDd> -@@ -108,6 +122,8 @@ target_compile_options(yaml-cpp - $<$:/W3 /wd4127 /wd4355>) - - target_compile_definitions(yaml-cpp -+ PUBLIC -+ $<$>:YAML_CPP_STATIC_DEFINE> - PRIVATE - $<${build-windows-dll}:${PROJECT_NAME}_DLL> - $<$>:YAML_CPP_NO_CONTRIB>) -@@ -127,10 +143,14 @@ set_target_properties(yaml-cpp PROPERTIES - PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" - DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - -+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") -+set(EXPORT_TARGETS yaml-cpp) - configure_package_config_file( - "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CONFIG_EXPORT_DIR YAML_BUILD_SHARED_LIBS) -+unset(EXPORT_TARGETS) - - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -@@ -139,36 +159,48 @@ write_basic_package_version_file( - configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) - - if (YAML_CPP_INSTALL) -- install(TARGETS yaml-cpp -+ install(TARGETS yaml-cpp - EXPORT yaml-cpp-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ -+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- FILES_MATCHING PATTERN "*.h") -+ FILES_MATCHING PATTERN "*.h") - install(EXPORT yaml-cpp-targets -- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -- install(FILES -- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ DESTINATION "${CONFIG_EXPORT_DIR}") -+ install(FILES -+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -+ DESTINATION "${CONFIG_EXPORT_DIR}") - install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" -- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif() -+unset(CONFIG_EXPORT_DIR) - - if(YAML_CPP_BUILD_TESTS) -- add_subdirectory(test) -+ add_subdirectory(test) - endif() - - if(YAML_CPP_BUILD_TOOLS) -- add_subdirectory(util) -+ add_subdirectory(util) - endif() - --if (YAML_CPP_CLANG_FORMAT_EXE) -+if (YAML_CPP_FORMAT_SOURCE AND YAML_CPP_CLANG_FORMAT_EXE) - add_custom_target(format - COMMAND clang-format --style=file -i $ - COMMAND_EXPAND_LISTS - COMMENT "Running clang-format" - VERBATIM) - endif() -+ -+# uninstall target -+if(NOT TARGET uninstall) -+ configure_file( -+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" -+ IMMEDIATE @ONLY) -+ -+ add_custom_target(uninstall -+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) -+endif() -diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in -new file mode 100644 -index 0000000..c2d34d4 ---- /dev/null -+++ b/cmake_uninstall.cmake.in -@@ -0,0 +1,21 @@ -+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") -+ message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") -+endif() -+ -+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -+string(REGEX REPLACE "\n" ";" files "${files}") -+foreach(file ${files}) -+ message(STATUS "Uninstalling $ENV{DESTDIR}${file}") -+ if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") -+ exec_program( -+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" -+ OUTPUT_VARIABLE rm_out -+ RETURN_VALUE rm_retval -+ ) -+ if(NOT "${rm_retval}" STREQUAL 0) -+ message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") -+ endif() -+ else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") -+ message(STATUS "File $ENV{DESTDIR}${file} does not exist.") -+ endif() -+endforeach() -diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in -index 7b41e3f..799b9b4 100644 ---- a/yaml-cpp-config.cmake.in -+++ b/yaml-cpp-config.cmake.in -@@ -1,14 +1,22 @@ - # - Config file for the yaml-cpp package - # It defines the following variables --# YAML_CPP_INCLUDE_DIR - include directory --# YAML_CPP_LIBRARIES - libraries to link against -+# YAML_CPP_INCLUDE_DIR - include directory -+# YAML_CPP_LIBRARY_DIR - directory containing libraries -+# YAML_CPP_SHARED_LIBS_BUILT - whether we have built shared libraries or not -+# YAML_CPP_LIBRARIES - libraries to link against - --# Compute paths --get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") -+@PACKAGE_INIT@ -+ -+set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+ -+# Are we building shared libraries? -+set(YAML_CPP_SHARED_LIBS_BUILT "@PACKAGE_YAML_BUILD_SHARED_LIBS@") - - # Our library dependencies (contains definitions for IMPORTED targets) --include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") -+include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) - - # These are IMPORTED targets created by yaml-cpp-targets.cmake - set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") -+ -+check_required_components(@EXPORT_TARGETS@) -diff --git a/yaml-cpp.pc.in b/yaml-cpp.pc.in -index f713de6..d02dc9e 100644 ---- a/yaml-cpp.pc.in -+++ b/yaml-cpp.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - - Name: Yaml-cpp - Description: A YAML parser and emitter for C++ diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 5108133..756aaef 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,16 +1,13 @@ -%global sover 0.7 +%global sover 0.8 Name: yaml-cpp -Version: 0.7.0 -Release: 6%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: MIT Summary: A YAML parser and emitter for C++ URL: https://github.com/jbeder/yaml-cpp -Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz - -# CMake fixes from 0e6e28d1a38224fc8172fae0109ea7f673c096db commit -Patch100: yaml-cpp-cmake.patch +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc @@ -37,7 +34,7 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} The %{name}-static package contains the static library for %{name}. %prep -%autosetup -n %{name}-%{name}-%{version} -p1 +%autosetup -n %{name}-%{version} -p1 %build %cmake -B build_static \ @@ -72,7 +69,7 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %files %doc CONTRIBUTING.md README.md %license LICENSE -%{_libdir}/lib%{name}*.so.%{sover}* +%{_libdir}/lib%{name}.so.%{sover}* %files devel %{_includedir}/yaml-cpp/ @@ -87,6 +84,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Mon Oct 21 2024 Orion Poplawski - 0.8.0-1 +- Update to 0.8.0 + * Sat Jul 20 2024 Fedora Release Engineering - 0.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cb47231900c19f643975e40ea353cbae4c27f0b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:29:42 +0000 Subject: [PATCH 71/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 756aaef..d27e996 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -84,6 +84,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Oct 21 2024 Orion Poplawski - 0.8.0-1 - Update to 0.8.0 From af5d9fc11197ce7118c51bf75375e47535559d89 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 26 Jan 2025 16:15:01 -0600 Subject: [PATCH 72/77] Add patch for FTBFS, BZ#2341591. --- yaml-cpp-include.patch | 9 +++++++++ yaml-cpp.spec | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 yaml-cpp-include.patch diff --git a/yaml-cpp-include.patch b/yaml-cpp-include.patch new file mode 100644 index 0000000..b248543 --- /dev/null +++ b/yaml-cpp-include.patch @@ -0,0 +1,9 @@ +Index: yaml-cpp-0.8.0/src/emitterutils.cpp +=================================================================== +--- yaml-cpp-0.8.0.orig/src/emitterutils.cpp ++++ yaml-cpp-0.8.0/src/emitterutils.cpp +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d27e996..c71b4d7 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,12 +2,14 @@ Name: yaml-cpp Version: 0.8.0 -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: A YAML parser and emitter for C++ URL: https://github.com/jbeder/yaml-cpp -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/jbeder/yaml-cpp/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0: yaml-cpp-include.patch BuildRequires: cmake BuildRequires: gcc @@ -34,7 +36,7 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} The %{name}-static package contains the static library for %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 %build %cmake -B build_static \ From 887798d8dff693b0cd9be60d087844e7763edf23 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 26 Jan 2025 16:17:29 -0600 Subject: [PATCH 73/77] Added patch for FTBFS, BZ#2341591. Added patch for FTBFS, BZ#2341591. Added patch for FTBFS, BZ#2341591. --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index c71b4d7..2bcf1c6 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -86,6 +86,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sun Jan 26 2025 Richard Shaw - 0.8.0-2 +- Added patch for FTBFS, BZ#2341591. + * Sun Jan 19 2025 Fedora Release Engineering - 0.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 117550bab9f43c4a3b37ddd12c42fe1f1d5e136f Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 15 May 2025 11:53:01 +0200 Subject: [PATCH 74/77] Allow to build with CMake 4.0 --- 1211.patch | 29 +++++++++++++++++++++++++++++ yaml-cpp.spec | 30 ++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 1211.patch diff --git a/1211.patch b/1211.patch new file mode 100644 index 0000000..29085ab --- /dev/null +++ b/1211.patch @@ -0,0 +1,29 @@ +From 8153a1add19018f65527faad3c4d3941705baf39 Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Wed, 16 Aug 2023 15:55:44 +1000 +Subject: [PATCH] Specify CMake policy range to avoid deprecation warning + +CMake 3.27 started issuing a deprecation warning for any +cmake_minimum_required() call that specified a minimum +version older than 3.5. Specifying a version range instead of +a simple minimum version avoids that warning without +raising the minimum supported CMake version. The NEW +policy behavior will be used for all policies introduced up to +CMake 3.14 with this change. +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46dc18059..1ae92e2b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ +-# 3.5 is actually available almost everywhere, but this a good minimum +-cmake_minimum_required(VERSION 3.4) ++# 3.5 is actually available almost everywhere, but this a good minimum. ++# 3.14 as the upper policy limit avoids CMake deprecation warnings. ++cmake_minimum_required(VERSION 3.4...3.14) + + # enable MSVC_RUNTIME_LIBRARY target property + # see https://cmake.org/cmake/help/latest/policy/CMP0091.html diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 2bcf1c6..d4d0a3d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -11,10 +11,12 @@ Source0: https://github.com/jbeder/yaml-cpp/archive/%{version}/%{name}-%{ Patch0: yaml-cpp-include.patch +# Allow CMake 4.0 build +Patch1: https://github.com/jbeder/yaml-cpp/pull/1211.patch + BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: make %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -39,26 +41,34 @@ The %{name}-static package contains the static library for %{name}. %autosetup -p1 %build -%cmake -B build_static \ +# Define separate build directories for static and shared +%global _vpath_builddir %{_target_platform}-${variant} + +variant=static +%cmake \ -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ -DYAML_CPP_INSTALL:BOOL=ON \ -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF -%make_build -C build_static -%cmake -B build_shared \ +variant=shared +%cmake \ -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ -DYAML_CPP_INSTALL:BOOL=ON \ -DYAML_BUILD_SHARED_LIBS:BOOL=ON \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF -%make_build -C build_shared + +for variant in static shared; do + %cmake_build +done %install -%make_install -C build_static yaml-cpp +variant=static +%cmake_install # Move files so they don't get trampled mv %{buildroot}%{_libdir}/cmake/%{name} \ @@ -66,7 +76,8 @@ mv %{buildroot}%{_libdir}/cmake/%{name} \ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc -%make_install -C build_shared +variant=shared +%cmake_install %files %doc CONTRIBUTING.md README.md @@ -86,6 +97,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Thu May 15 2025 Cristian Le - 0.8.0-3 +- Allow to build with CMake 4.0 and Ninja generator + * Sun Jan 26 2025 Richard Shaw - 0.8.0-2 - Added patch for FTBFS, BZ#2341591. From 0a64fb057bf4da6da90c42bca27561a806a77636 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:10:15 +0000 Subject: [PATCH 75/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d4d0a3d..39a5770 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 15 2025 Cristian Le - 0.8.0-3 - Allow to build with CMake 4.0 and Ninja generator From 21474c78e94840ffa5f49c23571d9cfaee4c64e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:00:01 +0000 Subject: [PATCH 76/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 39a5770..4239bc3 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From db6c2dc0cd537bc9b9fe00f5b4f80f550d8560d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:32:30 +0000 Subject: [PATCH 77/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4239bc3..6234375 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild