Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at 2017-03-02 19:37:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/whois (Old) and /work/SRC/openSUSE:Factory/.whois.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whois" Thu Mar 2 19:37:12 2017 rev:60 rq:460663 version:5.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/whois/whois.changes 2017-02-08 11:04:32.357812519 +0100 +++ /work/SRC/openSUSE:Factory/.whois.new/whois.changes 2017-03-02 19:37:13.308601880 +0100 @@ -1,0 +2,12 @@ +Mon Feb 27 10:00:11 UTC 2017 - astie...@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 + But disable to fix bsc#1026831 + +------------------------------------------------------------------- Old: ---- whois-5.2.14-IDNA2008.patch whois_5.2.14.tar.xz New: ---- whois_5.2.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.c7A8gE/_old 2017-03-02 19:37:14.068494349 +0100 +++ /var/tmp/diff_new_pack.c7A8gE/_new 2017-03-02 19:37:14.072493783 +0100 @@ -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,8 +30,7 @@ # 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: libidn-devel BuildRequires: xz Provides: ripe-whois-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,10 +63,9 @@ %setup -q %patch0 -p1 -%patch1 -p1 %build -make all mkpasswd HAVE_LIBIDN2=1 HAVE_ICONV=1 %{?_smp_mflags} \ +make all mkpasswd HAVE_LIBIDN=1 HAVE_ICONV=1 %{?_smp_mflags} \ %if 0%{?suse_version} <= 1140 HAVE_XCRYPT=1 \ %else ++++++ whois.asc ++++++ --- /var/tmp/diff_new_pack.c7A8gE/_old 2017-03-02 19:37:14.120486991 +0100 +++ /var/tmp/diff_new_pack.c7A8gE/_new 2017-03-02 19:37:14.124486425 +0100 @@ -5,7 +5,7 @@ Source: whois Binary: whois Architecture: any -Version: 5.2.14 +Version: 5.2.15 Maintainer: Marco d'Itri <m...@linux.it> Standards-Version: 3.9.8 Vcs-Browser: https://github.com/rfc1036/whois @@ -14,23 +14,23 @@ 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----- ++++++ whois_5.2.14.tar.xz -> whois_5.2.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/Makefile new/whois-5.2.15/Makefile --- old/whois-5.2.14/Makefile 2016-03-29 05:37:17.000000000 +0200 +++ new/whois-5.2.15/Makefile 2017-02-27 00:37:41.000000000 +0100 @@ -15,7 +15,7 @@ # FreeBSD #whois_LDADD += -liconv #LIBS += -L/usr/local/lib -lintl -#INCLUDES += -I/usr/local/include +#DEFS += -I/usr/local/include # OS/2 EMX #whois_LDADD += -lsocket @@ -32,10 +32,15 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/config.h new/whois-5.2.15/config.h --- old/whois-5.2.14/config.h 2015-01-09 03:49:00.000000000 +0100 +++ new/whois-5.2.15/config.h 2017-02-27 00:37:41.000000000 +0100 @@ -13,6 +13,10 @@ /* autoconf in cpp macros */ +#if defined __NetBSD__ || __OpenBSD__ +# include <sys/param.h> +#endif + #ifdef linux # define ENABLE_NLS #endif @@ -85,7 +89,7 @@ #if (defined __FreeBSD__ && __FreeBSD__ >= 9) || \ (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || \ (defined OpenBSD && OpenBSD >= 200805) || \ - (defined __APPLE__ && defined __MACH__) + (defined __APPLE__ && defined __MACH__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) # define HAVE_ARC4RANDOM_BUF # undef RANDOM_DEVICE #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/debian/changelog new/whois-5.2.15/debian/changelog --- old/whois-5.2.14/debian/changelog 2016-12-29 23:12:19.000000000 +0100 +++ new/whois-5.2.15/debian/changelog 2017-02-27 00:37:41.000000000 +0100 @@ -1,3 +1,14 @@ +whois (5.2.15) unstable; urgency=medium + + * Updated the .gf and .mq TLD servers. + * Updated the list of new gTLDs. + * Updated the charset for whois.nic.kz. + * Fixed multiple portability issues on non-Linux platforms. + * Fixed a lot of minor compiler warnings with no practical effects. + * Added support for libidn2, not enabled yet. + + -- Marco d'Itri <m...@linux.it> Mon, 27 Feb 2017 00:37:41 +0100 + whois (5.2.14) unstable; urgency=medium * Updated the .ar, .bm and .fm TLD servers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/mkpasswd.c new/whois-5.2.15/mkpasswd.c --- old/whois-5.2.14/mkpasswd.c 2016-03-29 05:37:17.000000000 +0200 +++ new/whois-5.2.15/mkpasswd.c 2017-02-27 00:37:41.000000000 +0100 @@ -32,6 +32,7 @@ #endif #include <fcntl.h> #include <string.h> +#include <strings.h> #include <time.h> #include <sys/types.h> #ifdef HAVE_XCRYPT @@ -123,7 +124,7 @@ void generate_salt(char *const buf, const unsigned int len); void *get_random_bytes(const unsigned int len); -void display_help(int error); +void NORETURN display_help(int error); void display_version(void); void display_methods(void); @@ -150,7 +151,7 @@ /* prepend options from environment */ argv = merge_args(getenv("MKPASSWD_OPTIONS"), argv, &argc); - while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:5P:R:sS:V", longopts, 0)) + while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:5P:R:sS:V", longopts, NULL)) > 0) { switch (ch) { case '5': @@ -363,7 +364,8 @@ void* get_random_bytes(const unsigned int count) { char *buf; - int fd, bytes_read; + int fd; + ssize_t bytes_read; buf = NOFAIL(malloc(count)); fd = open(RANDOM_DEVICE, O_RDONLY); @@ -394,7 +396,7 @@ unsigned char *entropy; #if defined HAVE_ARC4RANDOM_BUF - void *entropy = NOFAIL(malloc(len)); + entropy = NOFAIL(malloc(len)); arc4random_buf(entropy, len); #else entropy = get_random_bytes(len); @@ -436,7 +438,7 @@ #endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */ -void display_help(int error) +void NORETURN display_help(int error) { fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/new_gtlds_list new/whois-5.2.15/new_gtlds_list --- old/whois-5.2.14/new_gtlds_list 2016-12-29 23:11:41.000000000 +0100 +++ new/whois-5.2.15/new_gtlds_list 2017-02-27 00:37:41.000000000 +0100 @@ -28,6 +28,7 @@ aetna afamilycompany afl +africa agakhan agency aig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/servers_charset_list new/whois-5.2.15/servers_charset_list --- old/whois-5.2.14/servers_charset_list 2016-12-29 22:29:49.000000000 +0100 +++ new/whois-5.2.15/servers_charset_list 2017-02-27 00:37:41.000000000 +0100 @@ -36,9 +36,7 @@ whois.domain.kg cp1251 whois.nic.or.kr utf-8 whois.kr utf-8 -# XXX I had to guess: the server is unable to fully transcode U+49b in the -# answer for xn--e1aybc.xn--80ao21a. Maybe it is cp1251 instead? -whois.nic.kz rk1048 +whois.nic.kz utf-8 whois.nic.li utf-8 whois.domreg.lt utf-8 whois.dns.lu iso-8859-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/tld_serv_list new/whois-5.2.15/tld_serv_list --- old/whois-5.2.14/tld_serv_list 2016-12-29 23:11:41.000000000 +0100 +++ new/whois-5.2.15/tld_serv_list 2017-02-27 00:37:41.000000000 +0100 @@ -147,7 +147,7 @@ .gb NONE .gd whois.nic.gd .ge WEB http://www.registration.ge/ -.gf WEB https://www.dom-enic.com/whois.html +.gf whois.mediaserv.net .gg whois.gg .gh WEB http://www.nic.gh/customer/search_c.htm .gi whois2.afilias-grs.net @@ -217,7 +217,7 @@ .mn whois.nic.mn .mo WEB http://www.monic.mo/ # whois.monic.mo is restricted .mp NONE # get.mp -.mq WEB https://www.dom-enic.com/whois.html +.mq whois.mediaserv.net .mr NONE # www.nic.mr .ms whois.nic.ms .mt WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted @@ -375,6 +375,7 @@ .xn--mgb9awbf whois.registry.om # Oman .xn--mgba3a4f16a whois.nic.ir # Iran .xn--mgbaam7a8h whois.aeda.net.ae # United Arab Emirates +.xn--mgbai9azgqp6j NONE # Pakistan .xn--mgbayh7gpa WEB http://idn.jo/whois_a.aspx # Jordan .xn--mgbbh1a71e whois.inregistry.net # India, Urdu AW .xn--mgbc0a9azcg NONE # Morocco diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/utils.c new/whois-5.2.15/utils.c --- old/whois-5.2.14/utils.c 2013-03-30 02:31:41.000000000 +0100 +++ new/whois-5.2.15/utils.c 2017-02-27 00:37:41.000000000 +0100 @@ -46,7 +46,8 @@ { char *arg, *argstring; char **newargs = NULL; - unsigned int i, num_env = 0; + int i; + unsigned int num_env = 0; if (!args) return argv; @@ -72,7 +73,7 @@ } /* Error routines */ -void err_sys(const char *fmt, ...) +void NORETURN err_sys(const char *fmt, ...) { va_list ap; @@ -83,7 +84,7 @@ exit(2); } -void err_quit(const char *fmt, ...) +void NORETURN err_quit(const char *fmt, ...) { va_list ap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/utils.h new/whois-5.2.15/utils.h --- old/whois-5.2.14/utils.h 2016-03-29 05:37:17.000000000 +0200 +++ new/whois-5.2.15/utils.h 2017-02-27 00:37:41.000000000 +0100 @@ -49,12 +49,15 @@ # define ngettext(a, b, c) ((c==1) ? (a) : (b)) #endif +#if defined IDN2_VERSION_NUMBER && IDN2_VERSION_NUMBER < 0x00140000 +# define IDN2_NONTRANSITIONAL IDN2_NFC_INPUT +#endif /* Prototypes */ void *do_nofail(void *ptr, const char *file, const int line); char **merge_args(char *args, char *argv[], int *argc); -void err_quit(const char *fmt, ...) NORETURN; -void err_sys(const char *fmt, ...) NORETURN; +void NORETURN err_quit(const char *fmt, ...); +void NORETURN err_sys(const char *fmt, ...); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/version.h new/whois-5.2.15/version.h --- old/whois-5.2.14/version.h 2016-10-30 18:50:07.000000000 +0100 +++ new/whois-5.2.15/version.h 2017-02-27 00:37:41.000000000 +0100 @@ -1 +1 @@ -#define VERSION "5.2.13" +#define VERSION "5.2.15" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/whois.c new/whois-5.2.15/whois.c --- old/whois-5.2.14/whois.c 2016-10-30 18:49:57.000000000 +0100 +++ new/whois-5.2.15/whois.c 2017-02-27 00:37:41.000000000 +0100 @@ -31,7 +31,9 @@ #ifdef HAVE_REGEXEC #include <regex.h> #endif -#ifdef HAVE_LIBIDN +#ifdef HAVE_LIBIDN2 +#include <idn2.h> +#elif defined HAVE_LIBIDN #include <idna.h> #endif #ifdef HAVE_INET_PTON @@ -126,7 +128,8 @@ int longindex; #endif - int ch, nopar = 0, fstringlen = 64; + int ch, nopar = 0; + size_t fstringlen = 64; const char *server = NULL, *port = NULL; char *qstring, *fstring; int ret; @@ -653,7 +656,7 @@ 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 +942,7 @@ hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_ADDRCONFIG; -#ifdef HAVE_LIBIDN hints.ai_flags |= AI_IDN; -#endif if ((err = getaddrinfo(server, port ? port : "nicname", &hints, &res)) != 0) { @@ -1050,13 +1051,13 @@ return 0; } -void alarm_handler(int signum) +void NORETURN alarm_handler(int signum) { close(sockfd); err_quit(_("Timeout.")); } -void sighandler(int signum) +void NORETURN sighandler(int signum) { close(sockfd); err_quit(_("Interrupted by signal %d..."), signum); @@ -1133,7 +1134,7 @@ if (in_domain(s, new_gtlds[i])) return new_gtlds[i]; - return 0; + return NULL; } /* @@ -1145,7 +1146,7 @@ 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 @@ 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,8 +1171,13 @@ char *q, *r; int prefix_len; +#ifdef HAVE_LIBIDN2 + if (idn2_lookup_ul(domain_start, &q, IDN2_NONTRANSITIONAL) != IDN2_OK) + return ret; +#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; @@ -1186,8 +1192,13 @@ } else { char *q; +#ifdef HAVE_LIBIDN2 + if (idn2_lookup_ul(ret, &q, IDN2_NONTRANSITIONAL) != IDN2_OK) + return ret; +#else if (idna_to_ascii_lz(ret, &q, 0) != IDNA_SUCCESS) return ret; +#endif free(ret); return q; @@ -1232,7 +1243,7 @@ } /* change the server name to lower case */ - for (p = (char *) *server; *p && *p != '\0'; p++) + for (p = (char *) *server; *p; p++) *p = tolower(*p); } @@ -1268,7 +1279,7 @@ } new = malloc(sizeof("255.255.255.255")); - sprintf(new, "%d.%d.%d.%d", a >> 8, a & 0xff, b >> 8, b & 0xff); + sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); #endif return new; @@ -1298,7 +1309,7 @@ a ^= 0xffff; b ^= 0xffff; new = malloc(sizeof("255.255.255.255")); - sprintf(new, "%d.%d.%d.%d", a >> 8, a & 0xff, b >> 8, b & 0xff); + sprintf(new, "%ud.%ud.%ud.%ud", a >> 8, a & 0xff, b >> 8, b & 0xff); #endif return new; @@ -1378,7 +1389,7 @@ /* http://www.ripe.net/ripe/docs/databaseref-manual.html */ -void usage(int error) +void NORETURN usage(int error) { fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _( "Usage: whois [OPTION]... OBJECT...\n\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.2.14/whois.h new/whois-5.2.15/whois.h --- old/whois-5.2.14/whois.h 2015-06-08 02:20:37.000000000 +0200 +++ new/whois-5.2.15/whois.h 2017-02-27 00:37:41.000000000 +0100 @@ -1,3 +1,5 @@ +#include "utils.h" + /* 6bone referto: extension */ #define REFERTO_FORMAT "%% referto: whois -h %255s -p %15s %1021[^\n\r]" @@ -21,9 +23,9 @@ char *query_afilias(const int, const char *); int openconn(const char *, const char *); int connect_with_timeout(int, const struct sockaddr *, socklen_t, int); -void usage(int error); -void alarm_handler(int); -void sighandler(int); +void NORETURN usage(int error); +void NORETURN alarm_handler(int); +void NORETURN sighandler(int); int japanese_locale(void); unsigned long myinet_aton(const char *); unsigned long asn32_to_long(const char *);
