Hello community,

here is the log from the commit of package pdns for openSUSE:Factory checked in 
at 2018-05-29 10:49:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pdns (Old)
 and      /work/SRC/openSUSE:Factory/.pdns.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pdns"

Tue May 29 10:49:10 2018 rev:55 rq:612636 version:4.1.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/pdns/pdns.changes        2018-05-24 
23:24:29.094206350 +0200
+++ /work/SRC/openSUSE:Factory/.pdns.new/pdns.changes   2018-05-29 
10:49:20.666697109 +0200
@@ -1,0 +2,18 @@
+Thu May 24 14:53:16 UTC 2018 - mich...@stroeder.com
+
+- Use HTTPS links in .spec file like mentioned in PowerDNS announcements
+- removed obsolete 6370.patch
+- Update to 4.1.3
+  - Improvements
+    * #6239, #6559: pdnsutil: use new domain in b2bmigrate (Aki Tuomi)
+    * #6130: Update copyright years to 2018 (Matt Nordhoff)
+    * #6312, #6545: Lower ‘packet too short’ loglevel
+  - Bug Fixes
+    * #6441, #6614: Restrict creation of OPT and TSIG RRsets
+    * #6228, #6370: Fix handling of user-defined axfr filters return values
+    * #6584, #6585, #6608: Prevent the GeoIP backend from copying 
+      NetMaskTrees around, fixes slow-downs in certain configurations
+      (Aki Tuomi)
+    * #6654, #6659: Ensure alias answers over TCP have correct name
+
+-------------------------------------------------------------------

Old:
----
  6370.patch
  pdns-4.1.2.tar.bz2
  pdns-4.1.2.tar.bz2.sig

New:
----
  pdns-4.1.3.tar.bz2
  pdns-4.1.3.tar.bz2.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pdns.spec ++++++
--- /var/tmp/diff_new_pack.xaAtBq/_old  2018-05-29 10:49:22.398633212 +0200
+++ /var/tmp/diff_new_pack.xaAtBq/_new  2018-05-29 10:49:22.402633064 +0200
@@ -17,11 +17,11 @@
 
 
 Name:           pdns
-Version:        4.1.2
+Version:        4.1.3
 Release:        0
 #
 %define pkg_name       pdns
-%define pkg_version 4.1.2
+%define pkg_version 4.1.3
 #
 %if 0%{?suse_version} > 1230 || 0%{?rhel_version} > 600 || 0%{?centos_version} 
> 600 || 0%{?fedora_version} >= 20 || 
0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25}
 %bcond_without systemd
@@ -135,14 +135,13 @@
 %endif
 PreReq:         pdns-common
 #
-Url:            http://www.powerdns.com/
-Source:         
http://downloads.powerdns.com/releases/pdns-%{pkg_version}.tar.bz2
-Source3:        
http://downloads.powerdns.com/releases/pdns-%{pkg_version}.tar.bz2.sig
+Url:            https://www.powerdns.com/
+Source:         
https://downloads.powerdns.com/releases/pdns-%{pkg_version}.tar.bz2
+Source3:        
https://downloads.powerdns.com/releases/pdns-%{pkg_version}.tar.bz2.sig
 Source4:        https://powerdns.com/powerdns-keyblock.asc#/pdns.keyring
 Source1:        rcpdns
 Source2:        README.opendbx
 Patch:          pdns-4.0.3_allow_dacoverride_in_capset.patch
-Patch1:         6370.patch
 Summary:        Authoritative-only nameserver
 License:        GPL-2.0-only
 Group:          Productivity/Networking/DNS/Servers
@@ -280,7 +279,6 @@
 %prep
 %setup -n %{name}-%{pkg_version}
 %patch -p1
-%patch1 -p1
 %if %{with pdns_opendbx}
 cp %{S:2} README.opendbx
 %endif

++++++ pdns-4.1.2.tar.bz2 -> pdns-4.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/.version new/pdns-4.1.3/.version
--- old/pdns-4.1.2/.version     2018-05-07 17:00:30.000000000 +0200
+++ new/pdns-4.1.3/.version     2018-05-24 14:52:44.000000000 +0200
@@ -1 +1 @@
-4.1.2
+4.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/INSTALL new/pdns-4.1.3/INSTALL
--- old/pdns-4.1.2/INSTALL      2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/INSTALL      2018-05-24 14:52:33.000000000 +0200
@@ -1,4 +1,4 @@
-PowerDNS is copyright © 2002-2017 by PowerDNS.COM BV and lots of
+PowerDNS is copyright © 2001-2018 by PowerDNS.COM BV and lots of
 contributors, using the GNU GPLv2 license (see NOTICE for the
 exact license and exception used).
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/README new/pdns-4.1.3/README
--- old/pdns-4.1.2/README       2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/README       2018-05-24 14:52:33.000000000 +0200
@@ -1,4 +1,4 @@
-PowerDNS is copyright © 2002-2017 by PowerDNS.COM BV and lots of
+PowerDNS is copyright © 2001-2018 by PowerDNS.COM BV and lots of
 contributors, using the GNU GPLv2 license (see NOTICE for the
 exact license and exception used).
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/configure new/pdns-4.1.3/configure
--- old/pdns-4.1.2/configure    2018-05-07 17:00:29.000000000 +0200
+++ new/pdns-4.1.3/configure    2018-05-24 14:52:43.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pdns 4.1.2.
+# Generated by GNU Autoconf 2.69 for pdns 4.1.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='pdns'
 PACKAGE_TARNAME='pdns'
-PACKAGE_VERSION='4.1.2'
-PACKAGE_STRING='pdns 4.1.2'
+PACKAGE_VERSION='4.1.3'
+PACKAGE_STRING='pdns 4.1.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1538,7 +1538,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pdns 4.1.2 to adapt to many kinds of systems.
+\`configure' configures pdns 4.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1608,7 +1608,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pdns 4.1.2:";;
+     short | recursive ) echo "Configuration of pdns 4.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1842,7 +1842,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pdns configure 4.1.2
+pdns configure 4.1.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2435,7 +2435,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pdns $as_me 4.1.2, which was
+It was created by pdns $as_me 4.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3315,7 +3315,7 @@
 
 # Define the identity of the package.
  PACKAGE='pdns'
- VERSION='4.1.2'
+ VERSION='4.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23543,7 +23543,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pdns $as_me 4.1.2, which was
+This file was extended by pdns $as_me 4.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23609,7 +23609,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pdns config.status 4.1.2
+pdns config.status 4.1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/calidns.1 
new/pdns-4.1.3/docs/calidns.1
--- old/pdns-4.1.2/docs/calidns.1       2018-05-07 17:01:18.000000000 +0200
+++ new/pdns-4.1.3/docs/calidns.1       2018-05-24 14:53:36.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CALIDNS" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "CALIDNS" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 calidns \- 
 .
@@ -75,6 +75,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnsbulktest.1 
new/pdns-4.1.3/docs/dnsbulktest.1
--- old/pdns-4.1.2/docs/dnsbulktest.1   2018-05-07 17:01:30.000000000 +0200
+++ new/pdns-4.1.3/docs/dnsbulktest.1   2018-05-24 14:53:48.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSBULKTEST" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSBULKTEST" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnsbulktest \- 
 .
@@ -62,6 +62,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnsgram.1 
new/pdns-4.1.3/docs/dnsgram.1
--- old/pdns-4.1.2/docs/dnsgram.1       2018-05-07 17:01:19.000000000 +0200
+++ new/pdns-4.1.3/docs/dnsgram.1       2018-05-24 14:53:37.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSGRAM" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSGRAM" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnsgram \- 
 .
@@ -49,6 +49,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnspcap2protobuf.1 
new/pdns-4.1.3/docs/dnspcap2protobuf.1
--- old/pdns-4.1.2/docs/dnspcap2protobuf.1      2018-05-07 17:01:32.000000000 
+0200
+++ new/pdns-4.1.3/docs/dnspcap2protobuf.1      2018-05-24 14:53:50.000000000 
+0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSPCAP2PROTOBUF" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSPCAP2PROTOBUF" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnspcap2protobuf \- 
 .
@@ -52,6 +52,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnsreplay.1 
new/pdns-4.1.3/docs/dnsreplay.1
--- old/pdns-4.1.2/docs/dnsreplay.1     2018-05-07 17:01:20.000000000 +0200
+++ new/pdns-4.1.3/docs/dnsreplay.1     2018-05-24 14:53:38.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSREPLAY" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSREPLAY" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnsreplay \- 
 .
@@ -98,6 +98,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnsscan.1 
new/pdns-4.1.3/docs/dnsscan.1
--- old/pdns-4.1.2/docs/dnsscan.1       2018-05-07 17:01:21.000000000 +0200
+++ new/pdns-4.1.3/docs/dnsscan.1       2018-05-24 14:53:39.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSCAN" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSSCAN" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnsscan \- 
 .
@@ -48,6 +48,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnsscope.1 
new/pdns-4.1.3/docs/dnsscope.1
--- old/pdns-4.1.2/docs/dnsscope.1      2018-05-07 17:01:22.000000000 +0200
+++ new/pdns-4.1.3/docs/dnsscope.1      2018-05-24 14:53:40.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSCOPE" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSSCOPE" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnsscope \- 
 .
@@ -78,6 +78,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnstcpbench.1 
new/pdns-4.1.3/docs/dnstcpbench.1
--- old/pdns-4.1.2/docs/dnstcpbench.1   2018-05-07 17:01:31.000000000 +0200
+++ new/pdns-4.1.3/docs/dnstcpbench.1   2018-05-24 14:53:49.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSTCPBENCH" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSTCPBENCH" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnstcpbench \- 
 .
@@ -98,6 +98,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dnswasher.1 
new/pdns-4.1.3/docs/dnswasher.1
--- old/pdns-4.1.2/docs/dnswasher.1     2018-05-07 17:01:23.000000000 +0200
+++ new/pdns-4.1.3/docs/dnswasher.1     2018-05-24 14:53:41.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSWASHER" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DNSWASHER" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dnswasher \- 
 .
@@ -58,6 +58,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/dumresp.1 
new/pdns-4.1.3/docs/dumresp.1
--- old/pdns-4.1.2/docs/dumresp.1       2018-05-07 17:01:24.000000000 +0200
+++ new/pdns-4.1.3/docs/dumresp.1       2018-05-24 14:53:42.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DUMRESP" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "DUMRESP" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 dumresp \- 
 .
@@ -51,6 +51,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/ixplore.1 
new/pdns-4.1.3/docs/ixplore.1
--- old/pdns-4.1.2/docs/ixplore.1       2018-05-07 17:01:25.000000000 +0200
+++ new/pdns-4.1.3/docs/ixplore.1       2018-05-24 14:53:42.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "IXPLORE" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "IXPLORE" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 ixplore \- 
 .
@@ -86,6 +86,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/nproxy.1 new/pdns-4.1.3/docs/nproxy.1
--- old/pdns-4.1.2/docs/nproxy.1        2018-05-07 17:01:25.000000000 +0200
+++ new/pdns-4.1.3/docs/nproxy.1        2018-05-24 14:53:43.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NPROXY" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "NPROXY" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 nproxy \- 
 .
@@ -85,6 +85,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/nsec3dig.1 
new/pdns-4.1.3/docs/nsec3dig.1
--- old/pdns-4.1.2/docs/nsec3dig.1      2018-05-07 17:01:27.000000000 +0200
+++ new/pdns-4.1.3/docs/nsec3dig.1      2018-05-24 14:53:44.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NSEC3DIG" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "NSEC3DIG" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 nsec3dig \- 
 .
@@ -47,6 +47,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/pdns_control.1 
new/pdns-4.1.3/docs/pdns_control.1
--- old/pdns-4.1.2/docs/pdns_control.1  2018-05-07 17:01:14.000000000 +0200
+++ new/pdns-4.1.3/docs/pdns_control.1  2018-05-24 14:53:32.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PDNS_CONTROL" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "PDNS_CONTROL" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 pdns_control \- 
 .
@@ -176,6 +176,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/pdns_notify.1 
new/pdns-4.1.3/docs/pdns_notify.1
--- old/pdns-4.1.2/docs/pdns_notify.1   2018-05-07 17:01:27.000000000 +0200
+++ new/pdns-4.1.3/docs/pdns_notify.1   2018-05-24 14:53:45.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PDNS_NOTIFY" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "PDNS_NOTIFY" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 pdns_notify \- 
 .
@@ -45,6 +45,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/pdns_server.1 
new/pdns-4.1.3/docs/pdns_server.1
--- old/pdns-4.1.2/docs/pdns_server.1   2018-05-07 17:01:13.000000000 +0200
+++ new/pdns-4.1.3/docs/pdns_server.1   2018-05-24 14:53:31.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PDNS_SERVER" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "PDNS_SERVER" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 pdns_server \- 
 .
@@ -71,6 +71,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/pdnsutil.1 
new/pdns-4.1.3/docs/pdnsutil.1
--- old/pdns-4.1.2/docs/pdnsutil.1      2018-05-07 17:01:15.000000000 +0200
+++ new/pdns-4.1.3/docs/pdnsutil.1      2018-05-24 14:53:33.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PDNSUTIL" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "PDNSUTIL" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 pdnsutil \- 
 .
@@ -325,6 +325,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/saxfr.1 new/pdns-4.1.3/docs/saxfr.1
--- old/pdns-4.1.2/docs/saxfr.1 2018-05-07 17:01:28.000000000 +0200
+++ new/pdns-4.1.3/docs/saxfr.1 2018-05-24 14:53:46.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SAXFR" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "SAXFR" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 saxfr \- 
 .
@@ -55,6 +55,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/sdig.1 new/pdns-4.1.3/docs/sdig.1
--- old/pdns-4.1.2/docs/sdig.1  2018-05-07 17:01:29.000000000 +0200
+++ new/pdns-4.1.3/docs/sdig.1  2018-05-24 14:53:47.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SDIG" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "SDIG" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 sdig \- 
 .
@@ -64,6 +64,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/zone2json.1 
new/pdns-4.1.3/docs/zone2json.1
--- old/pdns-4.1.2/docs/zone2json.1     2018-05-07 17:01:15.000000000 +0200
+++ new/pdns-4.1.3/docs/zone2json.1     2018-05-24 14:53:33.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ZONE2JSON" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "ZONE2JSON" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 zone2json \- 
 .
@@ -73,6 +73,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/zone2ldap.1 
new/pdns-4.1.3/docs/zone2ldap.1
--- old/pdns-4.1.2/docs/zone2ldap.1     2018-05-07 17:01:17.000000000 +0200
+++ new/pdns-4.1.3/docs/zone2ldap.1     2018-05-24 14:53:35.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ZONE2LDAP" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "ZONE2LDAP" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 zone2ldap \- 
 .
@@ -75,6 +75,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/docs/zone2sql.1 
new/pdns-4.1.3/docs/zone2sql.1
--- old/pdns-4.1.2/docs/zone2sql.1      2018-05-07 17:01:16.000000000 +0200
+++ new/pdns-4.1.3/docs/zone2sql.1      2018-05-24 14:53:34.000000000 +0200
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "ZONE2SQL" "1" "May 07, 2018" "4.1" "PowerDNS Recursor"
+.TH "ZONE2SQL" "1" "May 24, 2018" "4.1" "PowerDNS Recursor"
 .SH NAME
 zone2sql \- 
 .
@@ -142,6 +142,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2017, PowerDNS.COM BV
+2001-2018, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/modules/geoipbackend/geoipbackend.cc 
new/pdns-4.1.3/modules/geoipbackend/geoipbackend.cc
--- old/pdns-4.1.2/modules/geoipbackend/geoipbackend.cc 2018-05-07 
17:00:19.000000000 +0200
+++ new/pdns-4.1.3/modules/geoipbackend/geoipbackend.cc 2018-05-24 
14:52:33.000000000 +0200
@@ -32,17 +32,21 @@
 pthread_rwlock_t GeoIPBackend::s_state_lock=PTHREAD_RWLOCK_INITIALIZER;
 
 struct GeoIPDNSResourceRecord: DNSResourceRecord {
-public:
-       int weight;
-       bool has_weight;
+  int weight;
+  bool has_weight;
 };
 
-class GeoIPDomain {
-public:
+struct GeoIPService {
+  NetmaskTree<vector<string> > masks;
+  unsigned int netmask4;
+  unsigned int netmask6;
+};
+
+struct GeoIPDomain {
   int id;
   DNSName domain;
   int ttl;
-  map<DNSName, NetmaskTree<vector<string> > > services;
+  map<DNSName, GeoIPService> services;
   map<DNSName, vector<GeoIPDNSResourceRecord> > records;
 };
 
@@ -185,6 +189,8 @@
     }
 
     for(YAML::const_iterator service = domain["services"].begin(); service != 
domain["services"].end(); service++) {
+      unsigned int netmask4 = 0, netmask6 = 0;
+      DNSName srvName{service->first.as<string>()};
       NetmaskTree<vector<string> > nmt;
 
       // if it's an another map, we need to iterate it again, otherwise we 
just add two root entries.
@@ -200,7 +206,12 @@
             
nmt.insert(Netmask("0.0.0.0/0")).second.assign(value.begin(),value.end());
             nmt.insert(Netmask("::/0")).second.swap(value);
           } else {
-            nmt.insert(Netmask(net->first.as<string>())).second.swap(value);
+            Netmask nm{net->first.as<string>()};
+            nmt.insert(nm).second.swap(value);
+            if (nm.isIpv6() == true && netmask6 < nm.getBits())
+              netmask6 = nm.getBits();
+            if (nm.isIpv6() == false && netmask4 < nm.getBits())
+              netmask4 = nm.getBits();
           }
         }
       } else {
@@ -213,7 +224,10 @@
         
nmt.insert(Netmask("0.0.0.0/0")).second.assign(value.begin(),value.end());
         nmt.insert(Netmask("::/0")).second.swap(value);
       }
-      dom.services[DNSName(service->first.as<string>())].swap(nmt);
+
+      dom.services[srvName].netmask4 = netmask4;
+      dom.services[srvName].netmask6 = netmask6;
+      dom.services[srvName].masks.swap(nmt);
     }
 
     // rectify the zone, first static records
@@ -283,7 +297,7 @@
       }
     }
 
-    tmp_domains.push_back(dom);
+    tmp_domains.push_back(std::move(dom));
   }
 
   s_domains.clear();
@@ -304,7 +318,7 @@
 }
 
 bool GeoIPBackend::lookup_static(const GeoIPDomain &dom, const DNSName 
&search, const QType &qtype, const DNSName& qdomain, const std::string &ip, 
GeoIPLookup &gl, bool v6) {
-  const auto i = dom.records.find(search);
+  const auto& i = dom.records.find(search);
   int cumul_probability = 0;
   int probability_rnd = 1+(dns_random(1000)); // setting probability=0 means 
it never is used
 
@@ -335,23 +349,21 @@
 
 void GeoIPBackend::lookup(const QType &qtype, const DNSName& qdomain, 
DNSPacket *pkt_p, int zoneId) {
   ReadLock rl(&s_state_lock);
-  GeoIPDomain dom;
+  const GeoIPDomain *dom;
   GeoIPLookup gl;
   bool found = false;
 
   if (d_result.size()>0) 
     throw PDNSException("Cannot perform lookup while another is running");
 
-  DNSName search = qdomain;
-
   d_result.clear();
 
   if (zoneId > -1 && zoneId < static_cast<int>(s_domains.size())) 
-    dom = s_domains[zoneId];
+    dom = &(s_domains[zoneId]);
   else {
     for(const GeoIPDomain& i : s_domains) {   // this is arguably wrong, we 
should probably find the most specific match
-      if (search.isPartOf(i.domain)) {
-        dom = i;
+      if (qdomain.isPartOf(i.domain)) {
+        dom = &i;
         found = true;
         break;
       }
@@ -368,23 +380,40 @@
 
   gl.netmask = 0;
 
-  (void)this->lookup_static(dom, search, qtype, qdomain, ip, gl, v6);
+  (void)this->lookup_static(*dom, qdomain, qtype, qdomain, ip, gl, v6);
 
-  auto target = dom.services.find(search);
-  if (target == dom.services.end()) return; // no hit
+  const auto& target = (*dom).services.find(qdomain);
+  if (target == (*dom).services.end()) return; // no hit
 
-  const NetmaskTree<vector<string> >::node_type* node = 
target->second.lookup(ComboAddress(ip));
+  const NetmaskTree<vector<string> >::node_type* node = 
target->second.masks.lookup(ComboAddress(ip));
   if (node == NULL) return; // no hit, again.
 
   DNSName sformat;
   gl.netmask = node->first.getBits();
+  // figure out smallest sensible netmask
+  if (gl.netmask == 0) {
+    GeoIPLookup tmp_gl;
+    tmp_gl.netmask = 0;
+    // get netmask from geoip backend
+    if (queryGeoIP(ip, v6, GeoIPQueryAttribute::Name, &tmp_gl) == "unknown") {
+      if (v6)
+        gl.netmask = target->second.netmask6;
+      else
+        gl.netmask = target->second.netmask4;
+    }
+  } else {
+    if (v6)
+      gl.netmask = target->second.netmask6;
+    else
+      gl.netmask = target->second.netmask4;
+  }
 
   // note that this means the array format won't work with indirect
   for(auto it = node->second.begin(); it != node->second.end(); it++) {
     sformat = DNSName(format2str(*it, ip, v6, &gl));
 
     // see if the record can be found
-    if (this->lookup_static(dom, sformat, qtype, qdomain, ip, gl, v6))
+    if (this->lookup_static((*dom), sformat, qtype, qdomain, ip, gl, v6))
       return;
   }
 
@@ -401,12 +430,12 @@
   if (!(qtype == QType::ANY || qtype == QType::CNAME)) return;
 
   DNSResourceRecord rr;
-  rr.domain_id = dom.id;
+  rr.domain_id = dom->id;
   rr.qtype = QType::CNAME;
   rr.qname = qdomain;
   rr.content = sformat.toString();
   rr.auth = 1;
-  rr.ttl = dom.ttl;
+  rr.ttl = dom->ttl;
   rr.scopeMask = gl.netmask;
   d_result.push_back(rr);
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/dnsproxy.cc 
new/pdns-4.1.3/pdns/dnsproxy.cc
--- old/pdns-4.1.2/pdns/dnsproxy.cc     2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/pdns/dnsproxy.cc     2018-05-24 14:52:33.000000000 +0200
@@ -83,7 +83,7 @@
   pthread_create(&tid,0,&launchhelper,this);
 }
 
-//! look up qname aname with r->qtype, plonk it in the answer section of 'r' 
with name target
+//! look up qname target with r->qtype, plonk it in the answer section of 'r' 
with name aname
 bool DNSProxy::completePacket(DNSPacket *r, const DNSName& target,const 
DNSName& aname)
 {
   if(r->d_tcp) {
@@ -101,7 +101,7 @@
 
     for (auto &ip : ips)
     {
-      ip.dr.d_name = target;
+      ip.dr.d_name = aname;
       r->addRecord(ip);
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/effective_tld_names.dat 
new/pdns-4.1.3/pdns/effective_tld_names.dat
--- old/pdns-4.1.2/pdns/effective_tld_names.dat 2018-05-07 17:01:34.000000000 
+0200
+++ new/pdns-4.1.3/pdns/effective_tld_names.dat 2018-05-24 14:53:52.000000000 
+0200
@@ -1114,8 +1114,18 @@
 net.gt
 org.gt
 
-// gu : http://gadao.gov.gu/registration.txt
-*.gu
+// gu : http://gadao.gov.gu/register.html
+// University of Guam : https://www.uog.edu
+// Submitted by uog...@triton.uog.edu
+gu
+com.gu
+edu.gu
+gov.gu
+guam.gu
+info.gu
+net.gu
+org.gu
+web.gu
 
 // gw : https://en.wikipedia.org/wiki/.gw
 gw
@@ -1130,7 +1140,7 @@
 net.gy
 org.gy
 
-// hk : https://www.hkdnr.hk
+// hk : https://www.hkirc.hk
 // Submitted by registry <hk.t...@hkirc.hk>
 hk
 com.hk
@@ -1341,10 +1351,8 @@
 it
 gov.it
 edu.it
-// Reserved geo-names:
-// 
http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
-// There is also a list of reserved geo-names corresponding to Italian 
municipalities
-// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here.
+// Reserved geo-names (regions and provinces):
+// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf
 // Regions
 abr.it
 abruzzo.it
@@ -1398,6 +1406,12 @@
 taa.it
 tos.it
 toscana.it
+trentin-sud-tirol.it
+trentin-süd-tirol.it
+trentin-sudtirol.it
+trentin-südtirol.it
+trentin-sued-tirol.it
+trentin-suedtirol.it
 trentino-a-adige.it
 trentino-aadige.it
 trentino-alto-adige.it
@@ -1405,9 +1419,12 @@
 trentino-s-tirol.it
 trentino-stirol.it
 trentino-sud-tirol.it
+trentino-süd-tirol.it
 trentino-sudtirol.it
+trentino-südtirol.it
 trentino-sued-tirol.it
 trentino-suedtirol.it
+trentino.it
 trentinoa-adige.it
 trentinoaadige.it
 trentinoalto-adige.it
@@ -1415,9 +1432,17 @@
 trentinos-tirol.it
 trentinostirol.it
 trentinosud-tirol.it
+trentinosüd-tirol.it
 trentinosudtirol.it
+trentinosüdtirol.it
 trentinosued-tirol.it
 trentinosuedtirol.it
+trentinsud-tirol.it
+trentinsüd-tirol.it
+trentinsudtirol.it
+trentinsüdtirol.it
+trentinsued-tirol.it
+trentinsuedtirol.it
 tuscany.it
 umb.it
 umbria.it
@@ -1432,7 +1457,13 @@
 valled-aosta.it
 valledaosta.it
 vallee-aoste.it
+vallée-aoste.it
+vallee-d-aoste.it
+vallée-d-aoste.it
 valleeaoste.it
+valléeaoste.it
+valleedaoste.it
+valléedaoste.it
 vao.it
 vda.it
 ven.it
@@ -1465,6 +1496,9 @@
 av.it
 avellino.it
 ba.it
+balsan-sudtirol.it
+balsan-südtirol.it
+balsan-suedtirol.it
 balsan.it
 bari.it
 barletta-trani-andria.it
@@ -1479,13 +1513,21 @@
 bn.it
 bo.it
 bologna.it
+bolzano-altoadige.it
 bolzano.it
+bozen-sudtirol.it
+bozen-südtirol.it
+bozen-suedtirol.it
 bozen.it
 br.it
 brescia.it
 brindisi.it
 bs.it
 bt.it
+bulsan-sudtirol.it
+bulsan-südtirol.it
+bulsan-suedtirol.it
+bulsan.it
 bz.it
 ca.it
 cagliari.it
@@ -1503,7 +1545,9 @@
 cb.it
 ce.it
 cesena-forli.it
+cesena-forlì.it
 cesenaforli.it
+cesenaforlì.it
 ch.it
 chieti.it
 ci.it
@@ -1534,7 +1578,9 @@
 fm.it
 foggia.it
 forli-cesena.it
+forlì-cesena.it
 forlicesena.it
+forlìcesena.it
 fr.it
 frosinone.it
 ge.it
@@ -1665,6 +1711,7 @@
 sr.it
 ss.it
 suedtirol.it
+südtirol.it
 sv.it
 ta.it
 taranto.it
@@ -1683,7 +1730,6 @@
 traniandriabarletta.it
 tranibarlettaandria.it
 trapani.it
-trentino.it
 trento.it
 treviso.it
 trieste.it
@@ -6153,9 +6199,6 @@
 // Used by government agencies of Northern Cyprus
 gov.nc.tr
 
-// travel : https://en.wikipedia.org/wiki/.travel
-travel
-
 // tt : http://www.nic.tt/
 tt
 co.tt
@@ -6730,8 +6773,16 @@
 ελ
 
 // xn--j6w193g ("Hong Kong", Chinese) : HK
-// https://www2.hkirc.hk/register/rules.jsp
+// https://www.hkirc.hk
+// Submitted by registry <hk.t...@hkirc.hk>
+// https://www.hkirc.hk/content.jsp?id=30#!/34
 香港
+公司.香港
+教育.香港
+政府.香港
+個人.香港
+網絡.香港
+組織.香港
 
 // xn--2scrj9c ("Bharat", Kannada) : IN
 // India
@@ -6985,7 +7036,7 @@
 
 
 // newGTLDs
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 
2018-04-18T19:16:57Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 
2018-05-08T19:40:37Z
 // This list is auto-generated, don't edit it manually.
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
@@ -7204,7 +7255,7 @@
 // author : 2014-12-18 Amazon Registry Services, Inc.
 author
 
-// auto : 2014-11-13 Cars Registry Limited 
+// auto : 2014-11-13 Cars Registry Limited
 auto
 
 // autos : 2014-01-09 DERAutos, LLC
@@ -7486,7 +7537,7 @@
 // capitalone : 2015-08-06 Capital One Financial Corporation
 capitalone
 
-// car : 2015-01-22 Cars Registry Limited 
+// car : 2015-01-22 Cars Registry Limited
 car
 
 // caravan : 2013-12-12 Caravan International, Inc.
@@ -7504,7 +7555,7 @@
 // careers : 2013-10-02 Binky Moon, LLC
 careers
 
-// cars : 2014-11-13 Cars Registry Limited 
+// cars : 2014-11-13 Cars Registry Limited
 cars
 
 // cartier : 2014-06-23 Richemont DNS Inc.
@@ -7705,7 +7756,7 @@
 // cool : 2013-11-14 Binky Moon, LLC
 cool
 
-// corsica : 2014-09-25 Collectivité Territoriale de Corse
+// corsica : 2014-09-25 Collectivité de Corse
 corsica
 
 // country : 2013-12-19 DotCountry LLC
@@ -9073,7 +9124,7 @@
 // network : 2013-11-14 Binky Moon, LLC
 network
 
-// neustar : 2013-12-05 NeuStar, Inc.
+// neustar : 2013-12-05 Registry Services, LLC
 neustar
 
 // new : 2014-01-30 Charleston Road Registry Inc.
@@ -10039,6 +10090,9 @@
 // training : 2013-11-07 Binky Moon, LLC
 training
 
+// travel :  Dog Beach, LLC
+travel
+
 // travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
 travelchannel
 
@@ -10809,6 +10863,10 @@
 // Submitted by Nathan O'Sullivan <nat...@mammoth.com.au>
 bnr.la
 
+// Blackbaud, Inc. : https://www.blackbaud.com
+// Submitted by Paul Crowder <paul.crow...@blackbaud.com>
+blackbaudcdn.net
+
 // Boomla : https://boomla.com
 // Submitted by Tibor Halter <thal...@boomla.com>
 boomla.net
@@ -10924,6 +10982,10 @@
 // co.ca : http://registry.co.ca/
 co.ca
 
+// Co & Co : https://co-co.nl/
+// Submitted by Govert Versluis <gov...@co-co.nl>
+*.otap.co
+
 // i-registry s.r.o. : http://www.i-registry.cz/
 // Submitted by Martin Semrad <sem...@i-registry.cz>
 co.cz
@@ -10954,6 +11016,10 @@
 // Submitted by Stefan Dimitrov <cont...@cloudeity.com>
 cloudeity.net
 
+// CNPY : https://cnpy.gdn
+// Submitted by Angelo Gladding <ang...@lahacker.net>
+cnpy.gdn
+
 // CoDNS B.V.
 co.nl
 co.no
@@ -10997,6 +11063,15 @@
 daplie.me
 localhost.daplie.me
 
+// Datto, Inc. : https://www.datto.com/
+// Submitted by Philipp Heckel <p...@datto.com>
+dattolocal.com
+dattorelay.com
+dattoweb.com
+mydatto.com
+dattolocal.net
+mydatto.net
+
 // Dansk.net : http://www.dansk.net/
 // Submitted by Anani Voule <digi...@digital.co.dk>
 biz.dk
@@ -11341,6 +11416,10 @@
 definima.net
 definima.io
 
+// dnstrace.pro : https://dnstrace.pro/
+// Submitted by Chris Partridge <ch...@partridge.tech>
+bci.dnstrace.pro
+
 // Dynu.com : https://www.dynu.com/
 // Submitted by Sue Ye <s...@dynu.com>
 ddnsfree.com
@@ -11552,6 +11631,11 @@
 b.ssl.fastly.net
 global.ssl.fastly.net
 
+// FASTVPS EESTI OU : https://fastvps.ru/
+// Submitted by Likhachev Vasiliy <lihac...@fastvps.ru>
+fastpanel.direct
+fastvps-server.com
+
 // Featherhead : https://featherhead.xyz/
 // Submitted by Simon Menke <si...@featherhead.xyz>
 fhapp.xyz
@@ -11586,9 +11670,15 @@
 freebox-os.fr
 freeboxos.fr
 
+// freedesktop.org : https://www.freedesktop.org
+// Submitted by Daniel Stone <dan...@fooishbar.org>
+freedesktop.org
+
 // Futureweb OG : http://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnede...@futureweb.at>
 *.futurecms.at
+*.ex.futurecms.at
+*.in.futurecms.at
 futurehosting.at
 futuremailing.at
 *.ex.ortsinfo.at
@@ -11714,6 +11804,7 @@
 
 // Hasura : https://hasura.io
 // Submitted by Shahidh K Muhammed <shah...@hasura.io>
+hasura.app
 hasura-app.io
 
 // Hepforge : https://www.hepforge.org
@@ -11787,6 +11878,11 @@
 // Submitted by Matthew Hardeman <mharde...@ipifony.com>
 ipifony.net
 
+// IServ GmbH : https://iserv.eu
+// Submitted by Kim-Alexander Brodowski <kim.brodow...@iserv.eu>
+mein-iserv.de
+test-iserv.de
+
 // Jino : https://www.jino.ru
 // Submitted by Sergey Ulyashin <ulyas...@jino.ru>
 myjino.ru
@@ -11822,6 +11918,14 @@
 lcube-server.de
 svn-repos.de
 
+// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
+// Submitted by Greg Holland <greg.holl...@lmpm.com>
+app.lmpm.com
+
+// Linki Tools UG : https://linki.tools
+// Submitted by Paulo Matos <pmatos@linki.tools>
+linkitools.space
+
 // linkyard ldt: https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegentha...@linkyard.ch>
 linkyard.cloud
@@ -11841,22 +11945,47 @@
 // Lukanet Ltd : https://lukanet.com
 // Submitted by Anton Avramov <regis...@lukanet.com>
 barsy.bg
+barsy.co.uk
+barsyonline.co.uk
+barsycenter.com
 barsyonline.com
+barsy.club
 barsy.de
 barsy.eu
 barsy.in
+barsy.info
+barsy.io
+barsy.me
+barsy.menu
+barsy.mobi
 barsy.net
 barsy.online
+barsy.org
+barsy.pro
+barsy.pub
+barsy.shop
+barsy.site
 barsy.support
+barsy.uk
 
 // Magento Commerce
 // Submitted by Damien Tournoud <dtournoud@magento.cloud>
 *.magentosite.cloud
 
+// May First - People Link : https://mayfirst.org/
+// Submitted by Jamie McClelland <i...@mayfirst.org>
+mayfirst.info
+mayfirst.org
+
 // Mail.Ru Group : https://hb.cldmail.ru
 // Submitted by Ilya Zaretskiy <zarets...@corp.mail.ru>
 hb.cldmail.ru
 
+// Memset hosting : https://www.memset.com
+// Submitted by Tom Whitwell <doma...@memset.com>
+miniserver.com
+memset.net
+
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
 // Submitted by Zdeněk Šustr <zdenek.su...@cesnet.cz>
 cloud.metacentrum.cz
@@ -11917,6 +12046,34 @@
 // Submitted by Jeff Wheelhouse <supp...@nearlyfreespeech.net>
 nfshost.com
 
+// Now-DNS : https://now-dns.com
+// Submitted by Steve Russell <st...@now-dns.com>
+dnsking.ch
+mypi.co
+n4t.co
+001www.com
+ddnslive.com
+myiphost.com
+forumz.info
+16-b.it
+32-b.it
+64-b.it
+soundcast.me
+tcp4.me
+dnsup.net
+hicam.net
+now-dns.net
+ownip.net
+vpndns.net
+dynserv.org
+now-dns.org
+x443.pw
+now-dns.top
+ntdll.top
+freeddns.us
+crafting.xyz
+zapto.xyz
+
 // nsupdate.info : https://www.nsupdate.info/
 // Submitted by Thomas Waldmann <i...@nsupdate.info>
 nsupdate.info
@@ -12030,25 +12187,32 @@
 // NymNom : https://nymnom.com/
 // Submitted by Dave McCormack <dave.mccorm...@nymnom.com>
 nom.ae
+nom.af
 nom.ai
 nom.al
 nym.by
 nym.bz
 nom.cl
 nom.gd
+nom.ge
 nom.gl
 nym.gr
 nom.gt
+nym.gy
 nom.hn
+nym.ie
 nom.im
+nom.ke
 nym.kz
 nym.la
+nym.lc
 nom.li
 nym.li
 nym.lt
 nym.lu
 nym.me
 nom.mk
+nym.mn
 nym.mx
 nom.nu
 nym.nz
@@ -12056,11 +12220,14 @@
 nym.pt
 nom.pw
 nom.qa
+nym.ro
 nom.rs
 nom.si
 nym.sk
+nom.st
 nym.su
 nym.sx
+nom.tj
 nym.tw
 nom.ug
 nom.uy
@@ -12071,6 +12238,10 @@
 // Submitted by Andrew Sampson <and...@ulterius.io>
 cya.gg
 
+// Omnibond Systems, LLC. : https://www.omnibond.com
+// Submitted by Cole Estep <c...@omnibond.com>
+cloudycluster.net
+
 // One Fold Media : http://www.onefoldmedia.com/
 // Submitted by Eddie Jones <ed...@onefoldmedia.com>
 nid.io
@@ -12288,6 +12459,10 @@
 // Submitted by Philip Hutchins <hostmas...@storj.io>
 storj.farm
 
+// Studenten Net Twente : http://www.snt.utwente.nl/
+// Submitted by Silke Hofstra <sys...@snt.utwente.nl>
+utwente.io
+
 // Sub 6 Limited: http://www.sub6.com
 // Submitted by Dan Miller <d...@sub6.com>
 temp-dns.com
@@ -12387,6 +12562,7 @@
 // Uberspace : https://uberspace.de
 // Submitted by Moritz Werner <mwer...@jonaspasche.com>
 uber.space
+*.uberspace.de
 
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmas...@udr.hk.com>
@@ -12395,6 +12571,11 @@
 ltd.hk
 inc.hk
 
+// United Gameserver GmbH : https://united-gameserver.de
+// Submitted by Stefan Schwarz <sys...@united-gameserver.de>
+virtualuser.de
+virtual-user.de
+
 // .US
 // Submitted by Ed Moore <ed.mo...@lib.de.us>
 lib.de.us
@@ -12425,6 +12606,10 @@
 // Submitted by Yuvi Panda <yuvipa...@wikimedia.org>
 wmflabs.org
 
+// XenonCloud GbR: https://xenoncloud.net
+// Submitted by Julian Uphoff <publicsuffixl...@xenoncloud.net>
+half.host
+
 // XnBay Technology : http://www.xnbay.com/
 // Submitted by XnBay Developer <developer.xncl...@gmail.com>
 xnbay.com
@@ -12469,4 +12654,8 @@
 // Submitted by Olli Vanhoja <o...@zeit.co>
 now.sh
 
+// Zone.id : https://zone.id/
+// Submitted by Su Hendro <ad...@zone.id>
+zone.id
+
 // ===END PRIVATE DOMAINS===
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/lua-auth4.cc 
new/pdns-4.1.3/pdns/lua-auth4.cc
--- old/pdns-4.1.2/pdns/lua-auth4.cc    2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/pdns/lua-auth4.cc    2018-05-24 14:52:33.000000000 +0200
@@ -236,10 +236,17 @@
 
   ret = d_axfr_filter(remote, zone, in);
   rcode = std::get<0>(ret);
-  if (rcode < 0)
+  if (rcode < 0) {
+    // no modification, handle normally
     return false;
-  else if (rcode == 1)
+  }
+  else if (rcode == 0) {
+    // replace the matching record by the filtered record(s)
+  }
+  else if (rcode == 1) {
+    // append the filtered record(s) after the matching record
     out.push_back(in);
+  }
   else
     throw PDNSException("Cannot understand return code 
"+std::to_string(rcode)+" in axfr filter response");
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/pdnsutil.cc 
new/pdns-4.1.3/pdns/pdnsutil.cc
--- old/pdns-4.1.2/pdns/pdnsutil.cc     2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/pdns/pdnsutil.cc     2018-05-24 14:52:33.000000000 +0200
@@ -3110,12 +3110,14 @@
     // iterate zones
     for(const DomainInfo& di: domains) {
       size_t nr,nc,nm,nk;
+      DomainInfo di_new;
       DNSResourceRecord rr;
       cout<<"Processing '"<<di.zone<<"'"<<endl;
       // create zone
       if (!tgt->createDomain(di.zone)) throw PDNSException("Failed to create 
zone");
-      tgt->setKind(di.zone, di.kind);
-      tgt->setAccount(di.zone,di.account);
+      if (!tgt->getDomainInfo(di.zone, di_new)) throw PDNSException("Failed to 
create zone");
+      tgt->setKind(di_new.zone, di.kind);
+      tgt->setAccount(di_new.zone,di.account);
       string masters="";
       bool first = true;
       for(const string& master: di.masters) {
@@ -3124,11 +3126,12 @@
         first = false;
         masters += master;
       }
-      tgt->setMaster(di.zone, masters);
+      tgt->setMaster(di_new.zone, masters);
       // move records
       if (!src->list(di.zone, di.id, true)) throw PDNSException("Failed to 
list records");
       nr=0;
       while(src->get(rr)) {
+        rr.domain_id = di_new.id;
         if (!tgt->feedRecord(rr, DNSName())) throw PDNSException("Failed to 
feed record");
         nr++;
       }
@@ -3137,6 +3140,7 @@
       if (src->listComments(di.id)) {
         Comment c;
         while(src->getComment(c)) {
+          c.domain_id = di_new.id;
           tgt->feedComment(c);
           nc++;
         }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/version.cc 
new/pdns-4.1.3/pdns/version.cc
--- old/pdns-4.1.2/pdns/version.cc      2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/pdns/version.cc      2018-05-24 14:52:33.000000000 +0200
@@ -71,7 +71,7 @@
 
 void showProductVersion()
 {
-  theL()<<Logger::Warning<<productName()<<" "<< VERSION << " (C) 2001-2017 "
+  theL()<<Logger::Warning<<productName()<<" "<< VERSION << " (C) 2001-2018 "
     "PowerDNS.COM BV" << endl;
   theL()<<Logger::Warning<<"Using "<<(sizeof(unsigned long)*8)<<"-bits mode. "
     "Built using " << compilerVersion()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-4.1.2/pdns/ws-auth.cc 
new/pdns-4.1.3/pdns/ws-auth.cc
--- old/pdns-4.1.2/pdns/ws-auth.cc      2018-05-07 17:00:19.000000000 +0200
+++ new/pdns-4.1.3/pdns/ws-auth.cc      2018-05-24 14:52:33.000000000 +0200
@@ -277,7 +277,7 @@
     
printtable(ret,req->getvars["ring"],S.getRingTitle(req->getvars["ring"]),100);
 
   ret<<"</div></div>"<<endl;
-  ret<<"<footer class=\"row\">"<<fullVersionString()<<"<br>&copy; 2013 - 2017 
<a href=\"http://www.powerdns.com/\";>PowerDNS.COM BV</a>.</footer>"<<endl;
+  ret<<"<footer class=\"row\">"<<fullVersionString()<<"<br>&copy; 2013 - 2018 
<a href=\"http://www.powerdns.com/\";>PowerDNS.COM BV</a>.</footer>"<<endl;
   ret<<"</body></html>"<<endl;
 
   resp->body = ret.str();
@@ -457,6 +457,12 @@
   out["uptime"] = std::to_string(time(0) - s_starttime);
 }
 
+static void validateGatheredRRType(const DNSResourceRecord& rr) {
+  if (rr.qtype.getCode() == QType::OPT || rr.qtype.getCode() == QType::TSIG) {
+    throw ApiException("RRset "+rr.qname.toString()+" IN 
"+rr.qtype.getName()+": invalid type given");
+  }
+}
+
 static void gatherRecords(const Json container, const DNSName& qname, const 
QType qtype, const int ttl, vector<DNSResourceRecord>& new_records, 
vector<DNSResourceRecord>& new_ptrs) {
   UeberBackend B;
   DNSResourceRecord rr;
@@ -464,6 +470,8 @@
   rr.qtype = qtype;
   rr.auth = 1;
   rr.ttl = ttl;
+
+  validateGatheredRRType(rr);
   for(auto record : container["records"].array_items()) {
     string content = stringFromJson(record, "content");
     rr.disabled = boolFromJson(record, "disabled");
@@ -1181,6 +1189,7 @@
         continue;
       if(rr.qtype.getCode() == QType::SOA)
         seenSOA=true;
+      validateGatheredRRType(rr);
 
       new_records.push_back(rr);
     }



Reply via email to