From 990b512d5a2ce8a59fe11e5a153cd87025bce6ef Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Feb 27 2017 13:30:59 +0000 Subject: Fix whois version --- diff --git a/whois-5.12.15-Fix-misspellings-in-IPv4-formatting-string.patch b/whois-5.12.15-Fix-misspellings-in-IPv4-formatting-string.patch deleted file mode 100644 index e8f9c0c..0000000 --- a/whois-5.12.15-Fix-misspellings-in-IPv4-formatting-string.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 28c4a1a6ef595f20a25f2c9815e405bf15df60b7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 27 Feb 2017 14:12:52 +0100 -Subject: [PATCH] Fix misspellings in IPv4 formatting string -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Querying 6to4 address failed on malformed IPv4 address: - -$ ./whois 2002:5ab2:d182::1 - -Querying for the IPv4 endpoint 90d.178d.209d.130d of a 6to4 IPv6 address. - -This patch fixes it. - -Signed-off-by: Petr Písař ---- - whois.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/whois.c b/whois.c -index 8f5f1f1..abbcd98 100644 ---- a/whois.c -+++ b/whois.c -@@ -1279,7 +1279,7 @@ char *convert_6to4(const char *s) - } - - new = malloc(sizeof("255.255.255.255")); -- sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); -+ sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff); - #endif - - return new; -@@ -1309,7 +1309,7 @@ char *convert_teredo(const char *s) - a ^= 0xffff; - b ^= 0xffff; - new = malloc(sizeof("255.255.255.255")); -- sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); -+ sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff); - #endif - - return new; --- -2.7.4 - diff --git a/whois-5.2.15-Fix-misspellings-in-IPv4-formatting-string.patch b/whois-5.2.15-Fix-misspellings-in-IPv4-formatting-string.patch new file mode 100644 index 0000000..e8f9c0c --- /dev/null +++ b/whois-5.2.15-Fix-misspellings-in-IPv4-formatting-string.patch @@ -0,0 +1,46 @@ +From 28c4a1a6ef595f20a25f2c9815e405bf15df60b7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 27 Feb 2017 14:12:52 +0100 +Subject: [PATCH] Fix misspellings in IPv4 formatting string +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Querying 6to4 address failed on malformed IPv4 address: + +$ ./whois 2002:5ab2:d182::1 + +Querying for the IPv4 endpoint 90d.178d.209d.130d of a 6to4 IPv6 address. + +This patch fixes it. + +Signed-off-by: Petr Písař +--- + whois.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/whois.c b/whois.c +index 8f5f1f1..abbcd98 100644 +--- a/whois.c ++++ b/whois.c +@@ -1279,7 +1279,7 @@ char *convert_6to4(const char *s) + } + + new = malloc(sizeof("255.255.255.255")); +- sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); ++ sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff); + #endif + + return new; +@@ -1309,7 +1309,7 @@ char *convert_teredo(const char *s) + a ^= 0xffff; + b ^= 0xffff; + new = malloc(sizeof("255.255.255.255")); +- sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); ++ sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff); + #endif + + return new; +-- +2.7.4 + diff --git a/whois.spec b/whois.spec index eb62cee..b8e28d4 100644 --- a/whois.spec +++ b/whois.spec @@ -8,7 +8,7 @@ URL: http://www.linux.it/~md/software/ Source0: http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz # Fix translating 6to4 addresses to IPv4 gatway addresses # -Patch0: whois-5.12.15-Fix-misspellings-in-IPv4-formatting-string.patch +Patch0: whois-5.2.15-Fix-misspellings-in-IPv4-formatting-string.patch BuildRequires: coreutils BuildRequires: gcc BuildRequires: gettext @@ -80,7 +80,7 @@ fi %changelog * Mon Feb 27 2017 Petr Pisar - 5.2.15-1 -- 5.12.15 bump +- 5.2.15 bump * Sat Feb 11 2017 Fedora Release Engineering - 5.2.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild