Changeset 2267

Timestamp:

Dec 27, 2017, 9:30:51 PM (7 years ago)

Author:

tellie

Message:

whois: update vendor to version 5.2.20

Location:

whois/vendor/current

Files:

• Makefile (modified) (2 diffs)
• config.h (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• mkpasswd.c (modified) (2 diffs)
• tld_serv_list (modified) (13 diffs)
• version.h (modified) (1 diff)
• whois.c (modified) (8 diffs)

whois/vendor/current/Makefile ¶

@@ -3 +3 @@
 CFLAGS ?= -g -O2
 
-PERL = perl
-INSTALL = install
+PKG_CONFIG ?= pkg-config
+PERL ?= perl
+INSTALL ?= install
 
 whois_OBJECTS := whois.o utils.o
@@ -33 +34 @@
 endif
 
-ifeq ($(shell pkg-config --exists 'libidn2 >= 2.0.3' || echo NO),)
-whois_LDADD += $(shell pkg-config --libs libidn2)
-DEFS += -DHAVE_LIBIDN2 $(shell pkg-config --cflags libidn2)
-else ifeq ($(shell pkg-config --exists 'libidn' || echo NO),)
-whois_LDADD += $(shell pkg-config --libs libidn)
-DEFS += -DHAVE_LIBIDN $(shell pkg-config --cflags libidn)
+ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
+whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
+DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
+else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
+whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
+DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
 endif
 

whois/vendor/current/config.h ¶

@@ -61 +61 @@
 /* FIXME: which systems lack this? */
 #define HAVE_GETTIMEOFDAY
-/* FIXME: disabled because it does not parse addresses with a netmask length.
- * The code using it needs to be either fixed or removed.
-#define HAVE_INET_PTON
-*/
 
 /*

whois/vendor/current/debian/changelog ¶

@@ +1 @@
+whois (5.2.20) unstable; urgency=medium
+
+  * Added the .mr TLD server.
+  * Removed the .bs TLD server.
+  * Updated the .ai, .gh, .gr, .kw, .ls, .ph, .sb, .com.uy and .vn TLD
+    servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 27 Dec 2017 03:15:27 +0100
+
 whois (5.2.19) unstable; urgency=medium
 

whois/vendor/current/mkpasswd.c ¶

@@ -365 +365 @@
 void* get_random_bytes(const unsigned int count)
 {
-    char *buf;
-    int fd;
-    ssize_t bytes_read;
-
-    buf = NOFAIL(malloc(count));
+    char *buf = NOFAIL(malloc(count));
+
 #if defined HAVE_ARC4RANDOM_BUF
     arc4random_buf(buf, count);
@@ -376 +373 @@
         perror("getentropy");
 #else
+    int fd;
+    ssize_t bytes_read;
+
     fd = open(RANDOM_DEVICE, O_RDONLY);
     if (fd < 0) {

whois/vendor/current/tld_serv_list ¶

@@ -68 +68 @@
 .af     whois.nic.af
 .ag     whois.nic.ag
-.ai     whois.ai
-.al     NONE            # http://www.akep.al/en/kerkoni-domain
+.ai     whois.nic.ai
+.al     NONE            # https://www.akep.al/en/kerkoni-domain-2
 .am     whois.amnic.net
 .ao     NONE            # www.dns.ao
@@ -96 +96 @@
 #.bq
 .br     whois.registro.br
-.bs     WEB http://www.nic.bs/cgi-bin/search.pl
+.bs     NONE            # http://www.register.bs/
 .bt     WEB http://www.nic.bt/
 .bv     NONE            # http://www.norid.no/domenenavnbaser/bv-sj.html
@@ -120 +120 @@
 .cu     WEB http://www.nic.cu/
 .cv     WEB http://www.dns.cv/
-.cw     NONE            # http://www.una.cw/cw_registry/
+.cw     NONE            # http://www.uoc.cw/ictssite/index.php/domreg/registering-a-cw-domain/register
 .cx     whois.nic.cx
 .cy     WEB http://www.nic.cy/nslookup/online_database.php
@@ -150 +150 @@
 .gf     whois.mediaserv.net
 .gg     whois.gg
-.gh     WEB http://www.nic.gh/customer/search_c.htm
+.gh     whois.nic.gh
 .gi     whois2.afilias-grs.net
 .gl     whois.nic.gl
@@ -157 +157 @@
 .gp     WEB https://www.dom-enic.com/whois.html
 .gq     whois.dominio.gq
-.gr     WEB https://grweb.ics.forth.gr/public/whois.jsp?lang=en
+.gr     WEB https://grweb.ics.forth.gr/public/whois
 .gs     whois.nic.gs
 .gt     WEB http://www.gt/
@@ -185 +185 @@
 .ke     whois.kenic.or.ke
 .kg     whois.kg
-.kh     NONE            # http://www.trc.gov.kh/index.php/en/newsCategory/view?id=42&detail_id=68
+.kh     NONE            # https://www.trc.gov.kh/en/offline-services/dns-registration/
 .ki     whois.nic.ki
 .km     NONE            # www.domaine.km
@@ -191 +191 @@
 .kp     NONE            # NIC? http://www.star.co.kp/
 .kr     whois.kr
-.kw     WEB http://www.kw/
+.kw     whois.nic.kw
 .ky     whois.kyregistry.ky
 .kz     whois.nic.kz
@@ -200 +200 @@
 .lk     whois.nic.lk
 .lr     NONE            # http://www.psg.com/dns/lr/
-.ls     WEB http://www.co.ls/co.asp
+.ls     WEB http://www.nic.ls/
 .lt     whois.domreg.lt
 .lu     whois.dns.lu
@@ -219 +219 @@
 .mp     NONE            # get.mp
 .mq     whois.mediaserv.net
-.mr     NONE            # www.nic.mr
+.mr     whois.nic.mr
 .ms     whois.nic.ms
 .mt     WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted
@@ -247 +247 @@
 .edu.ph WEB http://services.ph.net/dns/query.pl
 .gov.ph NONE    # http://dns.gov.ph/
-.ph     WEB http://www.dot.ph/whois
+.ph     WEB https://whois.dot.ph/
 .pk     WEB http://www.pknic.net.pk/
 .co.pl  whois.co.pl     # "unofficial" SLD
@@ -266 +266 @@
 .rw     whois.ricta.org.rw      # http://www.ricta.org.rw/
 .sa     whois.nic.net.sa
-.sb     whois.nic.sb
+.sb     whois.nic.net.sb
 .sc     whois2.afilias-grs.net          # www.nic.sc
 .sd     NONE            # http://wwe.domains.sd/
@@ -323 +323 @@
 .fed.us whois.nic.gov
 .us     whois.nic.us
-.com.uy WEB https://nic.anteldata.com.uy/dns/consultaWhois/whois.action
+.com.uy WEB https://nic.com.uy/public/consulta-whois/acceder.action
 .uy     whois.nic.org.uy
 .uz     whois.cctld.uz
@@ -331 +331 @@
 .vg     whois.nic.vg
 .vi     WEB https://secure.nic.vi/whois-lookup/
-.vn     WEB http://www.vnnic.vn/en/domain
+.vn     WEB http://www.vnnic.vn/en
 .vu     vunic.vu
 .wf     whois.nic.wf

whois/vendor/current/version.h ¶

@@ -1 @@
-#define VERSION "5.2.19"
+#define VERSION "5.2.20"

whois/vendor/current/whois.c ¶

@@ -36 +36 @@
 #elif defined HAVE_LIBIDN
 #include <idna.h>
-#endif
-#ifdef HAVE_INET_PTON
-#include <arpa/inet.h>
 #endif
 
@@ -542 +539 @@
 
     /* smells like an IP? */
-#ifdef HAVE_INET_PTON
-    if (inet_pton(AF_INET, s, &ip) > 0) {
-        ip = ntohl(ip);
-#else
     if ((ip = myinet_aton(s))) {
-#endif
         for (i = 0; ip_assign[i].serv; i++)
             if ((ip & ip_assign[i].mask) == ip_assign[i].net)
@@ -1261 +1253 @@
 {
     char *new;
-
-#ifdef HAVE_INET_PTON
-    struct in6_addr ipaddr;
-    unsigned char *ip;
-
-    if (inet_pton(AF_INET6, s, &ipaddr) <= 0)
-        return strdup("0.0.0.0");
-
-    ip = (unsigned char *)&ipaddr;
-    new = malloc(sizeof("255.255.255.255"));
-    sprintf(new, "%d.%d.%d.%d", *(ip + 2), *(ip + 3), *(ip + 4), *(ip + 5));
-#else
     int items;
     unsigned int a, b;
@@ -1291 +1271 @@
     new = malloc(sizeof("255.255.255.255"));
     sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);
-#endif
 
     return new;
@@ -1299 +1278 @@
 {
     char *new;
-
-#ifdef HAVE_INET_PTON
-    struct in6_addr ipaddr;
-    unsigned char *ip;
-
-    if (inet_pton(AF_INET6, s, &ipaddr) <= 0)
-        return strdup("0.0.0.0");
-
-    ip = (unsigned char *)&ipaddr;
-    new = malloc(sizeof("255.255.255.255"));
-    sprintf(new, "%d.%d.%d.%d", *(ip + 12) ^ 0xff, *(ip + 13) ^ 0xff,
-            *(ip + 14) ^ 0xff, *(ip + 15) ^ 0xff);
-#else
     unsigned int a, b;
 
@@ -1321 +1287 @@
     new = malloc(sizeof("255.255.255.255"));
     sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);
-#endif
 
     return new;
@@ -1362 +1327 @@
 }
 
-#ifndef HAVE_INET_PTON
 unsigned long myinet_aton(const char *s)
 {
@@ -1378 +1342 @@
     return (a << 24) + (b << 16) + (c << 8) + d;
 }
-#endif
 
 unsigned long asn32_to_long(const char *s)