From 99b543e3ace6aa1dfc73a9023e1ac19f4ca7663d Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 23 Jul 2012 09:49:54 +0200 Subject: [PATCH] Minor update: capabilities patch --- ...-20101006-ping-defer-caps-drop-when-marking-packets.patch | 4 ++-- iputils.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/iputils-20101006-ping-defer-caps-drop-when-marking-packets.patch b/iputils-20101006-ping-defer-caps-drop-when-marking-packets.patch index b0df208..fbce0d9 100644 --- a/iputils-20101006-ping-defer-caps-drop-when-marking-packets.patch +++ b/iputils-20101006-ping-defer-caps-drop-when-marking-packets.patch @@ -89,12 +89,12 @@ - perror("ping: cap_set_proc"); + /* check for cap_net_admin because it may be needed to set packet marks */ + if ((cap = cap_get_proc()) == NULL) { -+ perror("ping: cap_get_proc"); ++ perror("ping6: cap_get_proc"); exit(-1); } - cap_free(caps); + if (cap_get_flag(cap, CAP_NET_ADMIN, CAP_EFFECTIVE, &net_admin_set) != 0) { -+ perror("ping: cap_get_flag"); ++ perror("ping6: cap_get_flag"); + exit(-1); + } + cap_free(cap); diff --git a/iputils.spec b/iputils.spec index 2a6bd88..ba57af2 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,7 +1,7 @@ Summary: Network monitoring tools including ping Name: iputils Version: 20101006 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD URL: http://www.skbuff.net/iputils Group: System Environment/Daemons @@ -191,6 +191,9 @@ fi %{_sysconfdir}/rc.d/init.d/rdisc %changelog +* Mon Jul 23 2012 Jan Synáček 20101006-17 +- Minor update: capabilities patch + * Fri Jul 20 2012 Jan Synáček 20101006-16 - Make fedora-review friendly