From 46843acafaf71b17c70fb47fb4743981dca2ed3d50ddb71c72518ec959d7c282 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 27 Feb 2017 08:28:55 +0000 Subject: [PATCH] Accepting request 460652 from home:AndreasStieger:branches:network:utilities whois 5.2.15 OBS-URL: https://build.opensuse.org/request/show/460652 OBS-URL: https://build.opensuse.org/package/show/network:utilities/whois?expand=0&rev=75 --- whois-5.2.14-IDNA2008.patch | 131 ------------------------------------ whois.asc | 30 ++++----- whois.changes | 11 +++ whois.spec | 4 +- whois_5.2.14.tar.xz | 3 - whois_5.2.15.tar.xz | 3 + 6 files changed, 30 insertions(+), 152 deletions(-) delete mode 100644 whois-5.2.14-IDNA2008.patch delete mode 100644 whois_5.2.14.tar.xz create mode 100644 whois_5.2.15.tar.xz diff --git a/whois-5.2.14-IDNA2008.patch b/whois-5.2.14-IDNA2008.patch deleted file mode 100644 index a5c1e3b..0000000 --- a/whois-5.2.14-IDNA2008.patch +++ /dev/null @@ -1,131 +0,0 @@ -From b998d78f17088d891b822344ebdc8b5266e7a5e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Thu, 19 Jan 2017 16:56:43 +0100 -Subject: [PATCH] Add code for libidn2 (IDNA 2008 + TR46 non-transitional) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Set HAVE_LIBIDN2 instead of HAVE_LIBIDN for IDNA2008/TR46. -With IDNA2003, german sharp s will be stranslated into ss. -Thus straße.de and strasse.de will result in the same whois lookup. -TR46 preprocessing also takes care for a few other things, like -decomposed Unicode characters. ---- - Makefile | 5 +++++ - whois.c | 36 ++++++++++++++++++++++++++++-------- - 2 files changed, 33 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 2634a9a..79aa922 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,10 +32,15 @@ ifdef LOCALEDIR - DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" - endif - -+ifdef HAVE_LIBIDN2 -+whois_LDADD += -lidn2 -+DEFS += -DHAVE_LIBIDN2 -+else - ifdef HAVE_LIBIDN - whois_LDADD += -lidn - DEFS += -DHAVE_LIBIDN - endif -+endif - - ifdef HAVE_ICONV - whois_OBJECTS += simple_recode.o -diff --git a/whois.c b/whois.c -index 7c987ae..711a7d5 100644 ---- a/whois.c -+++ b/whois.c -@@ -31,7 +31,9 @@ - #ifdef HAVE_REGEXEC - #include - #endif --#ifdef HAVE_LIBIDN -+#ifdef HAVE_LIBIDN2 -+#include -+#elif defined HAVE_LIBIDN - #include - #endif - #ifdef HAVE_INET_PTON -@@ -653,7 +655,7 @@ char *queryformat(const char *server, const char *flags, const char *query) - simple_recode_input_charset = "utf-8"; /* then try UTF-8 */ - #endif - --#ifdef HAVE_LIBIDN -+#if defined HAVE_LIBIDN || defined HAVE_LIBIDN2 - # define DENIC_PARAM_ACE ",ace" - #else - # define DENIC_PARAM_ACE "" -@@ -939,9 +941,8 @@ int openconn(const char *server, const char *port) - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; --#ifdef HAVE_LIBIDN -- hints.ai_flags |= AI_IDN; --#endif -+ -+ server = normalize_domain(server); - - if ((err = getaddrinfo(server, port ? port : "nicname", &hints, &res)) - != 0) { -@@ -1145,7 +1146,7 @@ const char *is_new_gtld(const char *s) - char *normalize_domain(const char *dom) - { - char *p, *ret; --#ifdef HAVE_LIBIDN -+#if defined HAVE_LIBIDN || defined HAVE_LIBIDN2 - char *domain_start = NULL; - #endif - -@@ -1160,7 +1161,7 @@ char *normalize_domain(const char *dom) - p--; - } - --#ifdef HAVE_LIBIDN -+#if defined HAVE_LIBIDN || defined HAVE_LIBIDN2 - /* find the start of the last word if there are spaces in the query */ - for (p = ret; *p; p++) - if (*p == ' ') -@@ -1170,9 +1171,18 @@ char *normalize_domain(const char *dom) - char *q, *r; - int prefix_len; - -+#ifdef HAVE_LIBIDN2 -+#if IDN2_VERSION_NUMBER >= 0x00140000 -+ if (idn2_lookup_ul(domain_start, &q, IDN2_NONTRANSITIONAL) != IDN2_OK) -+ return ret; -+#else -+ if (idn2_lookup_ul(domain_start, &q, IDN2_NFC_INPUT) != IDN2_OK) -+ return ret; -+#endif -+#else - if (idna_to_ascii_lz(domain_start, &q, 0) != IDNA_SUCCESS) - return ret; -- -+#endif - /* reassemble the original query in a new buffer */ - prefix_len = domain_start - ret; - r = malloc(prefix_len + strlen(q) + 1); -@@ -1186,8 +1196,18 @@ char *normalize_domain(const char *dom) - } else { - char *q; - -+#ifdef HAVE_LIBIDN2 -+#if IDN2_VERSION_NUMBER >= 0x00140000 -+ if (idn2_lookup_ul(ret, &q, IDN2_NONTRANSITIONAL) != IDN2_OK) -+ return ret; -+#else -+ if (idn2_lookup_ul(ret, &q, IDN2_NFC_INPUT) != IDN2_OK) -+ return ret; -+#endif -+#else - if (idna_to_ascii_lz(ret, &q, 0) != IDNA_SUCCESS) - return ret; -+#endif - - free(ret); - return q; diff --git a/whois.asc b/whois.asc index be3fb7c..17d586d 100644 --- a/whois.asc +++ b/whois.asc @@ -5,7 +5,7 @@ Format: 3.0 (native) Source: whois Binary: whois Architecture: any -Version: 5.2.14 +Version: 5.2.15 Maintainer: Marco d'Itri Standards-Version: 3.9.8 Vcs-Browser: https://github.com/rfc1036/whois @@ -14,23 +14,23 @@ Build-Depends: debhelper (>= 5), gettext, libidn11-dev Package-List: whois deb net standard arch=any Checksums-Sha1: - 80d92c1e8f8ac94efcf7a1076c53b5866604d7d6 81888 whois_5.2.14.tar.xz + ff38902176a59fd09c78edc2cc7ad46d0ea945ef 82048 whois_5.2.15.tar.xz Checksums-Sha256: - a41daf41abed0fbfa8c9c4b0e4a3f5f22d9876dd6feb9091aac12f8f4c38b0d2 81888 whois_5.2.14.tar.xz + 7a5a6b690bfc6360d92d9328adbe5c1f096a41f0d6548ce0df4aa664dcb37188 82048 whois_5.2.15.tar.xz Files: - f5fb84dca2225162a1af2824c0143943 81888 whois_5.2.14.tar.xz + ef99ddbb9105106aa72f7485960d8a10 82048 whois_5.2.15.tar.xz -----BEGIN PGP SIGNATURE----- -iQGzBAEBCAAdFiEEGBsIcS5ipP0URKfyK/WlwSLE96QFAlhlitIACgkQK/WlwSLE -96Te0wwAoMY3leSCLyQb272bMDFwyhQFTPCs2UeGqIRzjjio5slbb/jWoDNE1lHJ -mAH+HWS0bMTDZlcyr+HvW46MlUpv63i/DXccnJyfRaLB7ub0poTF96C5AOrJkJRg -8PamaZBdj35RlyDrSt/6Eg5X5EITUTvW2eJ/vWnLR2TzKPzzgM2Ixj6zf8TYv5pd -PGiimo+ADBmZee2Grf1yAxn7YHISS2qxhykSNNSwSQQRCgXMGA0HrD522tlR2v33 -exFDQzA8qGhn+bF7b57m8w75QU6ZHz72kK1TCCDFlIzNTqFyk2eLApBe/Z3Nb4W/ -zN5D2eDDPiFEiYaWRnGZK0PkW2liai/PKnsH2668IF05DmgtDrmPkxmN4NxBBwJ1 -v8LVzaIwBHcAPcj7GHXwhMC/6aFXp05GI61GCjiN81tdg5boEKLMWjvzHu8ZxAbD -kFVGa8c8BnQ0SOLM16R4Z3KgfDwVpfZOHyHvPgEKt4o4VD94cGVESRdw4gkotMrW -TxvaAV0p -=1jj8 +iQGzBAEBCAAdFiEEGBsIcS5ipP0URKfyK/WlwSLE96QFAlizbdIACgkQK/WlwSLE +96TQYQwAnaFSlIZXBUsxuMz+oI5A0rdCncNkGNWalSS74CdXXBtKoyixRbC0D8sK +9bjxC+8Jgzuu7o2bMbbHPTViK7b74+Shh8fv2kUAYs7rhdb4Cwm1YyilYbIqtc+3 +PH3aMeO/9uli65icSWtEwCSklO5xVW+bWD178xXZS3wfjkGKb+b6L/bTVuJS3/uf +WKDsQHYnCconuReCad0yO1Tobe9TR6dhI8c/mn8eC2xsn3FyIYA0z1XdOzN8wnSf +s7zB5+2gQxjdHTdGrstGPSXr7y62pF4DOz9qCNshGgnFKDfdjiqsEDgFaxPIZajQ +tsfiLUNOSP3hEmoi99VSe7QIqQXL1x2sKbgF//2aLPpqgC5wPyq/Eh6DFahHRSUn +X13FQRqAMLSxLtWKyVXAq73YwRpi8I1AIuYu6DxFA5voxaijtarf1Pjaq4zX/yGL +UgzKkOehl/FY4gZ4h9P+bsAftHnQyjUDws0b6X1zFJrYJSauNI6Q6PXyjy3sVYOc +Cqcmsg+0 +=9RBC -----END PGP SIGNATURE----- diff --git a/whois.changes b/whois.changes index 91321fb..93bb250 100644 --- a/whois.changes +++ b/whois.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Feb 27 08:26:27 UTC 2017 - astieger@suse.com + +- whois 5.2.15: + * Update the .gf and .mq TLD servers + * Update the list of new gTLDs + * Update the charset for whois.nic.kz + * Fix minor compiler warnings with no practical effects + * Support for libidn2 is upstream - FATE#321897 + remove whois-5.2.14-IDNA2008.patch + ------------------------------------------------------------------- Mon Feb 6 21:49:09 UTC 2017 - astieger@suse.com diff --git a/whois.spec b/whois.spec index bb5125a..5120735 100644 --- a/whois.spec +++ b/whois.spec @@ -17,7 +17,7 @@ Name: whois -Version: 5.2.14 +Version: 5.2.15 Release: 0 Summary: Intelligent WHOIS client License: GPL-2.0+ @@ -30,7 +30,6 @@ Source2: %{name}.keyring # rename .dsc to not build the package in OBS Source3: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.dsc#/%{name}.asc Patch0: whois-nobsdsource.patch -Patch1: whois-5.2.14-IDNA2008.patch BuildRequires: libidn2-devel BuildRequires: xz Provides: ripe-whois-tools @@ -64,7 +63,6 @@ echo "`grep -A1 "Checksums-Sha256" %{SOURCE3} | grep %{name}_%{version}.tar.xz | %setup -q %patch0 -p1 -%patch1 -p1 %build make all mkpasswd HAVE_LIBIDN2=1 HAVE_ICONV=1 %{?_smp_mflags} \ diff --git a/whois_5.2.14.tar.xz b/whois_5.2.14.tar.xz deleted file mode 100644 index 3df3068..0000000 --- a/whois_5.2.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a41daf41abed0fbfa8c9c4b0e4a3f5f22d9876dd6feb9091aac12f8f4c38b0d2 -size 81888 diff --git a/whois_5.2.15.tar.xz b/whois_5.2.15.tar.xz new file mode 100644 index 0000000..afcc63d --- /dev/null +++ b/whois_5.2.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a5a6b690bfc6360d92d9328adbe5c1f096a41f0d6548ce0df4aa664dcb37188 +size 82048