Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2014-07-10 14:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-15 07:35:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2014-07-10 14:54:55.000000000 +0200 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Thu Jul 3 05:07:13 UTC 2014 - lzhong@suse.com + +- comment out line: to_logfile:no (bnc#882449) + work on patch bnc#882449-corosync-conf-example.patch + +------------------------------------------------------------------- +Wed Jul 2 05:48:47 UTC 2014 - yzou@suse.com + +- Fixed shared memory leak. + + bnc#881142-fix-shm-leak.patch + +------------------------------------------------------------------- +Fri Jun 13 03:13:13 UTC 2014 - lzhong@suse.com + +- Update corosync.conf.example and corosync.conf.example.udpu(bnc#882449) + - remove corosync-conf-example.patch + + add bnc#882449-corosync-conf-example.patch + +------------------------------------------------------------------- Old: ---- corosync-conf-example.patch New: ---- bnc#881142-fix-shm-leak.patch bnc#882449-corosync-conf-example.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.vlKPcp/_old 2014-07-10 14:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.vlKPcp/_new 2014-07-10 14:54:56.000000000 +0200 @@ -51,9 +51,10 @@ Source2: baselibs.conf Patch1: corosync-init-lockfile-path-error.patch Patch2: corosync-cts-api-error.patch -Patch3: corosync-conf-example.patch -Patch4: bnc#867767-add-version.patch -Patch5: bnc#872651-stop-cluster.patch +Patch3: bnc#867767-add-version.patch +Patch4: bnc#872651-stop-cluster.patch +Patch5: bnc#881142-fix-shm-leak.patch +Patch6: bnc#882449-corosync-conf-example.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. @@ -103,6 +104,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build #%if 0%{?buildtrunk} == 1 ++++++ bnc#881142-fix-shm-leak.patch ++++++ Index: corosync-2.3.3/exec/main.c =================================================================== --- corosync-2.3.3.orig/exec/main.c +++ corosync-2.3.3/exec/main.c @@ -1107,6 +1107,7 @@ int main (int argc, char **argv, char ** case 'v': printf ("Corosync Cluster Engine, version '%s'\n", VERSION); printf ("Copyright (c) 2006-2009 Red Hat, Inc.\n"); + logsys_system_fini(); return EXIT_SUCCESS; break; @@ -1117,6 +1118,7 @@ int main (int argc, char **argv, char ** " -p : Does nothing. \n"\ " -r : Set round robin realtime scheduling \n"\ " -v : Display version and SVN revision of Corosync and exit.\n"); + logsys_system_fini(); return EXIT_FAILURE; } } @@ -1254,6 +1256,10 @@ int main (int argc, char **argv, char ** qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, SIGINT, NULL, sig_exit_handler, NULL); qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, + SIGSEGV, NULL, sigsegv_handler, NULL); + qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, + SIGABRT, NULL, sigabrt_handler, NULL); + qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, SIGQUIT, NULL, sig_exit_handler, NULL); qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, SIGTERM, NULL, sig_exit_handler, NULL); ++++++ bnc#882449-corosync-conf-example.patch ++++++ Index: corosync-2.3.3/conf/corosync.conf.example =================================================================== --- corosync-2.3.3.orig/conf/corosync.conf.example +++ corosync-2.3.3/conf/corosync.conf.example @@ -9,6 +9,12 @@ totem { crypto_cipher: none crypto_hash: none + # Limit generated nodeids to 31-bits (positive signed integers) + # you would set it to 'yes', the new option 'new' means wiping + # off the highest bit in network order to avoid possible nodeid + # conflicting. + clear_node_high_bit: yes + # interface: define at least one interface to communicate # over. If you define more than one interface stanza, you must # also set rrp_mode. @@ -58,8 +64,8 @@ logging { to_stderr: no # Log to a log file. When set to "no", the "logfile" option # must not be set. - to_logfile: yes - logfile: /var/log/cluster/corosync.log + #to_logfile: no + #logfile: /var/log/cluster/corosync.log # Log to the system log daemon. When in doubt, set to yes. to_syslog: yes # Log debug messages (very verbose). When in doubt, leave off. @@ -77,5 +83,5 @@ logging { quorum { # Enable and configure quorum subsystem (default: off) # see also corosync.conf.5 and votequorum.5 - #provider: corosync_votequorum + provider: corosync_votequorum } Index: corosync-2.3.3/conf/corosync.conf.example.udpu =================================================================== --- corosync-2.3.3.orig/conf/corosync.conf.example.udpu +++ corosync-2.3.3/conf/corosync.conf.example.udpu @@ -5,6 +5,8 @@ totem { crypto_cipher: none crypto_hash: none + clear_node_high_bit: yes + interface { ringnumber: 0 bindnetaddr: 10.16.35.0 @@ -16,9 +18,9 @@ totem { logging { fileline: off - to_logfile: yes + #to_logfile: no + #logfile: /var/log/cluster/corosync.log to_syslog: yes - logfile: /var/log/cluster/corosync.log debug: off timestamp: on logger_subsys { @@ -54,5 +56,5 @@ nodelist { quorum { # Enable and configure quorum subsystem (default: off) # see also corosync.conf.5 and votequorum.5 - #provider: corosync_votequorum + provider: corosync_votequorum } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org