From 9ca28c69d96b9d6dc12e02e551301f9e0a7d9ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Tue, 20 Jan 2015 14:46:52 +0100
Subject: [PATCH 01/23] added ./configure to distribution tarball

Reported-by: Dagobert Michelsen
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index bc329fa..67f8582 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,4 +13,4 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpsl.pc
 
-EXTRA_DIST = config.rpath
+EXTRA_DIST = config.rpath configure

From b1b05d8dc49710a387a6299e9eee135a7a2c9b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Tue, 20 Jan 2015 15:23:51 +0100
Subject: [PATCH 02/23] Revert "added ./configure to distribution tarball"

This reverts commit 9ca28c69d96b9d6dc12e02e551301f9e0a7d9ab9.
The configure script *WAS* included in the dist tarball before.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 67f8582..bc329fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,4 +13,4 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpsl.pc
 
-EXTRA_DIST = config.rpath configure
+EXTRA_DIST = config.rpath

From 832829622d9cf7ab3f65e4da5c349e8868ee4597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 11:16:02 +0100
Subject: [PATCH 03/23] Added GTK_DOC_USE_LIBTOOL conditional for tarball using
 without gtk-doc tools installed

Reported-by: Dagobert Michelsen
---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index da9936c..9ab0508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,10 @@ 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)
+])
 
 #
 # enable creation of man pages

From de1a34d673db9d33848c7f2d816bdf45455657ad Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam@opencsw.org>
Date: Wed, 21 Jan 2015 11:36:58 +0100
Subject: [PATCH 04/23] Solaris needs -lsocket -lnsl for inet_ntop

---
 configure.ac | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9ab0508..145a873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,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,

From d5254ac81690c97d2212664cafd3e24e6a8ae342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 12:21:32 +0100
Subject: [PATCH 05/23] removed C99 style comments

---
 src/psl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/psl.c b/src/psl.c
index a4bc01b..dedab01 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -245,10 +245,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);
 }

From 6f899ae32b7e0292b9bb9742d8e24543ba90266a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 12:26:44 +0100
Subject: [PATCH 06/23] fixed gcc warning about comparison being always true

---
 src/psl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/psl.c b/src/psl.c
index dedab01..18acca4 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -483,7 +483,7 @@ const char *psl_registrable_domain(const psl_ctx_t *psl, const char *domain)
 
 static int _str_is_ascii(const char *s)
 {
-	while (*s > 0 && *s < 128) s++;
+	while (*s && *((unsigned char *)s) < 128) s++;
 
 	return !*s;
 }

From 06785d7f3fc6aedd33280714215a37c11a5ad781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 12:35:58 +0100
Subject: [PATCH 07/23] new author Dagobert Michelsen

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 562d9b7..e23f80b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,3 +11,4 @@ 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)

From 666e61659d0f1c979c48cb13179600f395535a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 14:22:57 +0100
Subject: [PATCH 08/23] use pkg-config to detect libicu

---
 configure.ac | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 145a873..0104170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,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,
@@ -134,16 +135,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 <unicode/ustring.h>]],
-      [[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([ICUUC], [icu-uc], [
+    HAVE_LIBICU=yes
+    LIBS="$ICUUC_LIBS $LIBS"
+    CFLAGS="$ICUUC_CFLAGS $CFLAGS"
+  ], [
+    OLDLIBS=$LIBS
+    LIBS="-licuuc $LIBS"
+    AC_MSG_CHECKING([for ICU unicode library])
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+        [[#include <unicode/ustring.h>]],
+        [[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

From 8e39ffa4c560b4dc988c06e7caec599fdeb45251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 14:26:12 +0100
Subject: [PATCH 09/23] renamed ICUUC to LIBICU

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0104170..ee3d272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,10 +135,10 @@ 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
-  PKG_CHECK_MODULES([ICUUC], [icu-uc], [
+  PKG_CHECK_MODULES([LIBICU], [icu-uc], [
     HAVE_LIBICU=yes
-    LIBS="$ICUUC_LIBS $LIBS"
-    CFLAGS="$ICUUC_CFLAGS $CFLAGS"
+    LIBS="$LIBICU_LIBS $LIBS"
+    CFLAGS="$LIBICU_CFLAGS $CFLAGS"
   ], [
     OLDLIBS=$LIBS
     LIBS="-licuuc $LIBS"

From 16d751c7d38df367905a30c87ce23f7b036c5354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 15:38:18 +0100
Subject: [PATCH 10/23] mark API as stable

---
 src/psl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/psl.c b/src/psl.c
index 18acca4..d0dbb10 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -97,7 +97,7 @@
  * 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.

From d22c4b1483e31eee6490a9e567e32e5c6ea505d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 21 Jan 2015 17:02:27 +0100
Subject: [PATCH 11/23] fixed docs for 'make distcheck' after 'make clean'

---
 docs/libpsl/Makefile.am  | 8 +++++---
 docs/libpsl/libpsl.types | 0
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 docs/libpsl/libpsl.types

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

From c485ed9edd7c0d765a602906e6248314e1b7d4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Thu, 22 Jan 2015 16:40:13 +0100
Subject: [PATCH 12/23] adjusted autogen.sh to work on Solaris

---
 autogen.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 14806ea..c98e715 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,16 @@ 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."
   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 "----------------------------------------------------------------"

From 768790eab73406e1570e4c7f11cc3c784a16ee53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 23 Jan 2015 12:19:50 +0100
Subject: [PATCH 13/23] explicitely remove gtk-doc.make if gtkdoc is not
 installed

---
 autogen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index c98e715..2c6dc20 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,6 +12,8 @@ mkdir m4 2>/dev/null
 GTKDOCIZE=`which gtkdocize 2>/dev/null`
 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=""

From 910c4b37b6705a70e95d9c61fc2921f835374b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 23 Jan 2015 15:05:02 +0100
Subject: [PATCH 14/23] add strndup() compatibility code

---
 configure.ac |  1 +
 src/psl.c    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/configure.ac b/configure.ac
index ee3d272..ed08540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,6 +231,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.
diff --git a/src/psl.c b/src/psl.c
index d0dbb10..4bc6e53 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -93,6 +93,22 @@
 /* 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

From 58a4f6c028c3c50455a8ba36eea261a066d875ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 23 Jan 2015 16:13:19 +0100
Subject: [PATCH 15/23] add iconv Solaris compatibility

---
 configure.ac    | 4 ++++
 src/Makefile.am | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ed08540..05e5f64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,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")
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

From 896f7f6ae4bd610b42dc1281476eea78f850a53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 26 Jan 2015 11:04:22 +0100
Subject: [PATCH 16/23] Fix ASCII check in src/psl2c.c

---
 src/psl2c.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <ctype.h>
 #include <sys/stat.h>
 #ifdef HAVE_ALLOCA_H
 #	include <alloca.h>
@@ -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;
 }

From 067f6aee9caab2b57583c14fae7e17a2b25c22d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 26 Jan 2015 11:05:32 +0100
Subject: [PATCH 17/23] Don't use locale dependent isspace()

Fixes an issue on Solaris
Reported-by: Dagobert Michelsen <dam@opencsw.org>
---
 configure.ac                    | 3 +++
 src/psl.c                       | 9 +++++++--
 tests/test-is-public-all.c      | 9 +++++++--
 tests/test-registrable-domain.c | 1 -
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 05e5f64..f2773b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 #
diff --git a/src/psl.c b/src/psl.c
index 4bc6e53..6fe0633 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -497,6 +497,11 @@ 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 && *((unsigned char *)s) < 128) s++;
@@ -680,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/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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #ifdef HAVE_ALLOCA_H
 #	include <alloca.h>
 #endif

From 8af7964a088144bb78049adb874b8bfced7c5f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 26 Jan 2015 13:16:59 +0100
Subject: [PATCH 18/23] Do not install docs when gtk-doc is not installed

Reported-by: Dagobert Michelsen <dam@opencsw.org>
---
 Makefile.am  |  5 +++--
 configure.ac | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

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/configure.ac b/configure.ac
index f2773b1..0840c60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,12 @@ 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
 #
@@ -247,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])

From 5910b625ced7f97839b7f56869b60774a81bdbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 26 Jan 2015 14:47:17 +0100
Subject: [PATCH 19/23] new version of effective_tld_names.dat

---
 data/effective_tld_names.dat | 502 +++++++++++++++++++++++++++++++++--
 1 file changed, 479 insertions(+), 23 deletions(-)

diff --git a/data/effective_tld_names.dat b/data/effective_tld_names.dat
index 8ae5d97..8f1a3b2 100644
--- a/data/effective_tld_names.dat
+++ b/data/effective_tld_names.dat
@@ -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 2014-12-22T18:02:07Z
 
 // abb : 2014-10-24 ABB Ltd
 abb
@@ -6797,6 +6797,9 @@ academy
 // accenture : 2014-08-15 Accenture plc
 accenture
 
+// accountant : 2014-11-20 dot Accountant Limited
+accountant
+
 // accountants : 2014-03-20 Knob Town, LLC
 accountants
 
@@ -6806,6 +6809,9 @@ 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,6 +6824,9 @@ 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
 
@@ -6833,37 +6842,58 @@ 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
 
+// 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
 
 // axa : 2013-12-19 AXA SA
 axa
 
-// band : 2014-06-12 
+// azure : 2014-12-18 Microsoft Corporation
+azure
+
+// band : 2014-06-12  
 band
 
 // bank : 2014-09-25 fTLD Registry Services LLC
@@ -6875,6 +6905,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 +6920,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 +6932,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 +6953,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 +6986,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 +6998,21 @@ bond
 // boo : 2014-01-30 Charleston Road Registry Inc.
 boo
 
+// 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
+
+// broker : 2014-12-11 IG Group Holdings PLC
+broker
+
 // brussels : 2014-02-06 DNS.be vzw
 brussels
 
@@ -6965,6 +7028,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 +7043,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
 
@@ -7010,6 +7079,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 +7091,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 +7115,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 +7139,18 @@ chrome
 // church : 2014-02-06 Holly Fileds, LLC
 church
 
+// circle : 2014-12-18 Amazon EU S.à r.l.
+circle
+
 // 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
 
@@ -7115,7 +7202,7 @@ condos
 // construction : 2013-09-16 Fox Dynamite, LLC
 construction
 
-// consulting : 2013-12-05 
+// consulting : 2013-12-05  
 consulting
 
 // contractors : 2013-09-10 Magic Woods, LLC
@@ -7133,6 +7220,9 @@ 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
 
@@ -7169,6 +7259,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 +7271,13 @@ datsun
 // day : 2014-01-30 Charleston Road Registry Inc.
 day
 
+// dclk : 2014-11-20 Charleston Road Registry Inc.
+dclk
+
 // 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 +7292,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 +7328,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 +7340,24 @@ domains
 // doosan : 2014-04-03 Doosan Corporation
 doosan
 
+// download : 2014-11-20 dot Support Limited
+download
+
 // 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 +7379,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 +7415,39 @@ 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
+
 // final : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br
 final
 
@@ -7325,6 +7457,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 +7469,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 +7493,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 +7520,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 +7538,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 +7556,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 +7580,27 @@ gmo
 // gmx : 2014-04-24 1&1 Mail & Media GmbH
 gmx
 
+// 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 +7616,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 +7634,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 +7670,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 +7682,9 @@ host
 // hosting : 2014-05-29 Uniregistry, Corp.
 hosting
 
+// hotmail : 2014-12-18 Microsoft Corporation
+hotmail
+
 // house : 2013-11-07 Sugar Park, LLC
 house
 
@@ -7574,15 +7754,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 +7790,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
 
@@ -7613,19 +7814,25 @@ 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 
+// lawyer : 2014-03-20  
 lawyer
 
 // lds : 2014-03-20 IRI Domain Management, LLC (\
@@ -7652,24 +7859,45 @@ lidl
 // life : 2014-02-06 Trixy Oaks, LLC
 life
 
+// 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
 
@@ -7679,6 +7907,9 @@ 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 +7925,24 @@ maif
 // maison : 2013-12-05 Victor Frostbite, LLC
 maison
 
+// 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 +7964,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 +8003,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,6 +8018,15 @@ 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
 
@@ -7784,6 +8045,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 +8057,18 @@ 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
 
+// norton : 2014-12-04 Symantec Corporation
+norton
+
 // nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
 nowruz
 
@@ -7820,6 +8090,9 @@ obi
 // okinawa : 2013-12-05 BusinessRalliart Inc.
 okinawa
 
+// one : 2014-11-07 One.com A/S
+one
+
 // ong : 2014-03-06 Public Interest Registry
 ong
 
@@ -7844,6 +8117,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 +8141,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 +8168,9 @@ pictet
 // pictures : 2014-03-06 Foggy Sky, LLC
 pictures
 
+// pin : 2014-12-18 Amazon EU S.à r.l.
+pin
+
 // pink : 2013-10-01 Afilias Limited
 pink
 
@@ -7922,6 +8207,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 +8225,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 +8258,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 +8279,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 +8321,45 @@ 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
+
+// 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 +8372,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 +8393,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 +8405,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
 
@@ -8093,10 +8432,16 @@ singles
 // 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
@@ -8117,12 +8462,30 @@ 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
+
+// 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
+
+// study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD
+study
+
+// style : 2014-12-04 Binky Moon, LLC
+style
+
 // supplies : 2013-12-19 Atomic Fields, LLC
 supplies
 
@@ -8147,9 +8510,15 @@ 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
 
@@ -8174,12 +8543,18 @@ 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
 
@@ -8195,6 +8570,9 @@ 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
 
@@ -8207,15 +8585,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 +8615,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,13 +8627,13 @@ 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
@@ -8261,6 +8651,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,9 +8675,15 @@ 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
 
@@ -8312,6 +8711,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 +8735,15 @@ wtc
 // wtf : 2014-03-06 Hidden Way, LLC
 wtf
 
+// xbox : 2014-12-18 Microsoft Corporation
+xbox
+
 // xerox : 2014-10-24 Xerox DNHC LLC
 xerox
 
+// xin : 2014-12-11 Elegant Leader Limited
+xin
+
 // xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd.
 佛山
 
@@ -8396,6 +8807,9 @@ 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 新华通讯社广东分社
 新闻
 
@@ -8417,15 +8831,27 @@ 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--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
+飞利浦
+
 // 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.
 همراه
 
@@ -8435,12 +8861,18 @@ xerox
 // 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
 рус
 
@@ -8483,9 +8915,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,12 +8933,21 @@ yokohama
 // youtube : 2014-05-01 Charleston Road Registry Inc.
 youtube
 
+// 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===
 
@@ -8509,7 +8956,7 @@ zone
 cloudfront.net
 
 // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Osman Surkatty <osmans@amazon.com> 2014-05-20
+// Submitted by Osman Surkatty <osmans@amazon.com> 2014-12-16
 ap-northeast-1.compute.amazonaws.com
 ap-southeast-1.compute.amazonaws.com
 ap-southeast-2.compute.amazonaws.com
@@ -8518,6 +8965,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
@@ -8941,7 +9389,7 @@ githubusercontent.com
 ro.com
 
 // Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com> 2012-10-24
+// Submitted by Eduardo Vela <evn@google.com> 2014-12-19
 appspot.com
 blogspot.ae
 blogspot.be
@@ -8989,6 +9437,7 @@ blogspot.tw
 codespot.com
 googleapis.com
 googlecode.com
+pagespeedmobilizer.com
 withgoogle.com
 
 // Heroku : https://www.heroku.com/
@@ -9060,6 +9509,13 @@ gdynia.pl
 med.pl
 sopot.pl
 
+// UDR Limited : http://www.udr.hk.com
+// Submitted by registry <hostmaster@udr.hk.com> 2014-11-07
+hk.com
+hk.org
+ltd.hk
+inc.hk
+
 // Yola : https://www.yola.com/
 // Submitted by Stefano Rivera <stefano@yola.com> 2014-07-09
 yolasite.com

From 22de5ae70979b4f1d16882eeb8db607e4b345c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 30 Jan 2015 16:16:42 +0100
Subject: [PATCH 20/23] Release v0.7.0

---
 NEWS         | 8 ++++++++
 configure.ac | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4212db1..37268c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Copyright (C) 2014 Tim Rühsen
 
+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/configure.ac b/configure.ac
index 0840c60..579cf35 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.0], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
 
@@ -77,7 +77,7 @@ PKG_PROG_PKG_CONFIG
 # 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

From eea684ba2017c07fb7fb09e82232b7ae5dfcc30e Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Fri, 13 Feb 2015 18:09:40 +0800
Subject: [PATCH 21/23] Allow custom public suffix file

There is an option already in the configure.ac to allow system-wide
public suffix. Fedora ships the data as a package "publicsuffix-list"
and installs it to /usr/share/.
Thus I'd like to use the system one since it's updated often.
---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

From fdcaea49db006ce2655ace37d5f92c7b8ba154cb Mon Sep 17 00:00:00 2001
From: Tim Ruehsen <tim.ruehsen@gmx.de>
Date: Sat, 21 Feb 2015 19:29:55 +0100
Subject: [PATCH 22/23] new version of effective_tld_names.dat

---
 data/effective_tld_names.dat | 218 +++++++++++++++++++++++++++++++++--
 1 file changed, 208 insertions(+), 10 deletions(-)

diff --git a/data/effective_tld_names.dat b/data/effective_tld_names.dat
index 8f1a3b2..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-12-22T18:02:07Z
+// 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
@@ -6803,6 +6803,9 @@ 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
 
@@ -6833,6 +6836,12 @@ 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
 
@@ -6848,6 +6857,9 @@ 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
 
@@ -6887,12 +6899,18 @@ 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
 
 // azure : 2014-12-18 Microsoft Corporation
 azure
 
+// baidu : 2015-01-08 Baidu, Inc.
+baidu
+
 // band : 2014-06-12  
 band
 
@@ -6998,6 +7016,9 @@ 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
 
@@ -7010,6 +7031,9 @@ 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
 
@@ -7064,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
 
@@ -7142,6 +7169,9 @@ 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
 
@@ -7196,6 +7226,9 @@ company
 // computer : 2013-10-24 Pine Mill, LLC
 computer
 
+// comsec : 2015-01-08 VeriSign, Inc.
+comsec
+
 // condos : 2013-12-05 Pine House, LLC
 condos
 
@@ -7205,6 +7238,9 @@ construction
 // consulting : 2013-12-05  
 consulting
 
+// contact : 2015-01-08 Top Level Spectrum, Inc.
+contact
+
 // contractors : 2013-09-10 Magic Woods, LLC
 contractors
 
@@ -7229,6 +7265,9 @@ 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
 
@@ -7250,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
 
@@ -7274,6 +7316,9 @@ 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
 
@@ -7343,6 +7388,9 @@ 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
 
@@ -7448,6 +7496,9 @@ 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
 
@@ -7580,6 +7631,9 @@ 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
 
@@ -7700,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
 
@@ -7808,6 +7865,12 @@ 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
 
@@ -7832,6 +7895,9 @@ lat
 // latrobe : 2014-06-16 La Trobe University
 latrobe
 
+// law : 2015-01-22 Minds + Machines Group Limited
+law
+
 // lawyer : 2014-03-20  
 lawyer
 
@@ -7859,6 +7925,9 @@ 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
 
@@ -7901,6 +7970,9 @@ 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
 
@@ -7925,6 +7997,9 @@ maif
 // maison : 2013-12-05 Victor Frostbite, LLC
 maison
 
+// makeup : 2015-01-15 L'Oréal
+makeup
+
 // man : 2014-12-04 MAN SE
 man
 
@@ -8033,6 +8108,9 @@ 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
 
@@ -8066,6 +8144,9 @@ ninja
 // nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
 nissan
 
+// nokia : 2015-01-08 Nokia Corporation
+nokia
+
 // norton : 2014-12-04 Symantec Corporation
 norton
 
@@ -8090,6 +8171,9 @@ 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
 
@@ -8099,6 +8183,9 @@ ong
 // onl : 2013-09-16 I-Registry Ltd.
 onl
 
+// online : 2015-01-15 DotOnline Inc.
+online
+
 // ooo : 2014-01-09 INFIBEAM INCORPORATION LIMITED
 ooo
 
@@ -8168,6 +8255,9 @@ 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
 
@@ -8324,6 +8414,9 @@ saarland
 // 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
 
@@ -8423,12 +8516,21 @@ 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
 
@@ -8453,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
 
@@ -8468,6 +8573,9 @@ 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
 
@@ -8480,12 +8588,18 @@ 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
 
@@ -8504,6 +8618,9 @@ 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
 
@@ -8522,6 +8639,9 @@ 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
 
@@ -8558,6 +8678,9 @@ 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
 
@@ -8576,6 +8699,9 @@ toray
 // toshiba : 2014-04-10 TOSHIBA Corporation
 toshiba
 
+// tours : 2015-01-22 Sugar Station, LLC
+tours
+
 // town : 2014-03-06 Koko Moon, LLC
 town
 
@@ -8639,6 +8765,9 @@ 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
 
@@ -8687,6 +8816,12 @@ 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
 
@@ -8741,9 +8876,15 @@ 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.
 佛山
 
@@ -8756,6 +8897,12 @@ xin
 // 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
 八卦
 
@@ -8768,6 +8915,9 @@ xin
 // 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
 移动
 
@@ -8783,6 +8933,9 @@ xin
 // xn--80aswg : 2013-07-14 CORE Association
 сайт
 
+// xn--9dbq2a : 2015-01-15 VeriSign Sarl
+קום
+
 // xn--9et52u : 2014-06-12 RISE VICTORY LIMITED
 时尚
 
@@ -8792,6 +8945,9 @@ xin
 // xn--c1avg : 2013-11-14 Public Interest Registry
 орг
 
+// xn--c2br7g : 2015-01-15 VeriSign Sarl
+नेट
+
 // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
 삼성
 
@@ -8813,6 +8969,9 @@ xin
 // 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
 中文网
 
@@ -8837,9 +8996,18 @@ xin
 // 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
 手机
 
@@ -8855,6 +9023,9 @@ xin
 // 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.
 政府
 
@@ -8876,6 +9047,12 @@ xin
 // 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.
 みんな
 
@@ -8885,9 +9062,15 @@ xin
 // 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
 游戏
 
@@ -8933,6 +9116,9 @@ 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
 
@@ -8948,8 +9134,10 @@ 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 <donavanm@amazon.com> 2013-03-22
@@ -9074,6 +9262,10 @@ co.ca
 co.nl
 co.no
 
+// Commerce Guys, SAS
+// Submitted by Damien Tournoud <damien@commerceguys.com> 2015-01-22
+*.platform.sh
+
 // Cupcake : https://cupcake.io/
 // Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08
 cupcake.is
@@ -9379,6 +9571,10 @@ firebaseapp.com
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io> 2014-07-12
 flynnhub.com
 
+// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
+// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
+service.gov.uk
+
 // GitHub, Inc.
 // Submitted by Ben Toews <btoews@github.com> 2014-02-06
 github.io
@@ -9490,17 +9686,19 @@ poznan.pl
 wroc.pl
 zakopane.pl
 
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
 // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
 // Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
 rhcloud.com
 
-// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
-// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
-service.gov.uk
-
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
+// SinaAppEngine : http://sae.sina.com.cn/
+// Submitted by SinaAppEngine <saesupport@sinacloud.com> 2015-02-02
+sinaapp.com
+vipsinaapp.com
+1kapp.com
 
 // TASK geographical domains (www.task.gda.pl/uslugi/dns)
 gda.pl

From 1030a438c95f9b3408386d1f12a587525240dee0 Mon Sep 17 00:00:00 2001
From: Tim Ruehsen <tim.ruehsen@gmx.de>
Date: Sat, 21 Feb 2015 19:30:52 +0100
Subject: [PATCH 23/23] Release v0.7.1

---
 AUTHORS      | 1 +
 NEWS         | 3 +++
 configure.ac | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index e23f80b..2843c28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,3 +12,4 @@ 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/NEWS b/NEWS
index 37268c9..c7962f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 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
diff --git a/configure.ac b/configure.ac
index 579cf35..7fc1491 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([libpsl], [0.7.0], [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])