5.2.16 bump
This commit is contained in:
parent
b51b184abc
commit
337ef08039
1
.gitignore
vendored
1
.gitignore
vendored
@ -35,3 +35,4 @@
|
||||
/whois_5.2.13.tar.xz
|
||||
/whois_5.2.14.tar.xz
|
||||
/whois_5.2.15.tar.xz
|
||||
/whois_5.2.16.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (whois_5.2.15.tar.xz) = b84aaa19ed12e2c3fd1d90095054b45619158e33d12e818980afb460aa3d6272363c7ad31012a6bf048e56066d31f886587e9cd1de9dc0e31ab4b6266d8b5054
|
||||
SHA512 (whois_5.2.16.tar.xz) = 08e75edbdab2c094150b92570e04de0fc10d42a18643e404262bef4366338bd67a4f23cef248660a4c2a435825cf5ebcc396c71d5702905ca97746686a5c8f06
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 28c4a1a6ef595f20a25f2c9815e405bf15df60b7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
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ř <ppisar@redhat.com>
|
||||
---
|
||||
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
|
||||
|
||||
13
whois.spec
13
whois.spec
@ -4,19 +4,16 @@
|
||||
%{bcond_without whois_enables_libidn2}
|
||||
|
||||
Name: whois
|
||||
Version: 5.2.15
|
||||
Release: 2%{?dist}
|
||||
Version: 5.2.16
|
||||
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 translating 6to4 addresses to IPv4 gatway addresses
|
||||
# <https://github.com/rfc1036/whois/pull/51>, in upstream after 5.2.15
|
||||
Patch0: whois-5.2.15-Fix-misspellings-in-IPv4-formatting-string.patch
|
||||
# Do not pass non-domains to libidn2,
|
||||
# <https://github.com/rfc1036/whois/issues/50>,
|
||||
# <https://github.com/rfc1036/whois/pull/53>
|
||||
Patch1: whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch
|
||||
Patch0: whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
@ -50,7 +47,6 @@ addresses and network names.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# libidn2 support is broken <https://github.com/rfc1036/whois/issues/50>
|
||||
@ -102,6 +98,9 @@ fi
|
||||
%{_mandir}/man5/%{cfgfile}.5.gz
|
||||
|
||||
%changelog
|
||||
* Tue Jun 13 2017 Petr Pisar <ppisar@redhat.com> - 5.2.16-1
|
||||
- 5.2.16 bump
|
||||
|
||||
* Wed Apr 26 2017 Petr Pisar <ppisar@redhat.com> - 5.2.15-2
|
||||
- Use libidn2 instead of libidn
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user