[jwhois/f13/master] Fix jwhois does not handle multi-homed server
vcrhonek
vcrhonek at fedoraproject.org
Wed Sep 29 15:17:59 UTC 2010
commit 59334ae03b7c19f060ffd53eec93b06259f99710
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed Sep 29 17:13:32 2010 +0200
Fix jwhois does not handle multi-homed server
jwhois-4.0-multi-homed.patch | 15 +++++++++++++++
jwhois.spec | 8 +++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/jwhois-4.0-multi-homed.patch b/jwhois-4.0-multi-homed.patch
new file mode 100644
index 0000000..05d6f46
--- /dev/null
+++ b/jwhois-4.0-multi-homed.patch
@@ -0,0 +1,15 @@
+diff -up jwhois-4.0/src/utils.c.orig jwhois-4.0/src/utils.c
+--- jwhois-4.0/src/utils.c.orig 2010-09-29 16:19:24.453608330 +0200
++++ jwhois-4.0/src/utils.c 2010-09-29 16:20:10.686608189 +0200
+@@ -292,7 +292,10 @@ make_connect(const char *host, int port)
+ if (error < 0 || retval)
+ {
+ close (sockfd);
+- return -1;
++ if (retval == ENETUNREACH)
++ continue;
++ else
++ return -1;
+ }
+
+ break;
diff --git a/jwhois.spec b/jwhois.spec
index 79a1ef8..d633660 100644
--- a/jwhois.spec
+++ b/jwhois.spec
@@ -1,6 +1,6 @@
Name: jwhois
Version: 4.0
-Release: 20%{?dist}
+Release: 21%{?dist}
URL: http://www.gnu.org/software/jwhois/
Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
Patch0: jwhois-4.0-connect.patch
@@ -16,6 +16,7 @@ Patch9: jwhois-4.0-conf_update3.patch
Patch10: jwhois-4.0-conf_update4.patch
Patch11: jwhois-4.0-select.patch
Patch12: jwhois-4.0-conf_update5.patch
+Patch13: jwhois-4.0-multi-homed.patch
License: GPLv3
Group: Applications/Internet
Summary: Internet whois/nicname client
@@ -42,6 +43,7 @@ A whois client that accepts both traditional and finger-style queries.
%patch10 -p1 -b .conf_update4
%patch11 -p1 -b .select
%patch12 -p1 -b .conf_update5
+%patch13 -p1 -b .multi-homed
iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -85,6 +87,10 @@ fi
rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed Sep 29 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-21
+- Fix jwhois does not handle multi-homed server
+ Resolves: #624608
+
* Tue Jun 22 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-20
- Update server options for whois.1api.net
Resolves: #600096
More information about the scm-commits
mailing list