Hello community,
here is the log from the commit of package corosync for openSUSE:13.1 checked
in at 2013-09-25 17:07:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/corosync (Old)
and /work/SRC/openSUSE:13.1/.corosync.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync"
Changes:
--------
--- /work/SRC/openSUSE:13.1/corosync/corosync.changes 2013-09-23
10:49:06.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.corosync.new/corosync.changes 2013-09-25
17:07:40.000000000 +0200
@@ -1,0 +2,42 @@
+Fri Sep 13 03:26:31 UTC 2013 - x...@suse.com
+
+- Upstream version cs: c6688c6e11a35d13293f9b610faca5c7beb7e5cb
+- Reload: document config.reload_in_progress in man page
+- Reload: Add atomic reload to log config
+- Reload: Add atomic reload to totemconfig
+- Reload: Add reload code to cfg
+- Reload: Make coroparse use a designated icmap hash table
+- icmap: Add func to test equality of two key values
+- [PATCH] Replace freopen with open/dup2 when daemonizing
+- Add log message to exit signal handler
+- icmap: Add map copy function
+- icmap: Add function to return item data pointer
+- icmap: Fix value len checking for strings
+- icmap: Add function to return global icmap
+- icmap: Allow multiple icmap instances
+- Fix scheduler pause-detection timeout
+
+-------------------------------------------------------------------
+Fri Sep 6 05:47:16 UTC 2013 - x...@suse.com
+
+- Update corosync-2.3.1.tar.gz for cts file missing
+
+-------------------------------------------------------------------
+Thu Jul 25 02:17:50 UTC 2013 - x...@suse.com
+
+- Fix corosync start failed issue
+ + corosync-init-lockfile-path-error.patch
+
+-------------------------------------------------------------------
+Tue Jul 23 09:44:07 UTC 2013 - x...@suse.com
+
+- Update to corosync 2.3.1 stable release
+- Remove patches for all merged in the upstream or obsoleted
+ - corosync-confexample-timestamp.patch
+ - corosync-cpg-procdown.patch
+ - corosync-revert-cs2429.patch
+ - corosync.conf.example.patch
+ - corosync_reduce_RR_priority.patch
+ - fix-nodeid-conflicting.patch
+
+-------------------------------------------------------------------
Old:
----
corosync-1.4.5.tar.gz
corosync-confexample-timestamp.patch
corosync-cpg-procdown.patch
corosync-revert-cs2429.patch
corosync.conf.example.patch
corosync_reduce_RR_priority.patch
fix-nodeid-conflicting.patch
New:
----
corosync-2.3.1.tar.gz
corosync-init-lockfile-path-error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ corosync.spec ++++++
--- /var/tmp/diff_new_pack.prMwHD/_old 2013-09-25 17:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.prMwHD/_new 2013-09-25 17:07:40.000000000 +0200
@@ -16,6 +16,21 @@
#
+# Conditionals
+# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
+# to disable or enable specific features
+%bcond_with testagents
+%define with_testagents 1
+%bcond_with watchdog
+%bcond_with monitoring
+%bcond_with snmp
+%bcond_with rdma
+%define with_systemd 1
+%bcond_with upstart
+%bcond_with xmlconf
+%bcond_with runautogen
+%define with_runautogen 1
+
%if 0%{?sles_version} == 11
%ifnarch s390 s390x
%define buildib 1
@@ -29,84 +44,132 @@
Summary: The Corosync Cluster Engine and Application Programming
Interfaces
License: BSD-3-Clause
Group: Productivity/Clustering/HA
-Version: 1.4.5
+Version: 2.3.1
Release: 0
Url: http://www.corosync.org
-Source0:
http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
Source2: baselibs.conf
-Patch1: corosync-confexample-timestamp.patch
-Patch2: corosync-revert-cs2429.patch
-Patch4: corosync.conf.example.patch
-Patch5: corosync-cpg-procdown.patch
-Patch6: corosync_reduce_RR_priority.patch
-Patch7: fix-nodeid-conflicting.patch
+Patch1: corosync-init-lockfile-path-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Runtime bits
Requires: libcorosync4 = %{version}-%{release}
-Requires(pre): /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Conflicts: openais <= 0.89, libopenais2 <= 0.89, libopenais-devel <= 0.89
-%define buildtrunk 1
-%{?_with_buildtrunk: %define buildtrunk 1}
-%if 0%{?buildtrunk} == 1
+#Requires(pre): /usr/sbin/useradd
+#Requires(post): /sbin/chkconfig
+#Requires(preun): /sbin/chkconfig
+#Conflicts: openais <= 0.89, openais-devel <= 0.89
+
+BuildRequires: libqb-devel
+BuildRequires: mozilla-nss
+BuildRequires: mozilla-nss-devel
+%if %{with_runautogen}
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: libtool
%endif
-BuildRequires: mozilla-nss
-BuildRequires: mozilla-nss-devel
-%if 0%{?buildib} == 1
+%if %{with monitoring}
+BuildRequires: libstatgrab-devel
+%endif
+%if %{with rdma}
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
%endif
-BuildRequires: pkg-config
+%if %{with snmp}
+BuildRequires: net-snmp-devel
+%endif
+%if %{with dbus}
+BuildRequires: dbus-1-devel
+%endif
+%if %{with_systemd}
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%endif
+%if %{with xmlconf}
+Requires: libxslt
+%endif
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
-%if 0%{?buildtrunk} == 1
+#%if 0%{?buildtrunk} == 1
./autogen.sh
-%endif
-%if 0%{?buildib} == 1
+#%endif
+
+%if %{with rdma}
export ibverbs_CFLAGS=-I/usr/include/infiniband \
export ibverbs_LIBS=-libverbs \
export rdmacm_CFLAGS=-I/usr/include/rdma \
export rdmacm_LIBS=-lrdmacm \
+%endif
%{configure} \
- --enable-nss \
- --enable-rdma
-%else
-%{configure} \
- --enable-nss
+%if %{with_testagents}
+ --enable-testagents \
+ --enable-augeas \
+ --enable-debug \
+%endif
+%if %{with watchdog}
+ --enable-watchdog \
+%endif
+%if %{with monitoring}
+ --enable-monitoring \
+%endif
+%if %{with snmp}
+ --enable-snmp \
+%endif
+%if %{with rdma}
+ --enable-rdma \
+%endif
+%if %{with_systemd}
+ --enable-systemd \
+%endif
+%if %{with upstart}
+ --enable-upstart \
%endif
+%if %{with xmlconf}
+ --enable-xmlconf \
+%endif
+ --with-initddir=%{_initrddir} \
+ --with-systemddir=%{_unitdir} \
+ --with-upstartdir=%{_sysconfdir}/init
+
make %{_smp_mflags}
%install
make install DESTDIR=%{buildroot}
+
+%if %{with dbus}
+mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
+install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf
%{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+%endif
# removed to discourage use of init.d/corosync (openais should be
# used instead)
#%if 0%{?suse_version}
#ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync
#%endif
-rm -f %{buildroot}%{_initrddir}/corosync
-rm -f %{buildroot}%{_initrddir}/corosync-notifyd
-rm -f %{buildroot}/usr/sbin/corosync-notifyd
-rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
+#rm -f %{buildroot}%{_initrddir}/corosync
+#rm -f %{buildroot}%{_initrddir}/corosync-notifyd
+#rm -f %{buildroot}/usr/sbin/corosync-notifyd
+#rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
## tree fixup
# drop static libs
rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.la
# drop docs and html docs for now
rm -rf %{buildroot}%{_docdir}/*
-# the docdir is /usr/share/doc/<pkg> in the configuration
rm -rf %{buildroot}%{_datadir}/doc/*
+# /etc/sysconfig/corosync-notifyd
+#mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+#install -m 644 tools/corosync-notifyd.sysconfig.example \
+# %{buildroot}%{_sysconfdir}/sysconfig/corosync-notifyd
+#%{__install} -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/
+#%{__install} -m 0644 %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
+mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
+install -m 0644 tools/corosync-notifyd.sysconfig.example
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
+
%clean
rm -rf %{buildroot}
@@ -115,78 +178,139 @@
default APIs and libraries, default configuration files, and an init
script.
+%pre
+%if %{with_systemd} && 0%{?systemd_post:1}
+%service_add_pre corosync.service corosync-notifyd.service
+%endif
+%post
+%if %{with_systemd} && 0%{?systemd_post:1}
+%service_add_post corosync.service corosync-notifyd.service
+%else
+if [ $1 -eq 1 ]; then
+ /sbin/chkconfig --add corosync || :
+fi
+%endif
+
+%preun
+%if %{with_systemd} && 0%{?systemd_preun:1}
+#%systemd_preun corosync.service corosync-notifyd.service
+%service_del_preun corosync.service corosync-notifyd.service
+%else
+if [ $1 -eq 0 ]; then
+ /sbin/service corosync stop &>/dev/null || :
+ /sbin/chkconfig --del corosync || :
+fi
+%endif
+
+%postun
+%if %{with_systemd} && 0%{?systemd_postun:1}
+#%systemd_postun corosync.service corosync-notifyd.service
+%service_del_postun corosync.service corosync-notifyd.service
+%endif
%files
%defattr(-,root,root,-)
%doc LICENSE SECURITY
-%{_bindir}/corosync-blackbox
%{_sbindir}/corosync
%{_sbindir}/corosync-keygen
-%{_sbindir}/corosync-objctl
+%{_sbindir}/corosync-cmapctl
%{_sbindir}/corosync-cfgtool
-%{_sbindir}/corosync-fplay
-%{_sbindir}/corosync-pload
%{_sbindir}/corosync-cpgtool
%{_sbindir}/corosync-quorumtool
+%{_sbindir}/corosync-notifyd
+%{_bindir}/corosync-blackbox
+%if %{with xmlconf}
+%{_bindir}/corosync-xmlproc
+%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
+%dir %{_datadir}/corosync
+%{_datadir}/corosync/xml2conf.xsl
+%{_mandir}/man8/corosync-xmlproc.8*
+%{_mandir}/man5/corosync.xml.5*
+%endif
%dir %{_sysconfdir}/corosync
-%dir %{_sysconfdir}/corosync/service.d
%dir %{_sysconfdir}/corosync/uidgid.d
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
-%dir %{_libexecdir}/lcrso
-%{_libexecdir}/lcrso/coroparse.lcrso
-%{_libexecdir}/lcrso/objdb.lcrso
-%{_libexecdir}/lcrso/service_cfg.lcrso
-%{_libexecdir}/lcrso/service_cpg.lcrso
-%{_libexecdir}/lcrso/service_evs.lcrso
-%{_libexecdir}/lcrso/service_confdb.lcrso
-%{_libexecdir}/lcrso/service_pload.lcrso
-%{_libexecdir}/lcrso/quorum_votequorum.lcrso
-%{_libexecdir}/lcrso/quorum_testquorum.lcrso
-%{_libexecdir}/lcrso/vsf_quorum.lcrso
-%{_libexecdir}/lcrso/vsf_ykd.lcrso
+#%config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd
+%config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
+%if %{with dbus}
+%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+%endif
+%if %{with snmp}
+%{_datadir}/snmp/mibs/COROSYNC-MIB.txt
+%endif
+%if %{with_systemd}
+%{_unitdir}/corosync.service
+%{_unitdir}/corosync-notifyd.service
+%dir %{_datadir}/corosync
+%{_datadir}/corosync/corosync
+%{_datadir}/corosync/corosync-notifyd
+%else
+%{_initrddir}/corosync
+%{_initrddir}/corosync-notifyd
+%endif
+%if %{with upstart}
+%{_sysconfdir}/init/corosync.conf
+%{_sysconfdir}/init/corosync-notifyd.conf
+%endif
%dir %{_localstatedir}/lib/corosync
%dir %{_localstatedir}/log/cluster
-%{_mandir}/man8/confdb_keys.8*
-%{_mandir}/man8/corosync_overview.8*
-%{_mandir}/man8/corosync.8*
-%{_mandir}/man8/corosync-blackbox.8*
-%{_mandir}/man8/corosync-objctl.8*
-%{_mandir}/man8/corosync-keygen.8*
-%{_mandir}/man8/corosync-cfgtool.8*
-%{_mandir}/man8/corosync-cpgtool.8*
-%{_mandir}/man8/corosync-fplay.8*
-%{_mandir}/man8/corosync-pload.8*
-%{_mandir}/man8/corosync-quorumtool.8*
-%{_mandir}/man5/corosync.conf.5*
+%{_mandir}/man8/*.8*
+%{_mandir}/man5/*.5*
+%{_mandir}/man3/*.3*
+# optional testagent rpm
+#
+%if %{with_testagents}
+
+%package -n corosync-testagents
+Summary: The Corosync Cluster Engine Test Agents
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n corosync-testagents
+This package contains corosync test agents.
+
+%files -n corosync-testagents
+%defattr(755,root,root,-)
+%dir %{_datadir}/corosync/tests
+%dir %{_datadir}/augeas
+%dir %{_datadir}/augeas/lenses
+%dir %{_datadir}/augeas/lenses/tests
+%{_datadir}/corosync/tests/mem_leak_test.sh
+%{_datadir}/corosync/tests/net_breaker.sh
+%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh
+%{_datadir}/corosync/tests/shm_leak_audit.sh
+%{_datadir}/augeas/lenses/corosync.aug
+%{_datadir}/augeas/lenses/tests/test_corosync.aug
+%{_bindir}/cpg_test_agent
+%{_bindir}/sam_test_agent
+%{_bindir}/votequorum_test_agent
+
+%endif
+
+# library
+#
%package -n libcorosync4
Summary: The Corosync Cluster Engine Libraries
Group: Productivity/Clustering/HA
-Conflicts: corosync < 0.92-7
-Requires: %{name} = %{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
%description -n libcorosync4
This package contains corosync libraries.
-
-
%files -n libcorosync4
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/libcfg.so.*
%{_libdir}/libcpg.so.*
-%{_libdir}/libconfdb.so.*
-%{_libdir}/libevs.so.*
+%{_libdir}/libcmap.so.*
%{_libdir}/libtotem_pg.so.*
-%{_libdir}/liblogsys.so.*
-%{_libdir}/libcoroipcc.so.*
-%{_libdir}/libcoroipcs.so.*
%{_libdir}/libquorum.so.*
%{_libdir}/libvotequorum.so.*
-%{_libdir}/libpload.so.*
%{_libdir}/libsam.so.*
+%{_libdir}/libcorosync_common.so.*
%post -n libcorosync4 -p /sbin/ldconfig
@@ -196,74 +320,42 @@
Summary: The Corosync Cluster Engine Development Kit
Group: Productivity/Clustering/HA
Requires: libcorosync4 = %{version}-%{release}
+Requires: libqb-devel
Requires: pkgconfig
+Provides: corosync-devel = %{version}
+Obsoletes: corosync-devel < 0.92-7
%description -n libcorosync-devel
This package contains include files and man pages used to develop using
The Corosync Cluster Engine APIs.
-
-
%files -n libcorosync-devel
%defattr(-,root,root,-)
-%doc LICENSE README.devmap
+%doc LICENSE
%dir %{_includedir}/corosync/
-%{_includedir}/corosync/cs_config.h
%{_includedir}/corosync/corodefs.h
-%{_includedir}/corosync/coroipc_types.h
-%{_includedir}/corosync/coroipcs.h
-%{_includedir}/corosync/coroipcc.h
%{_includedir}/corosync/cfg.h
-%{_includedir}/corosync/confdb.h
+%{_includedir}/corosync/cmap.h
%{_includedir}/corosync/corotypes.h
%{_includedir}/corosync/cpg.h
-%{_includedir}/corosync/evs.h
%{_includedir}/corosync/hdb.h
-%{_includedir}/corosync/list.h
-%{_includedir}/corosync/mar_gen.h
%{_includedir}/corosync/sam.h
-%{_includedir}/corosync/swab.h
%{_includedir}/corosync/quorum.h
%{_includedir}/corosync/votequorum.h
%dir %{_includedir}/corosync/totem/
-%{_includedir}/corosync/totem/coropoll.h
%{_includedir}/corosync/totem/totem.h
%{_includedir}/corosync/totem/totemip.h
%{_includedir}/corosync/totem/totempg.h
-%dir %{_includedir}/corosync/lcr/
-%{_includedir}/corosync/lcr/lcr_ckpt.h
-%{_includedir}/corosync/lcr/lcr_comp.h
-%{_includedir}/corosync/lcr/lcr_ifact.h
-%dir %{_includedir}/corosync/engine
-%{_includedir}/corosync/engine/config.h
-%{_includedir}/corosync/engine/coroapi.h
-%{_includedir}/corosync/engine/logsys.h
-%{_includedir}/corosync/engine/objdb.h
-%{_includedir}/corosync/engine/quorum.h
%{_libdir}/libcfg.so
%{_libdir}/libcpg.so
-%{_libdir}/libconfdb.so
-%{_libdir}/libevs.so
+%{_libdir}/libcmap.so
%{_libdir}/libtotem_pg.so
-%{_libdir}/liblogsys.so
-%{_libdir}/libcoroipcc.so
-%{_libdir}/libcoroipcs.so
%{_libdir}/libquorum.so
%{_libdir}/libvotequorum.so
-%{_libdir}/libpload.so
%{_libdir}/libsam.so
+%{_libdir}/libcorosync_common.so
%{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/cpg_*3*
-%{_mandir}/man3/evs_*3*
-%{_mandir}/man3/confdb_*3*
-%{_mandir}/man3/votequorum_*3*
-%{_mandir}/man3/sam_*3*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-%{_mandir}/man8/confdb_overview.8*
-%{_mandir}/man8/logsys_overview.8*
-%{_mandir}/man8/votequorum_overview.8*
-%{_mandir}/man8/coroipc_overview.8*
-%{_mandir}/man8/sam_overview.8*
+%post -n libcorosync-devel -p /sbin/ldconfig
+%postun -n libcorosync-devel -p /sbin/ldconfig
%changelog
++++++ corosync-1.4.5.tar.gz -> corosync-2.3.1.tar.gz ++++++
++++ 158356 lines of diff (skipped)
++++++ corosync-init-lockfile-path-error.patch ++++++
Index: corosync-2.3.1/init/corosync.in
===================================================================
--- corosync-2.3.1.orig/init/corosync.in
+++ corosync-2.3.1/init/corosync.in
@@ -29,6 +29,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBI
success()
{
echo -ne "[ OK ]\r"
+ rtrn=0
}
failure()
@@ -106,6 +107,7 @@ start()
# they also assume that init scripts will create
# required subdirectories for proper operations
mkdir -p @LOCALSTATEDIR@/run
+ mkdir -p @LOCALSTATEDIR@/lock/subsys
if status $prog > /dev/null 2>&1; then
success
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
