[packages/dlm] Up to snap 4283123f
mmazur
mmazur at pld-linux.org
Mon Jun 30 12:29:06 CEST 2014
commit 5ec7640ddead43fc2e334fce80b3c9228a61d65c
Author: Mariusz Mazur <mmazur at axeos.com>
Date: Mon Jun 30 10:28:54 2014 +0000
Up to snap 4283123f
dlm.spec | 16 +++---
fix_status_printing.patch | 140 ----------------------------------------------
old_udev_dir.patch | 21 +++++++
3 files changed, 29 insertions(+), 148 deletions(-)
---
diff --git a/dlm.spec b/dlm.spec
index 47839e5..b112ae6 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -5,18 +5,19 @@
Summary: General-purpose distributed lock manager
Summary(pl.UTF-8): Zarządca rozproszonych blokad ogólnego przeznaczenia
Name: dlm
-Version: 4.0.2
-Release: 2
+%define _snap 4283123f0b13eafc46d825050c5142cf44be79c3
+Version: 4.0.3
+Release: 0.1
License: LGPL v2.1+, GPL v2
Group: Libraries
-Source0: https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{version}.tar.bz2
-# Source0-md5: 87703eae3fb4a3312c10cc1b58f064b8
+Source0: https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{_snap}.tar.bz2
+# Source0-md5: 575174a0d7b0e1a6e45ec88f447c48cc
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
Source4: dlm.conf
Patch0: %{name}-systemd-configfs.patch
-Patch1: fix_status_printing.patch
+Patch1: old_udev_dir.patch
URL: http://sources.redhat.com/cluster/dlm/
BuildRequires: corosync-devel >= 2.0
%{?with_dlm_stonith:BuildRequires: libxml2-devel >= 2.0}
@@ -68,7 +69,7 @@ Header files and development documentation for DLM.
Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
%prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
%patch0 -p1
%patch1 -p1
@@ -158,8 +159,7 @@ fi
/lib/udev/rules.d/51-dlm.rules
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/%{name}
-%{_mandir}/man8/dlm_controld.8*
-%{_mandir}/man8/dlm_tool.8*
+%{_mandir}/man8/dlm_*.8*
%{_mandir}/man5/dlm.conf.5*
%{systemdunitdir}/%{name}.service
%{systemdtmpfilesdir}/%{name}.conf
diff --git a/fix_status_printing.patch b/fix_status_printing.patch
deleted file mode 100644
index 606e7a4..0000000
--- a/fix_status_printing.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 090026f33031c1b46dfe3e2e077c6cb0aa149378 Mon Sep 17 00:00:00 2001
-From: David Teigland <teigland at redhat.com>
-Date: Wed, 12 Feb 2014 12:09:10 -0600
-Subject: dlm_tool: fix status printing in libdlmcontrol
-
-When a node was both a startup node and a normal node,
-then status would segfault.
-
-Signed-off-by: David Teigland <teigland at redhat.com>
-
-diff --git a/dlm_controld/lib.c b/dlm_controld/lib.c
-index 961626f..efb74e0 100644
---- a/dlm_controld/lib.c
-+++ b/dlm_controld/lib.c
-@@ -337,12 +337,19 @@ int dlmc_print_status(uint32_t flags)
- struct dlmc_state *st;
- char maxstr[DLMC_STATE_MAXSTR];
- char maxbin[DLMC_STATE_MAXBIN];
-- char *str, *bin;
-- int all_count, node_count, fence_count;
-- int all_ids[MAX_SORT], node_ids[MAX_SORT], fence_ids[MAX_SORT];
-- char *node_lines[MAX_SORT], *fence_lines[MAX_SORT];
-- char *node_line, *fence_line;
-- int fd, rv, off;
-+ char *str;
-+ char *bin;
-+ int all_count, node_count, fence_count, startup_count;
-+ int all_ids[MAX_SORT];
-+ int node_ids[MAX_SORT];
-+ int fence_ids[MAX_SORT];
-+ int startup_ids[MAX_SORT];
-+ char *node_lines[MAX_SORT];
-+ char *fence_lines[MAX_SORT];
-+ char *node_line;
-+ char *fence_line;
-+ int found_node;
-+ int fd, rv;
- int i, j;
-
- init_header(&h, DLMC_CMD_DUMP_STATUS, NULL, 0);
-@@ -363,14 +370,15 @@ int dlmc_print_status(uint32_t flags)
- st = &state;
- str = maxstr;
- bin = maxbin;
-- off = 0;
-
- all_count = 0;
- node_count = 0;
- fence_count = 0;
-+ startup_count = 0;
- memset(&all_ids, 0, sizeof(all_ids));
- memset(&node_ids, 0, sizeof(node_ids));
- memset(&fence_ids, 0, sizeof(fence_ids));
-+ memset(&startup_ids, 0, sizeof(startup_ids));
- memset(node_lines, 0, sizeof(node_lines));
- memset(fence_lines, 0, sizeof(fence_lines));
-
-@@ -402,9 +410,11 @@ int dlmc_print_status(uint32_t flags)
- print_daemon(st, str, bin, flags);
- break;
-
-- case DLMC_STATE_DAEMON_NODE:
- case DLMC_STATE_STARTUP_NODE:
-+ startup_ids[startup_count++] = st->nodeid;
-+ break;
-
-+ case DLMC_STATE_DAEMON_NODE:
- if (flags & DLMC_STATUS_VERBOSE) {
- printf("nodeid %d\n", st->nodeid);
- print_str(str, st->str_len);
-@@ -426,7 +436,7 @@ int dlmc_print_status(uint32_t flags)
- all_ids[all_count++] = st->nodeid;
-
- node_ids[node_count] = st->nodeid;
-- node_lines[node_count++] = node_line;
-+ node_lines[node_count] = node_line;
- node_count++;
-
- if (!fence_line[0]) {
-@@ -450,13 +460,39 @@ int dlmc_print_status(uint32_t flags)
- if (all_count)
- qsort(all_ids, all_count, sizeof(int), nodeid_compare);
-
-+ /* don't free any node_lines in this startup loop because we are just
-+ borrowing them; they are needed in the real node loop below. */
-+
-+ if (startup_count) {
-+ for (i = 0; i < startup_count; i++) {
-+ found_node = 0;
-+ for (j = 0; j < node_count; j++) {
-+ if (startup_ids[i] != node_ids[j])
-+ continue;
-+ found_node = 1;
-+ if (!node_lines[j])
-+ printf("startup node %d\n", st->nodeid);
-+ else
-+ printf("startup %s", node_lines[j]);
-+ break;
-+ }
-+ if (!found_node)
-+ printf("startup node %d\n", st->nodeid);
-+ }
-+ }
-+
- if (all_count && fence_count) {
- for (i = 0; i < all_count; i++) {
- for (j = 0; j < fence_count; j++) {
- if (all_ids[i] != fence_ids[j])
- continue;
-- printf("%s", fence_lines[j]);
-- free(fence_lines[j]);
-+ if (!fence_lines[j]) {
-+ printf("fence %d no data\n", fence_ids[j]);
-+ } else {
-+ printf("%s", fence_lines[j]);
-+ free(fence_lines[j]);
-+ fence_lines[j] = NULL;
-+ }
- break;
- }
- }
-@@ -467,8 +503,13 @@ int dlmc_print_status(uint32_t flags)
- for (j = 0; j < node_count; j++) {
- if (all_ids[i] != node_ids[j])
- continue;
-- printf("%s", node_lines[j]);
-- free(node_lines[j]);
-+ if (!node_lines[j]) {
-+ printf("node %d no data\n", node_ids[j]);
-+ } else {
-+ printf("%s", node_lines[j]);
-+ free(node_lines[j]);
-+ node_lines[j] = NULL;
-+ }
- break;
- }
- }
---
-cgit v0.10.1
-
diff --git a/old_udev_dir.patch b/old_udev_dir.patch
new file mode 100644
index 0000000..32758e5
--- /dev/null
+++ b/old_udev_dir.patch
@@ -0,0 +1,21 @@
+commit 18c53486d8800c9e1a8a82ccd048825b4584ebc6
+Author: Mariusz Mazur <mmazur at axeos.com>
+Date: Mon Jun 30 12:19:36 2014 +0200
+
+ Revert "libdlm: udev dir now under /usr/lib"
+
+ This reverts commit 102d3c248c59f8f36a9d5088afd4eed787583e04.
+
+diff --git a/libdlm/Makefile b/libdlm/Makefile
+index e7cdb17..76d3504 100644
+--- a/libdlm/Makefile
++++ b/libdlm/Makefile
+@@ -5,7 +5,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM)
+ HDRDIR=$(PREFIX)/include
+ MANDIR=$(PREFIX)/share/man
+ PKGDIR=$(LIBDIR)/pkgconfig
+-UDEVDIR=/usr/lib/udev/rules.d
++UDEVDIR=/lib/udev/rules.d
+
+ LIB_NAME = libdlm
+ LIB_MAJOR = 3
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dlm.git/commitdiff/5ec7640ddead43fc2e334fce80b3c9228a61d65c
More information about the pld-cvs-commit
mailing list