From 3717a59938ac0a33dcb64c7e2c6e1276c6caddaf Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Wed, 6 Aug 2008 13:53:00 +0000
Subject: [PATCH] - Resolves: #455713 remove suid from ping - corrected typing
 error in man

---
 iputils-20071127-typing_bug.patch | 12 ++++++++++++
 iputils.spec                      | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 iputils-20071127-typing_bug.patch

diff --git a/iputils-20071127-typing_bug.patch b/iputils-20071127-typing_bug.patch
new file mode 100644
index 0000000..18547f5
--- /dev/null
+++ b/iputils-20071127-typing_bug.patch
@@ -0,0 +1,12 @@
+diff -up iputils-s20071127/doc/tracepath.sgml.typing_bug iputils-s20071127/doc/tracepath.sgml
+--- iputils-s20071127/doc/tracepath.sgml.typing_bug	2008-08-05 15:29:51.000000000 +0200
++++ iputils-s20071127/doc/tracepath.sgml	2008-08-05 15:30:12.000000000 +0200
+@@ -99,7 +99,7 @@ with TTL of 2 was rejected at the first 
+ </para>
+ 
+ <para>
+-Te last line summarizes information about all the path to the destination,
++The last line summarizes information about all the path to the destination,
+ it shows detected Path MTU, amount of hops to the destination and our
+ guess about amount of hops from the destination to us, which can be
+ different when the path is asymmetric.
diff --git a/iputils.spec b/iputils.spec
index a6a7505..86bba24 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -24,6 +24,7 @@ Patch10: iputils-20070202-arping_timeout.patch
 Patch11: iputils-20071127-output.patch
 Patch12: iputils-20070202-ia64_align.patch
 Patch13: iputils-20071127-warnings.patch
+Patch14: iputils-20071127-typing_bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -31,6 +32,7 @@ BuildRequires: glibc-kernheaders >= 2.4-8.19
 BuildRequires: libsysfs-devel
 BuildRequires: libidn-devel
 Requires(post): /sbin/chkconfig
+Requires(post): /usr/sbin/setcap
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
@@ -58,6 +60,7 @@ the target machine is alive and receiving network traffic.
 %patch11 -p1 -b .output
 %patch12 -p1 -b .ia64_align
 %patch13 -p1 -b .warnings
+%patch14 -p1 -b .typing_bug
 
 %build
 %ifarch s390 s390x
@@ -109,6 +112,8 @@ mv -f RELNOTES.tmp RELNOTES
 
 %post
 /sbin/chkconfig --add rdisc
+/usr/sbin/setcap cap_net_raw=ep /bin/ping
+/usr/sbin/setcap cap_net_raw=ep /bin/ping6
 
 %preun
 if [ $1 = 0 ]; then
@@ -134,10 +139,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/clockdiff
 /sbin/arping
 %{_sbindir}/arping
-%attr(4755,root,root) /bin/ping
+%attr(0755,root,root) /bin/ping
 /sbin/ifenslave
 /sbin/rdisc
-%attr(4755,root,root) /bin/ping6
+%attr(0755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
 %{_sbindir}/ping6
@@ -147,6 +152,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Wed Aug 06 2008 Jiri Skala <jskala@redhat.com> - 20071127-4
+- Resolves: #455713 remove suid from ping
+- corrected typing error in man
+
 * Tue Jun 03 2008 Martin Nagy <mnagy@redhat.com> - 20071127-3
 - major patch cleanup so it will be easier to get patches upstream
 - fix for #68212, previous fix actually didn't work for ping6