diff --git a/AUTHORS b/AUTHORS index 562d9b7..2843c28 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,3 +11,5 @@ Tim Ruehsen (Implementation of libpsl) Daniel Kahn Gillmor (Discussion, Ideas, Organization, Code) Daniel Stenberg (Discussion, Ideas) Darshit Shah (Patching Wget to work with libpsl) +Dagobert Michelsen (Fixed Solaris building) +Christopher Meng (Fedora building) diff --git a/Makefile.am b/Makefile.am index bc329fa..6c8d64a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,11 @@ # got some hints from https://gitorious.org/openismus-playground/examplelib/source -SUBDIRS = po include src tools data docs/libpsl tests +SUBDIRS = po include src tools data $(LIBPSL_DOCS) tests + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} # Enable GTK-Doc during make distcheck -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man +#DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man ## Install the generated pkg-config file (.pc) into the expected location for ## architecture-dependent package configuration information. Occasionally, diff --git a/NEWS b/NEWS index 4212db1..c7962f5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,16 @@ Copyright (C) 2014 Tim Rühsen +21.02.2015 Release V0.7.1 + * include configured PSL file into tarball + +30.01.2015 Release V0.7.0 + * include effective_tld_names.dat of date 29.12.2014 + * do not install docs when gtk-doc is not installed + * fix several compatibility issues with Solaris + * fix 'make distcheck' after 'make clean' + * mark API as stable + * use pkg-config to detect libicu + 14.11.2014 Release V0.6.2 * revoked commit from 0.6.1 to satisfy Travis-CI diff --git a/autogen.sh b/autogen.sh index 14806ea..2c6dc20 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,7 @@ # !/bin/sh -e -if test -z `which autoreconf`; then +AUTORECONF=`which autoreconf 2>/dev/null` +if test $? -ne 0; then echo "No 'autoreconf' found. You must install the autoconf package." exit 1 fi @@ -9,15 +10,18 @@ fi mkdir m4 2>/dev/null GTKDOCIZE=`which gtkdocize 2>/dev/null` -if test -z $GTKDOCIZE; then +if test $? -ne 0; then echo "No gtk-doc support found. You can't build the docs." + # rm because gtk-doc.make might be a link to a protected file + rm -f gtk-doc.make 2>/dev/null echo "EXTRA_DIST =" >gtk-doc.make echo "CLEANFILES =" >>gtk-doc.make + GTKDOCIZE="" else - gtkdocize || exit $? + $GTKDOCIZE || exit $? fi -autoreconf --install --force --symlink || exit $? +$AUTORECONF --install --force --symlink || exit $? echo echo "----------------------------------------------------------------" diff --git a/configure.ac b/configure.ac index da9936c..7fc1491 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([libpsl], [0.6.2], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl]) +AC_INIT([libpsl], [0.7.1], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) @@ -14,6 +14,9 @@ LT_INIT AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl Check that compiler understands inline +AC_C_INLINE + # # Gettext # @@ -28,6 +31,16 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) ],[ AM_CONDITIONAL([ENABLE_GTK_DOC], false) ]) +# needed for some older versions of gtk-doc +m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ +AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) +]) + +if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then + docdir_makefile=docs/libpsl/Makefile + docdir_version_xml=docs/libpsl/version.xml + AC_SUBST([LIBPSL_DOCS], [docs/libpsl]) +fi # # enable creation of man pages @@ -51,6 +64,7 @@ AS_IF([ test "$enable_man" != no ], [ AC_MSG_RESULT([no]) ]) +PKG_PROG_PKG_CONFIG # Define these substitions here to keep all version information in one place. # For information on how to properly maintain the library version information, @@ -63,7 +77,7 @@ AS_IF([ test "$enable_man" != no ], [ # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. # 5. If any interfaces have been added since the last public release, then increment age. # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. -AC_SUBST([LIBPSL_SO_VERSION], [2:3:2]) +AC_SUBST([LIBPSL_SO_VERSION], [2:4:2]) AC_SUBST([LIBPSL_VERSION], $VERSION) # Check for enable/disable builtin PSL data @@ -130,16 +144,22 @@ if test "$enable_runtime" = "libicu" -o "$enable_builtin" = "libicu"; then # Check for libicu # using pkg-config won't work on older systems like Ubuntu 12.04 LTS Server Edition 64bit # using AC_SEARCH_LIBS also don't work since functions have the library version appended - OLDLIBS=$LIBS - LIBS="-licuuc $LIBS" - AC_MSG_CHECKING([for ICU unicode library]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[u_strToUTF8(NULL, 0, NULL, NULL, 0, NULL);]])], - [HAVE_LIBICU=yes; AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]); AC_MSG_ERROR(You requested libicu but it is not installed.)]) - LIBS=$OLDLIBS + PKG_CHECK_MODULES([LIBICU], [icu-uc], [ + HAVE_LIBICU=yes + LIBS="$LIBICU_LIBS $LIBS" + CFLAGS="$LIBICU_CFLAGS $CFLAGS" + ], [ + OLDLIBS=$LIBS + LIBS="-licuuc $LIBS" + AC_MSG_CHECKING([for ICU unicode library]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[u_strToUTF8(NULL, 0, NULL, NULL, 0, NULL);]])], + [HAVE_LIBICU=yes; AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR(You requested libicu but it is not installed.)]) + LIBS=$OLDLIBS + ]) fi if test "$enable_runtime" = "libidn2" -o "$enable_builtin" = "libidn2"; then @@ -163,6 +183,10 @@ if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then LIBS=$OLDLIBS fi +# AM_ICONV sets @LIBICONV@ and @LTLIBICONV@ for use in Makefile.am +# do not use AM_ICONV conditionally +AM_ICONV + AM_CONDITIONAL([WITH_LIBICU], test "x$enable_runtime" = "xlibicu") AM_CONDITIONAL([WITH_LIBIDN2], test "x$enable_runtime" = "xlibidn2") AM_CONDITIONAL([WITH_LIBIDN], test "x$enable_runtime" = "xlibidn") @@ -171,6 +195,19 @@ AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN2], test "x$enable_builtin" = "xlibidn2" AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN], test "x$enable_builtin" = "xlibidn") AM_CONDITIONAL([WITH_BUILTIN], test $enable_builtin = yes) +# Solaris has socket in libsocket and inet_ntop in libnsl, but also needs libsocket, so the order is important here +AC_CHECK_LIB([socket], [socket], [NEEDS_SOCKET=yes], []) +if test -n "$NEEDS_SOCKET" ; then + AC_CHECK_LIB([nsl], [inet_ntop], [NEEDS_NSL=yes], []) +fi +if test -n "$NEEDS_SOCKET" && test -n "$NEEDS_NSL" ; then + LIBS="$LIBS -lsocket -lnsl" +elif test -n "$NEEDS_SOCKET" ; then + LIBS="$LIBS -lsocket" +elif test -n "$NEEDS_NSL" ; then + LIBS="$LIBS -lnsl" +fi + # Check for valgrind ac_enable_valgrind=no AC_ARG_ENABLE(valgrind-tests, @@ -207,6 +244,7 @@ AC_SUBST(PSL_TESTFILE) # check for alloca / alloca.h AC_FUNC_ALLOCA +AC_CHECK_FUNCS([strndup]) # Override the template file name of the generated .pc file, so that there # is no need to rename the template file when the API version changes. @@ -215,8 +253,8 @@ AC_CONFIG_FILES([Makefile src/Makefile tools/Makefile po/Makefile.in - docs/libpsl/Makefile - docs/libpsl/version.xml + ${docdir_makefile} + ${docdir_version_xml} data/Makefile tests/Makefile libpsl.pc:libpsl.pc.in]) diff --git a/data/Makefile.am b/data/Makefile.am index fa2cffb..ee1229f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,3 @@ filesdir = $(datadir)/@PACKAGE@ -files_DATA = effective_tld_names.dat test_psl.txt +files_DATA = $(PSL_FILE) test_psl.txt EXTRA_DIST = $(files_DATA) diff --git a/data/effective_tld_names.dat b/data/effective_tld_names.dat index 8ae5d97..601fae7 100644 --- a/data/effective_tld_names.dat +++ b/data/effective_tld_names.dat @@ -1130,7 +1130,7 @@ tt.im tv.im // in : http://en.wikipedia.org/wiki/.in -// see also: http://www.inregistry.in/policies/ +// see also: https://registry.in/Policies // Please note, that nic.in is not an offical eTLD, but used by most // government institutions. in @@ -6780,7 +6780,7 @@ xxx *.zw -// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2014-11-03T18:02:06Z +// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-01-27T00:02:07Z // abb : 2014-10-24 ABB Ltd abb @@ -6797,15 +6797,24 @@ academy // accenture : 2014-08-15 Accenture plc accenture +// accountant : 2014-11-20 dot Accountant Limited +accountant + // accountants : 2014-03-20 Knob Town, LLC accountants +// aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG +aco + // active : 2014-05-01 The Active Network, Inc active // actor : 2013-12-12 United TLD Holdco Ltd. actor +// ads : 2014-12-04 Charleston Road Registry Inc. +ads + // adult : 2014-10-16 ICM Registry AD LLC adult @@ -6818,12 +6827,21 @@ africa // agency : 2013-11-14 Steel Falls, LLC agency +// aig : 2014-12-18 American International Group, Inc. +aig + // airforce : 2014-03-06 United TLD Holdco Ltd. airforce // airtel : 2014-10-24 Bharti Airtel Limited airtel +// alibaba : 2015-01-15 Alibaba Group Holding Limited +alibaba + +// alipay : 2015-01-15 Alibaba Group Holding Limited +alipay + // allfinanz : 2014-07-03 Allfinanz Deutsche Vermögensberatung Aktiengesellschaft allfinanz @@ -6833,37 +6851,67 @@ alsace // amsterdam : 2014-07-24 Gemeente Amsterdam amsterdam +// analytics : 2014-12-18 Campus IP LLC +analytics + // android : 2014-08-07 Charleston Road Registry Inc. android +// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +anquan + +// apartments : 2014-12-11 June Maple, LLC +apartments + // aquarelle : 2014-07-24 Aquarelle.com aquarelle +// aramco : 2014-11-20 Aramco Services Company +aramco + // archi : 2014-02-06 STARTING DOT LIMITED archi // army : 2014-03-06 United TLD Holdco Ltd. army +// arte : 2014-12-11 Association Relative à la Télévision Européenne G.E.I.E. +arte + // associates : 2014-03-06 Baxter Hill, LLC associates -// attorney : 2014-03-20 +// attorney : 2014-03-20 attorney -// auction : 2014-03-20 +// auction : 2014-03-20 auction // audio : 2014-03-20 Uniregistry, Corp. audio +// author : 2014-12-18 Amazon EU S.à r.l. +author + +// auto : 2014-11-13 Uniregistry, Corp. +auto + // autos : 2014-01-09 DERAutos, LLC autos +// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca +avianca + // axa : 2013-12-19 AXA SA axa -// band : 2014-06-12 +// azure : 2014-12-18 Microsoft Corporation +azure + +// baidu : 2015-01-08 Baidu, Inc. +baidu + +// band : 2014-06-12 band // bank : 2014-09-25 fTLD Registry Services LLC @@ -6875,6 +6923,12 @@ bar // barcelona : 2014-07-24 Municipi de Barcelona barcelona +// barclaycard : 2014-11-20 Barclays Bank PLC +barclaycard + +// barclays : 2014-11-20 Barclays Bank PLC +barclays + // bargains : 2013-11-14 Half Hallow, LLC bargains @@ -6884,6 +6938,9 @@ bauhaus // bayern : 2014-01-23 Bayern Connect GmbH bayern +// bbc : 2014-12-18 British Broadcasting Corporation +bbc + // bbva : 2014-10-02 BANCO BILBAO VIZCAYA ARGENTARIA, S.A. bbva @@ -6893,6 +6950,9 @@ bcn // beer : 2014-01-09 Top Level Domain Holdings Limited beer +// bentley : 2014-12-18 Bentley Motors Limited +bentley + // berlin : 2013-10-31 dotBERLIN GmbH & Co. KG berlin @@ -6911,6 +6971,12 @@ bid // bike : 2013-08-27 Grand Hollow, LLC bike +// bing : 2014-12-18 Microsoft Corporation +bing + +// bingo : 2014-12-04 Sand Cedar, LLC +bingo + // bio : 2014-03-06 STARTING DOT LIMITED bio @@ -6938,6 +7004,9 @@ bnl // bnpparibas : 2014-05-29 BNP Paribas bnpparibas +// boats : 2014-12-04 DERBoats, LLC +boats + // bom : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br bom @@ -6947,9 +7016,27 @@ bond // boo : 2014-01-30 Charleston Road Registry Inc. boo +// boots : 2015-01-08 THE BOOTS COMPANY PLC +boots + +// bot : 2014-12-18 Amazon EU S.à r.l. +bot + // boutique : 2013-11-14 Over Galley, LLC boutique +// bradesco : 2014-12-18 Banco Bradesco S.A. +bradesco + +// bridgestone : 2014-12-18 Bridgestone Corporation +bridgestone + +// broadway : 2014-12-22 Celebrate Broadway, Inc. +broadway + +// broker : 2014-12-11 IG Group Holdings PLC +broker + // brussels : 2014-02-06 DNS.be vzw brussels @@ -6965,6 +7052,9 @@ builders // business : 2013-11-07 Spring Cross, LLC business +// buy : 2014-12-18 Amazon EU S.à r.l. +buy + // buzz : 2013-10-02 DOTSTRATEGY CO. buzz @@ -6977,6 +7067,9 @@ cab // cal : 2014-07-24 Charleston Road Registry Inc. cal +// call : 2014-12-18 Amazon EU S.à r.l. +call + // camera : 2013-08-27 Atomic Maple, LLC camera @@ -6995,6 +7088,9 @@ capetown // capital : 2014-03-06 Delta Mill, LLC capital +// car : 2015-01-22 Charleston Road Registry Inc. +car + // caravan : 2013-12-12 Caravan International, Inc. caravan @@ -7010,6 +7106,9 @@ career // careers : 2013-10-02 Wild Corner, LLC careers +// cars : 2014-11-13 Uniregistry, Corp. +cars + // cartier : 2014-06-23 Richemont DNS Inc. cartier @@ -7019,6 +7118,9 @@ casa // cash : 2014-03-06 Delta Lake, LLC cash +// casino : 2014-12-18 Binky Sky, LLC +casino + // catering : 2013-12-05 New Falls. LLC catering @@ -7040,9 +7142,15 @@ cern // cfa : 2014-08-28 CFA Institute cfa +// cfd : 2014-12-11 IG Group Holdings PLC +cfd + // channel : 2014-05-08 Charleston Road Registry Inc. channel +// chat : 2014-12-04 Sand Fields, LLC +chat + // cheap : 2013-11-14 Sand Cover, LLC cheap @@ -7058,12 +7166,21 @@ chrome // church : 2014-02-06 Holly Fileds, LLC church +// circle : 2014-12-18 Amazon EU S.à r.l. +circle + +// cisco : 2014-12-22 Cisco Technology, Inc. +cisco + // citic : 2014-01-09 CITIC Group Corporation citic // city : 2014-05-29 Snow Sky, LLC city +// cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc. +cityeats + // claims : 2014-03-20 Black Corner, LLC claims @@ -7109,15 +7226,21 @@ company // computer : 2013-10-24 Pine Mill, LLC computer +// comsec : 2015-01-08 VeriSign, Inc. +comsec + // condos : 2013-12-05 Pine House, LLC condos // construction : 2013-09-16 Fox Dynamite, LLC construction -// consulting : 2013-12-05 +// consulting : 2013-12-05 consulting +// contact : 2015-01-08 Top Level Spectrum, Inc. +contact + // contractors : 2013-09-10 Magic Woods, LLC contractors @@ -7133,12 +7256,18 @@ corsica // country : 2013-12-19 Top Level Domain Holdings Limited country +// courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD +courses + // credit : 2014-03-20 Snow Shadow, LLC credit // creditcard : 2014-03-20 Binky Frostbite, LLC creditcard +// creditunion : 2015-01-22 CUNA Performance Resources, LLC +creditunion + // cricket : 2014-10-09 dot Cricket Limited cricket @@ -7160,6 +7289,9 @@ cuisinella // cymru : 2014-05-08 Nominet UK cymru +// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd. +cyou + // dabur : 2014-02-06 Dabur India Limited dabur @@ -7169,6 +7301,9 @@ dad // dance : 2013-10-24 United TLD Holdco Ltd. dance +// date : 2014-11-20 dot Date Limited +date + // dating : 2013-12-05 Pine Fest, LLC dating @@ -7178,10 +7313,16 @@ datsun // day : 2014-01-30 Charleston Road Registry Inc. day +// dclk : 2014-11-20 Charleston Road Registry Inc. +dclk + +// dealer : 2014-12-22 Dealer Dot Com, Inc. +dealer + // deals : 2014-05-22 Sand Sunset, LLC deals -// degree : 2014-03-06 +// degree : 2014-03-06 degree // delivery : 2014-09-11 Steel Station, LLC @@ -7196,12 +7337,15 @@ democrat // dental : 2014-03-20 Tin Birch, LLC dental -// dentist : 2014-03-20 +// dentist : 2014-03-20 dentist // desi : 2013-11-14 Desi Networks LLC desi +// design : 2014-11-07 Top Level Design, LLC +design + // dev : 2014-10-16 Charleston Road Registry Inc. dev @@ -7229,6 +7373,9 @@ dnp // docs : 2014-10-16 Charleston Road Registry Inc. docs +// dog : 2014-12-04 Koko Mill, LLC +dog + // doha : 2014-09-18 Communications Regulatory Authority (CRA) doha @@ -7238,15 +7385,27 @@ domains // doosan : 2014-04-03 Doosan Corporation doosan +// download : 2014-11-20 dot Support Limited +download + +// dubai : 2015-01-01 Dubai Smart Government Department +dubai + // durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry durban // dvag : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG dvag +// earth : 2014-12-04 Interlink Co., Ltd. +earth + // eat : 2014-01-23 Charleston Road Registry Inc. eat +// edeka : 2014-12-18 EDEKA Verband kaufmännischer Genossenschaften e.V. +edeka + // education : 2013-11-07 Brice Way, LLC education @@ -7268,6 +7427,9 @@ engineering // enterprises : 2013-09-20 Snow Oaks, LLC enterprises +// epson : 2014-12-04 Seiko Epson Corporation +epson + // equipment : 2013-08-27 Corn Station, LLC equipment @@ -7301,21 +7463,42 @@ expert // exposed : 2013-12-05 Victor Beach, LLC exposed +// fage : 2014-12-18 Fage International S.A. +fage + // fail : 2014-03-06 Atomic Pipe, LLC fail -// fan : 2014-03-06 +// fairwinds : 2014-11-13 FairWinds Partners, LLC +fairwinds + +// faith : 2014-11-20 dot Faith Limited +faith + +// fan : 2014-03-06 fan +// fans : 2014-11-07 Asiamix Digital Limited +fans + // farm : 2013-11-07 Just Maple, LLC farm // fashion : 2014-07-03 Top Level Domain Holdings Limited fashion +// fast : 2014-12-18 Amazon EU S.à r.l. +fast + // feedback : 2013-12-19 Top Level Spectrum, Inc. feedback +// ferrero : 2014-12-18 Ferrero Trading Lux S.A. +ferrero + +// film : 2015-01-08 Motion Picture Domain Registry Pty Ltd +film + // final : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br final @@ -7325,6 +7508,9 @@ finance // financial : 2014-03-06 Just Cover, LLC financial +// firestone : 2014-12-18 Bridgestone Corporation +firestone + // firmdale : 2014-03-27 Firmdale Holdings Limited firmdale @@ -7334,6 +7520,9 @@ fish // fishing : 2013-11-21 Top Level Domain Holdings Limited fishing +// fit : 2014-11-07 Top Level Domain Holdings Limited +fit + // fitness : 2014-03-06 Brice Orchard, LLC fitness @@ -7355,7 +7544,16 @@ fly // foo : 2014-01-23 Charleston Road Registry Inc. foo -// forsale : 2014-05-22 +// football : 2014-12-18 Foggy Farms, LLC +football + +// ford : 2014-11-13 Ford Motor Company +ford + +// forex : 2014-12-11 IG Group Holdings PLC +forex + +// forsale : 2014-05-22 forsale // foundation : 2013-12-05 John Dale, LLC @@ -7373,7 +7571,7 @@ fund // furniture : 2014-03-20 Lone Fields, LLC furniture -// futbol : 2013-09-20 +// futbol : 2013-09-20 futbol // gal : 2013-11-07 Asociación puntoGAL @@ -7391,6 +7589,9 @@ gbiz // gdn : 2014-07-31 Joint Stock Company \ gdn +// gea : 2014-12-04 GEA Group Aktiengesellschaft +gea + // gent : 2014-01-23 COMBELL GROUP NV/SA gent @@ -7406,6 +7607,9 @@ gifts // gives : 2014-03-06 United TLD Holdco Ltd. gives +// giving : 2014-11-13 Giving Limited +giving + // glass : 2013-11-07 Black Cover, LLC glass @@ -7427,12 +7631,30 @@ gmo // gmx : 2014-04-24 1&1 Mail & Media GmbH gmx +// gold : 2015-01-22 June Edge, LLC +gold + +// goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD. +goldpoint + +// golf : 2014-12-18 Lone falls, LLC +golf + +// goo : 2014-12-18 NTT Resonant Inc. +goo + +// goog : 2014-11-20 Charleston Road Registry Inc. +goog + // google : 2014-07-24 Charleston Road Registry Inc. google // gop : 2014-01-16 Republican State Leadership Committee, Inc. gop +// got : 2014-12-18 Amazon EU S.à r.l. +got + // graphics : 2013-09-13 Over Madison, LLC graphics @@ -7448,6 +7670,9 @@ gripe // group : 2014-08-15 Romeo Town, LLC group +// gucci : 2014-11-13 Guccio Gucci S.p.a. +gucci + // guge : 2014-08-28 Charleston Road Registry Inc. guge @@ -7463,7 +7688,10 @@ guru // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH hamburg -// haus : 2013-12-05 +// hangout : 2014-11-13 Charleston Road Registry Inc. +hangout + +// haus : 2013-12-05 haus // healthcare : 2014-06-12 Silver Glen, LLC @@ -7496,6 +7724,9 @@ holiday // homes : 2014-01-09 DERHomes, LLC homes +// honda : 2014-12-18 Honda Motor Co., Ltd. +honda + // horse : 2013-11-21 Top Level Domain Holdings Limited horse @@ -7505,6 +7736,9 @@ host // hosting : 2014-05-29 Uniregistry, Corp. hosting +// hotmail : 2014-12-18 Microsoft Corporation +hotmail + // house : 2013-11-07 Sugar Park, LLC house @@ -7520,6 +7754,9 @@ ibm // ice : 2014-10-30 IntercontinentalExchange, Inc. ice +// icu : 2015-01-08 One.com A/S +icu + // ifm : 2014-01-30 ifm electronic gmbh ifm @@ -7574,15 +7811,30 @@ itau // iwc : 2014-06-23 Richemont DNS Inc. iwc +// jaguar : 2014-11-13 Jaguar Land Rover Ltd +jaguar + // java : 2014-06-19 Oracle Corporation java +// jcb : 2014-11-20 JCB Co., Ltd. +jcb + // jetzt : 2014-01-09 New TLD Company AB jetzt +// jlc : 2014-12-04 Richemont DNS Inc. +jlc + // joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry joburg +// jot : 2014-12-18 Amazon EU S.à r.l. +jot + +// joy : 2014-12-18 Amazon EU S.à r.l. +joy + // jprs : 2014-09-18 Japan Registry Services Co., Ltd. jprs @@ -7595,9 +7847,15 @@ kaufen // kddi : 2014-09-12 KDDI CORPORATION kddi +// kfh : 2014-12-04 Kuwait Finance House +kfh + // kim : 2013-09-23 Afilias Limited kim +// kinder : 2014-11-07 Ferrero Trading Lux S.A. +kinder + // kitchen : 2013-09-20 Just Goodbye, LLC kitchen @@ -7607,25 +7865,40 @@ kiwi // koeln : 2014-01-09 NetCologne Gesellschaft für Telekommunikation mbH koeln +// komatsu : 2015-01-08 Komatsu Ltd. +komatsu + +// kpn : 2015-01-08 Koninklijke KPN N.V. +kpn + // krd : 2013-12-05 KRG Department of Information Technology krd // kred : 2013-12-19 KredTLD Pty Ltd kred +// kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen +kyoto + // lacaixa : 2014-01-09 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA lacaixa // land : 2013-09-10 Pine Moon, LLC land +// landrover : 2014-11-13 Jaguar Land Rover Ltd +landrover + // lat : 2014-10-16 ECOM-LAC Federaciòn de Latinoamèrica y el Caribe para Internet y el Comercio Electrònico lat // latrobe : 2014-06-16 La Trobe University latrobe -// lawyer : 2014-03-20 +// law : 2015-01-22 Minds + Machines Group Limited +law + +// lawyer : 2014-03-20 lawyer // lds : 2014-03-20 IRI Domain Management, LLC (\ @@ -7652,33 +7925,63 @@ lidl // life : 2014-02-06 Trixy Oaks, LLC life +// lifeinsurance : 2015-01-15 American Council of Life Insurers +lifeinsurance + +// lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc. +lifestyle + // lighting : 2013-08-27 John McCook, LLC lighting +// like : 2014-12-18 Amazon EU S.à r.l. +like + // limited : 2014-03-06 Big Fest, LLC limited // limo : 2013-10-17 Hidden Frostbite, LLC limo +// lincoln : 2014-11-13 Ford Motor Company +lincoln + +// linde : 2014-12-04 Linde Aktiengesellschaft +linde + // link : 2013-11-14 Uniregistry, Corp. link +// live : 2014-12-04 Half Woods, LLC +live + +// loan : 2014-11-20 dot Loan Limited +loan + // loans : 2014-03-20 June Woods, LLC loans // london : 2013-11-14 Dot London Domains Limited london +// lotte : 2014-11-07 Lotte Holdings Co., Ltd. +lotte + // lotto : 2014-04-10 Afilias Limited lotto +// love : 2014-12-22 Merchant Law Group LLP +love + // ltd : 2014-09-25 Over Corner, LLC ltd // ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA ltda +// lupin : 2014-11-07 LUPIN LIMITED +lupin + // luxe : 2014-01-09 Top Level Domain Holdings Limited luxe @@ -7694,18 +7997,27 @@ maif // maison : 2013-12-05 Victor Frostbite, LLC maison +// makeup : 2015-01-15 L'Oréal +makeup + +// man : 2014-12-04 MAN SE +man + // management : 2013-11-07 John Goodbye, LLC management // mango : 2013-10-24 PUNTO FA S.L. mango -// market : 2014-03-06 +// market : 2014-03-06 market // marketing : 2013-11-07 Fern Pass, LLC marketing +// markets : 2014-12-11 IG Group Holdings PLC +markets + // marriott : 2014-10-09 Marriott Worldwide Corporation marriott @@ -7727,18 +8039,33 @@ memorial // menu : 2013-09-11 Wedding TLD2, LLC menu +// meo : 2014-11-07 PT Comunicacoes S.A. +meo + // miami : 2013-12-19 Top Level Domain Holdings Limited miami +// microsoft : 2014-12-18 Microsoft Corporation +microsoft + // mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft mini +// mma : 2014-11-07 MMA IARD +mma + +// mobily : 2014-12-18 GreenTech Consultancy Company W.L.L. +mobily + // moda : 2013-11-07 United TLD Holdco Ltd. moda // moe : 2013-11-13 Interlink Co., Ltd. moe +// moi : 2014-12-18 Amazon EU S.à r.l. +moi + // monash : 2013-09-30 Monash University monash @@ -7751,7 +8078,7 @@ montblanc // mormon : 2013-12-05 IRI Domain Management, LLC (\ mormon -// mortgage : 2014-03-20 +// mortgage : 2014-03-20 mortgage // moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) @@ -7766,12 +8093,24 @@ mov // movistar : 2014-10-16 Telefónica S.A. movistar +// mtn : 2014-12-04 MTN Dubai Limited +mtn + +// mtpc : 2014-11-20 Mitsubishi Tanabe Pharma Corporation +mtpc + +// nadex : 2014-12-11 IG Group Holdings PLC +nadex + // nagoya : 2013-10-24 GMO Registry, Inc. nagoya // navy : 2014-03-06 United TLD Holdco Ltd. navy +// nec : 2015-01-08 NEC Corporation +nec + // netbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA netbank @@ -7784,6 +8123,9 @@ neustar // new : 2014-01-30 Charleston Road Registry Inc. new +// news : 2014-12-18 Hidden Bloom, LLC +news + // nexus : 2014-07-24 Charleston Road Registry Inc. nexus @@ -7793,12 +8135,21 @@ ngo // nhk : 2014-02-13 Japan Broadcasting Corporation (NHK) nhk +// nico : 2014-12-04 DWANGO Co., Ltd. +nico + // ninja : 2013-11-07 United TLD Holdco Ltd. ninja // nissan : 2014-03-27 NISSAN MOTOR CO., LTD. nissan +// nokia : 2015-01-08 Nokia Corporation +nokia + +// norton : 2014-12-04 Symantec Corporation +norton + // nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. nowruz @@ -7820,12 +8171,21 @@ obi // okinawa : 2013-12-05 BusinessRalliart Inc. okinawa +// omega : 2015-01-08 The Swatch Group Ltd +omega + +// one : 2014-11-07 One.com A/S +one + // ong : 2014-03-06 Public Interest Registry ong // onl : 2013-09-16 I-Registry Ltd. onl +// online : 2015-01-15 DotOnline Inc. +online + // ooo : 2014-01-09 INFIBEAM INCORPORATION LIMITED ooo @@ -7844,6 +8204,12 @@ otsuka // ovh : 2014-01-16 OVH SAS ovh +// page : 2014-12-04 Charleston Road Registry Inc. +page + +// panerai : 2014-11-07 Richemont DNS Inc. +panerai + // paris : 2014-01-30 City of Paris paris @@ -7862,6 +8228,9 @@ party // pharmacy : 2014-06-19 National Association of Boards of Pharmacy pharmacy +// philips : 2014-11-07 Koninklijke Philips N.V. +philips + // photo : 2013-11-14 Uniregistry, Corp. photo @@ -7886,6 +8255,12 @@ pictet // pictures : 2014-03-06 Foggy Sky, LLC pictures +// pid : 2015-01-08 Top Level Spectrum, Inc. +pid + +// pin : 2014-12-18 Amazon EU S.à r.l. +pin + // pink : 2013-10-01 Afilias Limited pink @@ -7922,6 +8297,9 @@ productions // prof : 2014-07-24 Charleston Road Registry Inc. prof +// promo : 2014-12-18 Play.PROMO Oy +promo + // properties : 2013-12-05 Big Pass, LLC properties @@ -7937,6 +8315,12 @@ qpon // quebec : 2013-12-19 PointQuébec Inc quebec +// racing : 2014-12-04 Premier Registry Limited +racing + +// read : 2014-12-18 Amazon EU S.à r.l. +read + // realtor : 2014-05-29 Real Estate Domains LLC realtor @@ -7964,6 +8348,9 @@ reit // ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. ren +// rent : 2014-12-04 DERRent, LLC +rent + // rentals : 2013-12-05 Big Hollow,LLC rentals @@ -7982,24 +8369,36 @@ rest // restaurant : 2014-07-03 Snow Avenue, LLC restaurant -// reviews : 2013-09-13 +// review : 2014-11-20 dot Review Limited +review + +// reviews : 2013-09-13 reviews // rich : 2013-11-21 I-Registry Ltd. rich +// ricoh : 2014-11-20 Ricoh Company, Ltd. +ricoh + // rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO rio // rip : 2014-07-10 United TLD Holdco Ltd. rip -// rocks : 2013-11-14 +// rocher : 2014-12-18 Ferrero Trading Lux S.A. +rocher + +// rocks : 2013-11-14 rocks // rodeo : 2013-12-19 Top Level Domain Holdings Limited rodeo +// room : 2014-12-18 Amazon EU S.à r.l. +room + // rsvp : 2014-05-08 Charleston Road Registry Inc. rsvp @@ -8012,24 +8411,48 @@ ryukyu // saarland : 2013-12-12 dotSaarland GmbH saarland -// sale : 2014-10-16 Half Bloom, LLC +// safe : 2014-12-18 Amazon EU S.à r.l. +safe + +// safety : 2015-01-08 Safety Registry Services, LLC. +safety + +// sakura : 2014-12-18 SAKURA Internet Inc. +sakura + +// sale : 2014-10-16 sale +// salon : 2014-12-11 Outer Orchard, LLC +salon + // samsung : 2014-04-03 SAMSUNG SDS CO., LTD samsung +// sandvik : 2014-11-13 Sandvik AB +sandvik + +// sandvikcoromant : 2014-11-07 Sandvik AB +sandvikcoromant + // sanofi : 2014-10-09 Sanofi sanofi // sap : 2014-03-27 SAP AG sap +// sapo : 2014-11-07 PT Comunicacoes S.A. +sapo + // sarl : 2014-07-03 Delta Orchard, LLC sarl // saxo : 2014-10-31 Saxo Bank A/S saxo +// sbs : 2014-11-07 SPECIAL BROADCASTING SERVICE CORPORATION +sbs + // sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ) sca @@ -8042,6 +8465,9 @@ schmidt // scholarships : 2014-04-24 Scholarships.com, LLC scholarships +// school : 2014-12-18 Little Galley, LLC +school + // schule : 2014-03-06 Outer Moon, LLC schule @@ -8060,6 +8486,9 @@ scot // seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal) seat +// seek : 2014-12-04 Seek Limited +seek + // sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A. sener @@ -8069,6 +8498,9 @@ services // sew : 2014-07-17 SEW-EURODRIVE GmbH & Co KG sew +// sex : 2014-11-13 ICM Registry SX LLC +sex + // sexy : 2013-09-11 Uniregistry, Corp. sexy @@ -8084,19 +8516,34 @@ shiksha // shoes : 2013-10-02 Binky Galley, LLC shoes +// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +shouji + // shriram : 2014-01-23 Shriram Capital Ltd. shriram // singles : 2013-08-27 Fern Madison, LLC singles +// site : 2015-01-15 DotSite Inc. +site + +// skin : 2015-01-15 L'Oréal +skin + // sky : 2014-06-19 Sky IP International Ltd, a company incorporated in England and Wales, operating via its registered Swiss branch sky +// skype : 2014-12-18 Microsoft Corporation +skype + +// smile : 2014-12-18 Amazon EU S.à r.l. +smile + // social : 2013-11-07 United TLD Holdco Ltd. social -// software : 2014-03-20 +// software : 2014-03-20 software // sohu : 2013-12-19 Sohu.com Limited @@ -8108,6 +8555,9 @@ solar // solutions : 2013-11-07 Silver Cover, LLC solutions +// sony : 2015-01-08 Sony Corporation +sony + // soy : 2014-01-23 Charleston Road Registry Inc. soy @@ -8117,12 +8567,39 @@ space // spiegel : 2014-02-05 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG spiegel +// spreadbetting : 2014-12-11 IG Group Holdings PLC +spreadbetting + +// stada : 2014-11-13 STADA Arzneimittel AG +stada + +// star : 2015-01-08 Star India Private Limited +star + +// statoil : 2014-12-04 Statoil ASA +statoil + // stc : 2014-10-09 Saudi Telecom Company stc // stcgroup : 2014-10-09 Saudi Telecom Company stcgroup +// stockholm : 2014-12-18 Stockholms kommun +stockholm + +// storage : 2014-12-22 Self Storage Company LLC +storage + +// study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD +study + +// style : 2014-12-04 Binky Moon, LLC +style + +// sucks : 2014-12-22 Vox Populi Registry Inc. +sucks + // supplies : 2013-12-19 Atomic Fields, LLC supplies @@ -8141,18 +8618,30 @@ surgery // suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION suzuki +// swatch : 2015-01-08 The Swatch Group Ltd +swatch + // swiss : 2014-10-16 Swiss Confederation swiss // sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet sydney +// symantec : 2014-12-04 Symantec Corporation +symantec + // systems : 2013-11-07 Dash Cypress, LLC systems +// tab : 2014-12-04 Tabcorp Holdings Limited +tab + // taipei : 2014-07-10 Taipei City Government taipei +// taobao : 2015-01-15 Alibaba Group Holding Limited +taobao + // tatar : 2014-04-24 Limited Liability Company \ tatar @@ -8174,15 +8663,24 @@ telefonica // temasek : 2014-08-07 Temasek Holdings (Private) Limited temasek +// tennis : 2014-12-04 Cotton Bloom, LLC +tennis + // tienda : 2013-11-14 Victor Manor, LLC tienda // tips : 2013-09-20 Corn Willow, LLC tips +// tires : 2014-11-07 Dog Edge, LLC +tires + // tirol : 2014-04-24 punkt Tirol GmbH tirol +// tmall : 2015-01-15 Alibaba Group Holding Limited +tmall + // today : 2013-09-20 Pearl Woods, LLC today @@ -8195,9 +8693,15 @@ tools // top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. top +// toray : 2014-12-18 Toray Industries, Inc. +toray + // toshiba : 2014-04-10 TOSHIBA Corporation toshiba +// tours : 2015-01-22 Sugar Station, LLC +tours + // town : 2014-03-06 Koko Moon, LLC town @@ -8207,15 +8711,24 @@ toys // trade : 2014-01-23 Elite Registry Limited trade +// trading : 2014-12-11 IG Group Holdings PLC +trading + // training : 2013-11-07 Wild Willow, LLC training -// trust : 2014-10-16 +// trust : 2014-10-16 trust // tui : 2014-07-03 TUI AG tui +// tushu : 2014-12-18 Amazon EU S.à r.l. +tushu + +// ubs : 2014-12-11 UBS AG +ubs + // university : 2014-03-06 Little Station, LLC university @@ -8228,6 +8741,9 @@ uol // vacations : 2013-12-05 Atomic Tigers, LLC vacations +// vana : 2014-12-11 Lifestyle Domain Holdings, Inc. +vana + // vegas : 2014-01-16 Dot Vegas, Inc. vegas @@ -8237,18 +8753,21 @@ ventures // versicherung : 2014-03-20 dotversicherung-registry GmbH versicherung -// vet : 2014-03-06 +// vet : 2014-03-06 vet // viajes : 2013-10-17 Black Madison, LLC viajes -// video : 2014-10-16 Lone Tigers, LLC +// video : 2014-10-16 video // villas : 2013-12-05 New Sky, LLC villas +// vip : 2015-01-22 Minds + Machines Group Limited +vip + // virgin : 2014-09-25 Virgin Enterprises Limited virgin @@ -8261,6 +8780,9 @@ vista // vistaprint : 2014-09-18 Vistaprint Limited vistaprint +// viva : 2014-11-07 Saudi Telecom Company +viva + // vlaanderen : 2014-02-06 DNS.be vzw vlaanderen @@ -8282,12 +8804,24 @@ voyage // wales : 2014-05-08 Nominet UK wales +// walter : 2014-11-13 Sandvik AB +walter + // wang : 2013-10-24 Zodiac Leo Limited wang +// wanggou : 2014-12-18 Amazon EU S.à r.l. +wanggou + // watch : 2013-11-14 Sand Shadow, LLC watch +// watches : 2014-12-22 Richemont DNS Inc. +watches + +// weather : 2015-01-08 The Weather Channel, LLC +weather + // webcam : 2014-01-23 dot Webcam Limited webcam @@ -8312,6 +8846,12 @@ wiki // williamhill : 2014-03-13 William Hill Organization Limited williamhill +// win : 2014-11-20 First Registry Limited +win + +// windows : 2014-12-18 Microsoft Corporation +windows + // wme : 2014-02-13 William Morris Endeavor Entertainment, LLC wme @@ -8330,9 +8870,21 @@ wtc // wtf : 2014-03-06 Hidden Way, LLC wtf +// xbox : 2014-12-18 Microsoft Corporation +xbox + // xerox : 2014-10-24 Xerox DNHC LLC xerox +// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +xihuan + +// xin : 2014-12-11 Elegant Leader Limited +xin + +// xn--11b4c3d : 2015-01-15 VeriSign Sarl +कॉम + // xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd. 佛山 @@ -8345,6 +8897,12 @@ xerox // xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED 在线 +// xn--3pxu8k : 2015-01-15 VeriSign Sarl +点看 + +// xn--42c2d9a : 2015-01-15 VeriSign Sarl +คอม + // xn--45q11c : 2013-11-21 Zodiac Scorpio Limited 八卦 @@ -8357,6 +8915,9 @@ xerox // xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） 公司 +// xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited +网站 + // xn--6frz82g : 2013-09-23 Afilias Limited 移动 @@ -8372,6 +8933,9 @@ xerox // xn--80aswg : 2013-07-14 CORE Association сайт +// xn--9dbq2a : 2015-01-15 VeriSign Sarl +קום + // xn--9et52u : 2014-06-12 RISE VICTORY LIMITED 时尚 @@ -8381,6 +8945,9 @@ xerox // xn--c1avg : 2013-11-14 Public Interest Registry орг +// xn--c2br7g : 2015-01-15 VeriSign Sarl +नेट + // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD 삼성 @@ -8396,9 +8963,15 @@ xerox // xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives “The Smart Internet” дети +// xn--eckvdtc9d : 2014-12-18 Amazon EU S.à r.l. +ポイント + // xn--efvy88h : 2014-08-22 Xinhua News Agency Guangdong Branch 新华通讯社广东分社 新闻 +// xn--fhbei : 2015-01-15 VeriSign Sarl +كوم + // xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED 中文网 @@ -8417,33 +8990,69 @@ xerox // xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry संगठन +// xn--imr513n : 2014-12-11 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +餐厅 + // xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） 网络 +// xn--j1aef : 2015-01-15 VeriSign Sarl +ком + +// xn--jlq61u9w7b : 2015-01-08 Nokia Corporation +诺基亚 + +// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V. +飞利浦 + +// xn--kpu716f : 2014-12-22 Richemont DNS Inc. +手表 + // xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd 手机 +// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company +ارامكو + // xn--mgbab2bd : 2013-10-31 CORE Association بازار +// xn--mgbb9fbpob : 2014-12-18 GreenTech Consultancy Company W.L.L. +موبايلي + // xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. همراه +// xn--mk1bu44c : 2015-01-15 VeriSign Sarl +닷컴 + // xn--mxtq1m : 2014-03-06 Net-Chinese Co., Ltd. 政府 // xn--ngbc5azd : 2013-07-13 International Domain Registry Pty. Ltd. شبكة +// xn--ngbe9e0a : 2014-12-04 Kuwait Finance House +بيتك + // xn--nqv7f : 2013-11-14 Public Interest Registry 机构 // xn--nqv7fs00ema : 2013-11-14 Public Interest Registry 组织机构 +// xn--nyqy26a : 2014-11-07 Stable Tone Limited +健康 + // xn--p1acf : 2013-12-12 Rusnames Limited рус +// xn--pbt977c : 2014-12-22 Richemont DNS Inc. +珠宝 + +// xn--pssy2u : 2015-01-15 VeriSign Sarl +大拿 + // xn--q9jyb4c : 2013-09-17 Charleston Road Registry Inc. みんな @@ -8453,9 +9062,15 @@ xerox // xn--rhqv96g : 2013-09-11 Stable Tone Limited 世界 -// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +// xn--ses554g : 2014-01-16 网址 +// xn--t60b56a : 2015-01-15 VeriSign Sarl +닷넷 + +// xn--tckwe : 2015-01-15 VeriSign Sarl +コム + // xn--unup4y : 2013-07-14 Spring Fields, LLC 游戏 @@ -8483,9 +9098,15 @@ xyz // yachts : 2014-01-09 DERYachts, LLC yachts +// yamaxun : 2014-12-18 Amazon EU S.à r.l. +yamaxun + // yandex : 2014-04-10 YANDEX, LLC yandex +// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD. +yodobashi + // yoga : 2014-05-29 Top Level Domain Holdings Limited yoga @@ -8495,21 +9116,35 @@ yokohama // youtube : 2014-05-01 Charleston Road Registry Inc. youtube +// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +yun + +// zara : 2014-11-07 Industria de Diseño Textil, S.A. (INDITEX, S.A.) +zara + +// zero : 2014-12-18 Amazon EU S.à r.l. +zero + // zip : 2014-05-08 Charleston Road Registry Inc. zip // zone : 2013-11-14 Outer Falls, LLC zone +// zuerich : 2014-11-07 Kanton Zürich (Canton of Zurich) +zuerich + + // ===END ICANN DOMAINS=== // ===BEGIN PRIVATE DOMAINS=== +// (Note: these are in alphabetical order by company name) // Amazon CloudFront : https://aws.amazon.com/cloudfront/ // Submitted by Donavan Miller 2013-03-22 cloudfront.net // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ -// Submitted by Osman Surkatty 2014-05-20 +// Submitted by Osman Surkatty 2014-12-16 ap-northeast-1.compute.amazonaws.com ap-southeast-1.compute.amazonaws.com ap-southeast-2.compute.amazonaws.com @@ -8518,6 +9153,7 @@ compute.amazonaws.cn compute.amazonaws.com compute-1.amazonaws.com eu-west-1.compute.amazonaws.com +eu-central-1.compute.amazonaws.com sa-east-1.compute.amazonaws.com us-east-1.amazonaws.com us-gov-west-1.compute.amazonaws.com @@ -8626,6 +9262,10 @@ co.ca co.nl co.no +// Commerce Guys, SAS +// Submitted by Damien Tournoud 2015-01-22 +*.platform.sh + // Cupcake : https://cupcake.io/ // Submitted by Jonathan Rudenberg 2013-10-08 cupcake.is @@ -8931,6 +9571,10 @@ firebaseapp.com // Submitted by Jonathan Rudenberg 2014-07-12 flynnhub.com +// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains +// Submitted by David Illsley 2014-08-28 +service.gov.uk + // GitHub, Inc. // Submitted by Ben Toews 2014-02-06 github.io @@ -8941,7 +9585,7 @@ githubusercontent.com ro.com // Google, Inc. -// Submitted by Eduardo Vela 2012-10-24 +// Submitted by Eduardo Vela 2014-12-19 appspot.com blogspot.ae blogspot.be @@ -8989,6 +9633,7 @@ blogspot.tw codespot.com googleapis.com googlecode.com +pagespeedmobilizer.com withgoogle.com // Heroku : https://www.heroku.com/ @@ -9041,17 +9686,19 @@ poznan.pl wroc.pl zakopane.pl +// priv.at : http://www.nic.priv.at/ +// Submitted by registry 2008-06-09 +priv.at + // Red Hat, Inc. OpenShift : https://openshift.redhat.com/ // Submitted by Tim Kramer 2012-10-24 rhcloud.com -// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains -// Submitted by David Illsley 2014-08-28 -service.gov.uk - -// priv.at : http://www.nic.priv.at/ -// Submitted by registry 2008-06-09 -priv.at +// SinaAppEngine : http://sae.sina.com.cn/ +// Submitted by SinaAppEngine 2015-02-02 +sinaapp.com +vipsinaapp.com +1kapp.com // TASK geographical domains (www.task.gda.pl/uslugi/dns) gda.pl @@ -9060,6 +9707,13 @@ gdynia.pl med.pl sopot.pl +// UDR Limited : http://www.udr.hk.com +// Submitted by registry 2014-11-07 +hk.com +hk.org +ltd.hk +inc.hk + // Yola : https://www.yola.com/ // Submitted by Stefano Rivera 2014-07-09 yolasite.com diff --git a/docs/libpsl/Makefile.am b/docs/libpsl/Makefile.am index 97279b5..9812d70 100644 --- a/docs/libpsl/Makefile.am +++ b/docs/libpsl/Makefile.am @@ -113,9 +113,11 @@ if ENABLE_MAN theMANS += libpsl.3 man_MANS += docs $(theMANS) -%.3: -#.xml.3: - @file=xml/`echo $@|cut -d'.' -f1`.xml; \ +# make distcheck -jn randomly breaks +.NOTPARALLEL: + +%.3: sgml-build.stamp + @file=xml/`basename $@|cut -d'.' -f1`.xml; \ @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $$file endif diff --git a/docs/libpsl/libpsl.types b/docs/libpsl/libpsl.types new file mode 100644 index 0000000..e69de29 diff --git a/src/Makefile.am b/src/Makefile.am index f600134..412e26f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,10 +27,10 @@ if BUILTIN_GENERATOR_LIBICU psl2c_LDADD = -licuuc endif if BUILTIN_GENERATOR_LIBIDN2 - psl2c_LDADD = -lidn2 -lunistring + psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring endif if BUILTIN_GENERATOR_LIBIDN - psl2c_LDADD = -lidn -lunistring + psl2c_LDADD = @LTLIBICONV@ -lidn -lunistring endif # Build rule for suffix.c diff --git a/src/psl.c b/src/psl.c index a4bc01b..6fe0633 100644 --- a/src/psl.c +++ b/src/psl.c @@ -93,11 +93,27 @@ /* number of elements within an array */ #define countof(a) (sizeof(a)/sizeof(*(a))) +#ifndef HAVE_STRNDUP +// I found no strndup on my old SUSE 7.3 test system (gcc 2.95) + +static char *strndup(const char *s, size_t n) +{ + char *dst = malloc(n + 1); + + if (dst) { + memcpy(dst, s, n); + dst[n] = 0; + } + + return dst; +} +#endif + /** * SECTION:libpsl * @short_description: Public Suffix List library functions * @title: libpsl - * @stability: unstable + * @stability: Stable * @include: libpsl.h * * [Public Suffix List](http://publicsuffix.org/) library functions. @@ -245,10 +261,10 @@ static int _suffix_compare(const _psl_entry_t *s1, const _psl_entry_t *s2) int n; if ((n = s2->nlabels - s1->nlabels)) - return n; // most labels first + return n; /* most labels first */ if ((n = s1->length - s2->length)) - return n; // shorter rules first + return n; /* shorter rules first */ return strcmp(s1->label, s2->label ? s2->label : s2->label_buf); } @@ -481,9 +497,14 @@ const char *psl_registrable_domain(const psl_ctx_t *psl, const char *domain) return regdom; } +static inline int _isspace_ascii(const char c) +{ + return c == ' ' || c == '\t' || c == '\r' || c == '\n'; +} + static int _str_is_ascii(const char *s) { - while (*s > 0 && *s < 128) s++; + while (*s && *((unsigned char *)s) < 128) s++; return !*s; } @@ -664,14 +685,14 @@ psl_ctx_t *psl_load_fp(FILE *fp) psl->suffix_exceptions = _vector_alloc(64, _suffix_compare_array); while ((linep = fgets(buf, sizeof(buf), fp))) { - while (isspace(*linep)) linep++; /* ignore leading whitespace */ + while (_isspace_ascii(*linep)) linep++; /* ignore leading whitespace */ if (!*linep) continue; /* skip empty lines */ if (*linep == '/' && linep[1] == '/') continue; /* skip comments */ /* parse suffix rule */ - for (p = linep; *linep && !isspace(*linep);) linep++; + for (p = linep; *linep && !_isspace_ascii(*linep);) linep++; *linep = 0; if (*p == '!') { diff --git a/src/psl2c.c b/src/psl2c.c index a31a2cd..e634a97 100644 --- a/src/psl2c.c +++ b/src/psl2c.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #ifdef HAVE_ALLOCA_H # include @@ -92,7 +91,7 @@ static void _print_psl_entries(FILE *fpout, const _psl_vector_t *v, const char * #if !defined(WITH_LIBICU) && !defined(WITH_IDN2) static int _str_needs_encoding(const char *s) { - while (*s > 0) s++; + while (*s && *((unsigned char *)s) < 128) s++; return !!*s; } diff --git a/tests/test-is-public-all.c b/tests/test-is-public-all.c index 743004c..eb95e0e 100644 --- a/tests/test-is-public-all.c +++ b/tests/test-is-public-all.c @@ -46,6 +46,11 @@ static int ok, failed; +static inline int _isspace_ascii(const char c) +{ + return c == ' ' || c == '\t' || c == '\r' || c == '\n'; +} + static void test_psl(void) { FILE *fp; @@ -59,14 +64,14 @@ static void test_psl(void) if ((fp = fopen(PSL_FILE, "r"))) { while ((linep = fgets(buf, sizeof(buf), fp))) { - while (isspace(*linep)) linep++; /* ignore leading whitespace */ + while (_isspace_ascii(*linep)) linep++; /* ignore leading whitespace */ if (!*linep) continue; /* skip empty lines */ if (*linep == '/' && linep[1] == '/') continue; /* skip comments */ /* parse suffix rule */ - for (p = linep; *linep && !isspace(*linep);) linep++; + for (p = linep; *linep && !_isspace_ascii(*linep);) linep++; *linep = 0; if (*p == '!') { /* an exception to a wildcard, e.g. !www.ck (wildcard is *.ck) */ diff --git a/tests/test-registrable-domain.c b/tests/test-registrable-domain.c index 1d4b68d..cb6ae9b 100644 --- a/tests/test-registrable-domain.c +++ b/tests/test-registrable-domain.c @@ -35,7 +35,6 @@ #include #include #include -#include #ifdef HAVE_ALLOCA_H # include #endif