subject:"UPDATE\: powerdns 4.1.0"

Re: UPDATE: powerdns 4.1.0

2018-02-01 Thread Otto Moerbeek

I tested an earlier version of the diff. If needed I can test this one.

 -Otto

Stuart Henderson  schreef op 1 februari 2018 17:55:18 CET:
>On 2018/02/01 16:29, Otto Moerbeek wrote:
>> Hi,
>> 
>> Florian stopped being maintainer and I am not able to do ports stuff.
>> Is there anybody who can take this up? It would be much appreciated.
>
>That diff looks reasonable to me, it may need hand merging due to
>subsequent commits but that shouldn't be too fiddly. But I have no
>powerdns setup to test with..

-- 
Verstuurd vanaf mijn Android apparaat met K-9 Mail. Excuseer mijn beknoptheid.

Re: UPDATE: powerdns 4.1.0

2018-02-01 Thread Stuart Henderson

On 2018/02/01 16:55, Stuart Henderson wrote:
> On 2018/02/01 16:29, Otto Moerbeek wrote:
> > Hi,
> > 
> > Florian stopped being maintainer and I am not able to do ports stuff.
> > Is there anybody who can take this up? It would be much appreciated.
> 
> That diff looks reasonable to me, it may need hand merging due to
> subsequent commits but that shouldn't be too fiddly. But I have no
> powerdns setup to test with..
> 

...merged diff (I skipped the quirks part for now), no other changes:

Index: Makefile
===
RCS file: /cvs/ports/net/powerdns/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile11 Jan 2018 19:27:07 -  1.59
+++ Makefile1 Feb 2018 17:05:41 -
@@ -5,24 +5,18 @@ BROKEN-hppa = undefined reference to '_
 COMMENT-main=  modular authoritative nameserver (with database support)
 COMMENT-mysql= MySQL database access module for PowerDNS
 COMMENT-pgsql= PGSQL database access module for PowerDNS
-COMMENT-ldap=  LDAP module for PowerDNS
 
-V= 4.0.4
+V= 4.1.0
 DISTNAME=  pdns-${V}
 EXTRACT_SUFX = .tar.bz2
 PKGNAME=   powerdns-${V}
 PKGNAME-main=  powerdns-${V}
 PKGNAME-mysql= powerdns-mysql-${V}
 PKGNAME-pgsql= powerdns-pgsql-${V}
-PKGNAME-ldap=  powerdns-ldap-${V}
 CATEGORIES=net
 HOMEPAGE=  http://www.powerdns.com/
-REVISION-ldap= 1
-REVISION-main= 2
-REVISION-mysql=1
-REVISION-pgsql=1
 
-MULTI_PACKAGES=-main -mysql -pgsql -ldap
+MULTI_PACKAGES=-main -mysql -pgsql
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -30,22 +24,19 @@ PERMIT_PACKAGE_CDROM=   Yes
 COMPILER = base-clang ports-gcc
 
 WANTLIB += m pthread ${COMPILER_LIBCXX}
-#WANTLIB += ${MODGCC4_CPPWANTLIB}
 
 WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt boost_serialization-mt
-WANTLIB-main += bz2 c crypto gmp sqlite3 z
+WANTLIB-main += boost_program_options-mt c crypto sqlite3
 
-MASTER_SITES=  http://downloads.powerdns.com/releases/
+MASTER_SITES=  https://downloads.powerdns.com/releases/
 
 NO_TEST=   Yes
 
 LIB_DEPENDS-main=  ${LIB_DEPENDS} \
databases/sqlite3 \
-   devel/boost \
-   devel/gmp
+   devel/boost
 
-PSEUDO_FLAVORS+=   no_mysql no_pgsql no_ldap
+PSEUDO_FLAVORS+=   no_mysql no_pgsql
 FLAVOR?=
 
 BACKENDS=  gsqlite3
@@ -59,7 +50,9 @@ CONFIGURE_ARGS+=  --disable-shared \
--with-dynmodules="${BACKENDS}" \
--without-lua \
--disable-hardening \
-   --without-protobuf
+   --without-protobuf \
+   --enable-tools
+CONFIGURE_ARGS+=   --without-ldap
 
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -91,17 +84,6 @@ LIB_DEPENDS-pgsql=   ${LIB_DEPENDS} \
databases/postgresql,-main
 RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
 WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
-
-# LDAP
-.if ${BUILD_PACKAGES:M-ldap}
-BACKENDS+= ldap
-.else
-CONFIGURE_ARGS+=   --without-ldap
-.endif
-LIB_DEPENDS-ldap=  ${LIB_DEPENDS} \
-   databases/openldap
-RUN_DEPENDS-ldap=  ${FULLPKGNAME-main}:net/powerdns
-WANTLIB-ldap+= ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
 
 EXAMPLE_DIR=   ${PREFIX}/share/examples/pdns/
 post-install:
Index: distinfo
===
RCS file: /cvs/ports/net/powerdns/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo10 Jul 2017 07:42:13 -  1.16
+++ distinfo1 Feb 2018 17:05:41 -
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
+SIZE (pdns-4.1.0.tar.bz2) = 1116905
Index: patches/patch-ext_json11_json11_cpp
===
RCS file: /cvs/ports/net/powerdns/patches/patch-ext_json11_json11_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ext_json11_json11_cpp
--- patches/patch-ext_json11_json11_cpp 27 May 2017 06:21:43 -  1.1
+++ patches/patch-ext_json11_json11_cpp 1 Feb 2018 17:05:41 -
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
-nullptrs are non-comparable.
-patch from freebsd
-
-Index: ext/json11/json11.cpp
 ext/json11/json11.cpp.orig
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ using std::make_shared;
- using std::initializer_list;
-

Re: UPDATE: powerdns 4.1.0

2018-02-01 Thread Stuart Henderson

On 2018/02/01 16:29, Otto Moerbeek wrote:
> Hi,
> 
> Florian stopped being maintainer and I am not able to do ports stuff.
> Is there anybody who can take this up? It would be much appreciated.

That diff looks reasonable to me, it may need hand merging due to
subsequent commits but that shouldn't be too fiddly. But I have no
powerdns setup to test with..

Re: UPDATE: powerdns 4.1.0

2018-02-01 Thread Otto Moerbeek

Hi,

Florian stopped being maintainer and I am not able to do ports stuff.
Is there anybody who can take this up? It would be much appreciated.

-Otto

On Thu, Dec 28, 2017 at 04:29:16PM +0100, Florian Obser wrote:

> please disregard and sorry for the noise
> 
> On Thu, Dec 28, 2017 at 01:53:16PM +, Florian Obser wrote:
> > anyone?
> > 
> > On Sun, Dec 17, 2017 at 11:47:59AM +, Florian Obser wrote:
> > > 
> > > updated diff after input from jca and rsadowski
> > > 
> > > - added quirks for ldap removal
> > > - reduced wantlib
> > > - removed PLIST-ldap
> > > 
> > > OK?
> > > 
> > > diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> > > index 6a75e9ddae5..5460ffbf5f9 100644
> > > --- devel/quirks/files/Quirks.pm
> > > +++ devel/quirks/files/Quirks.pm
> > > @@ -1216,6 +1216,7 @@ my $obsolete_reason = {
> > >   'aimsniff' => 6,
> > >   'pork' => 6,
> > >   'ntimed' => 3,
> > > + 'powerdns-ldap' => 6,
> > >  };
> > >  
> > >  # reasons for obsolete packages
> > > diff --git net/powerdns/Makefile net/powerdns/Makefile
> > > index c96c9a9b108..11a08254528 100644
> > > --- net/powerdns/Makefile
> > > +++ net/powerdns/Makefile
> > > @@ -5,25 +5,19 @@ BROKEN-hppa =   undefined reference to 
> > > '__sync_fetch_and_add_4'
> > >  COMMENT-main=modular authoritative nameserver (with database 
> > > support)
> > >  COMMENT-mysql=   MySQL database access module for PowerDNS
> > >  COMMENT-pgsql=   PGSQL database access module for PowerDNS
> > > -COMMENT-ldap=LDAP module for PowerDNS
> > >  
> > > -V=   4.0.4
> > > +V=   4.1.0
> > >  DISTNAME=pdns-${V}
> > >  EXTRACT_SUFX =   .tar.bz2
> > >  PKGNAME= powerdns-${V}
> > >  PKGNAME-main=powerdns-${V}
> > >  PKGNAME-mysql=   powerdns-mysql-${V}
> > >  PKGNAME-pgsql=   powerdns-pgsql-${V}
> > > -PKGNAME-ldap=powerdns-ldap-${V}
> > >  CATEGORIES=  net
> > > -HOMEPAGE=http://www.powerdns.com/
> > > +HOMEPAGE=https://www.powerdns.com/
> > >  MAINTAINER=  Florian Obser 
> > > -REVISION-ldap=   0
> > > -REVISION-main=   0
> > > -REVISION-mysql=  0
> > > -REVISION-pgsql=  0
> > >  
> > > -MULTI_PACKAGES=  -main -mysql -pgsql -ldap
> > > +MULTI_PACKAGES=  -main -mysql -pgsql
> > >  
> > >  # GPLv2
> > >  PERMIT_PACKAGE_CDROM=Yes
> > > @@ -31,22 +25,19 @@ PERMIT_PACKAGE_CDROM= Yes
> > >  COMPILER =   base-clang ports-gcc
> > >  
> > >  WANTLIB += m pthread ${COMPILER_LIBCXX}
> > > -#WANTLIB += ${MODGCC4_CPPWANTLIB}
> > >  
> > >  WANTLIB-main += ${WANTLIB}
> > > -WANTLIB-main += boost_program_options-mt boost_serialization-mt
> > > -WANTLIB-main += bz2 c crypto gmp sqlite3 z
> > > +WANTLIB-main += boost_program_options-mt c crypto sqlite3
> > >  
> > > -MASTER_SITES=http://downloads.powerdns.com/releases/
> > > +MASTER_SITES=https://downloads.powerdns.com/releases/
> > >  
> > >  NO_TEST= Yes
> > >  
> > >  LIB_DEPENDS-main=${LIB_DEPENDS} \
> > >   databases/sqlite3 \
> > > - devel/boost \
> > > - devel/gmp
> > > + devel/boost
> > >  
> > > -PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
> > > +PSEUDO_FLAVORS+= no_mysql no_pgsql
> > >  FLAVOR?=
> > >  
> > >  BACKENDS=gsqlite3
> > > @@ -60,7 +51,9 @@ CONFIGURE_ARGS+=--disable-shared \
> > >   --with-dynmodules="${BACKENDS}" \
> > >   --without-lua \
> > >   --disable-hardening \
> > > - --without-protobuf
> > > + --without-protobuf \
> > > + --enable-tools
> > > +CONFIGURE_ARGS+= --without-ldap
> > >  
> > >  CONFIGURE_ENV+=  CPPFLAGS="-I${LOCALBASE}/include" \
> > >   LDFLAGS="-L${LOCALBASE}/lib"
> > > @@ -93,17 +86,6 @@ LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
> > >  RUN_DEPENDS-pgsql=   ${FULLPKGNAME-main}:net/powerdns
> > >  WANTLIB-pgsql=   crypto pq>=2 ssl ${WANTLIB}
> > >  
> > > -# LDAP
> > > -.if ${BUILD_PACKAGES:M-ldap}
> > > -BACKENDS+=   ldap
> > > -.else
> > > -CONFIGURE_ARGS+= --without-ldap
> > > -.endif
> > > -LIB_DEPENDS-ldap=${LIB_DEPENDS} \
> > > - databases/openldap
> > > -RUN_DEPENDS-ldap=${FULLPKGNAME-main}:net/powerdns
> > > -WANTLIB-ldap+=   ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
> > > -
> > >  EXAMPLE_DIR= ${PREFIX}/share/examples/pdns/
> > >  post-install:
> > >   rm -f ${PREFIX}/lib/pdns/*.la
> > > diff --git net/powerdns/distinfo net/powerdns/distinfo
> > > index 0b14f5ac821..7ba47e175d1 100644
> > > --- net/powerdns/distinfo
> > > +++ net/powerdns/distinfo
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (pdns-4.0.4.tar.bz2) = 
> > >

Re: UPDATE: powerdns 4.1.0

2017-12-28 Thread Florian Obser

please disregard and sorry for the noise

On Thu, Dec 28, 2017 at 01:53:16PM +, Florian Obser wrote:
> anyone?
> 
> On Sun, Dec 17, 2017 at 11:47:59AM +, Florian Obser wrote:
> > 
> > updated diff after input from jca and rsadowski
> > 
> > - added quirks for ldap removal
> > - reduced wantlib
> > - removed PLIST-ldap
> > 
> > OK?
> > 
> > diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> > index 6a75e9ddae5..5460ffbf5f9 100644
> > --- devel/quirks/files/Quirks.pm
> > +++ devel/quirks/files/Quirks.pm
> > @@ -1216,6 +1216,7 @@ my $obsolete_reason = {
> > 'aimsniff' => 6,
> > 'pork' => 6,
> > 'ntimed' => 3,
> > +   'powerdns-ldap' => 6,
> >  };
> >  
> >  # reasons for obsolete packages
> > diff --git net/powerdns/Makefile net/powerdns/Makefile
> > index c96c9a9b108..11a08254528 100644
> > --- net/powerdns/Makefile
> > +++ net/powerdns/Makefile
> > @@ -5,25 +5,19 @@ BROKEN-hppa = undefined reference to 
> > '__sync_fetch_and_add_4'
> >  COMMENT-main=  modular authoritative nameserver (with database 
> > support)
> >  COMMENT-mysql= MySQL database access module for PowerDNS
> >  COMMENT-pgsql= PGSQL database access module for PowerDNS
> > -COMMENT-ldap=  LDAP module for PowerDNS
> >  
> > -V= 4.0.4
> > +V= 4.1.0
> >  DISTNAME=  pdns-${V}
> >  EXTRACT_SUFX = .tar.bz2
> >  PKGNAME=   powerdns-${V}
> >  PKGNAME-main=  powerdns-${V}
> >  PKGNAME-mysql= powerdns-mysql-${V}
> >  PKGNAME-pgsql= powerdns-pgsql-${V}
> > -PKGNAME-ldap=  powerdns-ldap-${V}
> >  CATEGORIES=net
> > -HOMEPAGE=  http://www.powerdns.com/
> > +HOMEPAGE=  https://www.powerdns.com/
> >  MAINTAINER=Florian Obser 
> > -REVISION-ldap= 0
> > -REVISION-main= 0
> > -REVISION-mysql=0
> > -REVISION-pgsql=0
> >  
> > -MULTI_PACKAGES=-main -mysql -pgsql -ldap
> > +MULTI_PACKAGES=-main -mysql -pgsql
> >  
> >  # GPLv2
> >  PERMIT_PACKAGE_CDROM=  Yes
> > @@ -31,22 +25,19 @@ PERMIT_PACKAGE_CDROM=   Yes
> >  COMPILER = base-clang ports-gcc
> >  
> >  WANTLIB += m pthread ${COMPILER_LIBCXX}
> > -#WANTLIB += ${MODGCC4_CPPWANTLIB}
> >  
> >  WANTLIB-main += ${WANTLIB}
> > -WANTLIB-main += boost_program_options-mt boost_serialization-mt
> > -WANTLIB-main += bz2 c crypto gmp sqlite3 z
> > +WANTLIB-main += boost_program_options-mt c crypto sqlite3
> >  
> > -MASTER_SITES=  http://downloads.powerdns.com/releases/
> > +MASTER_SITES=  https://downloads.powerdns.com/releases/
> >  
> >  NO_TEST=   Yes
> >  
> >  LIB_DEPENDS-main=  ${LIB_DEPENDS} \
> > databases/sqlite3 \
> > -   devel/boost \
> > -   devel/gmp
> > +   devel/boost
> >  
> > -PSEUDO_FLAVORS+=   no_mysql no_pgsql no_ldap
> > +PSEUDO_FLAVORS+=   no_mysql no_pgsql
> >  FLAVOR?=
> >  
> >  BACKENDS=  gsqlite3
> > @@ -60,7 +51,9 @@ CONFIGURE_ARGS+=  --disable-shared \
> > --with-dynmodules="${BACKENDS}" \
> > --without-lua \
> > --disable-hardening \
> > -   --without-protobuf
> > +   --without-protobuf \
> > +   --enable-tools
> > +CONFIGURE_ARGS+=   --without-ldap
> >  
> >  CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
> > LDFLAGS="-L${LOCALBASE}/lib"
> > @@ -93,17 +86,6 @@ LIB_DEPENDS-pgsql=   ${LIB_DEPENDS} \
> >  RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
> >  WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
> >  
> > -# LDAP
> > -.if ${BUILD_PACKAGES:M-ldap}
> > -BACKENDS+= ldap
> > -.else
> > -CONFIGURE_ARGS+=   --without-ldap
> > -.endif
> > -LIB_DEPENDS-ldap=  ${LIB_DEPENDS} \
> > -   databases/openldap
> > -RUN_DEPENDS-ldap=  ${FULLPKGNAME-main}:net/powerdns
> > -WANTLIB-ldap+= ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
> > -
> >  EXAMPLE_DIR=   ${PREFIX}/share/examples/pdns/
> >  post-install:
> > rm -f ${PREFIX}/lib/pdns/*.la
> > diff --git net/powerdns/distinfo net/powerdns/distinfo
> > index 0b14f5ac821..7ba47e175d1 100644
> > --- net/powerdns/distinfo
> > +++ net/powerdns/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
> > -SIZE (pdns-4.0.4.tar.bz2) = 1320327
> > +SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
> > +SIZE (pdns-4.1.0.tar.bz2) = 1116905
> > diff --git net/powerdns/patches/patch-ext_json11_json11_cpp 
> > net/powerdns/patches/patch-ext_json11_json11_cpp
> > deleted file mode 100644
> > index caf69e13d07..000
> > --- net/powerdns/patches/patch-ext_json11_json11_cpp
> > +++ /dev/null
> > @@ -1,42 +0,0

Re: UPDATE: powerdns 4.1.0

2017-12-28 Thread Florian Obser

anyone?

On Sun, Dec 17, 2017 at 11:47:59AM +, Florian Obser wrote:
> 
> updated diff after input from jca and rsadowski
> 
> - added quirks for ldap removal
> - reduced wantlib
> - removed PLIST-ldap
> 
> OK?
> 
> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> index 6a75e9ddae5..5460ffbf5f9 100644
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -1216,6 +1216,7 @@ my $obsolete_reason = {
>   'aimsniff' => 6,
>   'pork' => 6,
>   'ntimed' => 3,
> + 'powerdns-ldap' => 6,
>  };
>  
>  # reasons for obsolete packages
> diff --git net/powerdns/Makefile net/powerdns/Makefile
> index c96c9a9b108..11a08254528 100644
> --- net/powerdns/Makefile
> +++ net/powerdns/Makefile
> @@ -5,25 +5,19 @@ BROKEN-hppa =   undefined reference to 
> '__sync_fetch_and_add_4'
>  COMMENT-main=modular authoritative nameserver (with database 
> support)
>  COMMENT-mysql=   MySQL database access module for PowerDNS
>  COMMENT-pgsql=   PGSQL database access module for PowerDNS
> -COMMENT-ldap=LDAP module for PowerDNS
>  
> -V=   4.0.4
> +V=   4.1.0
>  DISTNAME=pdns-${V}
>  EXTRACT_SUFX =   .tar.bz2
>  PKGNAME= powerdns-${V}
>  PKGNAME-main=powerdns-${V}
>  PKGNAME-mysql=   powerdns-mysql-${V}
>  PKGNAME-pgsql=   powerdns-pgsql-${V}
> -PKGNAME-ldap=powerdns-ldap-${V}
>  CATEGORIES=  net
> -HOMEPAGE=http://www.powerdns.com/
> +HOMEPAGE=https://www.powerdns.com/
>  MAINTAINER=  Florian Obser 
> -REVISION-ldap=   0
> -REVISION-main=   0
> -REVISION-mysql=  0
> -REVISION-pgsql=  0
>  
> -MULTI_PACKAGES=  -main -mysql -pgsql -ldap
> +MULTI_PACKAGES=  -main -mysql -pgsql
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -31,22 +25,19 @@ PERMIT_PACKAGE_CDROM= Yes
>  COMPILER =   base-clang ports-gcc
>  
>  WANTLIB += m pthread ${COMPILER_LIBCXX}
> -#WANTLIB += ${MODGCC4_CPPWANTLIB}
>  
>  WANTLIB-main += ${WANTLIB}
> -WANTLIB-main += boost_program_options-mt boost_serialization-mt
> -WANTLIB-main += bz2 c crypto gmp sqlite3 z
> +WANTLIB-main += boost_program_options-mt c crypto sqlite3
>  
> -MASTER_SITES=http://downloads.powerdns.com/releases/
> +MASTER_SITES=https://downloads.powerdns.com/releases/
>  
>  NO_TEST= Yes
>  
>  LIB_DEPENDS-main=${LIB_DEPENDS} \
>   databases/sqlite3 \
> - devel/boost \
> - devel/gmp
> + devel/boost
>  
> -PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
> +PSEUDO_FLAVORS+= no_mysql no_pgsql
>  FLAVOR?=
>  
>  BACKENDS=gsqlite3
> @@ -60,7 +51,9 @@ CONFIGURE_ARGS+=--disable-shared \
>   --with-dynmodules="${BACKENDS}" \
>   --without-lua \
>   --disable-hardening \
> - --without-protobuf
> + --without-protobuf \
> + --enable-tools
> +CONFIGURE_ARGS+= --without-ldap
>  
>  CONFIGURE_ENV+=  CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> @@ -93,17 +86,6 @@ LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
>  RUN_DEPENDS-pgsql=   ${FULLPKGNAME-main}:net/powerdns
>  WANTLIB-pgsql=   crypto pq>=2 ssl ${WANTLIB}
>  
> -# LDAP
> -.if ${BUILD_PACKAGES:M-ldap}
> -BACKENDS+=   ldap
> -.else
> -CONFIGURE_ARGS+= --without-ldap
> -.endif
> -LIB_DEPENDS-ldap=${LIB_DEPENDS} \
> - databases/openldap
> -RUN_DEPENDS-ldap=${FULLPKGNAME-main}:net/powerdns
> -WANTLIB-ldap+=   ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
> -
>  EXAMPLE_DIR= ${PREFIX}/share/examples/pdns/
>  post-install:
>   rm -f ${PREFIX}/lib/pdns/*.la
> diff --git net/powerdns/distinfo net/powerdns/distinfo
> index 0b14f5ac821..7ba47e175d1 100644
> --- net/powerdns/distinfo
> +++ net/powerdns/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
> -SIZE (pdns-4.0.4.tar.bz2) = 1320327
> +SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
> +SIZE (pdns-4.1.0.tar.bz2) = 1116905
> diff --git net/powerdns/patches/patch-ext_json11_json11_cpp 
> net/powerdns/patches/patch-ext_json11_json11_cpp
> deleted file mode 100644
> index caf69e13d07..000
> --- net/powerdns/patches/patch-ext_json11_json11_cpp
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
> -nullptrs are non-comparable.
> -patch from freebsd
> -
> -Index: ext/json11/json11.cpp
>  ext/json11/json11.cpp.orig
> -+++ ext/json11/json11.cpp
> -@@ -37,11 +37,21 @@ using

Re: UPDATE: powerdns 4.1.0

2017-12-17 Thread Florian Obser


updated diff after input from jca and rsadowski

- added quirks for ldap removal
- reduced wantlib
- removed PLIST-ldap

OK?

diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 6a75e9ddae5..5460ffbf5f9 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -1216,6 +1216,7 @@ my $obsolete_reason = {
'aimsniff' => 6,
'pork' => 6,
'ntimed' => 3,
+   'powerdns-ldap' => 6,
 };
 
 # reasons for obsolete packages
diff --git net/powerdns/Makefile net/powerdns/Makefile
index c96c9a9b108..11a08254528 100644
--- net/powerdns/Makefile
+++ net/powerdns/Makefile
@@ -5,25 +5,19 @@ BROKEN-hppa = undefined reference to 
'__sync_fetch_and_add_4'
 COMMENT-main=  modular authoritative nameserver (with database support)
 COMMENT-mysql= MySQL database access module for PowerDNS
 COMMENT-pgsql= PGSQL database access module for PowerDNS
-COMMENT-ldap=  LDAP module for PowerDNS
 
-V= 4.0.4
+V= 4.1.0
 DISTNAME=  pdns-${V}
 EXTRACT_SUFX = .tar.bz2
 PKGNAME=   powerdns-${V}
 PKGNAME-main=  powerdns-${V}
 PKGNAME-mysql= powerdns-mysql-${V}
 PKGNAME-pgsql= powerdns-pgsql-${V}
-PKGNAME-ldap=  powerdns-ldap-${V}
 CATEGORIES=net
-HOMEPAGE=  http://www.powerdns.com/
+HOMEPAGE=  https://www.powerdns.com/
 MAINTAINER=Florian Obser 
-REVISION-ldap= 0
-REVISION-main= 0
-REVISION-mysql=0
-REVISION-pgsql=0
 
-MULTI_PACKAGES=-main -mysql -pgsql -ldap
+MULTI_PACKAGES=-main -mysql -pgsql
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -31,22 +25,19 @@ PERMIT_PACKAGE_CDROM=   Yes
 COMPILER = base-clang ports-gcc
 
 WANTLIB += m pthread ${COMPILER_LIBCXX}
-#WANTLIB += ${MODGCC4_CPPWANTLIB}
 
 WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt boost_serialization-mt
-WANTLIB-main += bz2 c crypto gmp sqlite3 z
+WANTLIB-main += boost_program_options-mt c crypto sqlite3
 
-MASTER_SITES=  http://downloads.powerdns.com/releases/
+MASTER_SITES=  https://downloads.powerdns.com/releases/
 
 NO_TEST=   Yes
 
 LIB_DEPENDS-main=  ${LIB_DEPENDS} \
databases/sqlite3 \
-   devel/boost \
-   devel/gmp
+   devel/boost
 
-PSEUDO_FLAVORS+=   no_mysql no_pgsql no_ldap
+PSEUDO_FLAVORS+=   no_mysql no_pgsql
 FLAVOR?=
 
 BACKENDS=  gsqlite3
@@ -60,7 +51,9 @@ CONFIGURE_ARGS+=  --disable-shared \
--with-dynmodules="${BACKENDS}" \
--without-lua \
--disable-hardening \
-   --without-protobuf
+   --without-protobuf \
+   --enable-tools
+CONFIGURE_ARGS+=   --without-ldap
 
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -93,17 +86,6 @@ LIB_DEPENDS-pgsql=   ${LIB_DEPENDS} \
 RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
 WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
 
-# LDAP
-.if ${BUILD_PACKAGES:M-ldap}
-BACKENDS+= ldap
-.else
-CONFIGURE_ARGS+=   --without-ldap
-.endif
-LIB_DEPENDS-ldap=  ${LIB_DEPENDS} \
-   databases/openldap
-RUN_DEPENDS-ldap=  ${FULLPKGNAME-main}:net/powerdns
-WANTLIB-ldap+= ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
-
 EXAMPLE_DIR=   ${PREFIX}/share/examples/pdns/
 post-install:
rm -f ${PREFIX}/lib/pdns/*.la
diff --git net/powerdns/distinfo net/powerdns/distinfo
index 0b14f5ac821..7ba47e175d1 100644
--- net/powerdns/distinfo
+++ net/powerdns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
+SIZE (pdns-4.1.0.tar.bz2) = 1116905
diff --git net/powerdns/patches/patch-ext_json11_json11_cpp 
net/powerdns/patches/patch-ext_json11_json11_cpp
deleted file mode 100644
index caf69e13d07..000
--- net/powerdns/patches/patch-ext_json11_json11_cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
-nullptrs are non-comparable.
-patch from freebsd
-
-Index: ext/json11/json11.cpp
 ext/json11/json11.cpp.orig
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ using std::make_shared;
- using std::initializer_list;
- using std::move;
- 
-+/* Helper for representing null - just a do-nothing struct, plus comparison
-+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
-+ * it may not be orderable.
-+*/
-+
-+struct NullStruct {
-+bool operator==(NullStruct) const { return true; }
-+bool

Re: UPDATE: powerdns 4.1.0

2017-12-11 Thread Rafael Sadowski

On Tue Dec 12, 2017 at 02:18:18AM +0100, Jeremie Courreges-Anglas wrote:
> On Sat, Dec 09 2017, Florian Obser  wrote:
> > jca pointed out that I send an update for an older version (4.0.5)
> > before, so please disregard that. This jumps directly to the 4.1.x
> > series.
> >
> > - our local patch to json11.cpp is no longer needed, upstream
> >   picked it up
> > - two more local patches are needed, mplexer.hh is already fixed by
> >   upstream and nproxy.cc is reported so they should go away with
> >   the next update
> > - jca pointed out that the master side does https now, so switched it,
> >   same for the home page
> > - otto@ pointed out that we install the man pages for the tools but
> >   don't build tools. This is enabled now as per his request.
> > - enabling the ldap module introduces a hard dependency on kerberos,
> >   (configure aborts) since I have no experience with kerberos,
> >   don't use ldap and never heard of anyone using ldap I chose to
> >   drop ldap support. It is hard enough to get OKs - let alone
> >   tests for powerdns, so I will focus on the things *I* need.
> >   If you need other things, please step up.
> >
> > I assume the ldap removal needs some black magic somewhere in quirks?
> > Cluebats?
> 
> You'd need to add "powerdns-ldap" to $obsolete_reason in
> devel/quirks/files/Quirks.pm.  None of the existing reasons (see @msg)
> really match here, though.
> 
> > This runs in production and works for me[tm]
> > Tests, OKs?
> 
> Looks good ports-wise except that ''make port-lib-depends-check'' says
> that WANTLIB-main is outdated, some libs aren't used any more.  Do you
> see the same?

Same here. Please see below.

> 
> > diff --git Makefile Makefile
> > index c96c9a9b108..1a323cde121 100644
> > --- Makefile
> > +++ Makefile
> > @@ -5,25 +5,19 @@ BROKEN-hppa = undefined reference to 
> > '__sync_fetch_and_add_4'
> >  COMMENT-main=  modular authoritative nameserver (with database 
> > support)
> >  COMMENT-mysql= MySQL database access module for PowerDNS
> >  COMMENT-pgsql= PGSQL database access module for PowerDNS
> > -COMMENT-ldap=  LDAP module for PowerDNS
> >  
> > -V= 4.0.4
> > +V= 4.1.0
> >  DISTNAME=  pdns-${V}
> >  EXTRACT_SUFX = .tar.bz2
> >  PKGNAME=   powerdns-${V}
> >  PKGNAME-main=  powerdns-${V}
> >  PKGNAME-mysql= powerdns-mysql-${V}
> >  PKGNAME-pgsql= powerdns-pgsql-${V}
> > -PKGNAME-ldap=  powerdns-ldap-${V}
> >  CATEGORIES=net
> > -HOMEPAGE=  http://www.powerdns.com/
> > +HOMEPAGE=  https://www.powerdns.com/
> >  MAINTAINER=Florian Obser 
> > -REVISION-ldap= 0
> > -REVISION-main= 0
> > -REVISION-mysql=0
> > -REVISION-pgsql=0
> >  
> > -MULTI_PACKAGES=-main -mysql -pgsql -ldap
> > +MULTI_PACKAGES=-main -mysql -pgsql
> >  
> >  # GPLv2
> >  PERMIT_PACKAGE_CDROM=  Yes
> > @@ -37,7 +31,7 @@ WANTLIB-main += ${WANTLIB}

Please zap "#WANTLIB += ${MODGCC4_CPPWANTLIB}" Somewhere around here

> >  WANTLIB-main += boost_program_options-mt boost_serialization-mt
> >  WANTLIB-main += bz2 c crypto gmp sqlite3 z

boost_serialization-mt bz2 gmp can be removed.

> >  
> > -MASTER_SITES=  http://downloads.powerdns.com/releases/
> > +MASTER_SITES=  https://downloads.powerdns.com/releases/
> >  
> >  NO_TEST=   Yes
> >  
> > @@ -46,7 +40,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> > devel/boost \
> > devel/gmp

... and bye bye devel/gmp

Re: UPDATE: powerdns 4.1.0

2017-12-11 Thread Jeremie Courreges-Anglas

On Sat, Dec 09 2017, Florian Obser  wrote:
> jca pointed out that I send an update for an older version (4.0.5)
> before, so please disregard that. This jumps directly to the 4.1.x
> series.
>
> - our local patch to json11.cpp is no longer needed, upstream
>   picked it up
> - two more local patches are needed, mplexer.hh is already fixed by
>   upstream and nproxy.cc is reported so they should go away with
>   the next update
> - jca pointed out that the master side does https now, so switched it,
>   same for the home page
> - otto@ pointed out that we install the man pages for the tools but
>   don't build tools. This is enabled now as per his request.
> - enabling the ldap module introduces a hard dependency on kerberos,
>   (configure aborts) since I have no experience with kerberos,
>   don't use ldap and never heard of anyone using ldap I chose to
>   drop ldap support. It is hard enough to get OKs - let alone
>   tests for powerdns, so I will focus on the things *I* need.
>   If you need other things, please step up.
>
> I assume the ldap removal needs some black magic somewhere in quirks?
> Cluebats?

You'd need to add "powerdns-ldap" to $obsolete_reason in
devel/quirks/files/Quirks.pm.  None of the existing reasons (see @msg)
really match here, though.

> This runs in production and works for me[tm]
> Tests, OKs?

Looks good ports-wise except that ''make port-lib-depends-check'' says
that WANTLIB-main is outdated, some libs aren't used any more.  Do you
see the same?

> diff --git Makefile Makefile
> index c96c9a9b108..1a323cde121 100644
> --- Makefile
> +++ Makefile
> @@ -5,25 +5,19 @@ BROKEN-hppa =   undefined reference to 
> '__sync_fetch_and_add_4'
>  COMMENT-main=modular authoritative nameserver (with database 
> support)
>  COMMENT-mysql=   MySQL database access module for PowerDNS
>  COMMENT-pgsql=   PGSQL database access module for PowerDNS
> -COMMENT-ldap=LDAP module for PowerDNS
>  
> -V=   4.0.4
> +V=   4.1.0
>  DISTNAME=pdns-${V}
>  EXTRACT_SUFX =   .tar.bz2
>  PKGNAME= powerdns-${V}
>  PKGNAME-main=powerdns-${V}
>  PKGNAME-mysql=   powerdns-mysql-${V}
>  PKGNAME-pgsql=   powerdns-pgsql-${V}
> -PKGNAME-ldap=powerdns-ldap-${V}
>  CATEGORIES=  net
> -HOMEPAGE=http://www.powerdns.com/
> +HOMEPAGE=https://www.powerdns.com/
>  MAINTAINER=  Florian Obser 
> -REVISION-ldap=   0
> -REVISION-main=   0
> -REVISION-mysql=  0
> -REVISION-pgsql=  0
>  
> -MULTI_PACKAGES=  -main -mysql -pgsql -ldap
> +MULTI_PACKAGES=  -main -mysql -pgsql
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -37,7 +31,7 @@ WANTLIB-main += ${WANTLIB}
>  WANTLIB-main += boost_program_options-mt boost_serialization-mt
>  WANTLIB-main += bz2 c crypto gmp sqlite3 z
>  
> -MASTER_SITES=http://downloads.powerdns.com/releases/
> +MASTER_SITES=https://downloads.powerdns.com/releases/
>  
>  NO_TEST= Yes
>  
> @@ -46,7 +40,7 @@ LIB_DEPENDS-main=   ${LIB_DEPENDS} \
>   devel/boost \
>   devel/gmp
>  
> -PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
> +PSEUDO_FLAVORS+= no_mysql no_pgsql
>  FLAVOR?=
>  
>  BACKENDS=gsqlite3
> @@ -60,7 +54,9 @@ CONFIGURE_ARGS+=--disable-shared \
>   --with-dynmodules="${BACKENDS}" \
>   --without-lua \
>   --disable-hardening \
> - --without-protobuf
> + --without-protobuf \
> + --enable-tools
> +CONFIGURE_ARGS+= --without-ldap
>  
>  CONFIGURE_ENV+=  CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> @@ -93,17 +89,6 @@ LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
>  RUN_DEPENDS-pgsql=   ${FULLPKGNAME-main}:net/powerdns
>  WANTLIB-pgsql=   crypto pq>=2 ssl ${WANTLIB}
>  
> -# LDAP
> -.if ${BUILD_PACKAGES:M-ldap}
> -BACKENDS+=   ldap
> -.else
> -CONFIGURE_ARGS+= --without-ldap
> -.endif
> -LIB_DEPENDS-ldap=${LIB_DEPENDS} \
> - databases/openldap
> -RUN_DEPENDS-ldap=${FULLPKGNAME-main}:net/powerdns
> -WANTLIB-ldap+=   ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
> -
>  EXAMPLE_DIR= ${PREFIX}/share/examples/pdns/
>  post-install:
>   rm -f ${PREFIX}/lib/pdns/*.la
> diff --git distinfo distinfo
> index 0b14f5ac821..7ba47e175d1 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
> -SIZE (pdns-4.0.4.tar.bz2) = 1320327
> +SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
> +SIZE (pdns-4.1.0.tar.bz2) =

Re: UPDATE: powerdns 4.1.0

2017-12-10 Thread Otto Moerbeek

Hi,

works for me both as slave and master. Tiny setup but at least one bug
in pdnsutil I spotted earlier (setting  more than master as a slave) is fixed.

-Otto

On Sat, Dec 09, 2017 at 09:36:14AM +0100, Florian Obser wrote:

> jca pointed out that I send an update for an older version (4.0.5)
> before, so please disregard that. This jumps directly to the 4.1.x
> series.
> 
> - our local patch to json11.cpp is no longer needed, upstream
>   picked it up
> - two more local patches are needed, mplexer.hh is already fixed by
>   upstream and nproxy.cc is reported so they should go away with
>   the next update
> - jca pointed out that the master side does https now, so switched it,
>   same for the home page
> - otto@ pointed out that we install the man pages for the tools but
>   don't build tools. This is enabled now as per his request.
> - enabling the ldap module introduces a hard dependency on kerberos,
>   (configure aborts) since I have no experience with kerberos,
>   don't use ldap and never heard of anyone using ldap I chose to
>   drop ldap support. It is hard enough to get OKs - let alone
>   tests for powerdns, so I will focus on the things *I* need.
>   If you need other things, please step up.
> 
> I assume the ldap removal needs some black magic somewhere in quirks?
> Cluebats?
> 
> This runs in production and works for me[tm]
> Tests, OKs?
> 
> diff --git Makefile Makefile
> index c96c9a9b108..1a323cde121 100644
> --- Makefile
> +++ Makefile
> @@ -5,25 +5,19 @@ BROKEN-hppa =   undefined reference to 
> '__sync_fetch_and_add_4'
>  COMMENT-main=modular authoritative nameserver (with database 
> support)
>  COMMENT-mysql=   MySQL database access module for PowerDNS
>  COMMENT-pgsql=   PGSQL database access module for PowerDNS
> -COMMENT-ldap=LDAP module for PowerDNS
>  
> -V=   4.0.4
> +V=   4.1.0
>  DISTNAME=pdns-${V}
>  EXTRACT_SUFX =   .tar.bz2
>  PKGNAME= powerdns-${V}
>  PKGNAME-main=powerdns-${V}
>  PKGNAME-mysql=   powerdns-mysql-${V}
>  PKGNAME-pgsql=   powerdns-pgsql-${V}
> -PKGNAME-ldap=powerdns-ldap-${V}
>  CATEGORIES=  net
> -HOMEPAGE=http://www.powerdns.com/
> +HOMEPAGE=https://www.powerdns.com/
>  MAINTAINER=  Florian Obser 
> -REVISION-ldap=   0
> -REVISION-main=   0
> -REVISION-mysql=  0
> -REVISION-pgsql=  0
>  
> -MULTI_PACKAGES=  -main -mysql -pgsql -ldap
> +MULTI_PACKAGES=  -main -mysql -pgsql
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -37,7 +31,7 @@ WANTLIB-main += ${WANTLIB}
>  WANTLIB-main += boost_program_options-mt boost_serialization-mt
>  WANTLIB-main += bz2 c crypto gmp sqlite3 z
>  
> -MASTER_SITES=http://downloads.powerdns.com/releases/
> +MASTER_SITES=https://downloads.powerdns.com/releases/
>  
>  NO_TEST= Yes
>  
> @@ -46,7 +40,7 @@ LIB_DEPENDS-main=   ${LIB_DEPENDS} \
>   devel/boost \
>   devel/gmp
>  
> -PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
> +PSEUDO_FLAVORS+= no_mysql no_pgsql
>  FLAVOR?=
>  
>  BACKENDS=gsqlite3
> @@ -60,7 +54,9 @@ CONFIGURE_ARGS+=--disable-shared \
>   --with-dynmodules="${BACKENDS}" \
>   --without-lua \
>   --disable-hardening \
> - --without-protobuf
> + --without-protobuf \
> + --enable-tools
> +CONFIGURE_ARGS+= --without-ldap
>  
>  CONFIGURE_ENV+=  CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> @@ -93,17 +89,6 @@ LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
>  RUN_DEPENDS-pgsql=   ${FULLPKGNAME-main}:net/powerdns
>  WANTLIB-pgsql=   crypto pq>=2 ssl ${WANTLIB}
>  
> -# LDAP
> -.if ${BUILD_PACKAGES:M-ldap}
> -BACKENDS+=   ldap
> -.else
> -CONFIGURE_ARGS+= --without-ldap
> -.endif
> -LIB_DEPENDS-ldap=${LIB_DEPENDS} \
> - databases/openldap
> -RUN_DEPENDS-ldap=${FULLPKGNAME-main}:net/powerdns
> -WANTLIB-ldap+=   ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
> -
>  EXAMPLE_DIR= ${PREFIX}/share/examples/pdns/
>  post-install:
>   rm -f ${PREFIX}/lib/pdns/*.la
> diff --git distinfo distinfo
> index 0b14f5ac821..7ba47e175d1 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
> -SIZE (pdns-4.0.4.tar.bz2) = 1320327
> +SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
> +SIZE (pdns-4.1.0.tar.bz2) = 1116905
> diff --git patches/patch-ext_json11_json11_cpp 
> patches/patch-ext_json11_json11_cpp
> deleted file mode 100644
> index

UPDATE: powerdns 4.1.0

2017-12-09 Thread Florian Obser

jca pointed out that I send an update for an older version (4.0.5)
before, so please disregard that. This jumps directly to the 4.1.x
series.

- our local patch to json11.cpp is no longer needed, upstream
  picked it up
- two more local patches are needed, mplexer.hh is already fixed by
  upstream and nproxy.cc is reported so they should go away with
  the next update
- jca pointed out that the master side does https now, so switched it,
  same for the home page
- otto@ pointed out that we install the man pages for the tools but
  don't build tools. This is enabled now as per his request.
- enabling the ldap module introduces a hard dependency on kerberos,
  (configure aborts) since I have no experience with kerberos,
  don't use ldap and never heard of anyone using ldap I chose to
  drop ldap support. It is hard enough to get OKs - let alone
  tests for powerdns, so I will focus on the things *I* need.
  If you need other things, please step up.

I assume the ldap removal needs some black magic somewhere in quirks?
Cluebats?

This runs in production and works for me[tm]
Tests, OKs?

diff --git Makefile Makefile
index c96c9a9b108..1a323cde121 100644
--- Makefile
+++ Makefile
@@ -5,25 +5,19 @@ BROKEN-hppa = undefined reference to 
'__sync_fetch_and_add_4'
 COMMENT-main=  modular authoritative nameserver (with database support)
 COMMENT-mysql= MySQL database access module for PowerDNS
 COMMENT-pgsql= PGSQL database access module for PowerDNS
-COMMENT-ldap=  LDAP module for PowerDNS
 
-V= 4.0.4
+V= 4.1.0
 DISTNAME=  pdns-${V}
 EXTRACT_SUFX = .tar.bz2
 PKGNAME=   powerdns-${V}
 PKGNAME-main=  powerdns-${V}
 PKGNAME-mysql= powerdns-mysql-${V}
 PKGNAME-pgsql= powerdns-pgsql-${V}
-PKGNAME-ldap=  powerdns-ldap-${V}
 CATEGORIES=net
-HOMEPAGE=  http://www.powerdns.com/
+HOMEPAGE=  https://www.powerdns.com/
 MAINTAINER=Florian Obser 
-REVISION-ldap= 0
-REVISION-main= 0
-REVISION-mysql=0
-REVISION-pgsql=0
 
-MULTI_PACKAGES=-main -mysql -pgsql -ldap
+MULTI_PACKAGES=-main -mysql -pgsql
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -37,7 +31,7 @@ WANTLIB-main += ${WANTLIB}
 WANTLIB-main += boost_program_options-mt boost_serialization-mt
 WANTLIB-main += bz2 c crypto gmp sqlite3 z
 
-MASTER_SITES=  http://downloads.powerdns.com/releases/
+MASTER_SITES=  https://downloads.powerdns.com/releases/
 
 NO_TEST=   Yes
 
@@ -46,7 +40,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/boost \
devel/gmp
 
-PSEUDO_FLAVORS+=   no_mysql no_pgsql no_ldap
+PSEUDO_FLAVORS+=   no_mysql no_pgsql
 FLAVOR?=
 
 BACKENDS=  gsqlite3
@@ -60,7 +54,9 @@ CONFIGURE_ARGS+=  --disable-shared \
--with-dynmodules="${BACKENDS}" \
--without-lua \
--disable-hardening \
-   --without-protobuf
+   --without-protobuf \
+   --enable-tools
+CONFIGURE_ARGS+=   --without-ldap
 
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -93,17 +89,6 @@ LIB_DEPENDS-pgsql=   ${LIB_DEPENDS} \
 RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
 WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
 
-# LDAP
-.if ${BUILD_PACKAGES:M-ldap}
-BACKENDS+= ldap
-.else
-CONFIGURE_ARGS+=   --without-ldap
-.endif
-LIB_DEPENDS-ldap=  ${LIB_DEPENDS} \
-   databases/openldap
-RUN_DEPENDS-ldap=  ${FULLPKGNAME-main}:net/powerdns
-WANTLIB-ldap+= ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
-
 EXAMPLE_DIR=   ${PREFIX}/share/examples/pdns/
 post-install:
rm -f ${PREFIX}/lib/pdns/*.la
diff --git distinfo distinfo
index 0b14f5ac821..7ba47e175d1 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
+SIZE (pdns-4.1.0.tar.bz2) = 1116905
diff --git patches/patch-ext_json11_json11_cpp 
patches/patch-ext_json11_json11_cpp
deleted file mode 100644
index caf69e13d07..000
--- patches/patch-ext_json11_json11_cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
-nullptrs are non-comparable.
-patch from freebsd
-
-Index: ext/json11/json11.cpp
 ext/json11/json11.cpp.orig
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ using std::make_shared;
- using std::initializer_list;
- using std::move;
- 
-+/* Helper for representing null - just a do-nothing struct, plus comparison
-+ * operators so the

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

Re: UPDATE: powerdns 4.1.0

UPDATE: powerdns 4.1.0

11 matches

Site Navigation

Mail list logo

Footer information