commit e512ed2ae462ac5323ee7a47015d9ea24aed9e03
Author: Marcin Krol <h...@tld-linux.org>
Date: Thu Apr 25 19:34:24 2024 +0000
- updated to 4.14.0
resource-agents-types.patch | 41 +++++++++++++++++++++--------------------
resource-agents.spec | 7 ++++---
2 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/resource-agents.spec b/resource-agents.spec
index 9effab5..756f77d 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,13 +1,13 @@
Summary: Reusable cluster resource scripts
Summary(pl.UTF-8): Skrypty wielokrotnego użytku do obsługi zasobów
klastrowych
Name: resource-agents
-Version: 4.10.0
-Release: 2
+Version: 4.14.0
+Release: 1
License: GPL v2+, LGPL v2.1+
Group: Daemons
#Source0Download: https://github.com/ClusterLabs/resource-agents/releases
Source0:
https://github.com/ClusterLabs/resource-agents/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fffe3881b839846a6dc587ef83ec4cd5
+# Source0-md5: 0f48ab395633d2a92a31a54b7b0c018d
Source1: ldirectord.init
Source2: %{name}.tmpfiles
Patch0: %{name}-types.patch
@@ -21,6 +21,7 @@ BuildRequires: docbook-dtd44-xml
BuildRequires: docbook-style-xsl
BuildRequires: glib2-devel >= 2.0
BuildRequires: libnet-devel >= 1.0
+BuildRequires: libqb-devel
BuildRequires: libxslt-progs
BuildRequires: openssl-tools
BuildRequires: perl-tools-pod
diff --git a/resource-agents-types.patch b/resource-agents-types.patch
index b601130..b1cd2b2 100644
--- a/resource-agents-types.patch
+++ b/resource-agents-types.patch
@@ -1,34 +1,35 @@
---- resource-agents-4.10.0/tools/storage_mon.c.orig 2021-11-03
10:12:01.000000000 +0100
-+++ resource-agents-4.10.0/tools/storage_mon.c 2022-02-07 18:30:47.352605699
+0100
+diff -ur resource-agents-4.14.0.orig/tools/storage_mon.c
resource-agents-4.14.0/tools/storage_mon.c
+--- resource-agents-4.14.0.orig/tools/storage_mon.c 2024-04-24
09:11:40.000000000 +0000
++++ resource-agents-4.14.0/tools/storage_mon.c 2024-04-25 19:29:01.248095163
+0000
@@ -1,3 +1,4 @@
+#include <inttypes.h>
#include <stdio.h>
#include <getopt.h>
#include <stdlib.h>
-@@ -60,7 +61,7 @@ static void *test_device(const char *dev
- exit(-1);
+@@ -150,7 +151,7 @@
+ goto error;
}
if (verbose) {
-- fprintf(stderr, "%s: size=%zu\n", device, devsize);
-+ fprintf(stderr, "%s: size=%"PRIu64"\n", device, devsize);
+- PRINT_STORAGE_MON_INFO("%s: opened %s O_DIRECT, size=%zu",
device, (flags & O_DIRECT)?"with":"without", devsize);
++ PRINT_STORAGE_MON_INFO("%s: opened %s O_DIRECT, size=%"PRIu64,
device, (flags & O_DIRECT)?"with":"without", devsize);
}
+
/* Don't fret about real randomness */
- srand(time(NULL) + getpid());
-@@ -74,7 +75,7 @@ static void *test_device(const char *dev
+@@ -163,7 +164,7 @@
+ goto error;
}
-
if (verbose) {
-- printf("%s: reading from pos %ld\n", device, seek_spot);
-+ printf("%s: reading from pos %"PRId64"\n", device,
(int64_t)seek_spot);
+- PRINT_STORAGE_MON_INFO("%s: reading from pos %ld", device,
seek_spot);
++ PRINT_STORAGE_MON_INFO("%s: reading from pos %"PRId64, device,
(int64_t)seek_spot);
}
- res = read(device_fd, buffer, sizeof(buffer));
-@@ -84,7 +85,7 @@ static void *test_device(const char *dev
- exit(-1);
- }
- if (res < (int)sizeof(buffer)) {
-- fprintf(stderr, "Failed to read %ld bytes from %s, got %d\n",
sizeof(buffer), device, res);
-+ fprintf(stderr, "Failed to read %zd bytes from %s, got %d\n",
sizeof(buffer), device, res);
- close(device_fd);
- exit(-1);
+ if (flags & O_DIRECT) {
+@@ -203,7 +204,7 @@
+ goto error;
+ }
+ if (res < (int)sizeof(buffer)) {
+- PRINT_STORAGE_MON_ERR("Failed to read %ld bytes from
%s, got %d", sizeof(buffer), device, res);
++ PRINT_STORAGE_MON_ERR("Failed to read %zd bytes from
%s, got %d", sizeof(buffer), device, res);
+ goto error;
+ }
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/resource-agents.git/commitdiff/07852aa9c00431172862151f006186e0f3274f02
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
