rpms/mtr/devel mtr-0.75-fd-flags.path,NONE,1.1 mtr.spec,1.48,1.49

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21445

Modified Files:
	mtr.spec 
Added Files:
	mtr-0.75-fd-flags.path 
Log Message:
Fixed setting socket flags in ipv4 only environment (#467964)



--- NEW FILE mtr-0.75-fd-flags.path ---
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;
 }


Index: mtr.spec
===================================================================
RCS file: /cvs/extras/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mtr.spec	23 Sep 2008 12:29:18 -0000	1.48
+++ mtr.spec	29 Oct 2008 09:30:09 -0000	1.49
@@ -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 @@
 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 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fd-flags
 
 %build
 %configure --enable-gtk2
@@ -82,6 +84,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Wed Oct 29 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.75-2
+- Fixed setting socket flags in ipv4 only environment (#467964)
+
 * Tue Sep 23 2008 Zdenek Prikryl <zprikryl at redhat.com> - 2:0.75-1
 - Updated to 0.75
 - Removed confusing underflow patch