please disregard and sorry for the noise
On Thu, Dec 28, 2017 at 01:53:16PM +0000, Florian Obser wrote:
> anyone?
>
> On Sun, Dec 17, 2017 at 11:47:59AM +0000, 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 <[email protected]>
> > -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..00000000000
> > --- 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 operator<(NullStruct) const { return false; }
> > -+};
> > -+
> > - /* * * * * * * * * * * * * * * * * * * *
> > - * Serialization
> > - */
> > -
> > --static void dump(std::nullptr_t, string &out) {
> > -+static void dump(NullStruct, string &out) {
> > - out += "null";
> > - }
> > -
> > -@@ -204,9 +214,9 @@ class JsonObject final : public Value<Json::OBJECT, Js
> > - explicit JsonObject(Json::object &&value) : Value(move(value)) {}
> > - };
> > -
> > --class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
> > -+class JsonNull final : public Value<Json::NUL, NullStruct> {
> > - public:
> > -- JsonNull() : Value(nullptr) {}
> > -+ JsonNull() : Value({}) {}
> > - };
> > -
> > - /* * * * * * * * * * * * * * * * * * * *
> > diff --git net/powerdns/patches/patch-pdns_mplexer_hh
> > net/powerdns/patches/patch-pdns_mplexer_hh
> > new file mode 100644
> > index 00000000000..bd5842787e2
> > --- /dev/null
> > +++ net/powerdns/patches/patch-pdns_mplexer_hh
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +needed for timeval
> > +
> > +Index: pdns/mplexer.hh
> > +--- pdns/mplexer.hh.orig
> > ++++ pdns/mplexer.hh
> > +@@ -21,6 +21,7 @@
> > + */
> > + #ifndef PDNS_MPLEXER_HH
> > + #define PDNS_MPLEXER_HH
> > ++#include <sys/time.h>
> > + #include <boost/function.hpp>
> > + #include <boost/any.hpp>
> > + #include <boost/shared_array.hpp>
> > diff --git net/powerdns/patches/patch-pdns_nproxy_cc
> > net/powerdns/patches/patch-pdns_nproxy_cc
> > new file mode 100644
> > index 00000000000..db102950e03
> > --- /dev/null
> > +++ net/powerdns/patches/patch-pdns_nproxy_cc
> > @@ -0,0 +1,15 @@
> > +$OpenBSD$
> > +
> > +needed for chroot et al
> > +
> > +Index: pdns/nproxy.cc
> > +--- pdns/nproxy.cc.orig
> > ++++ pdns/nproxy.cc
> > +@@ -38,6 +38,7 @@
> > + #include <sys/stat.h>
> > + #include <fcntl.h>
> > + #include <grp.h>
> > ++#include <unistd.h>
> > + #include "dnsrecords.hh"
> > + #include "mplexer.hh"
> > + #include "statbag.hh"
> > diff --git net/powerdns/pkg/PLIST-ldap net/powerdns/pkg/PLIST-ldap
> > deleted file mode 100644
> > index 784c09881fd..00000000000
> > --- net/powerdns/pkg/PLIST-ldap
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -@comment $OpenBSD: PLIST-ldap,v 1.2 2015/04/14 18:10:27 florian Exp $
> > -lib/pdns/libldapbackend.so
> > diff --git net/powerdns/pkg/PLIST-main net/powerdns/pkg/PLIST-main
> > index d57f7c64a56..10401d1b415 100644
> > --- net/powerdns/pkg/PLIST-main
> > +++ net/powerdns/pkg/PLIST-main
> > @@ -5,10 +5,24 @@
> > @pkgpath net/powerdns,-sqlite3
> > @newgroup _powerdns:609
> > @newuser _powerdns:609:_powerdns:daemon:PowerDNS
> > Server:/nonexistent:/sbin/nologin
> > +@bin bin/dnsbulktest
> > +@bin bin/dnsgram
> > +@bin bin/dnsreplay
> > +@bin bin/dnsscan
> > +@bin bin/dnsscope
> > +@bin bin/dnstcpbench
> > +@bin bin/dnswasher
> > +@bin bin/dumresp
> > +@bin bin/ixplore
> > +@bin bin/nproxy
> > +@bin bin/nsec3dig
> > @bin bin/pdns_control
> > +@bin bin/pdns_notify
> > @bin bin/pdnsutil
> > +@bin bin/saxfr
> > +@bin bin/sdig
> > +@bin bin/stubquery
> > @bin bin/zone2json
> > -@bin bin/zone2ldap
> > @bin bin/zone2sql
> > lib/pdns/
> > lib/pdns/libbindbackend.so
> > @@ -36,6 +50,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.1.0_schema.mysql.sql
> > +share/doc/pdns/3.4.0_to_4.1.0_schema.pgsql.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
> >
> >
> > --
> > I'm not entirely sure you are real.
> >
>
> --
> I'm not entirely sure you are real.
>
--
I'm not entirely sure you are real.
