From 326546d34aca62e3ad90c3585ff7a12e776ae3a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 14:31:58 -0500 Subject: [PATCH 01/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index edad9bb..88bb744 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -94,6 +94,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Mar 16 2012 Fabio M. Di Nitto - 0.3.0-2 - Rebuild against new corosync (soname change). - Add patch to fix build against new corosync headers. From 07a2e869908372315cc3573b7b5d94a2ae9ef5e3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 17:52:20 -0600 Subject: [PATCH 02/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 88bb744..36772ab 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -94,6 +94,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c40a7366749093860fd26a73d0754c6f5c13e382 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 09:20:56 -0500 Subject: [PATCH 03/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 36772ab..3921405 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -94,6 +94,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From f8f77f882c2390fd92d0b4b291b51f7bd8945229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 21 Dec 2013 23:45:52 +0200 Subject: [PATCH 04/43] Drop empty %postun script. - Drop INSTALL from docs. - Fix bogus date in %changelog. --- sheepdog.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sheepdog.spec b/sheepdog.spec index 3921405..c439105 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -72,7 +72,6 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop sheepdog.service > /dev/null 2>&1 || : fi -%postun %triggerun -- sheepdog < 0.2.4-2 /usr/bin/systemd-sysv-convert --save httpd >/dev/null 2>&1 ||: /sbin/chkconfig --del httpd >/dev/null 2>&1 || : @@ -85,7 +84,7 @@ fi %files %defattr(-,root,root,-) -%doc COPYING README INSTALL +%doc COPYING README %{_sbindir}/sheep %{_sbindir}/collie #%attr(755,-,-)%config %{_initddir}/sheepdog @@ -94,6 +93,11 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Sat Dec 21 2013 Ville Skyttä - 0.3.0-6 +- Drop empty %%postun script. +- Drop INSTALL from docs. +- Fix bogus date in %%changelog. + * Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -107,7 +111,7 @@ fi - Rebuild against new corosync (soname change). - Add patch to fix build against new corosync headers. -* Wed Jan 15 2012 David Nalley - 0.3.0-1 +* Thu Jan 12 2012 David Nalley - 0.3.0-1 - updating to 0.3.0 * Thu Nov 24 2011 David Nalley - 0.2.4-2 From b8d9cf8e795f6d8c38ff77e65496e6c746e120ac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:16:18 -0500 Subject: [PATCH 05/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index c439105..f931497 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -93,6 +93,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Dec 21 2013 Ville Skyttä - 0.3.0-6 - Drop empty %%postun script. - Drop INSTALL from docs. From d4f5518ee16edcd53c8214ee153637c7b9d44831 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 02:12:20 +0000 Subject: [PATCH 06/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index f931497..8fb5a0b 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -93,6 +93,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 92cfb1989e2cf9617c3a4ee897276c3f0c4ac33a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Aug 2014 11:50:12 -0600 Subject: [PATCH 07/43] Rebuild for rpm bug 1131960 --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 8fb5a0b..0f3e4a1 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -93,6 +93,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Thu Aug 21 2014 Kevin Fenzi - 0.3.0-9 +- Rebuild for rpm bug 1131960 + * Mon Aug 18 2014 Fedora Release Engineering - 0.3.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ea9571d9570f4cacaef0a83d97d853d1bb753a70 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 00:46:07 +0000 Subject: [PATCH 08/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 0f3e4a1..94f77d2 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -93,6 +93,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Aug 21 2014 Kevin Fenzi - 0.3.0-9 - Rebuild for rpm bug 1131960 From f25932db853b0cb37b6182b5c95d1b7e0ae835b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:56:43 +0000 Subject: [PATCH 09/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 94f77d2..b6073ec 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog Distributed Storage System for KVM/QEMU Version: 0.3.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://www.osrg.net/sheepdog @@ -93,6 +93,9 @@ fi %{_mandir}/man8/sheep.8* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.3.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From c210216b0b96e451de23f3f25a0024d950c8f52f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 18 Nov 2016 10:28:13 +0100 Subject: [PATCH 10/43] sheepdog broken out of the box Coroutine stack size of 1M is not enough for the corosync backend, and placing objects in /tmp is a vulnerability. While at it, do not double-fork the daemon. --- coroutine-stack-size.patch | 15 +++++++++++++++ sheepdog.service | 3 +-- sheepdog.spec | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 coroutine-stack-size.patch diff --git a/coroutine-stack-size.patch b/coroutine-stack-size.patch new file mode 100644 index 0000000..11e2c74 --- /dev/null +++ b/coroutine-stack-size.patch @@ -0,0 +1,15 @@ +cpg_dispatch requires 0x101568 bytes of stack. + +diff --git a/lib/coroutine.c b/lib/coroutine.c +index 5b2ed79..1e1060c 100644 +--- a/lib/coroutine.c ++++ b/lib/coroutine.c +@@ -52,7 +52,7 @@ enum co_action { + #define POOL_MAX_SIZE 64 + #endif + +-#define STACK_MAX_SIZE (1 << 20) /* 1 MB */ ++#define STACK_MAX_SIZE (2 << 20) /* 1 MB */ + + struct coroutine { + coroutine_entry_func_t *entry; diff --git a/sheepdog.service b/sheepdog.service index c8fd01e..04d7bb5 100644 --- a/sheepdog.service +++ b/sheepdog.service @@ -3,8 +3,7 @@ Description=Sheepdog QEMU/KVM Block Storage After=syslog.target [Service] -ExecStart=/usr/sbin/sheep -Type=forking +ExecStart=/usr/sbin/sheep -f /var/lib/sheepdog [Install] WantedBy=multi-user.target diff --git a/sheepdog.spec b/sheepdog.spec index b6073ec..5f9549a 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -9,6 +9,7 @@ Source0: collie-sheepdog-v0.3.0-0-gbb41896.tar.gz #get source from github here https://github.com/collie/sheepdog/tarball/v0.3.0 Source1: sheepdog.service Patch0: update_cpg_to_cs_defines.patch +Patch1: coroutine-stack-size.patch # Runtime bits Requires: corosync @@ -40,6 +41,7 @@ a distributed object storage system for KVM. %prep %setup -qn collie-sheepdog-bb41896 %patch0 -p1 +%patch1 -p1 %build ./autogen.sh From 6d9518f7bb27fbfb1af1f08c7a803bc2649ab4a6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 9 Jan 2017 10:50:12 +0100 Subject: [PATCH 11/43] Update to 1.0.1 (Resolves: #1396430) /usr/bin/collie is now /usr/bin/dog Added /usr/sbin/sheepfs and /usr/sbin/shepherd Revamped systemd spec file, added /etc/sysconfig/sheepdog --- .gitignore | 2 + sheepdog | 11 ++++ sheepdog.service | 10 +++- sheepdog.spec | 134 +++++++++++++++++++++++++++++------------------ sources | 2 +- 5 files changed, 104 insertions(+), 55 deletions(-) create mode 100644 sheepdog diff --git a/.gitignore b/.gitignore index a812f1f..742d868 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.rpm /sheepdog-0.2.3.tar.gz /sheepdog-0.2.4.tar.gz /collie-sheepdog-v0.3.0-0-gbb41896.tar.gz +/v1.0.1.tar.gz diff --git a/sheepdog b/sheepdog new file mode 100644 index 0000000..ddd3bac --- /dev/null +++ b/sheepdog @@ -0,0 +1,11 @@ +# use stdout for journal; other possibilities include "default" and "syslog" +SHEEPDOG_LOGDEST=stdout +SHEEPDOG_LOGLEVEL=info +SHEEPDOG_LOGFMT=default + +SHEEPDOG_PORT=7000 + +# --no-sync, --directio, --gateway, --journal, --wq-threads, ... +SHEEPDOG_EXTRA_OPTS= + +SHEEPDOG_PATH=/var/lib/sheepdog diff --git a/sheepdog.service b/sheepdog.service index 04d7bb5..9cd474e 100644 --- a/sheepdog.service +++ b/sheepdog.service @@ -1,9 +1,15 @@ [Unit] Description=Sheepdog QEMU/KVM Block Storage -After=syslog.target +After=network.target +Requires=corosync.service [Service] -ExecStart=/usr/sbin/sheep -f /var/lib/sheepdog +EnvironmentFile=/etc/sysconfig/sheepdog +ExecStart=/usr/sbin/sheep -f --log level=${SHEEPDOG_LOGLEVEL},dst=${SHEEPDOG_LOGDEST},format=${SHEEPDOG_LOGFMT} $SHEEPDOG_EXTRA_OPTS ${SHEEPDOG_PATH} +#Restart=on-failure +#StartLimitInterval=10s +#StartLimitBurst=3 +LimitNOFILE=32768 [Install] WantedBy=multi-user.target diff --git a/sheepdog.spec b/sheepdog.spec index 5f9549a..0852022 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,100 +1,130 @@ Name: sheepdog -Summary: The Sheepdog Distributed Storage System for KVM/QEMU -Version: 0.3.0 -Release: 11%{?dist} +Summary: The Sheepdog distributed storage system for KVM/QEMU +Version: 1.0.1 +Release: 1%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base -URL: http://www.osrg.net/sheepdog -Source0: collie-sheepdog-v0.3.0-0-gbb41896.tar.gz -#get source from github here https://github.com/collie/sheepdog/tarball/v0.3.0 +URL: http://sheepdog.github.io/sheepdog +Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz Source1: sheepdog.service -Patch0: update_cpg_to_cs_defines.patch -Patch1: coroutine-stack-size.patch +Source2: sheepdog -# Runtime bits -Requires: corosync -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-sysv +%{?systemd_requires} # Build bits -BuildRequires: autoconf automake systemd-units +BuildRequires: autoconf automake libtool systemd BuildRequires: corosync corosynclib corosynclib-devel +BuildRequires: userspace-rcu-devel -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# For sheepfs +BuildRequires: fuse-devel +%ifarch x86_64 +BuildRequires: yasm +%endif + +# corosync not available on ppc/ppc64/ppc64le %if 0%{?rhel} >= 6 Excludearch: ppc Excludearch: ppc64 +Excludearch: ppc64le %endif - - %description -This package contains the Sheepdog server, and command line tool which offer -a distributed object storage system for KVM. +This package contains the Sheepdog server and the "dog" command line tool, +which offer a distributed object storage system for KVM. + +%package devel +Summary: Header files for the Sheepdog distributed storage system +Group: Development/Libraries +License: GPLv2 and GPLv2+ +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +This package contains the header files for libsheepdog. + +%package libs +Summary: Libraries for the Sheepdog distributed storage system +Group: Applications/File +License: GPLv2 and GPLv2+ + +%description libs +This package contains the libsheepdog shared library. %prep -%setup -qn collie-sheepdog-bb41896 -%patch0 -p1 -%patch1 -p1 +%setup -q %build ./autogen.sh -%{configure} --with-initddir=%{_initrddir} -make %{_smp_mflags} +# TODO: add LTTng-ust support +%{configure} \ + --without-initddir \ + --without-systemdsystemunitdir \ + --disable-static + +make %{_smp_mflags} V=1 + %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +rm -f %{buildroot}/%{_libdir}/libsheepdog.la +rm -f %{buildroot}/%{_libdir}/libsheepdog.a + mkdir -p %{buildroot}/%{_unitdir} cp -a %{SOURCE1} %{buildroot}/%{_unitdir}/ -## tree fixup -# drop static libs -rm -f %{buildroot}%{_libdir}/*.a -rm -f %{buildroot}%{_initddir}/sheepdog + +mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig +cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig + %clean rm -rf %{buildroot} %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post sheepdog.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable sheepdog.service > /dev/null 2>&1 || : - /bin/systemctl stop sheepdog.service > /dev/null 2>&1 || : -fi +%systemd_preun sheepdog.service -%triggerun -- sheepdog < 0.2.4-2 -/usr/bin/systemd-sysv-convert --save httpd >/dev/null 2>&1 ||: -/sbin/chkconfig --del httpd >/dev/null 2>&1 || : -/bin/systemctl try-restart sheepdog.service >/dev/null 2>&1 || : -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart sheepdog.service >/dev/null 2>&1 || : -fi +%postun +%systemd_postun_with_restart sheepdog.service %files %defattr(-,root,root,-) %doc COPYING README +%{_bindir}/dog %{_sbindir}/sheep -%{_sbindir}/collie -#%attr(755,-,-)%config %{_initddir}/sheepdog +%{_sbindir}/sheepfs +%{_sbindir}/shepherd +%{_sysconfdir}/bash_completion.d/dog + %{_unitdir}/sheepdog.service +%config %{_sysconfdir}/sysconfig/sheepdog + %dir %{_localstatedir}/lib/sheepdog %{_mandir}/man8/sheep.8* +%{_mandir}/man8/dog.8* +%{_mandir}/man8/sheepfs.8* + +%files devel +%dir %{_includedir}/sheepdog +%{_includedir}/sheepdog/internal.h +%{_includedir}/sheepdog/list.h +%{_includedir}/sheepdog/sheepdog.h +%{_includedir}/sheepdog/sheepdog_proto.h +%{_includedir}/sheepdog/util.h + +%files libs +%{_libdir}/libsheepdog.so %changelog +* Mon Jan 09 2017 Paolo Bonzini - 1.0.1-1 +- Update to 1.0.1 (Resolves: #1396430) +- /usr/bin/collie is now /usr/bin/dog +- Added /usr/sbin/sheepfs and /usr/sbin/shepherd +- Revamped systemd spec file, added /etc/sysconfig/sheepdog + * Thu Feb 04 2016 Fedora Release Engineering - 0.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e6f62d0..14ded64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b28dad11926ee52cda15a961d9b54fe collie-sheepdog-v0.3.0-0-gbb41896.tar.gz +SHA512 (v1.0.1.tar.gz) = fc8c90f9631a12032e380f7ad559e18859211df65c7b53a1cf4a64fcf5c85fb4e2f08a9fbb9330f0eb6e67e9848a885af10013bba5f8665f0e2864ea8770bcf8 From 477a0cb2c2dce933003ce34e2a9558dad9ff269b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 9 Jan 2017 12:09:25 +0100 Subject: [PATCH 12/43] Introduce sheepdog.timer; disable on aarch64 for EPEL7 --- sheepdog.service | 13 ++++++++----- sheepdog.spec | 22 +++++++++++++++------- sheepdog.timer | 12 ++++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 sheepdog.timer diff --git a/sheepdog.service b/sheepdog.service index 9cd474e..6e55331 100644 --- a/sheepdog.service +++ b/sheepdog.service @@ -6,10 +6,13 @@ Requires=corosync.service [Service] EnvironmentFile=/etc/sysconfig/sheepdog ExecStart=/usr/sbin/sheep -f --log level=${SHEEPDOG_LOGLEVEL},dst=${SHEEPDOG_LOGDEST},format=${SHEEPDOG_LOGFMT} $SHEEPDOG_EXTRA_OPTS ${SHEEPDOG_PATH} -#Restart=on-failure -#StartLimitInterval=10s -#StartLimitBurst=3 +Restart=on-failure +RestartSec=2s LimitNOFILE=32768 -[Install] -WantedBy=multi-user.target +# Use sheepdog.timer instead. Because corosync does not provide +# notification via sd_notify, we introduce an arbitrary delay between +# starting corosync.service and starting sheepdog. + +#[Install] +#WantedBy=multi-user.target diff --git a/sheepdog.spec b/sheepdog.spec index 0852022..0633333 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,13 +1,14 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz Source1: sheepdog.service -Source2: sheepdog +Source2: sheepdog.timer +Source3: sheepdog %{?systemd_requires} @@ -23,8 +24,9 @@ BuildRequires: fuse-devel BuildRequires: yasm %endif -# corosync not available on ppc/ppc64/ppc64le +# corosync not available on these architectures %if 0%{?rhel} >= 6 +Excludearch: aarch64 Excludearch: ppc Excludearch: ppc64 Excludearch: ppc64le @@ -74,21 +76,22 @@ rm -f %{buildroot}/%{_libdir}/libsheepdog.a mkdir -p %{buildroot}/%{_unitdir} cp -a %{SOURCE1} %{buildroot}/%{_unitdir}/ +cp -a %{SOURCE2} %{buildroot}/%{_unitdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig -cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig +cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %clean rm -rf %{buildroot} %post -%systemd_post sheepdog.service +%systemd_post sheepdog.timer %preun -%systemd_preun sheepdog.service +%systemd_preun sheepdog.timer %postun -%systemd_postun_with_restart sheepdog.service +%systemd_postun_with_restart sheepdog.timer %files %defattr(-,root,root,-) @@ -100,6 +103,7 @@ rm -rf %{buildroot} %{_sysconfdir}/bash_completion.d/dog %{_unitdir}/sheepdog.service +%{_unitdir}/sheepdog.timer %config %{_sysconfdir}/sysconfig/sheepdog %dir %{_localstatedir}/lib/sheepdog @@ -119,6 +123,10 @@ rm -rf %{buildroot} %{_libdir}/libsheepdog.so %changelog +* Mon Jan 09 2017 Paolo Bonzini - 1.0.1-2 +- Introduce sheepdog.timer +- For EPEL7, disable on aarch64 + * Mon Jan 09 2017 Paolo Bonzini - 1.0.1-1 - Update to 1.0.1 (Resolves: #1396430) - /usr/bin/collie is now /usr/bin/dog diff --git a/sheepdog.timer b/sheepdog.timer new file mode 100644 index 0000000..7ee0cc2 --- /dev/null +++ b/sheepdog.timer @@ -0,0 +1,12 @@ +[Unit] +Description=Sheepdog QEMU/KVM Block Storage +After=network.target +Requires=corosync.service + +[Timer] +OnActiveSec=2s +AccuracySec=100ms +Unit=sheepdog.service + +[Install] +WantedBy=multi-user.target From 3c722264d4e9e93962102d367bed304c103b5f07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:23:18 +0000 Subject: [PATCH 13/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 0633333..4e8e494 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_libdir}/libsheepdog.so %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 09 2017 Paolo Bonzini - 1.0.1-2 - Introduce sheepdog.timer - For EPEL7, disable on aarch64 From 84c60db8e647339fa574dc2a69252c7306bb3513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:32:21 +0000 Subject: [PATCH 14/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 4e8e494..992b388 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_libdir}/libsheepdog.so %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1dec9c067b93880ddb29369c731d9df1690f865b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:24:30 +0000 Subject: [PATCH 15/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 992b388..44ec1a1 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_libdir}/libsheepdog.so %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f289212fcf5553fa4da0c984d7771ad284d8f4d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:38:20 +0000 Subject: [PATCH 16/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 44ec1a1..2f9c175 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -123,6 +123,9 @@ rm -rf %{buildroot} %{_libdir}/libsheepdog.so %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From daef6866c4dd1b2d756372647331759eb04d9e3d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:39:26 +0100 Subject: [PATCH 17/43] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- sheepdog.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sheepdog.spec b/sheepdog.spec index 2f9c175..71793f2 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -81,9 +81,6 @@ cp -a %{SOURCE2} %{buildroot}/%{_unitdir}/ mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig -%clean -rm -rf %{buildroot} - %post %systemd_post sheepdog.timer From 59fc38482930445b0698e4031ea272d3ab34b3e1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 22 Mar 2018 19:26:56 -0700 Subject: [PATCH 18/43] Rebuild for new corosync. Fixes bug #1559672 --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 71793f2..fa25efc 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Thu Mar 22 2018 Kevin Fenzi - 1.0.1-7 +- Rebuild for new corosync. Fixes bug #1559672 + * Fri Feb 09 2018 Fedora Release Engineering - 1.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 8709770d67da90a336188617ddc61224dde1e58e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:21:10 -0500 Subject: [PATCH 19/43] Remove needless use of %defattr --- sheepdog.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index fa25efc..57bd45f 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -91,7 +91,6 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %systemd_postun_with_restart sheepdog.timer %files -%defattr(-,root,root,-) %doc COPYING README %{_bindir}/dog %{_sbindir}/sheep From ff97127b3b6ef8b23eb657aa48a505ae808063f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:03:55 +0000 Subject: [PATCH 20/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 57bd45f..c641da7 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 and GPLv2+ Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog @@ -119,6 +119,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 22 2018 Kevin Fenzi - 1.0.1-7 - Rebuild for new corosync. Fixes bug #1559672 From a4cdeda4e02df0857521c9ff5eacf29c095aaa74 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:25 +0100 Subject: [PATCH 21/43] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- sheepdog.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sheepdog.spec b/sheepdog.spec index c641da7..031d012 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -3,7 +3,6 @@ Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 Release: 8%{?dist} License: GPLv2 and GPLv2+ -Group: System Environment/Base URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz Source1: sheepdog.service @@ -38,7 +37,6 @@ which offer a distributed object storage system for KVM. %package devel Summary: Header files for the Sheepdog distributed storage system -Group: Development/Libraries License: GPLv2 and GPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -47,7 +45,6 @@ This package contains the header files for libsheepdog. %package libs Summary: Libraries for the Sheepdog distributed storage system -Group: Applications/File License: GPLv2 and GPLv2+ %description libs From a0d0c25db732c9a09ebc997b1e20f7f4a325df95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:19:28 +0000 Subject: [PATCH 22/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 031d012..3273400 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -116,6 +116,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5340dec1380fe004332fb7a23cd52397dd3ba049 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:13:02 +0000 Subject: [PATCH 23/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 3273400..760c4e0 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -116,6 +116,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8d54b4be55510bd6d23ad072918f04c429e2b734 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:22:43 +0000 Subject: [PATCH 24/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 760c4e0..540d3f6 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -116,6 +116,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.0.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ff3a31b7604f15816a24ad9a0276da2d16af8d3a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 30 Mar 2020 13:33:00 +0200 Subject: [PATCH 25/43] New patch sha1-extern.patch to fix FTBFS --- coroutine-stack-size.patch | 15 --------- sha1-extern.patch | 17 ++++++++++ sheepdog.spec | 9 ++++- update_cpg_to_cs_defines.patch | 61 ---------------------------------- 4 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 coroutine-stack-size.patch create mode 100644 sha1-extern.patch delete mode 100644 update_cpg_to_cs_defines.patch diff --git a/coroutine-stack-size.patch b/coroutine-stack-size.patch deleted file mode 100644 index 11e2c74..0000000 --- a/coroutine-stack-size.patch +++ /dev/null @@ -1,15 +0,0 @@ -cpg_dispatch requires 0x101568 bytes of stack. - -diff --git a/lib/coroutine.c b/lib/coroutine.c -index 5b2ed79..1e1060c 100644 ---- a/lib/coroutine.c -+++ b/lib/coroutine.c -@@ -52,7 +52,7 @@ enum co_action { - #define POOL_MAX_SIZE 64 - #endif - --#define STACK_MAX_SIZE (1 << 20) /* 1 MB */ -+#define STACK_MAX_SIZE (2 << 20) /* 1 MB */ - - struct coroutine { - coroutine_entry_func_t *entry; diff --git a/sha1-extern.patch b/sha1-extern.patch new file mode 100644 index 0000000..388793c --- /dev/null +++ b/sha1-extern.patch @@ -0,0 +1,17 @@ +diff --git a/include/sha1.h b/include/sha1.h +index e026998..bd45181 100644 +--- a/include/sha1.h ++++ b/include/sha1.h +@@ -27,9 +27,9 @@ typedef void (*sha1_init_func_t)(void *); + typedef void (*sha1_update_func_t)(void *, const uint8_t *, unsigned int); + typedef void (*sha1_final_func_t)(void *, uint8_t *); + +-sha1_init_func_t sha1_init; +-sha1_update_func_t sha1_update; +-sha1_final_func_t sha1_final; ++extern sha1_init_func_t sha1_init; ++extern sha1_update_func_t sha1_update; ++extern sha1_final_func_t sha1_final; + + const char *sha1_to_hex(const unsigned char *sha1); + void get_buffer_sha1(unsigned char *buf, unsigned len, unsigned char *sha1); diff --git a/sheepdog.spec b/sheepdog.spec index 540d3f6..49e95c0 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -9,6 +9,8 @@ Source1: sheepdog.service Source2: sheepdog.timer Source3: sheepdog +Patch0: sha1-extern.patch + %{?systemd_requires} # Build bits @@ -52,6 +54,7 @@ This package contains the libsheepdog shared library. %prep %setup -q +%patch0 -p1 %build ./autogen.sh @@ -116,6 +119,10 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Mon Mar 30 2020 Paolo Bonzini - 1.0.1-12 +- New patch sha1-extern.patch to fix FTBFS +- Delete obsolete patches + * Thu Jan 30 2020 Fedora Release Engineering - 1.0.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/update_cpg_to_cs_defines.patch b/update_cpg_to_cs_defines.patch deleted file mode 100644 index d610f46..0000000 --- a/update_cpg_to_cs_defines.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naurd collie-sheepdog-bb41896.orig/sheep/cluster/corosync.c collie-sheepdog-bb41896/sheep/cluster/corosync.c ---- collie-sheepdog-bb41896.orig/sheep/cluster/corosync.c 2011-12-28 18:03:36.000000000 +0100 -+++ collie-sheepdog-bb41896/sheep/cluster/corosync.c 2012-03-16 10:47:39.378340300 +0100 -@@ -196,9 +196,9 @@ - retry: - ret = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, iov_cnt); - switch (ret) { -- case CPG_OK: -+ case CS_OK: - break; -- case CPG_ERR_TRY_AGAIN: -+ case CS_ERR_TRY_AGAIN: - dprintf("failed to send message: retrying\n"); - sleep(1); - goto retry; -@@ -632,7 +632,7 @@ - corosync_handlers = *handlers; - - ret = cpg_initialize(&cpg_handle, &cb); -- if (ret != CPG_OK) { -+ if (ret != CS_OK) { - eprintf("failed to initialize cpg (%d) - is corosync running?\n", ret); - return -1; - } -@@ -659,7 +659,7 @@ - this_node.pid = getpid(); - - ret = cpg_fd_get(cpg_handle, &fd); -- if (ret != CPG_OK) { -+ if (ret != CS_OK) { - eprintf("failed to get cpg file descriptor (%d)\n", ret); - return -1; - } -@@ -681,13 +681,13 @@ - retry: - ret = cpg_join(cpg_handle, &cpg_group); - switch (ret) { -- case CPG_OK: -+ case CS_OK: - break; -- case CPG_ERR_TRY_AGAIN: -+ case CS_ERR_TRY_AGAIN: - dprintf("failed to join the sheepdog group: retrying\n"); - sleep(1); - goto retry; -- case CPG_ERR_SECURITY: -+ case CS_ERR_SECURITY: - eprintf("permission denied to join the sheepdog group\n"); - return -1; - default: -@@ -740,8 +740,8 @@ - { - int ret; - -- ret = cpg_dispatch(cpg_handle, CPG_DISPATCH_ALL); -- if (ret != CPG_OK) -+ ret = cpg_dispatch(cpg_handle, CS_DISPATCH_ALL); -+ if (ret != CS_OK) - return -1; - - return 0; From 869710acbdfdf684a493a4a06980e55365b0a0ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:39:31 +0000 Subject: [PATCH 26/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 49e95c0..b26456c 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -119,6 +119,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Mar 30 2020 Paolo Bonzini - 1.0.1-12 - New patch sha1-extern.patch to fix FTBFS - Delete obsolete patches From 00d22891e12e238e74fefb28a528c18a22abc49f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:27:04 +0000 Subject: [PATCH 27/43] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sheepdog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sheepdog.spec b/sheepdog.spec index b26456c..93b9b02 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -14,6 +14,7 @@ Patch0: sha1-extern.patch %{?systemd_requires} # Build bits +BuildRequires: make BuildRequires: autoconf automake libtool systemd BuildRequires: corosync corosynclib corosynclib-devel BuildRequires: userspace-rcu-devel From d8d7b9e8bec42ba8fe8e350c32c250d69876437b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:19:23 +0000 Subject: [PATCH 28/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 93b9b02..22d4862 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4886fd2ce874b83589d5cc16b815200b1748be47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:20 +0100 Subject: [PATCH 29/43] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- sheepdog.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 22d4862..d40bc9b 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,10 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.1-15 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 1.0.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 56854b09c6a91725d5c2bf4e9635df27c327f819 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:29:29 +0000 Subject: [PATCH 30/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index d40bc9b..b76da4b 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.1-15 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 4744ac859a00768902e5096b73002e6bcd28f1bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:48:43 +0000 Subject: [PATCH 31/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index b76da4b..5d5b641 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.0.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 43dda673e2e6e9d5980f3b46c376ac142fb9078e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:31:00 +0000 Subject: [PATCH 32/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 5d5b641..7efce0f 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.0.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e6566d8d23c7ec4e10ad1ccde9cafa0cb9617362 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:09:37 +0000 Subject: [PATCH 33/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 7efce0f..b48a06e 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.0.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f9996fbd9853d3509fca36e304c026f860475dd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:34:08 +0000 Subject: [PATCH 34/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index b48a06e..1305519 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5ccb1c6f338663aa359ef1d8ee2cb90401ac2336 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:54:57 +0000 Subject: [PATCH 35/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 1305519..5c5f616 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.0.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a7d70631209edefb35f0d2ea683f92601b4bf618 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 36/43] Eliminate use of obsolete %patchN syntax (#2283636) --- sheepdog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 5c5f616..91bb6f0 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -55,7 +55,7 @@ This package contains the libsheepdog shared library. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 %build ./autogen.sh From 2bba79cf3f72c2b3ff9392095b2e724888a52115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:25:21 +0000 Subject: [PATCH 37/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 91bb6f0..060629a 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2 and GPLv2+ URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz @@ -120,6 +120,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.0.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b20a8e96e2f97f44cd1dbae2ca3966b21524b693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:14:45 +0200 Subject: [PATCH 38/43] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sheepdog.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sheepdog.spec b/sheepdog.spec index 060629a..b4fb69a 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,8 +1,9 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 22%{?dist} -License: GPLv2 and GPLv2+ +Release: 23%{?dist} +# Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. +License: GPL-2.0-only AND GPL-2.0-or-later URL: http://sheepdog.github.io/sheepdog Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz Source1: sheepdog.service @@ -40,7 +41,8 @@ which offer a distributed object storage system for KVM. %package devel Summary: Header files for the Sheepdog distributed storage system -License: GPLv2 and GPLv2+ +# Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. +License: GPL-2.0-only AND GPL-2.0-or-later Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -48,7 +50,8 @@ This package contains the header files for libsheepdog. %package libs Summary: Libraries for the Sheepdog distributed storage system -License: GPLv2 and GPLv2+ +# Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. +License: GPL-2.0-only AND GPL-2.0-or-later %description libs This package contains the libsheepdog shared library. @@ -120,6 +123,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Wed Aug 07 2024 Miroslav Suchý - 1.0.1-23 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.0.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 446ea8bbdd17633baa1ed2f4d25603535e124e32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:34:36 +0000 Subject: [PATCH 39/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index b4fb69a..8eeebcd 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 23%{?dist} +Release: 24%{?dist} # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later URL: http://sheepdog.github.io/sheepdog @@ -123,6 +123,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 1.0.1-23 - convert license to SPDX From 1103b04ef4873db91b1dbadc7f5ab62849719df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 16 Apr 2025 16:41:31 +0200 Subject: [PATCH 40/43] Fix build with modern userspace-rcu-devel ... (rhbz#2341344) I guess -std=gnu11 might work too. But gnu23 seems to be fine, so let's go for the latest. --- sheepdog.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sheepdog.spec b/sheepdog.spec index 8eeebcd..3565794 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -60,6 +60,9 @@ This package contains the libsheepdog shared library. %setup -q %patch -P0 -p1 +# urcu/compiler.h from userspace-rcu-devel requires __STDC_VERSION__ 201112L +sed -r -i 's/-std=gnu99/-std=gnu23/' configure.ac + %build ./autogen.sh From 6f44643f061cde313262ab75cf706e811f872ee3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:13:59 +0000 Subject: [PATCH 41/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 3565794..b981cd9 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 24%{?dist} +Release: 25%{?dist} # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later URL: http://sheepdog.github.io/sheepdog @@ -126,6 +126,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d07cf8a21b061fb022b92c21be42093f9b884512 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:58:58 +0000 Subject: [PATCH 42/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index b981cd9..0891ec3 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 25%{?dist} +Release: 26%{?dist} # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later URL: http://sheepdog.github.io/sheepdog @@ -126,6 +126,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 54784da2a4f4d635bf6dd9019525a2c8ab00ba9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:29:02 +0000 Subject: [PATCH 43/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- sheepdog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sheepdog.spec b/sheepdog.spec index 0891ec3..bec8630 100644 --- a/sheepdog.spec +++ b/sheepdog.spec @@ -1,7 +1,7 @@ Name: sheepdog Summary: The Sheepdog distributed storage system for KVM/QEMU Version: 1.0.1 -Release: 26%{?dist} +Release: 27%{?dist} # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later URL: http://sheepdog.github.io/sheepdog @@ -126,6 +126,9 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig %{_libdir}/libsheepdog.so %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild