Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2015-07-28 11:41:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync" Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2014-11-24 11:15:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2015-07-28 11:41:50.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Jul 27 10:32:27 UTC 2015 - [email protected] + +- BuildRequire pkgconfig(systemd) instead of systemd: this should + help avoid a build cycle. + +------------------------------------------------------------------- +Wed Jul 21 15:12:26 UTC 2015 - [email protected] + +update from v2.3.3 to v2.3.5 (bnc#939328) +v2.3.5 +- Log: Add logrotate configuration file +- totemsrp: Improve logging of left/down nodes +- totemconfig: Check for duplicate nodeids +- Really add cpghum +- cpg: Add support for messages larger than 1Mb +- Handle adding and removing UDPU members atomically + +- add patches: + * corosync-cts-api-error.patch + * bnc#867767-add-version.patch + +------------------------------------------------------------------- +Wed Jul 1 17:30:22 UTC 2015 - [email protected] + +- mv the place of corosync.conf.example*(fate#318190) + +------------------------------------------------------------------- @@ -554 +580,0 @@ - Old: ---- corosync-2.3.4.tar.gz New: ---- bnc#867767-add-version.patch corosync-2.3.5.tar.gz corosync-cts-api-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.PUiH5o/_old 2015-07-28 11:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PUiH5o/_new 2015-07-28 11:41:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package corosync # -# 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 @@ -16,6 +16,8 @@ # +#%global dirty dirty + # Conditionals # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>" # to disable or enable specific features @@ -44,22 +46,33 @@ Summary: The Corosync Cluster Engine and Application Programming Interfaces License: BSD-3-Clause Group: Productivity/Clustering/HA -Version: 2.3.4 +Version: 2.3.5 Release: 0 Url: http://www.corosync.org Source0: %{name}-%{version}.tar.gz Source2: baselibs.conf Patch1: corosync-init-lockfile-path-error.patch -Patch2: bnc#872651-stop-cluster.patch -Patch3: bnc#882449-corosync-conf-example.patch -Patch4: corosync-2.3.4-fix-bashisms.patch +Patch2: corosync-cts-api-error.patch +Patch3: bnc#867767-add-version.patch +Patch4: bnc#872651-stop-cluster.patch +Patch5: bnc#882449-corosync-conf-example.patch +Patch6: corosync-2.3.4-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not # provide openais on purpose, the package has been deleted. -Obsoletes: openais -Conflicts: openais +Obsoletes: openais < 1.2 +Conflicts: openais < 1.2 + # Runtime bits Requires: libcorosync4 = %{version}-%{release} +Requires(pre): /usr/sbin/useradd +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Conflicts: openais <= 0.89, openais-devel <= 0.89 + +# Build bits + +Requires: libcorosync4 = %{version}-%{release} #Requires(pre): /usr/sbin/useradd #Requires(post): /sbin/chkconfig #Requires(preun): /sbin/chkconfig @@ -71,6 +84,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool + %endif %if %{with monitoring} BuildRequires: libstatgrab-devel @@ -85,7 +99,7 @@ %if %{with dbus} BuildRequires: dbus-1-devel %endif -%if %{with_systemd} +%if %{with systemd} BuildRequires: pkgconfig(systemd) Requires(post): systemd Requires(preun): systemd @@ -101,11 +115,13 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build -#%if 0%{?buildtrunk} == 1 +%if %{with runautogen} ./autogen.sh -#%endif +%endif %if %{with rdma} export ibverbs_CFLAGS=-I/usr/include/infiniband \ @@ -114,7 +130,7 @@ export rdmacm_LIBS=-lrdmacm \ %endif %{configure} \ -%if %{with_testagents} +%if %{with testagents} --enable-testagents \ --enable-augeas \ --enable-debug \ @@ -128,10 +144,13 @@ %if %{with snmp} --enable-snmp \ %endif +%if %{with dbus} + --enable-dbus \ +%endif %if %{with rdma} --enable-rdma \ %endif -%if %{with_systemd} +%if %{with systemd} --enable-systemd \ %endif %if %{with upstart} @@ -147,8 +166,11 @@ make %{_smp_mflags} %install -make install DESTDIR=%{buildroot} +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +rm -rf %{buildroot}/usr/share/doc/corosync/html +rm -rf %{buildroot}/usr/share/doc/corosync %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 @@ -156,30 +178,25 @@ %if %{with_systemd} ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync %endif + ## 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}/* -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/ +mkdir -p %{buildroot}/usr/share/doc/packages/corosync/ install -m 0644 tools/corosync-notifyd.sysconfig.example %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd +install -m 0644 conf/corosync.conf.example* %{buildroot}/usr/share/doc/packages/corosync/ +rm -rf %{buildroot}/etc/corosync/corosync.conf.example* %clean rm -rf %{buildroot} %description -This package contains the Corosync Cluster Engine Executive, several -default APIs and libraries, default configuration files, and an init -script. +This package contains the Corosync Cluster Engine Executive, several default +APIs and libraries, default configuration files, and an init script. %pre %if %{with_systemd} && 0%{?systemd_post:1} @@ -187,34 +204,40 @@ %endif %post -%if %{with_systemd} && 0%{?systemd_post:1} +%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 +rm -rf %{_sysconfdir}/corosync/corosync.conf.example %{_sysconfdir}/corosync/corosync.conf.example.unicast +ln -s /usr/share/doc/packages/corosync/corosync.conf.example %{_sysconfdir}/corosync/ +ln -s /usr/share/doc/packages/corosync/corosync.conf.example.udpu %{_sysconfdir}/corosync/corosync.conf.example.unicast %preun -%if %{with_systemd} && 0%{?systemd_preun:1} -#%systemd_preun corosync.service corosync-notifyd.service -%service_del_preun corosync.service corosync-notifyd.service + +unlink %{_sysconfdir}/corosync/corosync.conf.example.unicast +unlink %{_sysconfdir}//corosync/corosync.conf.example + +%if %{with systemd} && 0%{?systemd_preun:1} +%systemd_preun corosync.service %else if [ $1 -eq 0 ]; then - /sbin/service corosync stop >/dev/null 2>&1 ||: + /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 +%if %{with systemd} && 0%{?systemd_postun:1} +%systemd_postun %endif %files %defattr(-,root,root,-) -%doc LICENSE SECURITY +%doc LICENSE +%doc SECURITY %{_sbindir}/corosync %{_sbindir}/corosync-keygen %{_sbindir}/corosync-cmapctl @@ -236,8 +259,8 @@ %endif %dir %{_sysconfdir}/corosync %dir %{_sysconfdir}/corosync/uidgid.d -%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example -%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu +%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example +%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu #%config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd %config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd %if %{with dbus} @@ -246,7 +269,7 @@ %if %{with snmp} %{_datadir}/snmp/mibs/COROSYNC-MIB.txt %endif -%if %{with_systemd} +%if %{with systemd} %{_unitdir}/corosync.service %{_unitdir}/corosync-notifyd.service %dir %{_datadir}/corosync @@ -262,13 +285,22 @@ %endif %dir %{_localstatedir}/lib/corosync %dir %{_localstatedir}/log/cluster -%{_mandir}/man8/*.8* -%{_mandir}/man5/*.5* -%{_mandir}/man3/*.3* +%{_mandir}/man8/corosync_overview.8* +%{_mandir}/man8/corosync.8* +%{_mandir}/man8/corosync-blackbox.8* +%{_mandir}/man8/corosync-cmapctl.8* +%{_mandir}/man8/corosync-keygen.8* +%{_mandir}/man8/corosync-cfgtool.8* +%{_mandir}/man8/corosync-cpgtool.8* +%{_mandir}/man8/corosync-notifyd.8* +%{_mandir}/man8/corosync-quorumtool.8* +%{_mandir}/man5/corosync.conf.5* +%{_mandir}/man5/votequorum.5* +%{_mandir}/man8/cmap_keys.8* # optional testagent rpm # -%if %{with_testagents} +%if %{with testagents} %package -n corosync-testagents Summary: The Corosync Cluster Engine Test Agents @@ -284,6 +316,7 @@ %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 @@ -302,8 +335,9 @@ Summary: The Corosync Cluster Engine Libraries Group: Productivity/Clustering/HA # openais is indeed gone and should be uninstalled. Yes, we do not -# provide openais on purpose, the package has been deleted. -Obsoletes: libopenais3 +# provide libopenais on purpose, the package has been deleted. +Obsoletes: libopenais3 < 1.2 +Conflicts: libopenais3 < 1.2 #Requires: %{name} = %{version}-%{release} %description -n libcorosync4 @@ -364,6 +398,16 @@ %{_libdir}/libsam.so %{_libdir}/libcorosync_common.so %{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/cpg_*3* +%{_mandir}/man3/quorum_*3* +%{_mandir}/man3/votequorum_*3* +%{_mandir}/man3/sam_*3* +%{_mandir}/man8/cpg_overview.8* +%{_mandir}/man8/votequorum_overview.8* +%{_mandir}/man8/sam_overview.8* +%{_mandir}/man3/cmap_*3* +%{_mandir}/man8/cmap_overview.8* +%{_mandir}/man8/quorum_overview.8* %post -n libcorosync-devel -p /sbin/ldconfig %postun -n libcorosync-devel -p /sbin/ldconfig ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.PUiH5o/_old 2015-07-28 11:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PUiH5o/_new 2015-07-28 11:41:50.000000000 +0200 @@ -1,4 +1,3 @@ libcorosync4 -corosync-devel requires -corosync-<targettype> requires "libcorosync4-<targettype> = <version>" ++++++ bnc#867767-add-version.patch ++++++ --- /dev/null 2015-07-20 08:30:37.121221591 +0800 +++ corosync-2.3.5/.tarball-version 2015-07-21 13:20:34.907779088 +0800 @@ -0,0 +1 @@ +2.3.5 ++++++ bnc#872651-stop-cluster.patch ++++++ --- /var/tmp/diff_new_pack.PUiH5o/_old 2015-07-28 11:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PUiH5o/_new 2015-07-28 11:41:50.000000000 +0200 @@ -1,8 +1,6 @@ -Index: corosync-2.3.3/init/corosync.service.in -=================================================================== ---- corosync-2.3.3.orig/init/corosync.service.in -+++ corosync-2.3.3/init/corosync.service.in -@@ -3,6 +3,7 @@ Description=Corosync Cluster Engine +--- corosync-2.3.5.orig/init/corosync.service.in 2015-07-21 11:09:11.911660803 +0800 ++++ corosync-2.3.5/init/corosync.service.in 2015-07-21 13:25:08.239783189 +0800 +@@ -3,6 +3,7 @@ ConditionKernelCommandLine=!nocluster Requires=network-online.target After=network-online.target ++++++ bnc#882449-corosync-conf-example.patch ++++++ --- /var/tmp/diff_new_pack.PUiH5o/_old 2015-07-28 11:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PUiH5o/_new 2015-07-28 11:41:50.000000000 +0200 @@ -52,9 +52,9 @@ fileline: off - to_logfile: yes + #to_logfile: no -+ #logfile: /var/log/cluster/corosync.log to_syslog: yes - logfile: /var/log/cluster/corosync.log ++ #logfile: /var/log/cluster/corosync.log debug: off timestamp: on logger_subsys { ++++++ corosync-2.3.4-fix-bashisms.patch ++++++ --- /var/tmp/diff_new_pack.PUiH5o/_old 2015-07-28 11:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.PUiH5o/_new 2015-07-28 11:41:50.000000000 +0200 @@ -1,12 +1,11 @@ -diff -Ndur corosync-2.3.4/cts/agents/mem_leak_test.sh corosync-2.3.4-fix-bashisms/cts/agents/mem_leak_test.sh ---- corosync-2.3.4/cts/agents/mem_leak_test.sh 2014-08-12 10:27:36.000000000 +0300 -+++ corosync-2.3.4-fix-bashisms/cts/agents/mem_leak_test.sh 2014-11-17 05:57:38.986640342 +0200 +--- corosync-2.3.5.orig/cts/agents/mem_leak_test.sh 2015-07-21 13:47:30.058803324 +0800 ++++ corosync-2.3.5/cts/agents/mem_leak_test.sh 2015-07-27 10:03:53.903380662 +0800 @@ -41,14 +41,14 @@ find $f | sed "s|\.|_|g" | sed "s|/|.|g" | while read l do echo $l.count u64 $COUNT >> $temp_file - let COUNT="$COUNT+1" -+ COUNT=$((COUNT + 1)) ++ COUNT="$COUNT+1" done corosync-cmapctl -p $temp_file @@ -14,7 +13,7 @@ done AFTER=$(get_mem $TYPE) - let DIFF="$AFTER - $BEFORE" -+ DIFF=$((AFTER - BEFORE)) ++ DIFF="$AFTER - $BEFORE" rm -f $temp_file #echo $f diff $TYPE $DIFF echo $DIFF @@ -23,12 +22,12 @@ do corosync-cmapctl -s $l u32 $COUNT - let COUNT="$COUNT+1" -+ COUNT=$((COUNT + 1)) ++ COUNT="$COUNT+1" done corosync-cmapctl -D usr AFTER=$(get_mem $TYPE) - let DIFF="$AFTER - $BEFORE" -+ DIFF=$((AFTER - BEFORE)) ++ DIFF="$AFTER - $BEFORE" echo $DIFF exit 0 ++++++ corosync-2.3.4.tar.gz -> corosync-2.3.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/corosync/corosync-2.3.4.tar.gz /work/SRC/openSUSE:Factory/.corosync.new/corosync-2.3.5.tar.gz differ: char 5, line 1 ++++++ corosync-cts-api-error.patch ++++++ --- corosync-2.3.5.orig/cts/corolab.py 2015-07-21 11:09:11.898660803 +0800 +++ corosync-2.3.5/cts/corolab.py 2015-07-21 12:53:27.922754675 +0800 @@ -308,10 +308,10 @@ elif Environment["all-once"] or NumIter == 0: NumIter = len(Tests) scenario = AllOnce( - cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) + cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) else: scenario = RandomTests( - cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) + cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) Environment.log(">>>>>>>>>>>>>>>> BEGINNING " + repr(NumIter) + " TESTS ") Environment.log("Stack: %s" % Environment["Stack"])
