diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile index ab5be86287ff..575339937a0a 100644 --- a/dns/dnsdist/Makefile +++ b/dns/dnsdist/Makefile @@ -1,41 +1,44 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= dnsdist -DISTVERSION= 1.0.0 -PORTREVISION= 4 +DISTVERSION= 1.1.0 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm MAINTAINER= cpm@FreeBSD.org COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer LICENSE= GPLv2 UNLICENSE LICENSE_COMB= multi LICENSE_NAME_UNLICENSE= The Unlicense LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE LICENSE_PERMS_UNLICENSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ + libprotobuf.so:devel/protobuf \ + libre2.so:devel/re2 \ libsodium.so:security/libsodium -CXXFLAGS+= -D_GLIBCXX_USE_C99 -LDFLAGS+= -L${LOCALBASE}/lib -latomic GNU_CONFIGURE= yes -USE_GCC= yes -USES= bison cpe gmake libedit libtool lua:52 pkgconfig tar:bz2 -CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --enable-dnscrypt --enable-libsodium --without-protobuf +USES= bison compiler:c++14-lang cpe gmake libedit libtool localbase \ + lua:52 pkgconfig tar:bz2 +CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ + --enable-dnscrypt \ + --enable-libsodium \ + --enable-re2 + INSTALL_TARGET= install-strip USERS= _dnsdist GROUPS= _dnsdist USE_RC_SUBR= dnsdist post-install: ${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample \ ${STAGEDIR}${PREFIX}/etc .include diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo index b9353bf1f999..044b5a9032b2 100644 --- a/dns/dnsdist/distinfo +++ b/dns/dnsdist/distinfo @@ -1,2 +1,3 @@ -SHA256 (dnsdist-1.0.0.tar.bz2) = 1f72a5ca420fdea248dda60733a9b0ce3d68e13ee77dd5031887769a8451c713 -SIZE (dnsdist-1.0.0.tar.bz2) = 834177 +TIMESTAMP = 1483106940 +SHA256 (dnsdist-1.1.0.tar.bz2) = b4a1e8931b6d05a24494f54224211c0de0eeb1f5ff170f6b9f5665219bfeafc2 +SIZE (dnsdist-1.1.0.tar.bz2) = 874837 diff --git a/dns/dnsdist/files/patch-dnsname.cc b/dns/dnsdist/files/patch-dnsname.cc deleted file mode 100644 index ab8aac6469ca..000000000000 --- a/dns/dnsdist/files/patch-dnsname.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- dnsname.cc.orig 2016-03-18 18:34:07 UTC -+++ dnsname.cc -@@ -142,8 +142,8 @@ bool DNSName::isPartOf(const DNSName& pa - return false; - - // this is slightly complicated since we can't start from the end, since we can't see where a label begins/ends then -- for(auto us=d_storage.cbegin(); us= static_cast(parent.d_storage.size()); us+=*us+1) { -- if (std::distance(us,d_storage.cend()) == static_cast(parent.d_storage.size())) { -+ for(auto us=d_storage.cbegin(); us= static_cast(parent.d_storage.size()); us+=*us+1) { -+ if (std::distance(us,d_storage.cend()) == static_cast(parent.d_storage.size())) { - auto p = parent.d_storage.cbegin(); - for(; us != d_storage.cend(); ++us, ++p) { - if(dns2_tolower(*p) != dns2_tolower(*us)) diff --git a/dns/dnsdist/files/patch-iputils.hh b/dns/dnsdist/files/patch-iputils.hh deleted file mode 100644 index 5439389ca10f..000000000000 --- a/dns/dnsdist/files/patch-iputils.hh +++ /dev/null @@ -1,14 +0,0 @@ ---- iputils.hh.orig 2016-02-05 09:35:08 UTC -+++ iputils.hh -@@ -79,6 +79,11 @@ - - #endif - -+// for FreeBSD -+#ifdef __FreeBSD__ -+#include -+#endif -+ - union ComboAddress { - struct sockaddr_in sin4; - struct sockaddr_in6 sin6;