PowerDNS Recursor 4.2.0

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

PowerDNS Recursor 4.2.0

Otto Moerbeek
Hi,

just released. This is s strightforward port, I left some new features out
for the moment.

Al local patches have been upstreamed.

        -Otto

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/powerdns/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile 12 Aug 2019 09:00:30 -0000 1.73
+++ Makefile 30 Aug 2019 12:43:25 -0000
@@ -5,7 +5,7 @@ COMMENT-mysql= MySQL database access mo
 COMMENT-pgsql= PostgreSQL database access module for PowerDNS
 COMMENT-ldap= LDAP database access module for PowerDNS
 
-V= 4.1.13
+V= 4.2.0
 DISTNAME= pdns-${V}
 EXTRACT_SUFX = .tar.bz2
 PKGNAME-main= powerdns-${V}
@@ -57,9 +57,11 @@ CONFIGURE_ARGS+= --disable-shared \
  --with-sqlite3 \
  --with-dynmodules="${BACKENDS}" \
  --without-lua \
+ --disable-lua-records \
  --disable-hardening \
- --without-protobuf \
- --enable-tools
+ --with-protobuf=no \
+ --enable-tools \
+ --disable-ixfrdist
 
 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/powerdns/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 12 Aug 2019 09:00:30 -0000 1.25
+++ distinfo 30 Aug 2019 12:43:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.1.13.tar.bz2) = 5+qcYooDZS0sqeBIUl1ErFYoqf7eReUQ/5unVq4vXyU=
-SIZE (pdns-4.1.13.tar.bz2) = 1117990
+SHA256 (pdns-4.2.0.tar.bz2) = IiAH8l4lqtcax9i38Xl6S8sweB5FbXTtADluU4KKkDo=
+SIZE (pdns-4.2.0.tar.bz2) = 1249282
Index: patches/patch-pdns_iputils_hh
===================================================================
RCS file: patches/patch-pdns_iputils_hh
diff -N patches/patch-pdns_iputils_hh
--- patches/patch-pdns_iputils_hh 8 Feb 2019 20:08:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-pdns_iputils_hh,v 1.1 2019/02/08 20:08:57 otto Exp $
-
-Index: pdns/iputils.hh
---- pdns/iputils.hh.orig
-+++ pdns/iputils.hh
-@@ -85,6 +85,13 @@
- union ComboAddress {
-   struct sockaddr_in sin4;
-   struct sockaddr_in6 sin6;
-+  // struct sockaddr_in6 is *not* defined as containing two uint64_t for the
-+  // address , but we like to read or write it like that.
-+  // Force alignment by adding an uint64_t in the union. This makes sure
-+  // the start of the struct and s6_addr gets aligned.
-+  // This works because of the spot of s6_addr in struct sockaddr_in6.
-+  // Needed for strict alignment architectures like sparc64.
-+  uint64_t force_align;
-
-   bool operator==(const ComboAddress& rhs) const
-   {
Index: patches/patch-pdns_logger_cc
===================================================================
RCS file: patches/patch-pdns_logger_cc
diff -N patches/patch-pdns_logger_cc
--- patches/patch-pdns_logger_cc 9 Sep 2018 17:47:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-pdns_logger_cc,v 1.1 2018/09/09 17:47:28 florian Exp $
-Reported upstream: https://github.com/PowerDNS/pdns/pull/6928
-
-Index: pdns/logger.cc
---- pdns/logger.cc.orig
-+++ pdns/logger.cc
-@@ -201,6 +201,16 @@ Logger& Logger::operator<<(unsigned long i)
-   return *this;
- }
-
-+Logger& Logger::operator<<(long long i)
-+{
-+  ostringstream tmp;
-+  tmp<<i;
-+
-+  *this<<tmp.str();
-+
-+  return *this;
-+}
-+
- Logger& Logger::operator<<(unsigned long long i)
- {
-   ostringstream tmp;
Index: patches/patch-pdns_logger_hh
===================================================================
RCS file: patches/patch-pdns_logger_hh
diff -N patches/patch-pdns_logger_hh
--- patches/patch-pdns_logger_hh 9 Sep 2018 17:47:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-pdns_logger_hh,v 1.1 2018/09/09 17:47:28 florian Exp $
-Reported upstream: https://github.com/PowerDNS/pdns/pull/6928
-
-Index: pdns/logger.hh
---- pdns/logger.hh.orig
-+++ pdns/logger.hh
-@@ -82,6 +82,7 @@ class Logger (public)
-   Logger& operator<<(unsigned int);   //!< log an unsigned int
-   Logger& operator<<(long);   //!< log an unsigned int
-   Logger& operator<<(unsigned long);   //!< log an unsigned int
-+  Logger& operator<<(long long);   //!< log a 64 bit int
-   Logger& operator<<(unsigned long long);   //!< log an unsigned 64 bit int
-   Logger& operator<<(const DNSName&);
-   Logger& operator<<(const ComboAddress&); //!< log an address
Index: patches/patch-pdns_nameserver_cc
===================================================================
RCS file: patches/patch-pdns_nameserver_cc
diff -N patches/patch-pdns_nameserver_cc
--- patches/patch-pdns_nameserver_cc 8 Feb 2019 20:08:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-pdns_nameserver_cc,v 1.1 2019/02/08 20:08:57 otto Exp $
-
-Index: pdns/nameserver.cc
---- pdns/nameserver.cc.orig
-+++ pdns/nameserver.cc
-@@ -243,7 +243,7 @@ void UDPNameserver::bindIPv6()
-
-     if( !d_additional_socket )
-         g_localaddresses.push_back(locala);
--    if(::bind(s, (sockaddr*)&locala, sizeof(locala))<0) {
-+    if(::bind(s, (sockaddr*)&locala, locala.getSocklen())<0) {
-       close(s);
-       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-ipv6-nonexist-fail") ) {
-         L<<Logger::Error<<"IPv6 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/powerdns/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 6 Nov 2018 22:52:06 -0000 1.13
+++ pkg/PLIST-main 30 Aug 2019 12:43:25 -0000
@@ -7,8 +7,10 @@
 @newuser _powerdns:609:_powerdns:daemon:PowerDNS Server:/nonexistent:/sbin/nologin
 @sample ${SYSCONFDIR}/
 @rcscript ${RCDIR}/pdns_server
+@bin bin/calidns
 @bin bin/dnsbulktest
 @bin bin/dnsgram
+@bin bin/dnspcap2calidns
 @bin bin/dnsreplay
 @bin bin/dnsscan
 @bin bin/dnsscope
@@ -32,6 +34,7 @@ lib/pdns/libgsqlite3backend.so
 @man man/man1/calidns.1
 @man man/man1/dnsbulktest.1
 @man man/man1/dnsgram.1
+@man man/man1/dnspcap2calidns.1
 @man man/man1/dnsreplay.1
 @man man/man1/dnsscan.1
 @man man/man1/dnsscope.1
@@ -51,6 +54,8 @@ lib/pdns/libgsqlite3backend.so
 @man man/man1/zone2sql.1
 @bin sbin/pdns_server
 share/doc/pdns/
+share/doc/pdns/3.4.0_to_4.0.0_schema.sqlite3.sql
+share/doc/pdns/4.0.0_to_4.2.0_schema.sqlite3.sql
 share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 share/doc/pdns/schema.sqlite3.sql
Index: pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/net/powerdns/pkg/PLIST-mysql,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-mysql
--- pkg/PLIST-mysql 1 Feb 2018 21:47:43 -0000 1.4
+++ pkg/PLIST-mysql 30 Aug 2019 12:43:25 -0000
@@ -4,4 +4,5 @@ lib/pdns/libgmysqlbackend.so
 share/doc/pdns/3.4.0_to_4.1.0_schema.mysql.sql
 share/doc/pdns/dnssec-3.x_to_3.4.0_schema.mysql.sql
 share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.mysql.sql
+share/doc/pdns/4.1.0_to_4.2.0_schema.mysql.sql
 share/doc/pdns/schema.mysql.sql
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/net/powerdns/pkg/PLIST-pgsql,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-pgsql
--- pkg/PLIST-pgsql 1 Feb 2018 21:47:43 -0000 1.4
+++ pkg/PLIST-pgsql 30 Aug 2019 12:43:25 -0000
@@ -4,4 +4,5 @@ lib/pdns/libgpgsqlbackend.so
 share/doc/pdns/3.4.0_to_4.1.0_schema.pgsql.sql
 share/doc/pdns/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
+share/doc/pdns/4.1.0_to_4.2.0_schema.pgsql.sql
 share/doc/pdns/schema.pgsql.sql

Reply | Threaded
Open this post in threaded view
|

Re: PowerDNS Recursor 4.2.0

Stuart Henderson
On 2019/08/30 16:25, Otto Moerbeek wrote:
> Hi,
>
> just released. This is s strightforward port, I left some new features out
> for the moment.

s/recursor/auth/ :)

> Al local patches have been upstreamed.

It now picks up libcurl if present (used by sdig). Here's a diff on top of
yours to fix up the library dependencies (the -mysql and -ldap ones also
changed slightly due to other changes in the ports tree). OK sthen with that
applied on top; otherwise if you prefer it looks like the curl support could
be disabled via autoconf.

"make port-lib-depends-check" still complains about the heimdal libraries,
but that is a limitation of the checker which doesn't correctly handle
libraries in subdirs and can be ignored.

--- Makefile- Fri Aug 30 17:24:25 2019
+++ Makefile Fri Aug 30 17:24:08 2019
@@ -27,10 +27,11 @@ MULTI_PACKAGES= -main -mysql -pgsql -ldap
 # GPLv2 only, OpenSSL exemption
 PERMIT_PACKAGE= Yes
 
-WANTLIB += m pthread ${COMPILER_LIBCXX}
+WANTLIB += crypto m pthread ssl ${COMPILER_LIBCXX}
 
 WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt c crypto sodium sqlite3 z
+WANTLIB-main += boost_program_options-mt c curl nghttp2 sodium
+WANTLIB-main += sqlite3 z
 
 MASTER_SITES= https://downloads.powerdns.com/releases/
 MAINTAINER= Otto Moerbeek <[hidden email]>
@@ -42,6 +43,7 @@ NO_TEST= Yes
 LIB_DEPENDS-main= ${LIB_DEPENDS} \
  databases/sqlite3 \
  devel/boost \
+ net/curl \
  security/libsodium
 
 PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
@@ -79,7 +81,7 @@ CONFIGURE_ARGS+= --without-mysql
 LIB_DEPENDS-mysql= ${LIB_DEPENDS} \
  databases/mariadb
 RUN_DEPENDS-mysql= net/powerdns
-WANTLIB-mysql+= ${WANTLIB} crypto lib/mysql/mysqlclient ssl z
+WANTLIB-mysql+= ${WANTLIB} iconv mariadb z
 
 # PostgreSQL
 .if ${BUILD_PACKAGES:M-pgsql}
@@ -91,7 +93,7 @@ CONFIGURE_ARGS+= --without-pg-config
 LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
  databases/postgresql,-main
 RUN_DEPENDS-pgsql= net/powerdns
-WANTLIB-pgsql= ${WANTLIB} crypto pq>=2 ssl
+WANTLIB-pgsql= ${WANTLIB} pq>=2
 
 # LDAP
 .if ${BUILD_PACKAGES:M-ldap}
@@ -104,7 +106,7 @@ LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
  security/heimdal,-libs
 RUN_DEPENDS-ldap= net/powerdns
 WANTLIB-ldap= ${WANTLIB} ldap_r
-WANTLIB-ldap+=          c com_err crypto lber-2.4 ldap_r-2.4 sasl2 ssl util
+WANTLIB-ldap+=          c com_err lber sasl2 util
 WANTLIB-ldap+=          heimdal/lib/asn1 heimdal/lib/hcrypto heimdal/lib/heimbase
 WANTLIB-ldap+=          heimdal/lib/heimsqlite heimdal/lib/hx509 heimdal/lib/krb5
 WANTLIB-ldap+=          heimdal/lib/roken heimdal/lib/wind


Reply | Threaded
Open this post in threaded view
|

Re: PowerDNS Recursor 4.2.0

Otto Moerbeek
On Fri, Aug 30, 2019 at 05:34:03PM +0100, Stuart Henderson wrote:

> On 2019/08/30 16:25, Otto Moerbeek wrote:
> > Hi,
> >
> > just released. This is s strightforward port, I left some new features out
> > for the moment.
>
> s/recursor/auth/ :)

heh, glad you're paying attention ;-)

>
> > Al local patches have been upstreamed.
>
> It now picks up libcurl if present (used by sdig). Here's a diff on top of
> yours to fix up the library dependencies (the -mysql and -ldap ones also
> changed slightly due to other changes in the ports tree). OK sthen with that
> applied on top; otherwise if you prefer it looks like the curl support could
> be disabled via autoconf.

I'd rather keep it, since it is used by the DNS over HTTP code, it is
nice to have a client being able talk that.

>
> "make port-lib-depends-check" still complains about the heimdal libraries,
> but that is a limitation of the checker which doesn't correctly handle
> libraries in subdirs and can be ignored.

OK, I'll test your changes here and commit.

Thanks,

        -Otto

>
> --- Makefile- Fri Aug 30 17:24:25 2019
> +++ Makefile Fri Aug 30 17:24:08 2019
> @@ -27,10 +27,11 @@ MULTI_PACKAGES= -main -mysql -pgsql -ldap
>  # GPLv2 only, OpenSSL exemption
>  PERMIT_PACKAGE= Yes
>  
> -WANTLIB += m pthread ${COMPILER_LIBCXX}
> +WANTLIB += crypto m pthread ssl ${COMPILER_LIBCXX}
>  
>  WANTLIB-main += ${WANTLIB}
> -WANTLIB-main += boost_program_options-mt c crypto sodium sqlite3 z
> +WANTLIB-main += boost_program_options-mt c curl nghttp2 sodium
> +WANTLIB-main += sqlite3 z
>  
>  MASTER_SITES= https://downloads.powerdns.com/releases/
>  MAINTAINER= Otto Moerbeek <[hidden email]>
> @@ -42,6 +43,7 @@ NO_TEST= Yes
>  LIB_DEPENDS-main= ${LIB_DEPENDS} \
>   databases/sqlite3 \
>   devel/boost \
> + net/curl \
>   security/libsodium
>  
>  PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
> @@ -79,7 +81,7 @@ CONFIGURE_ARGS+= --without-mysql
>  LIB_DEPENDS-mysql= ${LIB_DEPENDS} \
>   databases/mariadb
>  RUN_DEPENDS-mysql= net/powerdns
> -WANTLIB-mysql+= ${WANTLIB} crypto lib/mysql/mysqlclient ssl z
> +WANTLIB-mysql+= ${WANTLIB} iconv mariadb z
>  
>  # PostgreSQL
>  .if ${BUILD_PACKAGES:M-pgsql}
> @@ -91,7 +93,7 @@ CONFIGURE_ARGS+= --without-pg-config
>  LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
>   databases/postgresql,-main
>  RUN_DEPENDS-pgsql= net/powerdns
> -WANTLIB-pgsql= ${WANTLIB} crypto pq>=2 ssl
> +WANTLIB-pgsql= ${WANTLIB} pq>=2
>  
>  # LDAP
>  .if ${BUILD_PACKAGES:M-ldap}
> @@ -104,7 +106,7 @@ LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
>   security/heimdal,-libs
>  RUN_DEPENDS-ldap= net/powerdns
>  WANTLIB-ldap= ${WANTLIB} ldap_r
> -WANTLIB-ldap+=          c com_err crypto lber-2.4 ldap_r-2.4 sasl2 ssl util
> +WANTLIB-ldap+=          c com_err lber sasl2 util
>  WANTLIB-ldap+=          heimdal/lib/asn1 heimdal/lib/hcrypto heimdal/lib/heimbase
>  WANTLIB-ldap+=          heimdal/lib/heimsqlite heimdal/lib/hx509 heimdal/lib/krb5
>  WANTLIB-ldap+=          heimdal/lib/roken heimdal/lib/wind
>
>