pool/corosync
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 239246 from home:yzou:branches:network:ha-clustering:Factory

Browse Source 
Fix shared memory leak in corosync and add new line in the end of my change log

OBS-URL: https://build.opensuse.org/request/show/239246
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=54
This commit is contained in:
xia li 2014-07-02 06:19:34 +00:00 committed by Git OBS Bridge
parent 4b5316db1e
commit 5d77851dab
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bnc#881142-fix-shm-leak.patch Normal file
View File

@ -0,0 +1,31 @@
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);

6
corosync.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Fri Jun 13 03:13:13 UTC 2014 - lzhong@suse.com

2
corosync.spec
View File

@ -54,6 +54,7 @@ Patch2: corosync-cts-api-error.patch
Patch3: bnc#867767-add-version.patch Patch3: bnc#867767-add-version.patch
Patch4: bnc#872651-stop-cluster.patch Patch4: bnc#872651-stop-cluster.patch
Patch5: bnc#882449-corosync-conf-example.patch Patch5: bnc#882449-corosync-conf-example.patch
Patch6: bnc#881142-fix-shm-leak.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# openais is indeed gone and should be uninstalled. Yes, we do not # openais is indeed gone and should be uninstalled. Yes, we do not
# provide openais on purpose, the package has been deleted. # provide openais on purpose, the package has been deleted.
@ -103,6 +104,7 @@ Requires: libxslt
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%build %build
#%if 0%{?buildtrunk} == 1 #%if 0%{?buildtrunk} == 1