- 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:
parent
cea2a550bc
commit
d4673e7ddd
19
iputils-s20101006-sec-ping-unblock.diff
Normal file
19
iputils-s20101006-sec-ping-unblock.diff
Normal 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;
|
||||||
|
|
@ -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
|
Fri Mar 8 03:27:28 UTC 2013 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@ Patch2: iputils-traceroute6-stdint.diff
|
|||||||
Patch3: iputils-ifenslave.diff
|
Patch3: iputils-ifenslave.diff
|
||||||
Patch6: iputils-s20101006-capabilities.diff
|
Patch6: iputils-s20101006-capabilities.diff
|
||||||
Patch7: iputils-pingtypo.diff
|
Patch7: iputils-pingtypo.diff
|
||||||
|
Patch8: iputils-s20101006-sec-ping-unblock.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
PreReq: permissions
|
PreReq: permissions
|
||||||
|
|
||||||
@ -59,6 +60,7 @@ cp -a %SOURCE1 .
|
|||||||
#patch5
|
#patch5
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7
|
%patch7
|
||||||
|
%patch8
|
||||||
mkdir linux
|
mkdir linux
|
||||||
touch linux/autoconf.h
|
touch linux/autoconf.h
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user