From f1bf803fe937dc3afe0c41b4297b7a1eb943d09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 24 Mar 2015 17:23:47 +0100 Subject: [PATCH] Fix a regression in hiding disclaimers --- ....2.6-Remove-bogus-hide_strings-entry.patch | 32 +++++++++++++++++++ whois.spec | 9 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 whois-5.2.6-Remove-bogus-hide_strings-entry.patch diff --git a/whois-5.2.6-Remove-bogus-hide_strings-entry.patch b/whois-5.2.6-Remove-bogus-hide_strings-entry.patch new file mode 100644 index 0000000..08b194d --- /dev/null +++ b/whois-5.2.6-Remove-bogus-hide_strings-entry.patch @@ -0,0 +1,32 @@ +From b41ad469f975f274c2f2e0716241467ff495ff2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 24 Mar 2015 17:13:05 +0100 +Subject: [PATCH] Remove bogus hide_strings[] entry +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The empty starting string matched always and the final NULL string +enabled hiding to the end of the response. + +As a result any response got hidden. + + + +Signed-off-by: Petr Písař + +diff --git a/data.h b/data.h +index 402fce5..e5c7b01 100644 +--- a/data.h ++++ b/data.h +@@ -72,7 +72,6 @@ const char *hide_strings[] = { + "TERMS OF USE: The information in the Whois database", NULL, /* .wang */ + "The WHOIS service offered by Neustar, Inc, on behalf", NULL, + "The WHOIS service offered by the Registry Operator", NULL, /* .science */ +- "", NULL, + + /* ccTLDs */ + "Access to CCTLD WHOIS information is provided", "", /* Afilias */ +-- +2.1.0 + diff --git a/whois.spec b/whois.spec index 6807454..c9ef7dc 100644 --- a/whois.spec +++ b/whois.spec @@ -1,11 +1,14 @@ Name: whois Version: 5.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Improved WHOIS client Group: Applications/Internet License: GPLv2+ URL: http://www.linux.it/~md/software/ Source0: http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz +# Fix a regression in hiding disclaimers, submitted to upstream +# +Patch0: whois-5.2.6-Remove-bogus-hide_strings-entry.patch BuildRequires: gettext BuildRequires: libidn-devel BuildRequires: perl @@ -31,6 +34,7 @@ addresses and network names. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -78,6 +82,9 @@ fi %changelog +* Tue Mar 24 2015 Petr Pisar - 5.2.6-2 +- Fix a regression in hiding disclaimers + * Tue Mar 24 2015 Petr Pisar - 5.2.6-1 - 5.2.6 bump