- ping denpend on SIGALRM to exit sometime, so we mask it UNBLOCK (bnc #674304)

OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=30
This commit is contained in:
Marcus Schaefer 2013-07-23 09:05:43 +00:00 committed by Git OBS Bridge
parent cea2a550bc
commit d4673e7ddd
3 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,19 @@
--- ping.c 2013-07-23 11:02:26.364843595 +0200
+++ ping.c 2013-07-23 11:02:32.740900627 +0200
@@ -129,6 +129,16 @@
cap_t caps;
#endif
+ /*
+ * ping depend on SIGALARM to exit sometimes,
+ * but to popen, system, fork carry on parent signal handler
+ * so we mask it ourself.
+ */
+ sigset_t s;
+ sigaddset(&s, SIGALRM);
+ sigprocmask(SIG_UNBLOCK, &s, NULL);
+ set_signal(SIGALRM, doexit);
+
icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
socket_errno = errno;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 23 11:04:46 CEST 2013 - ms@suse.de
- ping denpend on SIGALRM to exit sometime, so we mask it UNBLOCK (bnc #674304)
-------------------------------------------------------------------
Fri Mar 8 03:27:28 UTC 2013 - crrodriguez@opensuse.org

View File

@ -42,6 +42,7 @@ Patch2: iputils-traceroute6-stdint.diff
Patch3: iputils-ifenslave.diff
Patch6: iputils-s20101006-capabilities.diff
Patch7: iputils-pingtypo.diff
Patch8: iputils-s20101006-sec-ping-unblock.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: permissions
@ -59,6 +60,7 @@ cp -a %SOURCE1 .
#patch5
%patch6 -p1
%patch7
%patch8
mkdir linux
touch linux/autoconf.h