Your message dated Fri, 26 Dec 2014 22:36:25 +0100 with message-id <20141226213623.GA23944@ugent.be> and subject line Re: unblock: whois/5.2.3 has caused the Debian Bug report #773995, regarding unblock: whois/5.2.3 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 773995: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773995 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: whois/5.2.3
- From: Marco d'Itri <md@linux.it>
- Date: Fri, 26 Dec 2014 20:48:27 +0100
- Message-id: <20141226194827.GA19043@bongo.bofh.it>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Only data changes, except for some code that is not compiled on Linux systems. https://github.com/rfc1036/whois unblock whois/5.2.2 diff -Nru whois-5.2.2/debian/changelog whois-5.2.3/debian/changelog --- whois-5.2.2/debian/changelog 2014-11-12 03:35:56.000000000 +0100 +++ whois-5.2.3/debian/changelog 2014-12-26 20:14:35.000000000 +0100 @@ -1,3 +1,17 @@ +whois (5.2.3) unstable; urgency=medium + + * Added the .gw TLD server. + * Updated the .bm, .gr, .gt, .md, .np, .py, .tc, .tg, .vi, .net.za, + .org.za and .web.za TLD servers. (Closes: #773489) + * Removed the .cg TLD server. + * Updated the list of new gTLDs. + * mkpasswd: use arc4random_buf(3) where available. + * mkpasswd: support OpenBSD's new hash 2b. + * Updated some IPv4 allocations. + * Remove the new_gtlds.h generated file from the Debian source package. + + -- Marco d'Itri <md@linux.it> Fri, 26 Dec 2014 20:12:24 +0100 + whois (5.2.2) unstable; urgency=medium * Fixed the code that removes trailing dots. (Closes: #763834) diff -Nru whois-5.2.2/ip_del_list whois-5.2.3/ip_del_list --- whois-5.2.2/ip_del_list 2014-08-02 03:31:54.000000000 +0200 +++ whois-5.2.3/ip_del_list 2014-12-26 19:56:21.000000000 +0100 @@ -19,6 +19,7 @@ 39.0.0.0/8 apnic 41.0.0.0/8 afrinic 42.0.0.0/8 apnic +43.224.0.0/11 apnic 43.0.0.0/8 whois.nic.ad.jp 46.0.0.0/8 ripe 49.0.0.0/8 apnic @@ -149,11 +150,6 @@ 196.0.0.0/7 afrinic 198.0.0.0/7 arin -200.17.0.0/16 whois.nic.br -200.18.0.0/15 whois.nic.br -200.20.0.0/16 whois.nic.br -200.96.0.0/13 whois.nic.br -200.128.0.0/9 whois.nic.br 200.0.0.0/7 lacnic 202.11.0.0/16 whois.nic.ad.jp 202.13.0.0/16 whois.nic.ad.jp diff -Nru whois-5.2.2/Makefile whois-5.2.3/Makefile --- whois-5.2.2/Makefile 2014-10-16 01:57:19.000000000 +0200 +++ whois-5.2.3/Makefile 2014-12-26 20:14:34.000000000 +0100 @@ -121,7 +121,7 @@ clean: rm -f Makefile.depend as_del.h as32_del.h ip_del.h ip6_del.h \ - tld_serv.h servers_charset.h *.o whois mkpasswd + new_gtlds.h tld_serv.h servers_charset.h *.o whois mkpasswd rm -f po/*.mo pos: diff -Nru whois-5.2.2/new_gtlds.h whois-5.2.3/new_gtlds.h --- whois-5.2.2/new_gtlds.h 2014-10-16 02:03:04.000000000 +0200 +++ whois-5.2.3/new_gtlds.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,430 +0,0 @@ - "abogado", - "academy", - "accountants", - "active", - "actor", - "agency", - "airforce", - "allfinanz", - "alsace", - "archi", - "army", - "associates", - "attorney", - "auction", - "audio", - "autos", - "axa", - "band", - "bar", - "bargains", - "bayern", - "beer", - "berlin", - "best", - "bid", - "bike", - "bio", - "black", - "blackfriday", - "blue", - "bmw", - "bnpparibas", - "boo", - "boutique", - "brussels", - "budapest", - "build", - "builders", - "business", - "buzz", - "bzh", - "cab", - "cal", - "camera", - "camp", - "cancerresearch", - "capetown", - "capital", - "caravan", - "cards", - "care", - "career", - "careers", - "casa", - "cash", - "catering", - "center", - "ceo", - "cern", - "channel", - "cheap", - "christmas", - "chrome", - "church", - "citic", - "city", - "claims", - "cleaning", - "click", - "clinic", - "clothing", - "club", - "codes", - "coffee", - "college", - "cologne", - "com", - "community", - "company", - "computer", - "condos", - "construction", - "consulting", - "contractors", - "cooking", - "cool", - "country", - "credit", - "creditcard", - "crs", - "cruises", - "cuisinella", - "cymru", - "dad", - "dance", - "dating", - "day", - "deals", - "degree", - "democrat", - "dental", - "dentist", - "desi", - "diamonds", - "diet", - "digital", - "direct", - "directory", - "discount", - "dnp", - "domains", - "durban", - "dvag", - "eat", - "education", - "email", - "engineer", - "engineering", - "enterprises", - "equipment", - "esq", - "estate", - "eus", - "events", - "exchange", - "expert", - "exposed", - "fail", - "farm", - "feedback", - "finance", - "financial", - "fish", - "fishing", - "fitness", - "flights", - "florist", - "flsmidth", - "fly", - "foo", - "forsale", - "foundation", - "frl", - "frogans", - "fund", - "furniture", - "futbol", - "gal", - "gallery", - "gbiz", - "gent", - "gift", - "gifts", - "gives", - "glass", - "gle", - "global", - "globo", - "gmail", - "gmo", - "gmx", - "google", - "gop", - "graphics", - "gratis", - "green", - "gripe", - "guide", - "guitars", - "guru", - "hamburg", - "haus", - "healthcare", - "help", - "here", - "hiphop", - "hiv", - "holdings", - "holiday", - "homes", - "horse", - "host", - "hosting", - "house", - "how", - "ibm", - "immo", - "immobilien", - "industries", - "info", - "ing", - "ink", - "institute", - "insure", - "international", - "investments", - "jetzt", - "joburg", - "juegos", - "kaufen", - "kim", - "kitchen", - "kiwi", - "koeln", - "krd", - "kred", - "lacaixa", - "land", - "lawyer", - "lease", - "lgbt", - "life", - "lighting", - "limited", - "limo", - "link", - "loans", - "london", - "lotto", - "ltda", - "luxe", - "luxury", - "maison", - "management", - "mango", - "market", - "marketing", - "media", - "meet", - "melbourne", - "meme", - "menu", - "miami", - "mini", - "moda", - "moe", - "monash", - "mortgage", - "moscow", - "motorcycles", - "mov", - "nagoya", - "navy", - "net", - "network", - "neustar", - "new", - "nexus", - "ngo", - "nhk", - "ninja", - "nra", - "nrw", - "nyc", - "okinawa", - "ong", - "onl", - "ooo", - "org", - "organic", - "otsuka", - "ovh", - "paris", - "partners", - "parts", - "pharmacy", - "photo", - "photography", - "photos", - "physio", - "pics", - "pictures", - "pink", - "pizza", - "place", - "plumbing", - "pohl", - "poker", - "praxi", - "press", - "prod", - "productions", - "prof", - "properties", - "property", - "pub", - "qpon", - "quebec", - "realtor", - "recipes", - "red", - "rehab", - "reise", - "reisen", - "ren", - "rentals", - "repair", - "report", - "republican", - "rest", - "restaurant", - "reviews", - "rich", - "rio", - "rip", - "rocks", - "rodeo", - "rsvp", - "ruhr", - "ryukyu", - "saarland", - "sarl", - "sca", - "scb", - "schmidt", - "schule", - "scot", - "services", - "sexy", - "shiksha", - "shoes", - "singles", - "social", - "software", - "sohu", - "solar", - "solutions", - "soy", - "space", - "spiegel", - "supplies", - "supply", - "support", - "surf", - "surgery", - "suzuki", - "systems", - "tatar", - "tattoo", - "tax", - "technology", - "tienda", - "tips", - "tirol", - "today", - "tokyo", - "tools", - "top", - "town", - "toys", - "trade", - "training", - "tui", - "university", - "uno", - "uol", - "vacations", - "vegas", - "ventures", - "versicherung", - "vet", - "viajes", - "villas", - "vision", - "vlaanderen", - "vodka", - "vote", - "voting", - "voto", - "voyage", - "wales", - "wang", - "watch", - "webcam", - "website", - "wed", - "wedding", - "whoswho", - "wien", - "wiki", - "williamhill", - "wme", - "work", - "works", - "world", - "wtc", - "wtf", - "xn--1qqw23a", - "xn--3bst00m", - "xn--3ds443g", - "xn--4gbrim", - "xn--55qw42g", - "xn--55qx5d", - "xn--6frz82g", - "xn--6qq986b3xl", - "xn--80adxhks", - "xn--80asehdb", - "xn--80aswg", - "xn--c1avg", - "xn--cg4bki", - "xn--czr694b", - "xn--czru2d", - "xn--d1acj3b", - "xn--fiq228c5hs", - "xn--fiq64b", - "xn--i1b6b1a6a2e", - "xn--io0a7i", - "xn--kput3i", - "xn--mgbab2bd", - "xn--ngbc5azd", - "xn--nqv7f", - "xn--nqv7fs00ema", - "xn--p1acf", - "xn--q9jyb4c", - "xn--rhqv96g", - "xn--ses554g", - "xn--unup4y", - "xn--vermgensberater-ctb", - "xn--vermgensberatung-pwb", - "xn--vhquv", - "xn--xhq521b", - "xn--zfr164b", - "xyz", - "yachts", - "yandex", - "yoga", - "yokohama", - "youtube", - "zip", - "zone", diff -Nru whois-5.2.2/new_gtlds_list whois-5.2.3/new_gtlds_list --- whois-5.2.2/new_gtlds_list 2014-11-12 03:35:56.000000000 +0100 +++ whois-5.2.3/new_gtlds_list 2014-12-26 19:56:21.000000000 +0100 @@ -9,10 +9,14 @@ accountants active actor +adult agency airforce allfinanz alsace +amsterdam +android +aquarelle archi army associates @@ -58,6 +62,7 @@ care career careers +cartier casa cash catering @@ -77,11 +82,11 @@ clinic clothing club +coach codes coffee college cologne -com community company computer @@ -94,6 +99,7 @@ country credit creditcard +cricket crs cruises cuisinella @@ -109,6 +115,7 @@ dental dentist desi +dev diamonds diet digital @@ -116,7 +123,9 @@ directory discount dnp +docs domains +doosan durban dvag eat @@ -130,21 +139,26 @@ equipment esq estate +eurovision eus events +everbank exchange expert exposed fail farm +fashion feedback finance financial +firmdale fish fishing fitness flights florist +flowers flsmidth fly foo @@ -157,8 +171,10 @@ futbol gal gallery +garden gbiz gent +ggee gift gifts gives @@ -197,13 +213,14 @@ immo immobilien industries -info ing ink institute insure international investments +irish +iwc jetzt joburg juegos @@ -216,9 +233,13 @@ kred lacaixa land +latrobe lawyer +lds lease +legal lgbt +lidl life lighting limited @@ -230,6 +251,7 @@ ltda luxe luxury +madrid maison management mango @@ -239,19 +261,21 @@ meet melbourne meme +memorial menu miami mini moda moe monash +money +mormon mortgage moscow motorcycles mov nagoya navy -net network neustar new @@ -266,13 +290,14 @@ ong onl ooo -org organic +osaka otsuka ovh paris partners parts +party pharmacy photo photography @@ -286,6 +311,7 @@ plumbing pohl poker +porn praxi press prod @@ -302,6 +328,7 @@ rehab reise reisen +reit ren rentals repair @@ -319,17 +346,23 @@ ruhr ryukyu saarland +sale +samsung sarl sca scb schmidt schule +schwarz +science scot services +sew sexy shiksha shoes singles +sky social software sohu @@ -353,6 +386,7 @@ technology tienda tips +tires tirol today tokyo @@ -362,6 +396,7 @@ toys trade training +trust tui university uno @@ -372,6 +407,7 @@ versicherung vet viajes +video villas vision vlaanderen @@ -400,6 +436,7 @@ xn--1qqw23a xn--3bst00m xn--3ds443g +xn--45q11c xn--4gbrim xn--55qw42g xn--55qx5d @@ -411,10 +448,13 @@ xn--c1avg xn--cg4bki xn--czr694b +xn--czrs0t xn--czru2d xn--d1acj3b xn--fiq228c5hs xn--fiq64b +xn--flw351e +xn--hxt814e xn--i1b6b1a6a2e xn--io0a7i xn--kput3i @@ -424,6 +464,7 @@ xn--nqv7fs00ema xn--p1acf xn--q9jyb4c +xn--qcka1pmc xn--rhqv96g xn--ses554g xn--unup4y @@ -440,3 +481,4 @@ youtube zip zone +zuerich diff -Nru whois-5.2.2/tld_serv_list whois-5.2.3/tld_serv_list --- whois-5.2.2/tld_serv_list 2014-11-12 03:35:56.000000000 +0100 +++ whois-5.2.3/tld_serv_list 2014-12-26 19:56:21.000000000 +0100 @@ -91,7 +91,7 @@ .bi whois1.nic.bi .bj whois.nic.bj #.bl -.bm WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO +.bm WEB http://www.bermudanic.bm/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO .bn whois.bn # www.brunet.bn .bo whois.nic.bo #.bq @@ -107,7 +107,7 @@ .cc VERISIGN ccwhois.verisign-grs.com .cd whois.nic.cd .cf whois.dot.cf -.cg WEB http://www.nic.cg/cgi-bin/whois.pl +.cg NONE .ch whois.nic.ch .ci whois.nic.ci .ck NONE @@ -157,11 +157,11 @@ .gn NONE # http://www.psg.com/dns/gn/ .gp WEB https://www.dom-enic.com/whois.html .gq whois.dominio.gq -.gr WEB https://grweb.ics.forth.gr/Whois?lang=en +.gr WEB https://grweb.ics.forth.gr/public/whois.jsp?lang=en .gs whois.nic.gs -.gt WEB http://www.gt/who_is.html +.gt WEB http://www.gt/ .gu WEB http://gadao.gov.gu/domainsearch.htm -.gw NONE # currently no registry +.gw WEB http://nic.gw/en/whois/ .gy whois.registry.gy .hk whois.hkirc.hk .hm whois.registry.hm @@ -185,7 +185,7 @@ .jp whois.jprs.jp .ke whois.kenic.or.ke .kg whois.domain.kg -.kh NONE # http://www.mptc.gov.kh/DomainNameRegistrationForm.aspx http://www.nic.net.kh/ +.kh NONE # http://www.trc.gov.kh/index.php/en/newsCategory/view?id=42&detail_id=68 .ki whois.nic.mu .km NONE # www.domaine.km .kn WEB http://www.nic.kn/ @@ -207,7 +207,7 @@ .ly whois.nic.ly .ma whois.iam.net.ma # www.nic.ma .mc NONE # www.nic.mc -.md WEB http://www.dns.md/wh1.php # whois.nic.md is restricted +.md whois.nic.md .me whois.nic.me # afilias #.mf .mg whois.nic.mg @@ -236,7 +236,7 @@ .ni WEB http://www.nic.ni/ .nl whois.domain-registry.nl .no whois.norid.no -.np WEB http://register.mos.com.np/userSearchInc.asp +.np WEB http://register.mos.com.np/np-whois-lookup .nr WEB http://www.cenpac.net.nr/dns/whois.html .nu whois.iis.nu .nz whois.srs.net.nz @@ -255,7 +255,7 @@ .ps whois.pnina.ps .pt whois.dns.pt .pw whois.nic.pw -.py WEB http://www.nic.py/consultas.html +.py WEB http://www.nic.py/consulta-datos.php .qa whois.registry.qa .re whois.nic.re .ro whois.rotld.ro @@ -285,10 +285,10 @@ .sx whois.sx .sy whois.tld.sy .sz NONE # http://www.sispa.org.sz/ -.tc whois.meridiantld.net +.tc whois.nic.tc .td WEB http://www.nic.td/ .tf whois.nic.tf -.tg WEB http://www.nic.tg/ +.tg whois.nic.tg .th whois.thnic.co.th .tj WEB http://www.nic.tj/whois.html .tk whois.dot.tk @@ -329,7 +329,7 @@ .vc AFILIAS .ve whois.nic.ve .vg whois.adamsnames.tc -.vi WEB http://www.nic.vi/whoisform.htm +.vi WEB https://secure.nic.vi/whois-lookup/ .vn WEB http://www.vnnic.vn/en/domain .vu vunic.vu .wf whois.nic.wf @@ -340,10 +340,10 @@ .alt.za whois.alt.za .co.za whois.registry.net.za .gov.za whois.gov.za -.net.za whois.net.za -.org.za WEB http://www.org.za/ # rwhois.org.za:4321 is restricted -.web.za whois.web.za -.za NONE # http://www.zadna.org.za/annexure-d.html +.net.za net-whois.registry.net.za +.org.za org-whois.registry.net.za +.web.za web-whois.registry.net.za +.za NONE # http://www.zadna.org.za/content/page/domain-information .zm whois.nic.zm .zw NONE # http://www.zispa.co.zw/ diff -Nru whois-5.2.2/version.h whois-5.2.3/version.h --- whois-5.2.2/version.h 2014-10-16 02:03:04.000000000 +0200 +++ whois-5.2.3/version.h 2014-12-26 19:57:56.000000000 +0100 @@ -1 +1 @@ -#define VERSION "5.2.1" +#define VERSION "5.2.3" diff -Nru whois-5.2.2/config.h whois-5.2.3/config.h --- whois-5.2.2/config.h 2014-08-02 03:31:54.000000000 +0200 +++ whois-5.2.3/config.h 2014-12-26 19:56:21.000000000 +0100 @@ -81,6 +81,15 @@ # define RANDOM_DEVICE "/dev/urandom" #endif +/* use arc4random_buf instead if it is available */ +#if (defined __FreeBSD__ && __FreeBSD__ >= 9) || \ + (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || \ + (defined OpenBSD && OpenBSD >= 200805) || \ + (defined __APPLE__ && defined __MACH__) +# define HAVE_ARC4RANDOM_BUF +# undef RANDOM_DEVICE +#endif + #ifdef ENABLE_NLS # ifndef NLS_CAT_NAME # define NLS_CAT_NAME "whois" diff -Nru whois-5.2.2/mkpasswd.c whois-5.2.3/mkpasswd.c --- whois-5.2.2/mkpasswd.c 2014-09-14 12:52:10.000000000 +0200 +++ whois-5.2.3/mkpasswd.c 2014-12-26 19:56:21.000000000 +0100 @@ -86,7 +86,13 @@ N_("standard 56 bit DES-based crypt(3)") }, { "md5", "$1$", 8, 8, 0, "MD5" }, #if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun) +# if (defined OpenBSD && OpenBSD >= 201405) + /* http://marc.info/?l=openbsd-misc&m=139320023202696 */ + { "bf", "$2b$", 22, 22, 1, "Blowfish" }, + { "bfa", "$2a$", 22, 22, 1, "Blowfish (obsolete $2a$ version)" }, +# else { "bf", "$2a$", 22, 22, 1, "Blowfish" }, +# endif #endif #if defined HAVE_LINUX_CRYPT_GENSALT { "bf", "$2a$", 22, 22, 1, "Blowfish, system-specific on 8-bit chars" }, @@ -377,20 +383,27 @@ } #endif -#ifdef RANDOM_DEVICE +#if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF void generate_salt(char *const buf, const unsigned int len) { unsigned int i; + unsigned char *entropy; + +#if defined HAVE_ARC4RANDOM_BUF + void *entropy = NOFAIL(malloc(len)); + arc4random_buf(entropy, len); +#else + entropy = get_random_bytes(len); +#endif - unsigned char *entropy = get_random_bytes(len * sizeof(unsigned char)); for (i = 0; i < len; i++) buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)]; buf[i] = '\0'; free(entropy); } -#else /* RANDOM_DEVICE */ +#else /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */ void generate_salt(char *const buf, const unsigned int len) { @@ -418,7 +431,7 @@ buf[i] = '\0'; } -#endif /* RANDOM_DEVICE */ +#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */ void display_help(int error) { -- ciao, MarcoAttachment: pgpojjxWirxwT.pgp
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: Marco d'Itri <md@linux.it>, 773995-done@bugs.debian.org
- Subject: Re: unblock: whois/5.2.3
- From: Ivo De Decker <ivodd@debian.org>
- Date: Fri, 26 Dec 2014 22:36:25 +0100
- Message-id: <20141226213623.GA23944@ugent.be>
- In-reply-to: <20141226194827.GA19043@bongo.bofh.it>
- References: <20141226194827.GA19043@bongo.bofh.it>
Hi, On Fri, Dec 26, 2014 at 08:48:27PM +0100, Marco d'Itri wrote: > unblock whois/5.2.2 Unblocked. Cheers, Ivo
--- End Message ---