Hello community, here is the log from the commit of package libdlm.1704 for openSUSE:12.3:Update checked in at 2013-06-03 11:01:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/libdlm.1704 (Old) and /work/SRC/openSUSE:12.3:Update/.libdlm.1704.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm.1704" Changes: -------- New Changes file: --- /dev/null 2013-05-23 01:40:31.032032505 +0200 +++ /work/SRC/openSUSE:12.3:Update/.libdlm.1704.new/libdlm.changes 2013-06-03 11:01:13.000000000 +0200 @@ -0,0 +1,297 @@ +------------------------------------------------------------------- +Mon May 27 10:09:13 UTC 2013 - [email protected] + +- Replace NAME= with SYMLINK+= in udev rules (bnc#779718) + + use-symlink-in-udev-rules.patch + +------------------------------------------------------------------- +Mon Jan 28 14:48:07 UTC 2013 - [email protected] + +- small cleanup of spec file + +------------------------------------------------------------------- +Mon Jan 28 06:42:32 UTC 2013 - [email protected] + +- 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 - [email protected] + +- dlm_controld: fix plock dev_write no op (bnc#777137) + add bnc777137-fix-plock-dev_write-no-op.patch + +------------------------------------------------------------------- +Sat Jun 23 07:21:44 UTC 2012 - [email protected] + +- dlm_controld: Replace use of crm_is_member_active() with the new + crm_is_peer_active() from pacemaker > 1.1.7 + +------------------------------------------------------------------- +Thu May 24 10:38:35 UTC 2012 - [email protected] + +- Fix build with gcc 4.7 + +------------------------------------------------------------------- +Fri Dec 16 04:55:40 UTC 2011 - [email protected] + +- fix build with current pacemaker + (/usr/include/pacemaker/crm/common/stack.h + moved to + /usr/include/pacemaker/crm/cluster/stack.h) + +------------------------------------------------------------------- +Sun Nov 13 09:15:17 UTC 2011 - [email protected] + +- add libtool as explicit buildrequire to avoid implicit dependency from prjconf + +------------------------------------------------------------------- +Tue Sep 20 14:07:24 UTC 2011 - [email protected] + +- 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 + +------------------------------------------------------------------- +Tue Aug 30 19:36:41 UTC 2011 - [email protected] + +- Fixed typos and removed duplicated "Authors:" entry in + descriptions of libdlm.spec + +------------------------------------------------------------------- +Mon May 23 19:39:04 UTC 2011 - [email protected] + +- Avoid adding build time in binaries, breaks build-compare. + +------------------------------------------------------------------- +Tue Feb 8 12:24:01 UTC 2011 - [email protected] + +- bnc-634240_reset-fs_notified.diff : Reset fs_notified when check_fs_done + + +------------------------------------------------------------------- +Thu Aug 19 11:13:53 UTC 2010 - [email protected] + +- Revert previous change ("allow libdlm to compile with new + pacemaker version") + +------------------------------------------------------------------- +Mon Jun 14 15:16:06 UTC 2010 - [email protected] + +- Allow libdlm to compile with new pacemaker version. + +------------------------------------------------------------------- +Tue May 18 01:46:52 UTC 2010 - [email protected] + +- Reverted libdlm-bug-603685-v2.diff (bug now fixed in Pacemaker) + +------------------------------------------------------------------- +Fri May 14 12:54:48 UTC 2010 - [email protected] + +- libdlm-bug-603685-v2.diff: fix dlm_controld.pcmk member processing + (bnc#603685) + +------------------------------------------------------------------- +Mon Apr 26 16:00:24 UTC 2010 - [email protected] + +- update from upstream (cs fae6ee39) + - dlm_controld: don't log errors after disabling plocks + - dlm_controld: don't skip unlinking checkpoint + - dlm_controld: set last_plock_time for ownership operations + - dlm_controld: add plock checkpoint signatures + - dlm_controld: check all messages against enable options + - dlm_controld: avoid full plock unlock when no resource exists + +------------------------------------------------------------------- +Wed Mar 24 18:34:58 UTC 2010 - [email protected] + +- update from upstream: + - dlm_controld: set rmem for sctp + - misc: update copyright year and owners + - man pages: dlm_tool and dlm_controld + - dlm_controld/libdlmcontrol/dlm_tool: separate plock debug buffer + - dlm_controld: add more fs_notified debugging + +------------------------------------------------------------------- +Fri Feb 5 10:22:31 UTC 2010 - [email protected] + +- delete 64bytes_lvb_len.diff (bnc#573460) + +------------------------------------------------------------------- +Wed Jan 27 09:32:49 UTC 2010 - [email protected] + +- Remove libdlm2 on upgrade. + +------------------------------------------------------------------- +Tue Dec 8 06:35:06 UTC 2009 - [email protected] + +- 64bytes_lvb_len.diff: change DLM_LVB_LEN to 64 bytes (bnc#515645) + +------------------------------------------------------------------- +Wed Dec 2 08:35:31 UTC 2009 - [email protected] + +- remove already-in-upstream patches from package + +------------------------------------------------------------------- +Wed Dec 2 07:44:08 UTC 2009 - [email protected] + +- update to upstream commit 7ad436ba4a7d68a79510fd6c033568b6bb100191. + not pass compiling yet + +------------------------------------------------------------------- +Thu Nov 26 18:31:24 UTC 2009 - [email protected] + +- upgrade package version number from 2.99.08 to 3.00.01, no code + modified. + +------------------------------------------------------------------- +Tue Sep 29 06:54:06 UTC 2009 - "[email protected]" + +- libdlm-lockspace-fs_notify.diff: fix a race which could lead to an + infinite logging loop (bnc#532406). + +------------------------------------------------------------------- +Tue Sep 22 14:19:50 UTC 2009 - "[email protected]" + +- dlm-no-quorum-default.diff: change quorum handling to allow cluster to + shutdown nodes one-by-one (bnc#541042). + +------------------------------------------------------------------- +Thu Sep 3 09:25:51 UTC 2009 - "[email protected]" + +- dlm-debug.diff: Include the lockspace name in syslog(). + +------------------------------------------------------------------- +Thu Aug 27 16:14:16 UTC 2009 - "[email protected]" + +- dlm-plock-optimization.diff: allow plocks to revert back to single + node mode (bnc#497176). + +------------------------------------------------------------------- +Mon Aug 10 17:48:27 UTC 2009 - [email protected] + +- libdlm-lockspace-recovery.patch: ensure that all lock spaces are + recovered (bnc#528425). + +------------------------------------------------------------------- +Wed Jul 29 16:20:24 CST 2009 - [email protected] + +- add ocfs2-kmp to libdlm requires, since fs/dlm will be integrated + into ocfs2-kmp. + +------------------------------------------------------------------- +Tue Jul 21 15:10:39 CEST 2009 - [email protected] + +- Fix compilation with new pacemaker code. ++++ 100 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.libdlm.1704.new/libdlm.changes New: ---- bnc777137-fix-plock-dev_write-no-op.patch bnc798263-fix-opensuse123-compile-error.patch libdlm-gcc47.patch libdlm-pacemaker.patch libdlm.changes libdlm.spec libdlm.tar.bz2 use-symlink-in-udev-rules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ # # spec file for package libdlm # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # %if 0%{?suse_version} %define _libexecdir %{_libdir} %endif %define with_extra_warnings 0 %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 %define pkg_group Productivity/Clustering/HA %endif Name: libdlm 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 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: use-symlink-in-udev-rules.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 %description Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %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 Obsoletes: libdlm2 Conflicts: libdlm2 %description -n libdlm3 Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %package devel Summary: Application interface to the kernel's distributed lock manager License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: libdlm3 = %{version} %description devel Libraries and tools that allow applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. %prep ########################################################### %setup -n libdlm %patch0 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -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 -fgnu89-inline" %endif %if 0%{?fedora_version} > 6 CFLAGS="$CFLAGS -fgnu89-inline" %endif export CFLAGS ./autogen.sh %configure --enable-pacemaker --disable-cman export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} ########################################################### %install ########################################################### make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/ mv $RPM_BUILD_ROOT%{_datadir}/doc/{dlm,packages/libdlm-%{version}} # Cleanup [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f ########################################################### %clean ########################################################### if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ] then rm -rf $RPM_BUILD_ROOT fi ########################################################### %post -n libdlm3 -p /sbin/ldconfig %postun -n libdlm3 -p /sbin/ldconfig %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 %{_sbindir}/dlm_controld.pcmk %{_sbindir}/dlm_tool %{_datadir}/man/man8/dlm_tool.8.gz %{_datadir}/man/man8/dlm_controld.8.gz %{_datadir}/doc/packages/libdlm-%{version} %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 %{_libdir}/pkgconfig/libdlmcontrol.pc %{_includedir}/libdlm.h %{_includedir}/libdlmcontrol.h %{_datadir}/man/man3/dlm_*.3.gz %{_datadir}/man/man3/libdlm.3.gz %changelog ++++++ bnc777137-fix-plock-dev_write-no-op.patch ++++++ Index: libdlm/group/dlm_controld/plock.c =================================================================== --- libdlm.orig/group/dlm_controld/plock.c +++ libdlm/group/dlm_controld/plock.c @@ -1641,8 +1641,10 @@ void process_plocks(int ci) return; fail: - info.rv = rv; - rv = write(plock_device_fd, &info, sizeof(info)); + if (!(info.flags & DLM_PLOCK_FL_CLOSE)) { + info.rv = rv; + rv = write(plock_device_fd, &info, sizeof(info)); + } } void process_saved_plocks(struct lockspace *ls) ++++++ bnc798263-fix-opensuse123-compile-error.patch ++++++ Index: libdlm/configure.ac =================================================================== --- libdlm.orig/configure.ac +++ libdlm/configure.ac @@ -115,10 +115,10 @@ if test "x${enable_pacemaker}" = xno && AC_MSG_ERROR([At least one dlm_controld build method (cman or pacemaker) has to be selected]) fi -AC_ARG_WITH([kernel], - [ --with-kernel=path path to kernel source. ], - [ KERNEL_DIR="$withval" ], - [ KERNEL_DIR="$DEFAULT_KERNEL_DIR" ]) +#AC_ARG_WITH([kernel], +# [ --with-kernel=path path to kernel source. ], +# [ KERNEL_DIR="$withval" ], +# [ KERNEL_DIR="$DEFAULT_KERNEL_DIR" ]) KERNEL_CPPFLAGS="-I$KERNEL_DIR/include" ++++++ 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 ++++++ libdlm-pacemaker.patch ++++++ Index: group/dlm_controld/pacemaker.c =================================================================== --- group/dlm_controld/pacemaker.c.orig +++ 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> @@ -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) { ++++++ use-symlink-in-udev-rules.patch ++++++ Index: libdlm/dlm/libdlm/51-dlm.rules =================================================================== --- libdlm.orig/dlm/libdlm/51-dlm.rules +++ libdlm/dlm/libdlm/51-dlm.rules @@ -1,5 +1,5 @@ -KERNEL=="dlm-control", NAME="misc/dlm-control", MODE="0666" -KERNEL=="dlm-monitor", NAME="misc/dlm-monitor", MODE="0666" -KERNEL=="dlm_default", NAME="misc/dlm_default", MODE="0666" -KERNEL=="dlm_*", NAME="misc/%k", MODE="0660" +KERNEL=="dlm-control", SYMLINK+="misc/dlm-control", MODE="0666" +KERNEL=="dlm-monitor", SYMLINK+="misc/dlm-monitor", MODE="0666" +KERNEL=="dlm_default", SYMLINK+="misc/dlm_default", MODE="0666" +KERNEL=="dlm_*", SYMLINK+="misc/%k", MODE="0660" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
