component/powerdns: version up 4.5.1

powerdns needs a pkgconfig file from lua to compile

component/lua/buildout.cfg

@@ -15,5 +15,16 @@ make-options =
   "$(uname -sr 2>/dev/null|grep -Eq '^Linux' && echo linux || echo posix)"
   MYCFLAGS="-I${readline:location}/include -fPIC"
   MYLDFLAGS="-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib"
-make-targets =
-  install INSTALL_TOP=@@LOCATION@@
+  INSTALL_TOP=@@LOCATION@@
+post-install =
+  mkdir -p %(location)s/lib/pkgconfig
+  {
+    make pc INSTALL_TOP=%(location)s
+    echo '%(pc)s'
+  } > %(location)s/lib/pkgconfig/lua.pc
+pc =
+  Name: Lua
+  Description: Lua language engine
+  Version: $${version}
+  Libs: -L$${libdir} -llua
+  Cflags: -I$${includedir}

component/powerdns/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../automake/buildout.cfg
   ../boost-lib/buildout.cfg
   ../libtool/buildout.cfg
+  ../lua/buildout.cfg
   ../make/buildout.cfg
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -19,17 +20,16 @@ parts =
 
 [powerdns]
 recipe = slapos.recipe.cmmi
-url = http://downloads.powerdns.com/releases/pdns-4.2.1.tar.bz2
-md5sum = b5f3998a3bc438b905c72c0473408839
+url = https://downloads.powerdns.com/releases/pdns-4.5.1.tar.bz2
+md5sum = 5f0ba98ca59bc3d84cfd09097c8b9953
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-boost=${boost-lib:location}
   --with-libcrypto=${openssl:location}
   --with-modules="geoip"
   --with-dynmodules=""
-  --without-lua
   --disable-lua-records
-pkg_config_depends = ${yaml-cpp:location}/lib/pkgconfig
+pkg_config_depends = ${yaml-cpp:location}/lib/pkgconfig:${lua:location}/lib/pkgconfig
 environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:${libmaxminddb:location}/bin:${libtool:location}/bin:${make:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${libmaxminddb:location}/lib -Wl,-rpath=${libmaxminddb:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${yaml-cpp:location}/lib -Wl,-rpath=${yaml-cpp:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -39,5 +39,3 @@ environment =
   YAML_LIBS = -lyaml-cpp
 make-options =
   LIBTOOL=libtool
-make-target =
-  install

software/powerdns/buildout.hash.cfg

@@ -22,11 +22,11 @@ md5sum = c04c3b490e7f9f35af3d204a9df51f35
 
 [template-pdns-configuration]
 _update_hash_filename_ = template/pdns.conf.jinja2
-md5sum = 20c37ea06a8fa405bc02470d5115fd11
+md5sum = 851353e1d4dd562ace58b3345c2da515
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = 4ff993a39da03d9d66d7c0f98efeb1e0
+md5sum = bad5bcf578ad9700281419bbf3c9fe32
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
@@ -34,4 +34,4 @@ md5sum = c4dc8c141d81b92d92cdb82ca67a13ee
 
 [template-zones-file]
 _update_hash_filename_ = template/zones-file.yml.jinja2
-md5sum = 612de569ac3d1e8cc10b830683ff92ae
+md5sum = 1fab79102f296a1259ce4ac9d054be9f

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -66,7 +66,7 @@ name = {{dns_name}}
 state = {{ slapparameter_dict.pop(state_key) }}
 {%   endif%}
 config-supported-zone-list = {{ ' '.join(supported_zone_list) }}
-config-soa = {{ "%s,%s" % (dns_domain, server_admin) }}
+config-soa = {{ "%s,%s,0,10800,3600,604800,3600" % (dns_domain, server_admin) }}
 {%   for parameter in sla_parameters -%}
 sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
 {%   endfor -%}

software/powerdns/template/pdns.conf.jinja2

 # -------------------------------------------------------------------------
 
 # Configure ip/port binding
-local-address={{ pdns.get('ipv4') }}
-local-ipv6={{ pdns.get('ipv6') }}
+local-address={{ pdns.get('ipv4') }}, {{ pdns.get('ipv6') }}
 local-port={{ pdns.get('port') }}
 
 
@@ -48,4 +47,4 @@ edns-subnet-processing=yes
 geoip-database-files={{ geo['database'] }}
 geoip-zones-file={{ geo['zones-file'] }}
 
-# -------------------------------------------------------------------------
\ No newline at end of file
+# -------------------------------------------------------------------------

software/powerdns/template/zones-file.yml.jinja2

@@ -22,7 +22,7 @@ domains:
   # Note: For each domain, one record of the domain name MUST exist with a soa record.
   records:
     {{ zone }}:
-      - soa: {{ slapparameter_dict.get('soa', 'ns0.example.com,admin@example.com').replace(',', ' ') }}
+      - soa: {{ slapparameter_dict.get('soa', 'ns0.example.com,admin@example.com,0,10800,3600,604800,3600').replace(',', ' ') }}
       {%- for ns in slapparameter_dict.get('ns-record', 'ns0.example.com,ns1.example.com').split(',') %}
       - ns: {{ ns }}
       {%- endfor %}