From 7516fb65d06a8091eaffc7d74d37ffaa53a0fc2f2f8c3fdf85c44d5efff0117f Mon Sep 17 00:00:00 2001 From: Vladimir Nadvornik Date: Fri, 27 Sep 2013 12:35:47 +0000 Subject: [PATCH 1/3] - 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 From 7d7dc02a1f64326869dd414f9aea2809c3e05003202500368f5bdf37b098a0f0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Oct 2013 07:22:12 +0000 Subject: [PATCH 2/3] Accepting request 201508 from home:sbrabec:branches:Base:System - Fix invalid mc.png (IDAT TFB error). OBS-URL: https://build.opensuse.org/request/show/201508 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=64 --- mc.changes | 5 +++++ mc.png | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mc.changes b/mc.changes index 7c9b0b0..05ce602 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 30 17:23:48 CEST 2013 - sbrabec@suse.cz + +- Fix invalid mc.png (IDAT TFB error). + ------------------------------------------------------------------- Fri Sep 27 12:10:18 UTC 2013 - nadvornik@suse.com diff --git a/mc.png b/mc.png index ab43dbc..dbf8ddf 100644 --- a/mc.png +++ b/mc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0f7db222d01346de9ce98a16713b105314af6a532b175f1c74a14cebf87f22c +oid sha256:0bca715a4e2cc6f5f582b2a49596e4d52802d1e400b5bb1c185d044d4dcd56fc size 923 From 00946b0a09aaa01eb4f2773dcab3cd1f1fdfa171ec92a3ef2cb2a0b90a7a524a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Oct 2013 14:32:42 +0000 Subject: [PATCH 3/3] - mc-startup-timeout.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=65 --- mc.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mc.changes b/mc.changes index 05ce602..974f444 100644 --- a/mc.changes +++ b/mc.changes @@ -6,8 +6,8 @@ Mon Sep 30 17:23:48 CEST 2013 - sbrabec@suse.cz ------------------------------------------------------------------- Fri Sep 27 12:10:18 UTC 2013 - nadvornik@suse.com -- reduce the timeout when a dns server does not respond - (bnc#824729) +- mc-startup-timeout.patch: reduce the timeout when a dns server does + not respond (bnc#824729) ------------------------------------------------------------------- Fri Aug 23 18:10:44 UTC 2013 - dnh@opensuse.org