From 16b3abc2d67476dd1f0f0c513c42b67cb4c6ca99 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@fedoraproject.org>
Date: Wed, 29 Oct 2008 09:30:09 +0000
Subject: [PATCH] Fixed setting socket flags in ipv4 only environment (#467964)

---
 mtr-0.75-fd-flags.path | 14 ++++++++++++++
 mtr.spec               |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 mtr-0.75-fd-flags.path

diff --git a/mtr-0.75-fd-flags.path b/mtr-0.75-fd-flags.path
new file mode 100644
index 0000000..762413a
--- /dev/null
+++ b/mtr-0.75-fd-flags.path
@@ -0,0 +1,14 @@
+diff -up mtr-0.75/net.c.fd-flags mtr-0.75/net.c
+--- mtr-0.75/net.c.fd-flags	2008-10-22 08:07:53.000000000 +0200
++++ mtr-0.75/net.c	2008-10-23 13:57:04.000000000 +0200
+@@ -945,8 +945,9 @@ int net_preopen(void) 
+   set_fd_flags(recvsock4);
+ #ifdef ENABLE_IPV6
+   recvsock6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
++  if (recvsock6 >= 0)
++    set_fd_flags(recvsock6);  
+ #endif
+-  set_fd_flags(recvsock6);
+ 
+   return 0;
+ }
diff --git a/mtr.spec b/mtr.spec
index 89e4274..eed7e34 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
 Version: 0.75
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -10,6 +10,7 @@ Source:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
 Source1: xmtr.consolehelper
 Source2: xmtr.pam
 Source3: net-x%{name}.desktop
+Patch0: mtr-0.75-fd-flags.path
 BuildRequires: ncurses-devel gtk2-devel desktop-file-utils gtk+-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +33,7 @@ diagnostic tool.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fd-flags
 
 %build
 %configure --enable-gtk2
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Wed Oct 29 2008 Zdenek Prikryl <zprikryl@redhat.com> - 2:0.75-2
+- Fixed setting socket flags in ipv4 only environment (#467964)
+
 * Tue Sep 23 2008 Zdenek Prikryl <zprikryl@redhat.com> - 2:0.75-1
 - Updated to 0.75
 - Removed confusing underflow patch