From 7516fb65d06a8091eaffc7d74d37ffaa53a0fc2f2f8c3fdf85c44d5efff0117f Mon Sep 17 00:00:00 2001
From: Vladimir Nadvornik <nadvornik@suse.com>
Date: Fri, 27 Sep 2013 12:35:47 +0000
Subject: [PATCH] - reduce the timeout when a dns server does not respond
(bnc#824729)
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=63
---
mc-startup-timeout.patch | 40 ++++++++++++++++++++++++++++++++++++++++
mc.changes | 6 ++++++
mc.spec | 3 +++
3 files changed, 49 insertions(+)
create mode 100644 mc-startup-timeout.patch
diff --git a/mc-startup-timeout.patch b/mc-startup-timeout.patch
new file mode 100644
index 0000000..38ddc67
--- /dev/null
+++ b/mc-startup-timeout.patch
@@ -0,0 +1,40 @@
+diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c
+--- mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c 2013-06-25 23:29:14.000000000 +0200
++++ mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c 2013-09-27 12:04:27.306008996 +0200
+@@ -1841,11 +1841,13 @@
+ /* Ensure null termination. */
+ hostname[sizeof (hostname) - 1] = '\0';
+
+- /* get host info */
+- if ((hp = Get_Hostbyname (hostname)) == 0)
+- {
+- DEBUG (0, ("Get_Hostbyname: Unknown host %s\n", hostname));
+- return False;
++ if (ip) { /* query the ip only if it is requested */
++ /* get host info */
++ if ((hp = Get_Hostbyname (hostname)) == 0)
++ {
++ DEBUG (0, ("Get_Hostbyname: Unknown host %s\n", hostname));
++ return False;
++ }
+ }
+
+ if (my_name)
+@@ -2474,6 +2476,9 @@
+ return (ret);
+ }
+
++#if 0
++ /* IMHO this is useless and only increases the timeout */
++
+ /* try with all lowercase */
+ strlower (name2);
+ ret = sys_gethostbyname (name2);
+@@ -2491,6 +2496,7 @@
+ free (name2);
+ return (ret);
+ }
++#endif
+
+ /* nothing works :-( */
+ free (name2);
diff --git a/mc.changes b/mc.changes
index c0151a3..7c9b0b0 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 27 12:10:18 UTC 2013 - nadvornik@suse.com
+
+- reduce the timeout when a dns server does not respond
+ (bnc#824729)
+
-------------------------------------------------------------------
Fri Aug 23 18:10:44 UTC 2013 - dnh@opensuse.org
diff --git a/mc.spec b/mc.spec
index 18a34e9..e358d6a 100644
--- a/mc.spec
+++ b/mc.spec
@@ -52,6 +52,8 @@ Patch41: mc-multi-press-f-keys.patch
# Patches from Fedora
#Patch adding -fpie and -pie to compilation and linking of setuid binaries
Patch52: mc-pie.patch
+# mc-startup-timeout.patch mc3082 nadvornik@suse.cz - fix for long timeout on startup, bnc#824729
+Patch60: mc-startup-timeout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audiofile-devel
@@ -121,6 +123,7 @@ target directory.
%patch32
%patch41
%patch52 -p1
+%patch60 -p1
%build
autoreconf --force --install