commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2020-10-18 16:19:39
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new.3486 (New)
Package is "libdlm"
Sun Oct 18 16:19:39 2020 rev:52 rq:841897 version:4.0.9
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2020-09-24
16:13:02.812826777 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new.3486/libdlm.changes 2020-10-18
16:19:52.328449454 +0200
@@ -1,0 +2,13 @@
+Wed Oct 14 11:04:44 UTC 2020 - Jan Engelhardt
+
+- Do build with SUSE's %optflags.
+- Abolish historic specfile constructs.
+- Rework libdlm3 require with a shared library version
+ tag instead so it propagates to all consuming packages.
+
+---
+Wed Oct 14 10:10:20 UTC 2020 - g...@suse.com
+
+- Add require libdlm3 (bsc#1177658)
+
+---
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.U5NYMQ/_old 2020-10-18 16:19:53.388449925 +0200
+++ /var/tmp/diff_new_pack.U5NYMQ/_new 2020-10-18 16:19:53.392449927 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
Group: Productivity/Clustering/HA
Version:4.0.9
Release:0
-Url:https://pagure.io/dlm
+URL:https://pagure.io/dlm/
Source: https://releases.pagure.org/dlm/dlm-%{version}.tar.gz
Patch1: 0001-makefile-for-diff-arch.patch
Patch2: 0002-remove-sd-notify.patch
@@ -44,7 +44,6 @@
Patch4: sysmacros.patch
Patch5: cluster-ringid-seq.patch
Patch6: dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
@@ -82,23 +81,18 @@
like OCFS2, to interface with the in-kernel distributed lock manager.
%prep
-###
-%setup -qn dlm-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-###
+%autosetup -p1 -n dlm-%{version}
%build
+echo "V_%version { global: *; };" >dlm.ver
+export CFLAGS="%optflags"
+export LDFLAGS="-Wl,--version-script=$PWD/dlm.ver"
make all UDEVDIR="%{_udevrulesdir}"
###
%install
###
-make DESTDIR=$RPM_BUILD_ROOT UDEVDIR="%{_udevrulesdir}" install
+%make_install UDEVDIR="%{_udevrulesdir}"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version}
install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service
@@ -125,8 +119,6 @@
%postun -n libdlm3 -p /sbin/ldconfig
%files
-###
-%defattr(-,root,root)
%dir %{_datadir}/doc/packages/libdlm-%{version}
%{_udevrulesdir}/51-dlm.rules
%{_sbindir}/dlm_controld
@@ -140,14 +132,11 @@
%{_fillupdir}/sysconfig.dlm
%files -n libdlm3
-%defattr(-,root,root)
%{_libdir}/libdlm.so.*
%{_libdir}/libdlm_lt.so.*
%{_libdir}/libdlmcontrol.so.*
%files devel
-###
-%defattr(-,root,root)
%{_libdir}/libdlm*.so
%{_libdir}/pkgconfig/libdlm.pc
%{_libdir}/pkgconfig/libdlm_lt.pc
commit libdlm for openSUSE:Factory
Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2020-09-24 16:12:30 Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new.4249 (New) Package is "libdlm" Thu Sep 24 16:12:30 2020 rev:51 rq:835763 version:4.0.9 Changes: --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2020-09-18 15:21:06.721952346 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new.4249/libdlm.changes 2020-09-24 16:13:02.812826777 +0200 @@ -1,0 +2,5 @@ +Mon Sep 21 11:10:20 UTC 2020 - g...@suse.com + +- Add dependency relationship between libdlm and dlm-kmp (bsc#1121380) + +--- Other differences: -- ++ libdlm.spec ++ --- /var/tmp/diff_new_pack.DZtezD/_old 2020-09-24 16:13:03.844827809 +0200 +++ /var/tmp/diff_new_pack.DZtezD/_new 2020-09-24 16:13:03.848827813 +0200 @@ -53,6 +53,7 @@ BuildRequires: libxml2-devel BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) +Recommends: dlm-kmp %description Libraries and tools that allow applications, particularly filesystems
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2020-09-18 15:20:57
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new.4249 (New)
Package is "libdlm"
Fri Sep 18 15:20:57 2020 rev:50 rq:834519 version:4.0.9
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2020-06-03
20:30:20.048774455 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new.4249/libdlm.changes 2020-09-18
15:21:06.721952346 +0200
@@ -1,0 +2,6 @@
+Tue Sep 15 10:30:20 UTC 2020 - g...@suse.com
+
+- Add notes in dlm.conf man page (bsc#1175812)
+ * add dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch
+
+---
New:
dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.teHnSd/_old 2020-09-18 15:21:08.969954521 +0200
+++ /var/tmp/diff_new_pack.teHnSd/_new 2020-09-18 15:21:08.973954525 +0200
@@ -43,6 +43,7 @@
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
Patch4: sysmacros.patch
Patch5: cluster-ringid-seq.patch
+Patch6: dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: glib2-devel
@@ -87,6 +88,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
###
%build
++ dlm_controld-add-note-that-the-dlm-file-is-not-creat.patch ++
>From 74595a9400f20c4d4fd83c0a748ddb875d39f578 Mon Sep 17 00:00:00 2001
From: Gang He
Date: Mon, 14 Sep 2020 15:51:01 +0800
Subject: [PATCH] dlm_controld: add note that the dlm file is not created
/etc/dlm/dlm.conf file is not created during installation.
we need to tell the user this configuration file does not exist.
Signed-off-by: Gang He
---
dlm_controld/dlm.conf.5 | 6 ++
1 file changed, 6 insertions(+)
diff --git a/dlm_controld/dlm.conf.5 b/dlm_controld/dlm.conf.5
index 1ce0c644..78ac22c0 100644
--- a/dlm_controld/dlm.conf.5
+++ b/dlm_controld/dlm.conf.5
@@ -411,6 +411,12 @@ node id=1 mark=42
In which case node 1 will master 2/3 of the total resources and node 2
will master the other 1/3.
+.SH NOTES
+.B /etc/dlm/dlm.conf
+file is not created during installation.
+.br
+If you want to modify any default configuration items, you need to create and
edit the file.
+
.SH SEE ALSO
.BR dlm_controld (8),
.BR dlm_tool (8)
--
2.12.3
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2020-06-03 20:30:14
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new.3606 (New)
Package is "libdlm"
Wed Jun 3 20:30:14 2020 rev:49 rq:807937 version:4.0.9
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2019-08-13
13:12:17.109557532 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new.3606/libdlm.changes 2020-06-03
20:30:20.048774455 +0200
@@ -1,0 +2,6 @@
+Fri May 15 08:10:20 UTC 2020 - g...@suse.com
+
+- Support uint64_t corosync ringid (bsc#1168771)
+ * add cluster-ringid-seq.patch
+
+---
New:
cluster-ringid-seq.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.5Y34l0/_old 2020-06-03 20:30:21.928780170 +0200
+++ /var/tmp/diff_new_pack.5Y34l0/_new 2020-06-03 20:30:21.932780182 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,7 @@
Patch2: 0002-remove-sd-notify.patch
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
Patch4: sysmacros.patch
+Patch5: cluster-ringid-seq.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: glib2-devel
@@ -85,6 +86,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
###
%build
++ cluster-ringid-seq.patch ++
diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c
index e4b27fac3cd5..5b5c52fc09bc 100644
--- a/dlm_controld/cpg.c
+++ b/dlm_controld/cpg.c
@@ -450,21 +450,24 @@ static int check_ringid_done(struct lockspace *ls)
but that's probably not guaranteed.) */
if (ls->cpg_ringid_wait) {
- log_group(ls, "check_ringid wait cluster %u cpg %u:%llu",
- cluster_ringid_seq, ls->cpg_ringid.nodeid,
+ log_group(ls, "check_ringid wait cluster %u cpg %llu:%llu",
+ (unsigned long long)cluster_ringid_seq,
+ ls->cpg_ringid.nodeid,
(unsigned long long)ls->cpg_ringid.seq);
return 0;
}
- if (cluster_ringid_seq != (uint32_t)ls->cpg_ringid.seq) {
- log_group(ls, "check_ringid cluster %u cpg %u:%llu",
- cluster_ringid_seq, ls->cpg_ringid.nodeid,
+ if (cluster_ringid_seq != ls->cpg_ringid.seq) {
+ log_group(ls, "check_ringid cluster %llu cpg %u:%llu",
+ (unsigned long long)cluster_ringid_seq,
+ ls->cpg_ringid.nodeid,
(unsigned long long)ls->cpg_ringid.seq);
return 0;
}
- log_limit(ls, "check_ringid done cluster %u cpg %u:%llu",
- cluster_ringid_seq, ls->cpg_ringid.nodeid,
+ log_limit(ls, "check_ringid done cluster %llu cpg %u:%llu",
+ (unsigned long long)cluster_ringid_seq,
+ ls->cpg_ringid.nodeid,
(unsigned long long)ls->cpg_ringid.seq);
return 1;
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 3221e19cb7be..5b9a52dae750 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -179,7 +179,7 @@ EXTERN uint64_t fence_delay_begin;
EXTERN uint64_t cluster_quorate_monotime;
EXTERN uint64_t cluster_joined_monotime;
EXTERN uint64_t cluster_joined_walltime;
-EXTERN uint32_t cluster_ringid_seq;
+EXTERN uint64_t cluster_ringid_seq;
EXTERN char cluster_name[DLM_LOCKSPACE_LEN+1];
EXTERN int our_nodeid;
EXTERN uint32_t control_minor;
diff --git a/dlm_controld/member.c b/dlm_controld/member.c
index 10351ec41d6d..da3a1f5b0e90 100644
--- a/dlm_controld/member.c
+++ b/dlm_controld/member.c
@@ -122,10 +122,10 @@ static void quorum_callback(quorum_handle_t h, uint32_t
quorate,
cluster_quorate_monotime = now;
cluster_quorate = quorate;
- cluster_ringid_seq = (uint32_t)ring_seq;
+ cluster_ringid_seq = ring_seq;
- log_debug("cluster quorum %u seq %u nodes %u",
- cluster_quorate, cluster_ringid_seq, node_list_entries);
+ log_debug("cluster quorum %u seq %llu nodes %u",
+ cluster_quorate, (unsigned long long)cluster_ringid_seq,
node_list_entries);
old_node_count = quorum_node_count;
memcpy(_nodes,
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2019-08-13 13:12:14
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new.9556 (New)
Package is "libdlm"
Tue Aug 13 13:12:14 2019 rev:48 rq:721899 version:4.0.9
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2018-08-17
23:57:58.233978608 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new.9556/libdlm.changes 2019-08-13
13:12:17.109557532 +0200
@@ -1,0 +2,7 @@
+Mon Aug 5 09:16:31 UTC 2019 - g...@suse.com
+
+- Update to v4.0.9
+ * include some fixes/enhancements for dlm_controld (bsc#1144793)
+ * source moved to https://pagure.io/dlm
+
+---
Old:
dlm-4.0.7.tar.xz
New:
dlm-4.0.9.tar.gz
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.DYcWa1/_old 2019-08-13 13:12:18.133556974 +0200
+++ /var/tmp/diff_new_pack.DYcWa1/_new 2019-08-13 13:12:18.133556974 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -34,10 +34,10 @@
Summary:Application interface to the kernel's distributed lock manager
License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Clustering/HA
-Version:4.0.7
+Version:4.0.9
Release:0
-Url:https://fedorahosted.org/cluster/wiki/HomePage
-Source:
https://git.fedorahosted.org/cgit/dlm.git/snapshot/dlm-%{version}.tar.xz
+Url:https://pagure.io/dlm
+Source: https://releases.pagure.org/dlm/dlm-%{version}.tar.gz
Patch1: 0001-makefile-for-diff-arch.patch
Patch2: 0002-remove-sd-notify.patch
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
@@ -58,9 +58,9 @@
%package -n libdlm3
Summary:Application interface to the kernel's distributed lock manager
+# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Libraries
-# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -146,6 +146,7 @@
%{_libdir}/libdlm*.so
%{_libdir}/pkgconfig/libdlm.pc
%{_libdir}/pkgconfig/libdlm_lt.pc
+%{_libdir}/pkgconfig/libdlmcontrol.pc
%{_includedir}/libdlm.h
%{_includedir}/libdlmcontrol.h
++ 0002-remove-sd-notify.patch ++
--- /var/tmp/diff_new_pack.DYcWa1/_old 2019-08-13 13:12:18.149556965 +0200
+++ /var/tmp/diff_new_pack.DYcWa1/_new 2019-08-13 13:12:18.149556965 +0200
@@ -3,8 +3,8 @@
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -6,7 +6,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM)
- HDRDIR=$(PREFIX)/include
MANDIR=$(PREFIX)/share/man
+ PKGDIR=$(LIBDIR)/pkgconfig
-USE_SD_NOTIFY=yes
+USE_SD_NOTIFY=no
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2018-08-17 23:57:56
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is "libdlm"
Fri Aug 17 23:57:56 2018 rev:47 rq:628532 version:4.0.7
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2017-11-30
12:37:20.603475560 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2018-08-17
23:57:58.233978608 +0200
@@ -1,0 +2,5 @@
+Mon Aug 6 11:01:48 UTC 2018 - sch...@suse.de
+
+- sysmacros.patch: Include for minor
+
+---
New:
sysmacros.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.fhRTWX/_old 2018-08-17 23:57:58.985980843 +0200
+++ /var/tmp/diff_new_pack.fhRTWX/_new 2018-08-17 23:57:58.985980843 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
Name: libdlm
Summary:Application interface to the kernel's distributed lock manager
-License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
+License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Clustering/HA
Version:4.0.7
Release:0
@@ -41,6 +41,7 @@
Patch1: 0001-makefile-for-diff-arch.patch
Patch2: 0002-remove-sd-notify.patch
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
+Patch4: sysmacros.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: glib2-devel
@@ -57,9 +58,9 @@
%package -n libdlm3
Summary:Application interface to the kernel's distributed lock manager
-# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
-License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
+License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Libraries
+# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -69,7 +70,7 @@
%packagedevel
Summary:Development files for the kernel's distributed lock manager
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Requires: libdlm3 = %{version}
@@ -83,6 +84,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
###
%build
++ sysmacros.patch ++
Index: dlm-4.0.7/dlm_controld/action.c
===
--- dlm-4.0.7.orig/dlm_controld/action.c
+++ dlm-4.0.7/dlm_controld/action.c
@@ -7,6 +7,7 @@
*/
#include "dlm_daemon.h"
+#include
#include
#include
Index: dlm-4.0.7/libdlm/libdlm.c
===
--- dlm-4.0.7.orig/libdlm/libdlm.c
+++ dlm-4.0.7/libdlm/libdlm.c
@@ -11,6 +11,7 @@
#include
#endif
#include
+#include
#include
#include
#include
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2017-11-30 12:37:19
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is "libdlm"
Thu Nov 30 12:37:19 2017 rev:46 rq:544879 version:4.0.7
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2017-02-19
00:59:18.362126561 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2017-11-30
12:37:20.603475560 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:48:46 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.Jd1ZVo/_old 2017-11-30 12:37:21.219453161 +0100
+++ /var/tmp/diff_new_pack.Jd1ZVo/_new 2017-11-30 12:37:21.223453015 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
%endif
@@ -90,7 +95,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version}
install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service
-install -Dm 0644 init/dlm.sysconfig
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dlm
+install -Dm 0644 init/dlm.sysconfig $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dlm
%fdupes %{buildroot}/%{_prefix}
###
@@ -125,7 +130,7 @@
%{_datadir}/man/man5/*.gz
%{_datadir}/doc/packages/libdlm-%{version}
%{_unitdir}/dlm.service
-/var/adm/fillup-templates/sysconfig.dlm
+%{_fillupdir}/sysconfig.dlm
%files -n libdlm3
%defattr(-,root,root)
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2017-02-19 00:59:17
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is "libdlm"
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2017-02-14
00:37:46.460251618 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2017-02-19
00:59:18.362126561 +0100
@@ -1,0 +2,6 @@
+Tue Feb 14 09:04:32 UTC 2017 - jeng...@inai.de
+
+- Use source URL; drop redundant %clean section;
+ rectify RPM groups; run fdupes to merge duplicate files.
+
+---
Old:
libdlm-4.0.7.tar.gz
New:
dlm-4.0.7.tar.xz
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.o27vXG/_old 2017-02-19 00:59:18.826061412 +0100
+++ /var/tmp/diff_new_pack.o27vXG/_new 2017-02-19 00:59:18.826061412 +0100
@@ -31,12 +31,13 @@
Group: Productivity/Clustering/HA
Version:4.0.7
Release:0
-Url:http://sources.redhat.com/cluster/wiki
-Source: libdlm-4.0.7.tar.gz
+Url:https://fedorahosted.org/cluster/wiki/HomePage
+Source:
https://git.fedorahosted.org/cgit/dlm.git/snapshot/dlm-%{version}.tar.xz
Patch1: 0001-makefile-for-diff-arch.patch
Patch2: 0002-remove-sd-notify.patch
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: fdupes
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
BuildRequires: libpacemaker-devel
@@ -51,9 +52,9 @@
%package -n libdlm3
Summary:Application interface to the kernel's distributed lock manager
-License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
-Group: Productivity/Clustering/HA
# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
+License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
+Group: System/Libraries
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -62,7 +63,7 @@
like OCFS2, to interface with the in-kernel distributed lock manager.
%packagedevel
-Summary:Application interface to the kernel's distributed lock manager
+Summary:Development files for the kernel's distributed lock manager
License:LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: libdlm3 = %{version}
@@ -73,7 +74,7 @@
%prep
###
-%setup
+%setup -qn dlm-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -90,6 +91,7 @@
install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service
install -Dm 0644 init/dlm.sysconfig
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dlm
+%fdupes %{buildroot}/%{_prefix}
###
@@ -107,11 +109,6 @@
%postun
%service_del_postun dlm.service
-%clean
-###
-make clean
-###
-
%post -n libdlm3 -p /sbin/ldconfig
%postun -n libdlm3 -p /sbin/ldconfig
commit libdlm for openSUSE:Factory
Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2017-02-14 00:37:45 Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) Package is "libdlm" Changes: --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2017-02-08 12:06:31.461906375 +0100 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2017-02-14 00:37:46.460251618 +0100 @@ -5,0 +6,2 @@ +- Re-add the dropped bsc numbers to follow the factory-first policy + * take Factory fixes for SLE12 (boo#944795, bsc#944797) Other differences: --
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2017-02-08 12:06:29
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is "libdlm"
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2016-08-03
11:38:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2017-02-08
12:06:31.461906375 +0100
@@ -1,0 +2,6 @@
+Sat Feb 4 07:26:02 UTC 2017 - z...@suse.com
+
+- Update to v4.0.7
+ * bsc#1023595: libdlm: upgrade version to 4.0.7
+
+---
Old:
libdlm-4.0.6.tar.gz
New:
libdlm-4.0.7.tar.gz
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.QgnHGf/_old 2017-02-08 12:06:32.37365 +0100
+++ /var/tmp/diff_new_pack.QgnHGf/_new 2017-02-08 12:06:32.37365 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,10 +29,10 @@
Summary:Application interface to the kernel's distributed lock manager
License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:4.0.6
+Version:4.0.7
Release:0
Url:http://sources.redhat.com/cluster/wiki
-Source: libdlm-4.0.6.tar.gz
+Source: libdlm-4.0.7.tar.gz
Patch1: 0001-makefile-for-diff-arch.patch
Patch2: 0002-remove-sd-notify.patch
Patch3: 0003-bnc#874705-nodes-without-quorum.patch
++ libdlm-4.0.6.tar.gz -> libdlm-4.0.7.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/Makefile
new/libdlm-4.0.7/dlm_controld/Makefile
--- old/libdlm-4.0.6/dlm_controld/Makefile 2016-06-10 18:36:25.0
+0200
+++ new/libdlm-4.0.7/dlm_controld/Makefile 2016-12-19 16:01:53.0
+0100
@@ -62,9 +62,9 @@
LIB_LDFLAGS += -Wl,-z,relro -pie
ifeq ($(USE_SD_NOTIFY),yes)
- BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
+ BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \
-DUSE_SD_NOTIFY
- BIN_LDFLAGS += $(shell pkg-config --libs libsystemd-daemon)
+ BIN_LDFLAGS += $(shell pkg-config --libs libsystemd)
endif
all: $(LIB_TARGET) $(BIN_TARGET)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libdlm-4.0.6/dlm_controld/daemon_cpg.c
new/libdlm-4.0.7/dlm_controld/daemon_cpg.c
--- old/libdlm-4.0.6/dlm_controld/daemon_cpg.c 2016-06-10 18:36:25.0
+0200
+++ new/libdlm-4.0.7/dlm_controld/daemon_cpg.c 2016-12-19 16:01:53.0
+0100
@@ -79,6 +79,7 @@
int fence_actor_done; /* for status/debug */
int fence_actor_last; /* for status/debug */
int fence_actors[MAX_NODES];
+ int fence_actors_orig[MAX_NODES];
struct protocol proto;
struct fence_config fence_config;
@@ -537,6 +538,7 @@
int i, nodeid, count = 0, low = 0;
memset(node->fence_actors, 0, sizeof(node->fence_actors));
+ memset(node->fence_actors_orig, 0, sizeof(node->fence_actors_orig));
for (i = 0; i < daemon_member_count; i++) {
nodeid = daemon_member[i].nodeid;
@@ -550,6 +552,9 @@
low = nodeid;
}
+ /* keep a copy of the original set so they can be retried if all fail */
+ memcpy(node->fence_actors_orig, node->fence_actors,
sizeof(node->fence_actors));
+
log_debug("set_fence_actors for %d low %d count %d",
node->nodeid, low, count);
return low;
@@ -592,6 +597,7 @@
static void clear_fence_actor(int nodeid, int actor)
{
struct node_daemon *node;
+ int remaining = 0;
int i;
node = get_node_daemon(nodeid);
@@ -599,10 +605,15 @@
return;
for (i = 0; i < MAX_NODES; i++) {
- if (node->fence_actors[i] == actor) {
+ if (node->fence_actors[i] == actor)
node->fence_actors[i] = 0;
- return;
- }
+ else if (node->fence_actors[i])
+ remaining++;
+ }
+
+ if (!remaining && opt(repeat_failed_fencing_ind)) {
+ log_debug("clear_fence_actor %d restoring original actors to
retry", actor);
+ memcpy(node->fence_actors, node->fence_actors_orig,
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2016-08-03 11:38:15
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is "libdlm"
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2015-05-06
11:17:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2016-08-03
11:38:17.0 +0200
@@ -1,0 +2,31 @@
+Mon Jul 25 06:54:31 UTC 2016 - z...@suse.com
+
+- Update to v4.0.6
+ * In v4.0.4, there's a stupid and severe bug so that upstream
+ released v4.0.5 soon with an urgent fix
+ * Upstream merged our fix for bsc#977201 with release v4.0.6,
+ so I still use the 2 below bugs for this updates:
+ * bsc#967332: libdlm: package update to v4.0.4
+ * bsc#977201: output of `dlm_tool ls` should distinguish causes
+ for "wait fencing" message
+
+- Drop patches
+ * bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
+ * build-dlm_stonith.patch
+
+- Rename patches more readable
+ * remove: Makefile-for-diff-arch.patch, remove-sd-notify.patch,
+ bnc#874705nodes-without-quorum.patch
+ * add: 0001-makefile-for-diff-arch.patch,
+ 0002-remove-sd-notify.patch,
+ 0003-bnc#874705-nodes-without-quorum.patch
+
+
+---
+Mon Feb 15 06:15:03 UTC 2016 - z...@suse.com
+
+- Update to V4.0.4
+ * Remove build-dlm_stonith.patch
+ * Reove bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
+
+---
Old:
Makefile-for-diff-arch.patch
bnc#874705nodes-without-quorum.patch
bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
build-dlm_stonith.patch
libdlm-4.0.2.tar.gz
remove-sd-notify.patch
New:
0001-makefile-for-diff-arch.patch
0002-remove-sd-notify.patch
0003-bnc#874705-nodes-without-quorum.patch
libdlm-4.0.6.tar.gz
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.Jgim8E/_old 2016-08-03 11:38:18.0 +0200
+++ /var/tmp/diff_new_pack.Jgim8E/_new 2016-08-03 11:38:18.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,15 +29,13 @@
Summary:Application interface to the kernel's distributed lock manager
License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:4.0.2
+Version:4.0.6
Release:0
Url:http://sources.redhat.com/cluster/wiki
-Source: libdlm-4.0.2.tar.gz
-Patch1: Makefile-for-diff-arch.patch
-Patch2: build-dlm_stonith.patch
-Patch3: remove-sd-notify.patch
-Patch4: bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
-Patch5: bnc#874705nodes-without-quorum.patch
+Source: libdlm-4.0.6.tar.gz
+Patch1: 0001-makefile-for-diff-arch.patch
+Patch2: 0002-remove-sd-notify.patch
+Patch3: 0003-bnc#874705-nodes-without-quorum.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
@@ -79,8 +77,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
###
%build
++ 0001-makefile-for-diff-arch.patch ++
Index: a/dlm_controld/Makefile
===
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -1,6 +1,11 @@
DESTDIR=
PREFIX=/usr
-LIBNUM=/lib64
+cpu_bit=$(shell getconf LONG_BIT)
+ifeq ($(cpu_bit),64)
+ LIBNUM=/lib64
+else
+ LIBNUM=/lib
+endif
BINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/$(LIBNUM)
HDRDIR=$(PREFIX)/include
Index: libdlm-4.0.2/libdlm/Makefile
===
--- libdlm-4.0.2.orig/libdlm/Makefile
+++ libdlm-4.0.2/libdlm/Makefile
@@ -1,6 +1,11 @@
DESTDIR=
PREFIX=/usr
-LIBNUM=/lib64
+cpu_bit=$(shell getconf LONG_BIT)
+ifeq ($(cpu_bit),64)
+ LIBNUM=/lib64
+else
+ LIBNUM=/lib
+endif
LIBDIR=$(PREFIX)/$(LIBNUM)
HDRDIR=$(PREFIX)/include
MANDIR=$(PREFIX)/share/man
++ 0002-remove-sd-notify.patch ++
Index: a/dlm_controld/Makefile
===
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -6,7 +6,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM)
HDRDIR=$(PREFIX)/include
MANDIR=$(PREFIX)/share/man
-USE_SD_NOTIFY=yes
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2015-05-06 11:17:36
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2015-04-21
10:46:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2015-05-06
11:17:38.0 +0200
@@ -1,0 +2,6 @@
+Fri May 1 16:41:52 UTC 2015 - jeng...@inai.de
+
+- Avoid running sh for %post ldconfig
+- Default to implicit -n for %setup
+
+---
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.4CTnM5/_old 2015-05-06 11:17:39.0 +0200
+++ /var/tmp/diff_new_pack.4CTnM5/_new 2015-05-06 11:17:39.0 +0200
@@ -55,6 +55,7 @@
Summary:Application interface to the kernel's distributed lock manager
License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
+# libdlm2 (openSUSE 11.2) also contained libdlm*.so.3
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -74,7 +75,7 @@
%prep
###
-%setup -n %{name}-%{version}
+%setup
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -115,13 +116,8 @@
make clean
###
-%post -n libdlm3
-/sbin/ldconfig
-exit 0
-
-%postun -n libdlm3
-/sbin/ldconfig
-exit 0
+%post -n libdlm3 -p /sbin/ldconfig
+%postun -n libdlm3 -p /sbin/ldconfig
%files
###
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2015-04-21 10:46:03
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2014-11-24
11:15:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2015-04-21
10:46:07.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 12 16:30:46 UTC 2015 - crrodrig...@opensuse.org
+
+- Move udev rules to %{_udevrulesdir}, packages should
+ not ship files in /etc/udev/rules.d which is reserved
+ for the sysadmin.
+
+---
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.IGpeqT/_old 2015-04-21 10:46:08.0 +0200
+++ /var/tmp/diff_new_pack.IGpeqT/_new 2015-04-21 10:46:08.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,7 @@
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(udev)
%description
Libraries and tools that allow applications, particularly filesystems
@@ -82,14 +83,13 @@
###
%build
-make all
+make all UDEVDIR=%{_udevrulesdir}
###
%install
###
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT UDEVDIR=%{_udevrulesdir} install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version}
-mv $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/etc
install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service
install -Dm 0644 init/dlm.sysconfig
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dlm
@@ -98,6 +98,7 @@
%post
%fillup_only -n dlm
+%{?udev_rules_update}
%service_add_post dlm.service
%preun
@@ -125,10 +126,8 @@
%files
###
%defattr(-,root,root)
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
%dir %{_datadir}/doc/packages/libdlm-%{version}
-%config %{_sysconfdir}/udev/rules.d/51-dlm.rules
+%{_udevrulesdir}/51-dlm.rules
%{_sbindir}/dlm_controld
%{_sbindir}/dlm_stonith
%{_sbindir}/dlm_tool
commit libdlm for openSUSE:Factory
Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2014-11-24 11:15:41 Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) Package is libdlm Changes: --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2014-06-01 18:57:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2014-11-24 11:15:41.0 +0100 @@ -1,0 +2,5 @@ +Fri Nov 14 08:33:11 UTC 2014 - dims...@opensuse.org + +- BuildRequire pkgconfig(systemd) instead of systemd-devel. + +--- Other differences: -- ++ libdlm.spec ++ --- /var/tmp/diff_new_pack.ATEUT0/_old 2014-11-24 11:15:42.0 +0100 +++ /var/tmp/diff_new_pack.ATEUT0/_new 2014-11-24 11:15:42.0 +0100 @@ -44,7 +44,7 @@ BuildRequires: libpacemaker-devel BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %description Libraries and tools that allow applications, particularly filesystems -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2014-06-01 18:57:07 Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new (New) Package is libdlm Changes: --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2014-05-22 09:04:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2014-06-01 18:57:08.0 +0200 @@ -1,0 +2,5 @@ +Wed May 21 11:34:53 UTC 2014 - jseg...@novell.com + +- added necessary macros for systemd files + +--- Other differences: -- ++ libdlm.spec ++ --- /var/tmp/diff_new_pack.jaGyge/_old 2014-06-01 18:57:09.0 +0200 +++ /var/tmp/diff_new_pack.jaGyge/_new 2014-06-01 18:57:09.0 +0200 @@ -103,6 +103,12 @@ %preun %service_del_preun dlm.service +%pre +%service_add_pre dlm.service + +%postun +%service_del_postun dlm.service + %clean ### make clean -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2014-05-22 09:04:19
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2014-05-05
21:09:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2014-05-22
09:04:25.0 +0200
@@ -1,0 +2,6 @@
+Tue May 20 08:06:58 UTC 2014 - lzh...@suse.com
+
+- fix different behavior when nodes without quorum
+ + bnc#874705nodes-without-quorum.patch
+
+---
New:
bnc#874705nodes-without-quorum.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.i7RIHp/_old 2014-05-22 09:04:26.0 +0200
+++ /var/tmp/diff_new_pack.i7RIHp/_new 2014-05-22 09:04:26.0 +0200
@@ -37,6 +37,7 @@
Patch2: build-dlm_stonith.patch
Patch3: remove-sd-notify.patch
Patch4: bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
+Patch5: bnc#874705nodes-without-quorum.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
@@ -77,6 +78,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
###
%build
++ bnc#874705nodes-without-quorum.patch ++
Index: libdlm-4.0.2/dlm_controld/cpg.c
===
--- libdlm-4.0.2.orig/dlm_controld/cpg.c
+++ libdlm-4.0.2/dlm_controld/cpg.c
@@ -1261,6 +1261,19 @@ void process_lockspace_changes(void)
poll_fs = 0;
list_for_each_entry_safe(ls, safe, lockspaces, list) {
+ if (ls-leaving !(opt(enable_quorum_lockspace_ind)
+!cluster_quorate)) {
+ log_group(ls, confchg for our leave);
+ stop_kernel(ls, 0);
+ set_configfs_members(ls, ls-name, 0, NULL, 0, NULL);
+ set_sysfs_event_done(ls-name, 0);
+ cpg_finalize(ls-cpg_handle);
+ client_dead(ls-cpg_client);
+ purge_plocks(ls, our_nodeid, 1);
+ list_del(ls-list);
+ free_ls(ls);
+ return;
+ }
if (!list_empty(ls-changes))
apply_changes(ls);
}
@@ -1414,7 +1427,10 @@ static void confchg_cb(cpg_handle_t hand
return;
}
- if (ls-leaving we_left(left_list, left_list_entries)) {
+ /*check currently if we have quorum in order to keep the
+ same behavior with other nodes*/
+ if (ls-leaving we_left(left_list, left_list_entries)
+!(opt(enable_quorum_lockspace_ind)
!cluster_quorate)) {
/* we called cpg_leave(), and this should be the final
cpg callback we receive */
log_group(ls, confchg for our leave);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2014-05-05 21:09:56
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2014-04-05
16:49:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2014-05-05
21:09:58.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 28 02:36:41 UTC 2014 - lzh...@suse.com
+
+- dlm_controld print out error format message(bnc#875122)
+ + bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
+
+---
New:
bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.9FiHEM/_old 2014-05-05 21:09:59.0 +0200
+++ /var/tmp/diff_new_pack.9FiHEM/_new 2014-05-05 21:09:59.0 +0200
@@ -36,6 +36,7 @@
Patch1: Makefile-for-diff-arch.patch
Patch2: build-dlm_stonith.patch
Patch3: remove-sd-notify.patch
+Patch4: bnc#875122dlm_controld-fix-long-name-in-log-entry.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
@@ -75,6 +76,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
###
%build
++ bnc#875122dlm_controld-fix-long-name-in-log-entry.patch ++
From 4283123f0b13eafc46d825050c5142cf44be79c3 Mon Sep 17 00:00:00 2001
From: Lidong Zhong lzh...@suse.com
Date: Fri, 25 Apr 2014 10:52:52 -0500
Subject: [PATCH 1/1] dlm_controld: fix long name in log entry
When the length of name_in is NAME_ID_SIZE, the last byte of the name
and a whitespace will get lost.
(Modified by teigl...@redhat.com to also
handle names longer than NAME_ID_SIZE.)
Signed-off-by: Lidong Zhong lzh...@suse.com
---
dlm_controld/logging.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c
index 9347e43..4aa3406 100644
--- a/dlm_controld/logging.c
+++ b/dlm_controld/logging.c
@@ -122,17 +122,23 @@ static void log_save_str(int len, char *log_buf, unsigned
int *point,
void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
{
va_list ap;
- char name[NAME_ID_SIZE + 1];
+ char name[NAME_ID_SIZE + 2];
uint32_t level = level_in 0x;
uint32_t extra = level_in 0x;
int ret, pos = 0;
int len = LOG_STR_LEN - 2;
+ int namelen = 0;
int plock = extra LOG_PLOCK;
memset(name, 0, sizeof(name));
- if (name_in)
- snprintf(name, NAME_ID_SIZE, %s , name_in);
+ if (name_in) {
+ namelen = snprintf(name, NAME_ID_SIZE + 1, %s, name_in);
+ if (namelen NAME_ID_SIZE)
+ namelen = NAME_ID_SIZE;
+ name[namelen] = ' ';
+ name[namelen+1] = '\0';
+ }
ret = snprintf(log_str + pos, len - pos, %llu %s,
(unsigned long long)monotime(), name);
--
1.8.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2014-04-05 16:49:48
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2013-09-26
11:47:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2014-04-05
16:49:52.0 +0200
@@ -1,0 +2,6 @@
+Mon Mar 31 06:12:40 UTC 2014 - lzh...@suse.com
+
+- dlm_controld notifies systemd(bnc#870626)
+ + remove-sd-notify.patch
+
+---
New:
remove-sd-notify.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.DODbNK/_old 2014-04-05 16:49:52.0 +0200
+++ /var/tmp/diff_new_pack.DODbNK/_new 2014-04-05 16:49:52.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
Source: libdlm-4.0.2.tar.gz
Patch1: Makefile-for-diff-arch.patch
Patch2: build-dlm_stonith.patch
+Patch3: remove-sd-notify.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
@@ -73,6 +74,7 @@
%setup -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
###
%build
++ remove-sd-notify.patch ++
Index: libdlm-4.0.2/dlm_controld/Makefile
===
--- libdlm-4.0.2.orig/dlm_controld/Makefile
+++ libdlm-4.0.2/dlm_controld/Makefile
@@ -6,7 +6,7 @@ LIBDIR=$(PREFIX)/$(LIBNUM)
HDRDIR=$(PREFIX)/include
MANDIR=$(PREFIX)/share/man
-USE_SD_NOTIFY=yes
+USE_SD_NOTIFY=no
BIN_TARGET = dlm_controld
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2013-09-26 11:47:01
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2013-07-08
07:24:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2013-09-26
11:47:02.0 +0200
@@ -1,0 +2,33 @@
+Sat Sep 7 09:40:54 CDT 2013 - rgold...@suse.com
+
+- Build dlm_stonith to prox fencing for pacemaker
+ + build-dlm_stonith.patch
+- Remove patch to use default fscontrol using sysconfig
+ - libdlm-enable-fscontrol.patch
+
+---
+Thu Aug 1 04:33:51 UTC 2013 - lzh...@suse.com
+
+- Update to V4.0.2
+
+---
+Tue Jul 23 01:44:05 UTC 2013 - lzh...@suse.com
+
+- Update to V4.0.1(openSuse13.1)
+ + file a patch for opensuse build service
+- Remove patches from sle11sp3 for either merged in the upstream
+ or obsoleted.
+ - bnc804707-reduce-RR-priority.patch
+ - bnc777137-fix-plock-dev_write_no_op.patch
+ - libdlm-gcc47.patch
+ - libdlm-pacemaker.patch
+
+---
+Mon Jun 24 07:59:44 UTC 2013 - y...@suse.com
+
+- dl_controld: libdlm-pacemaker.patch
+ * Replace use of send_ais_text() with send_cluster_text()
+ * Replace use of ais_dispatch() with plugin_dispatch()
+ * Replace use of crm_peer_id_cache with crm_peer_cache
+
+---
Old:
bnc777137-fix-plock-dev_write-no-op.patch
bnc798263-fix-opensuse123-compile-error.patch
bnc804707-reduce-RR-priority.patch
libdlm-gcc47.patch
libdlm-pacemaker.patch
libdlm.tar.bz2
use-symlink-in-udev-rules.patch
New:
Makefile-for-diff-arch.patch
build-dlm_stonith.patch
libdlm-4.0.2.tar.gz
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.3wjut9/_old 2013-09-26 11:47:03.0 +0200
+++ /var/tmp/diff_new_pack.3wjut9/_new 2013-09-26 11:47:03.0 +0200
@@ -19,9 +19,6 @@
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
%endif
-%define with_extra_warnings0
-%define with_debugging 0
-%define without_fatal_warnings 1
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
%define pkg_group System Environment/Daemons
%else
@@ -32,25 +29,19 @@
Summary:Application interface to the kernel's distributed lock manager
License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:3.00.01
+Version:4.0.2
Release:0
Url:http://sources.redhat.com/cluster/wiki
-Source: libdlm.tar.bz2
-Patch0: libdlm-pacemaker.patch
-Patch1: libdlm-gcc47.patch
-Patch2: bnc777137-fix-plock-dev_write-no-op.patch
-Patch3: bnc798263-fix-opensuse123-compile-error.patch
-Patch4: bnc804707-reduce-RR-priority.patch
-Patch5: use-symlink-in-udev-rules.patch
+Source: libdlm-4.0.2.tar.gz
+Patch1: Makefile-for-diff-arch.patch
+Patch2: build-dlm_stonith.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: pacemaker
BuildRequires: glib2-devel
-BuildRequires: kernel-source = 2.6.26
BuildRequires: libcorosync-devel
-BuildRequires: libopenais-devel
BuildRequires: libpacemaker-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
+BuildRequires: systemd-devel
%description
Libraries and tools that allow applications, particularly filesystems
@@ -79,71 +70,45 @@
%prep
###
-%setup -n libdlm
-%patch0 -p1
+%setup -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
###
%build
-modified=$(sed -n '/^/n;s/ - .*$//;p;q' %{_sourcedir}/%{name}.changes)
-DATE=\$(date -d ${modified} +%%b %%e %%Y)\
-TIME=\$(date -d ${modified} +%%R)\
-find . -name '*.[ch]' -exec sed -i s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g
{} +
-
-# TODO: revisit -all
-CFLAGS=${CFLAGS} ${RPM_OPT_FLAGS}
-# Feature-dependent CFLAGS:
-%if %with_extra_warnings
-# CFLAGS=${CFLAGS} -Wshadow -Wfloat-equal -Waggregate-return -Wnested-externs
-Wunreachable-code -Wendif-labels -Winline
-CFLAGS=${CFLAGS} -Wfloat-equal -Wendif-labels -Winline
-%endif
-%if %with_debugging
-CFLAGS=${CFLAGS} -O0
-%endif
-# Distribution specific settings:
-%if 0%{?suse_version} 1001
-CFLAGS=${CFLAGS} -fstack-protector-all
-%endif
-%if 0%{?suse_version} 1020
-CFLAGS=$CFLAGS
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2013-07-08 07:24:09
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2013-01-30
11:16:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2013-07-08
07:24:10.0 +0200
@@ -1,0 +2,17 @@
+Mon May 27 08:14:43 UTC 2013 - tser...@suse.com
+
+- Replace NAME= with SYMLINK+= in udev rules (bnc#779718)
+ + use-symlink-in-udev-rules.patch
+
+---
+Thu Mar 28 09:50:01 UTC 2013 - dmzh...@suse.com
+
+- reduce dlm_controld priority to RR(1). (bnc#804707)
+
+---
+Fri Feb 22 18:16:54 UTC 2013 - l...@suse.com
+
+- Make sure we poll the right fd for AIS notifications to avoid spinning
+ (bnc#803746)
+
+---
New:
bnc804707-reduce-RR-priority.patch
use-symlink-in-udev-rules.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.0ivw3S/_old 2013-07-08 07:24:11.0 +0200
+++ /var/tmp/diff_new_pack.0ivw3S/_new 2013-07-08 07:24:11.0 +0200
@@ -40,6 +40,8 @@
Patch1: libdlm-gcc47.patch
Patch2: bnc777137-fix-plock-dev_write-no-op.patch
Patch3: bnc798263-fix-opensuse123-compile-error.patch
+Patch4: bnc804707-reduce-RR-priority.patch
+Patch5: use-symlink-in-udev-rules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pacemaker
BuildRequires: glib2-devel
@@ -78,10 +80,12 @@
%prep
###
%setup -n libdlm
-%patch0
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
###
%build
++ bnc804707-reduce-RR-priority.patch ++
Index: libdlm/group/dlm_controld/main.c
===
--- libdlm.orig/group/dlm_controld/main.c
+++ libdlm/group/dlm_controld/main.c
@@ -1230,7 +1230,7 @@ static void set_scheduler(void)
struct sched_param sched_param;
int rv;
- rv = sched_get_priority_max(SCHED_RR);
+ rv = sched_get_priority_min(SCHED_RR);
if (rv != -1) {
sched_param.sched_priority = rv;
rv = sched_setscheduler(0, SCHED_RR, sched_param);
++ libdlm-pacemaker.patch ++
--- /var/tmp/diff_new_pack.0ivw3S/_old 2013-07-08 07:24:11.0 +0200
+++ /var/tmp/diff_new_pack.0ivw3S/_new 2013-07-08 07:24:11.0 +0200
@@ -1,17 +1,85 @@
-Index: group/dlm_controld/pacemaker.c
+Index: libdlm/configure.ac
===
group/dlm_controld/pacemaker.c.orig
-+++ group/dlm_controld/pacemaker.c
-@@ -16,7 +16,7 @@
+--- libdlm.orig/configure.ac
libdlm/configure.ac
+@@ -132,7 +132,7 @@ if test x${enable_pacemaker} = xyes; t
+ PKG_CHECK_MODULES([glib],[glib-2.0])
+ check_lib_no_libs cib cib_new
+ check_lib_no_libs crmcluster crm_set_status_callback
+- check_lib_no_libs crmcommon init_server_ipc_comms
++# check_lib_no_libs crmcommon init_server_ipc_comms
+ fi
+
+ if test x${enable_cman} = xyes; then
+Index: libdlm/group/dlm_controld/pacemaker.c
+===
+--- libdlm.orig/group/dlm_controld/pacemaker.c
libdlm/group/dlm_controld/pacemaker.c
+@@ -10,13 +10,12 @@
+ #include pacemaker/crm_config.h
+
+ #include pacemaker/crm/crm.h
+-#include pacemaker/crm/ais.h
++#include pacemaker/crm/cluster.h
++#include pacemaker/crm/cluster/plugin.h
+ #include pacemaker/crm/attrd.h
+ /* heartbeat support is irrelevant here */
#undef SUPPORT_HEARTBEAT
#define SUPPORT_HEARTBEAT 0
- #include pacemaker/crm/common/cluster.h
+-#include pacemaker/crm/common/cluster.h
-#include pacemaker/crm/common/stack.h
-+#include pacemaker/crm/cluster/stack.h
#include pacemaker/crm/common/ipc.h
#include pacemaker/crm/msg_xml.h
#include pacemaker/crm/cib.h
-@@ -117,7 +117,7 @@ void dlm_process_node(gpointer key, gpoi
+@@ -52,20 +51,27 @@ int setup_cluster_cfg(void) { return 0;
+ void process_cluster_cfg(int ci) {}
+ void close_cluster_cfg(void) {}
+
+-extern int ais_fd_async;
+-
++static crm_cluster_t crm_cluster;
+ char *local_node_uname = NULL;
+ void dlm_process_node(gpointer key, gpointer value, gpointer user_data);
+
++/* Mean ugly dirty hack */
++extern int ais_fd_async;
++
+ int setup_cluster(void)
+ {
+-ais_fd_async = -1;
+-
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2013-01-30 11:16:58
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2012-06-26
16:06:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2013-01-30
11:16:59.0 +0100
@@ -1,0 +2,17 @@
+Mon Jan 28 14:48:07 UTC 2013 - co...@suse.com
+
+- small cleanup of spec file
+
+---
+Mon Jan 28 06:42:32 UTC 2013 - x...@suse.com
+
+- fix the build issue on openSuSE 12.3 Milestone 1 (bnc#798263)
+ add bnc798263-fix-opensuse123-compile-error.patch
+
+---
+Fri Aug 24 02:51:55 UTC 2012 - jjzh...@suse.com
+
+- dlm_controld: fix plock dev_write no op (bnc#777137)
+ add bnc777137-fix-plock-dev_write-no-op.patch
+
+---
New:
bnc777137-fix-plock-dev_write-no-op.patch
bnc798263-fix-opensuse123-compile-error.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.E5sAz6/_old 2013-01-30 11:17:00.0 +0100
+++ /var/tmp/diff_new_pack.E5sAz6/_new 2013-01-30 11:17:00.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
Name: libdlm
Summary:Application interface to the kernel's distributed lock manager
-License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
+License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Version:3.00.01
Release:0
@@ -38,6 +38,8 @@
Source: libdlm.tar.bz2
Patch0: libdlm-pacemaker.patch
Patch1: libdlm-gcc47.patch
+Patch2: bnc777137-fix-plock-dev_write-no-op.patch
+Patch3: bnc798263-fix-opensuse123-compile-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pacemaker
BuildRequires: glib2-devel
@@ -52,44 +54,9 @@
Libraries and tools that allow applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
-
-
-Authors:
-
-A. J. Lewis ale...@redhat.com
-Abhijith Das a...@redhat.com
-Adam Manthei amant...@redhat.com
-Alasdair G. Kergon a...@redhat.com
-Andrew Price a...@andrewprice.me.uk
-Benjamin Marzinski bmarz...@redhat.com
-Bob Peterson rpete...@redhat.com
-Chris Feist cfe...@redhat.com
-Christine Caulfield ccaul...@redhat.com
-Daniel Phillips phill...@redhat.com
-David Teigland teigl...@redhat.com
-Fabio M. Di Nitto fdini...@redhat.com
-James Parsons jpars...@redhat.com
-Joel Becker joel.bec...@oracle.com
-Jonathan Brassow jbras...@redhat.com
-Ken Preslan kpres...@redhat.com
-Lon Hohberger l...@redhat.com
-Marc - A. Dahlhaus m...@wol.de
-Marek Grac mg...@redhat.com
-Mark Hlawatschek hlawatsc...@atix.de
-Michael Conrad Tadpol Tilstra mtils...@redhat.com
-Patrick Caulfield pcaul...@redhat.com
-Robert Peterson rpete...@redhat.com
-Ross Vandegrift r...@kallisti.us
-Ryan McCabe rmcc...@redhat.com
-Ryan O'Hara roh...@redhat.com
-Stanko Kupcevic kupce...@redhat.com
-Steven Whitehouse swhit...@redhat.com
-Wendy Cheng wch...@redhat.com
-jparsons jpars...@redhat.com
-
%package -n libdlm3
Summary:Application interface to the kernel's distributed lock manager
-License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
+License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -98,39 +65,6 @@
Libraries and tools that allow applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
-Authors:
-
-A. J. Lewis ale...@redhat.com
-Abhijith Das a...@redhat.com
-Adam Manthei amant...@redhat.com
-Alasdair G. Kergon a...@redhat.com
-Andrew Price a...@andrewprice.me.uk
-Benjamin Marzinski bmarz...@redhat.com
-Bob Peterson rpete...@redhat.com
-Chris Feist cfe...@redhat.com
-Christine Caulfield ccaul...@redhat.com
-Daniel Phillips phill...@redhat.com
-David Teigland teigl...@redhat.com
-Fabio M. Di Nitto
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2012-06-26 16:06:54
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2012-05-26
09:26:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2012-06-26
16:06:56.0 +0200
@@ -1,0 +2,6 @@
+Sat Jun 23 07:21:44 UTC 2012 - y...@suse.com
+
+- dlm_controld: Replace use of crm_is_member_active() with the new
+ crm_is_peer_active() from pacemaker 1.1.7
+
+---
Other differences:
--
++ libdlm-pacemaker.patch ++
--- /var/tmp/diff_new_pack.LXUSof/_old 2012-06-26 16:06:57.0 +0200
+++ /var/tmp/diff_new_pack.LXUSof/_new 2012-06-26 16:06:57.0 +0200
@@ -1,4 +1,6 @@
group/dlm_controld/pacemaker.c
+Index: group/dlm_controld/pacemaker.c
+===
+--- group/dlm_controld/pacemaker.c.orig
+++ group/dlm_controld/pacemaker.c
@@ -16,7 +16,7 @@
#undef SUPPORT_HEARTBEAT
@@ -9,3 +11,30 @@
#include pacemaker/crm/common/ipc.h
#include pacemaker/crm/msg_xml.h
#include pacemaker/crm/cib.h
+@@ -117,7 +117,7 @@ void dlm_process_node(gpointer key, gpoi
+ snprintf(path, PATH_MAX, %s/%d, COMMS_DIR, node-id);
+
+ rc = stat(path, tmp);
+-is_active = crm_is_member_active(node);
++is_active = crm_is_peer_active(node);
+
+ if(rc == 0 is_active) {
+ /* nothing to do?
+@@ -205,7 +205,7 @@ void dlm_process_node(gpointer key, gpoi
+ }
+
+ log_debug(%s %sctive node %u: born-on=%llu, last-seen=%llu,
this-event=%llu, last-event=%llu,
+- action, crm_is_member_active(value)?a:ina,
++ action, crm_is_peer_active(value)?a:ina,
+ node-id, node-born, node-last_seen,
+ crm_peer_seq, (unsigned long long)*last);
+ }
+@@ -213,7 +213,7 @@ void dlm_process_node(gpointer key, gpoi
+ int is_cluster_member(uint32_t nodeid)
+ {
+ crm_node_t *node = crm_get_peer(nodeid, NULL);
+-return crm_is_member_active(node);
++return crm_is_peer_active(node);
+ }
+
+ char *nodeid2name(int nodeid) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2012-05-26 09:26:17
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2011-12-25
17:35:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2012-05-26
09:26:23.0 +0200
@@ -1,0 +2,5 @@
+Thu May 24 10:38:35 UTC 2012 - idon...@suse.com
+
+- Fix build with gcc 4.7
+
+---
New:
libdlm-gcc47.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.mzM0bI/_old 2012-05-26 09:26:27.0 +0200
+++ /var/tmp/diff_new_pack.mzM0bI/_new 2012-05-26 09:26:27.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdlm
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
%endif
@@ -36,6 +37,7 @@
Url:http://sources.redhat.com/cluster/wiki
Source: libdlm.tar.bz2
Patch0: libdlm-pacemaker.patch
+Patch1: libdlm-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pacemaker
BuildRequires: glib2-devel
@@ -178,6 +180,7 @@
###
%setup -n libdlm
%patch0
+%patch1 -p1
###
%build
++ libdlm-gcc47.patch ++
Index: libdlm/group/include/rbtree.h
===
--- libdlm.orig/group/include/rbtree.h
+++ libdlm/group/include/rbtree.h
@@ -91,6 +91,8 @@ static inline struct page * rb_insert_pa
---
*/
+#include stddef.h // for NULL
+
#ifndef_LINUX_RBTREE_H
#define_LINUX_RBTREE_H
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2011-12-25 17:35:37
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2011-11-14
12:00:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2011-12-25
17:35:39.0 +0100
@@ -1,0 +2,8 @@
+Fri Dec 16 04:55:40 UTC 2011 - tser...@suse.com
+
+- fix build with current pacemaker
+ (/usr/include/pacemaker/crm/common/stack.h
+ moved to
+ /usr/include/pacemaker/crm/cluster/stack.h)
+
+---
New:
libdlm-pacemaker.patch
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.DHHdo9/_old 2011-12-25 17:35:39.0 +0100
+++ /var/tmp/diff_new_pack.DHHdo9/_new 2011-12-25 17:35:39.0 +0100
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
%endif
@@ -31,16 +29,22 @@
Name: libdlm
Summary:Application interface to the kernel's distributed lock manager
-Version:3.00.01
-Release:14
License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
-Url:http://sources.redhat.com/cluster/wiki
Group: Productivity/Clustering/HA
+Version:3.00.01
+Release:0
+Url:http://sources.redhat.com/cluster/wiki
Source: libdlm.tar.bz2
+Patch0: libdlm-pacemaker.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pacemaker
-BuildRequires: glib2-devel kernel-source = 2.6.26 libcorosync-devel
libopenais-devel libpacemaker-devel libxml2-devel
+BuildRequires: glib2-devel
+BuildRequires: kernel-source = 2.6.26
+BuildRequires: libcorosync-devel
+BuildRequires: libopenais-devel
+BuildRequires: libpacemaker-devel
BuildRequires: libtool
+BuildRequires: libxml2-devel
%description
Libraries and tools that allow applications, particularly filesystems
@@ -126,8 +130,8 @@
jparsons jpars...@redhat.com
%packagedevel
-License:LGPL-2.1+
Summary:Application interface to the kernel's distributed lock manager
+License:LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: libdlm3 = %{version}
@@ -173,6 +177,7 @@
%prep
###
%setup -n libdlm
+%patch0
###
%build
++ libdlm-pacemaker.patch ++
--- group/dlm_controld/pacemaker.c
+++ group/dlm_controld/pacemaker.c
@@ -16,7 +16,7 @@
#undef SUPPORT_HEARTBEAT
#define SUPPORT_HEARTBEAT 0
#include pacemaker/crm/common/cluster.h
-#include pacemaker/crm/common/stack.h
+#include pacemaker/crm/cluster/stack.h
#include pacemaker/crm/common/ipc.h
#include pacemaker/crm/msg_xml.h
#include pacemaker/crm/cib.h
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2011-12-06 18:23:08
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.e1TtBc/_old 2011-12-06 18:40:41.0 +0100
+++ /var/tmp/diff_new_pack.e1TtBc/_new 2011-12-06 18:40:41.0 +0100
@@ -33,7 +33,7 @@
Summary:Application interface to the kernel's distributed lock manager
Version:3.00.01
Release:14
-License:GPLv2 ; GPLv2+ ; LGPLv2.1+
+License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Url:http://sources.redhat.com/cluster/wiki
Group: Productivity/Clustering/HA
Source: libdlm.tar.bz2
@@ -83,7 +83,7 @@
%package -n libdlm3
Summary:Application interface to the kernel's distributed lock manager
-License:GPLv2 ; GPLv2+ ; LGPLv2.1+
+License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Group: Productivity/Clustering/HA
Obsoletes: libdlm2
Conflicts: libdlm2
@@ -126,7 +126,7 @@
jparsons jpars...@redhat.com
%packagedevel
-License:LGPLv2.1+
+License:LGPL-2.1+
Summary:Application interface to the kernel's distributed lock manager
Group: Development/Libraries/C and C++
Requires: libdlm3 = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory checked
in at 2011-11-14 12:00:28
Comparing /work/SRC/openSUSE:Factory/libdlm (Old)
and /work/SRC/openSUSE:Factory/.libdlm.new (New)
Package is libdlm, Maintainer is jjzh...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes2011-09-23
02:08:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdlm.new/libdlm.changes 2011-11-14
12:00:29.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 13 09:15:17 UTC 2011 - co...@suse.com
+
+- add libtool as explicit buildrequire to avoid implicit dependency from
prjconf
+
+---
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.QLqxFc/_old 2011-11-14 12:00:31.0 +0100
+++ /var/tmp/diff_new_pack.QLqxFc/_new 2011-11-14 12:00:31.0 +0100
@@ -38,9 +38,9 @@
Group: Productivity/Clustering/HA
Source: libdlm.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:on
Requires: pacemaker
BuildRequires: glib2-devel kernel-source = 2.6.26 libcorosync-devel
libopenais-devel libpacemaker-devel libxml2-devel
+BuildRequires: libtool
%description
Libraries and tools that allow applications, particularly filesystems
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory
checked in at Wed Sep 21 17:10:02 CEST 2011.
--- libdlm/libdlm.changes 2011-08-30 21:33:36.0 +0200
+++ /mounts/work_src_done/STABLE/libdlm/libdlm.changes 2011-09-20
16:08:24.0 +0200
@@ -1,0 +2,19 @@
+Tue Sep 20 14:07:24 UTC 2011 - tser...@suse.com
+
+- dlm_controld: fix build with old ( 3.0) kernel headers
+- dlm_controld: clear waiting plocks for closed files
+- dlm_controld: Introduce RB tree for improving plock resources searching
+ efficiency
+- dlm_controld: RB tree implementation borrowed from the kernel source
+- dlm_controld: remove oom_adj
+- dlm_controld: ignore plocks until checkpoint time
+- dlm_controld: fix plock signature in stored message
+- dlm_controld: fix plock owner syncing
+- dlm_controld: fix plock owner in checkpoints
+- dlm_controld: fix plock checkpoint signatures
+- dlm_controld: wrong fencing time comparison
+- dlm_controld.pcmk: Prevent use-of-NULL by checking the node has a valid
+ address before adding it to configfs
+- dlm_controld: always return error if the daemon is not ready to operate
+
+---
calling whatdependson for head-i586
Old:
bnc-634240_reset-fs_notified.diff
sles-specific.diff
upstream-submissions.diff
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.DRRxTF/_old 2011-09-21 17:09:57.0 +0200
+++ /var/tmp/diff_new_pack.DRRxTF/_new 2011-09-21 17:09:57.0 +0200
@@ -32,14 +32,11 @@
Name: libdlm
Summary:Application interface to the kernel's distributed lock manager
Version:3.00.01
-Release:13
+Release:14
License:GPLv2 ; GPLv2+ ; LGPLv2.1+
Url:http://sources.redhat.com/cluster/wiki
Group: Productivity/Clustering/HA
Source: libdlm.tar.bz2
-Patch1: upstream-submissions.diff
-Patch2: sles-specific.diff
-Patch3: bnc-634240_reset-fs_notified.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv:on
Requires: pacemaker
@@ -176,9 +173,6 @@
%prep
###
%setup -n libdlm
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
###
%build
++ libdlm.tar.bz2 ++
5878 lines of diff (skipped)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdlm for openSUSE:Factory
Hello community,
here is the log from the commit of package libdlm for openSUSE:Factory
checked in at Wed Aug 31 10:45:08 CEST 2011.
--- libdlm/libdlm.changes 2011-05-23 21:39:37.0 +0200
+++ /mounts/work_src_done/STABLE/libdlm/libdlm.changes 2011-08-30
21:33:36.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug 30 19:36:41 UTC 2011 - andrea.turr...@gmail.com
+
+- Fixed typos and removed duplicated Authors: entry in
+ descriptions of libdlm.spec
+
+---
calling whatdependson for head-i586
Other differences:
--
++ libdlm.spec ++
--- /var/tmp/diff_new_pack.u07JWD/_old 2011-08-31 10:44:49.0 +0200
+++ /var/tmp/diff_new_pack.u07JWD/_new 2011-08-31 10:44:49.0 +0200
@@ -32,7 +32,7 @@
Name: libdlm
Summary:Application interface to the kernel's distributed lock manager
Version:3.00.01
-Release:11
+Release:13
License:GPLv2 ; GPLv2+ ; LGPLv2.1+
Url:http://sources.redhat.com/cluster/wiki
Group: Productivity/Clustering/HA
@@ -46,7 +46,7 @@
BuildRequires: glib2-devel kernel-source = 2.6.26 libcorosync-devel
libopenais-devel libpacemaker-devel libxml2-devel
%description
-Libraries and tools that allows applications, particularly filesystems
+Libraries and tools that allow applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
@@ -92,29 +92,9 @@
Conflicts: libdlm2
%description -n libdlm3
-Libraries and tools that allows applications, particularly filesystems
+Libraries and tools that allow applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
-Authors: A. J. Lewis ale...@redhat.com Abhijith Das a...@redhat.com
-Adam Manthei amant...@redhat.com Alasdair G. Kergon a...@redhat.com
-Andrew Price a...@andrewprice.me.uk Benjamin Marzinski
-bmarz...@redhat.com Bob Peterson rpete...@redhat.com Chris Feist
-cfe...@redhat.com Christine Caulfield ccaul...@redhat.com Daniel
-Phillips phill...@redhat.com David Teigland teigl...@redhat.com
-Fabio M. Di Nitto fdini...@redhat.com James Parsons
-jpars...@redhat.com Joel Becker joel.bec...@oracle.com Jonathan
-Brassow jbras...@redhat.com Ken Preslan kpres...@redhat.com Lon
-Hohberger l...@redhat.com Marc - A. Dahlhaus m...@wol.de Marek Grac
-mg...@redhat.com Mark Hlawatschek hlawatsc...@atix.de Michael
-Conrad Tadpol Tilstra mtils...@redhat.com Patrick Caulfield
-pcaul...@redhat.com Robert Peterson rpete...@redhat.com Ross
-Vandegrift r...@kallisti.us Ryan McCabe rmcc...@redhat.com Ryan
-O'Hara roh...@redhat.com Stanko Kupcevic kupce...@redhat.com Steven
-Whitehouse swhit...@redhat.com Wendy Cheng wch...@redhat.com
-jparsons jpars...@redhat.com
-
-
-
Authors:
A. J. Lewis ale...@redhat.com
@@ -155,7 +135,7 @@
Requires: libdlm3 = %{version}
%description devel
-Libraries and tools that allows applications, particularly filesystems
+Libraries and tools that allow applications, particularly filesystems
like OCFS2, to interface with the in-kernel distributed lock manager.
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
