Compare commits
13 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | e6566d8d23 | |
Fedora Release Engineering | 43dda673e2 | |
Fedora Release Engineering | 4744ac859a | |
Fedora Release Engineering | 56854b09c6 | |
Zbigniew Jędrzejewski-Szmek | 4886fd2ce8 | |
Fedora Release Engineering | d8d7b9e8be | |
Tom Stellard | 00d22891e1 | |
Fedora Release Engineering | 869710acbd | |
Paolo Bonzini | ff3a31b760 | |
Fedora Release Engineering | 8d54b4be55 | |
Fedora Release Engineering | 5340dec138 | |
Fedora Release Engineering | a0d0c25db7 | |
Igor Gnatenko | a4cdeda4e0 |
|
@ -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;
|
|
|
@ -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);
|
|
@ -1,18 +1,20 @@
|
||||||
Name: sheepdog
|
Name: sheepdog
|
||||||
Summary: The Sheepdog distributed storage system for KVM/QEMU
|
Summary: The Sheepdog distributed storage system for KVM/QEMU
|
||||||
Version: 1.0.1
|
Version: 1.0.1
|
||||||
Release: 8%{?dist}
|
Release: 19%{?dist}
|
||||||
License: GPLv2 and GPLv2+
|
License: GPLv2 and GPLv2+
|
||||||
Group: System Environment/Base
|
|
||||||
URL: http://sheepdog.github.io/sheepdog
|
URL: http://sheepdog.github.io/sheepdog
|
||||||
Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz
|
Source0: https://github.com/sheepdog/sheepdog/archive/v1.0.1.tar.gz
|
||||||
Source1: sheepdog.service
|
Source1: sheepdog.service
|
||||||
Source2: sheepdog.timer
|
Source2: sheepdog.timer
|
||||||
Source3: sheepdog
|
Source3: sheepdog
|
||||||
|
|
||||||
|
Patch0: sha1-extern.patch
|
||||||
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
# Build bits
|
# Build bits
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: autoconf automake libtool systemd
|
BuildRequires: autoconf automake libtool systemd
|
||||||
BuildRequires: corosync corosynclib corosynclib-devel
|
BuildRequires: corosync corosynclib corosynclib-devel
|
||||||
BuildRequires: userspace-rcu-devel
|
BuildRequires: userspace-rcu-devel
|
||||||
|
@ -38,7 +40,6 @@ which offer a distributed object storage system for KVM.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Header files for the Sheepdog distributed storage system
|
Summary: Header files for the Sheepdog distributed storage system
|
||||||
Group: Development/Libraries
|
|
||||||
License: GPLv2 and GPLv2+
|
License: GPLv2 and GPLv2+
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
@ -47,7 +48,6 @@ This package contains the header files for libsheepdog.
|
||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Libraries for the Sheepdog distributed storage system
|
Summary: Libraries for the Sheepdog distributed storage system
|
||||||
Group: Applications/File
|
|
||||||
License: GPLv2 and GPLv2+
|
License: GPLv2 and GPLv2+
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
|
@ -55,6 +55,7 @@ This package contains the libsheepdog shared library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
@ -119,6 +120,41 @@ cp -a %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig
|
||||||
%{_libdir}/libsheepdog.so
|
%{_libdir}/libsheepdog.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-19
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-18
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-17
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.1-15
|
||||||
|
- Rebuilt for updated systemd-rpm-macros
|
||||||
|
See https://pagure.io/fesco/issue/2583.
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 30 2020 Paolo Bonzini <pbonzini@redhat.com> - 1.0.1-12
|
||||||
|
- New patch sha1-extern.patch to fix FTBFS
|
||||||
|
- Delete obsolete patches
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
@ -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;
|
|
Loading…
Reference in New Issue