From 9793c1ff10dfbe493a107a235f7548c92da88ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 23 Jan 2020 16:48:18 +0100 Subject: [PATCH] 5.5.5 bump --- ...4-Make-sx.-hide-string-more-specific.patch | 41 ------------------- whois.spec | 11 +++-- 2 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 whois-5.5.4-Make-sx.-hide-string-more-specific.patch diff --git a/whois-5.5.4-Make-sx.-hide-string-more-specific.patch b/whois-5.5.4-Make-sx.-hide-string-more-specific.patch deleted file mode 100644 index 06e72ce..0000000 --- a/whois-5.5.4-Make-sx.-hide-string-more-specific.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9a94411d91276c3d9f4319f89900600da9533b73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 15 Jan 2020 12:00:14 +0100 -Subject: [PATCH] Make sx. hide string more specific -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit caa27b0675e171fe85c043d0199bfe77fddb23b9 broke displaying -results for at. subdomains because "%" lines exists in their outputs. - -This patch changes the sx. start hide string to be more specific on -the expense that sx. output will contain a single "%" line. - -More thorough fix would require changing the hiding algorithm to -either require prefix for each hidden line or to bind the strings to -their respective domains or servers. - -Fixes . - -Signed-off-by: Petr Písař ---- - data.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data.h b/data.h -index 82530da..718f40a 100644 ---- a/data.h -+++ b/data.h -@@ -72,7 +72,7 @@ const char *hide_strings[] = { - "% The WHOIS service offered by EURid", "% of the database", /* eu */ - "Access to .IN WHOIS information", NULL, /* in */ - "access to .in whois information", NULL, /* in registar */ -- "%", NULL, /* sx */ -+ "% Use of CIRA's WHOIS service is governed by the Terms of Use in its Legal", NULL, /* sx */ - "The Service is provided so that you may look", "We may discontinue",/*vu*/ - "NeuStar, Inc., the Registry Administrator for .US", NULL, - --- -2.21.1 - diff --git a/whois.spec b/whois.spec index a017144..3502afd 100644 --- a/whois.spec +++ b/whois.spec @@ -10,15 +10,12 @@ %{bcond_without whois_enables_libidn2} Name: whois -Version: 5.5.4 -Release: 2%{?dist} +Version: 5.5.5 +Release: 1%{?dist} Summary: Improved WHOIS client License: GPLv2+ URL: http://www.linux.it/~md/software/ Source0: http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz -# Fix hiding legal strings on at. subdomains, proposed to the upstream, -# bug #1791035, -Patch0: whois-5.5.4-Make-sx.-hide-string-more-specific.patch BuildRequires: coreutils BuildRequires: gcc BuildRequires: gettext @@ -87,7 +84,6 @@ whois tools messages translated into different natural languages. %prep %setup -q -n %{name} -%patch0 -p1 %build %{make_build} CONFIG_FILE="%{_sysconfdir}/%{cfgfile}" \ @@ -143,6 +139,9 @@ fi %endif %changelog +* Thu Jan 23 2020 Petr Pisar - 5.5.5-1 +- 5.5.5 bump + * Wed Jan 15 2020 Petr Pisar - 5.5.4-2 - Fix hiding legal strings on at. subdomains (bug #1791035)