diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2016-03-22 02:14:01 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2016-03-22 02:14:01 +0000 |
| commit | f94e4f56ca1969f46fd043f1f7140173f05c44af (patch) | |
| tree | c484a3ba0d0aab41dfca158fdb7ac7d9cccaa983 /dns/dnsdist | |
| parent | 6efd1f55fb10bcf6e28e1974dd667f3c063c6e7b (diff) | |
| download | ports-f94e4f56ca1969f46fd043f1f7140173f05c44af.tar.gz ports-f94e4f56ca1969f46fd043f1f7140173f05c44af.zip | |
Notes
Diffstat (limited to 'dns/dnsdist')
| -rw-r--r-- | dns/dnsdist/Makefile | 17 | ||||
| -rw-r--r-- | dns/dnsdist/distinfo | 4 | ||||
| -rw-r--r-- | dns/dnsdist/files/patch-dnsname.cc | 13 | ||||
| -rw-r--r-- | dns/dnsdist/files/patch-iputils.hh | 12 |
4 files changed, 31 insertions, 15 deletions
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile index 2f83bda2d6fa..538d9f669405 100644 --- a/dns/dnsdist/Makefile +++ b/dns/dnsdist/Makefile @@ -2,18 +2,21 @@ # $FreeBSD$ PORTNAME= dnsdist -DISTVERSION= 0.0.791gfbb356b +DISTVERSION= 1.0.0-alpha2 CATEGORIES= dns net -MASTER_SITES= http://builder.powerdns.com/files/dnsdist/dist/ \ +MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm MAINTAINER= cpm@FreeBSD.org COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer -LICENSE= GPLv2 +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:${PORTSDIR}/devel/libatomic_ops \ - ragel>0:${PORTSDIR}/devel/ragel +BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs \ libsodium.so:${PORTSDIR}/security/libsodium @@ -21,8 +24,8 @@ CXXFLAGS+= -D_GLIBCXX_USE_C99 LDFLAGS+= -L${LOCALBASE}/lib -latomic GNU_CONFIGURE= yes USE_GCC= yes -USES= bison cpe gmake libtool lua:52 pkgconfig readline tar:bz2 -CONFIGURE_ARGS= --enable-libsodium +USES= bison cpe gmake libedit libtool lua:52 pkgconfig tar:bz2 +CONFIGURE_ARGS= --enable-dnscrypt --enable-libsodium INSTALL_TARGET= install-strip USE_RC_SUBR= dnsdist diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo index 9cf983e6cb8c..aacd343a740a 100644 --- a/dns/dnsdist/distinfo +++ b/dns/dnsdist/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnsdist-0.0.791gfbb356b.tar.bz2) = bbd063adb3c39dde957c4578e1b06ab79400d26764ce9d21b8afc8437fa9992b -SIZE (dnsdist-0.0.791gfbb356b.tar.bz2) = 803402 +SHA256 (dnsdist-1.0.0-alpha2.tar.bz2) = dcbfa4f375a856694276f11921a6007bc954edd517a1cf1311a31839ca083c50 +SIZE (dnsdist-1.0.0-alpha2.tar.bz2) = 789252 diff --git a/dns/dnsdist/files/patch-dnsname.cc b/dns/dnsdist/files/patch-dnsname.cc new file mode 100644 index 000000000000..ab8aac6469ca --- /dev/null +++ b/dns/dnsdist/files/patch-dnsname.cc @@ -0,0 +1,13 @@ +--- 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<d_storage.cend() && std::distance(us,d_storage.cend()) >= static_cast<unsigned int>(parent.d_storage.size()); us+=*us+1) { +- if (std::distance(us,d_storage.cend()) == static_cast<unsigned int>(parent.d_storage.size())) { ++ for(auto us=d_storage.cbegin(); us<d_storage.cend() && std::distance(us,d_storage.cend()) >= static_cast<int>(parent.d_storage.size()); us+=*us+1) { ++ if (std::distance(us,d_storage.cend()) == static_cast<int>(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 index fead6b9f76e7..5439389ca10f 100644 --- a/dns/dnsdist/files/patch-iputils.hh +++ b/dns/dnsdist/files/patch-iputils.hh @@ -1,7 +1,7 @@ ---- iputils.hh.orig 2016-01-13 10:18:24 UTC +--- iputils.hh.orig 2016-02-05 09:35:08 UTC +++ iputils.hh -@@ -59,6 +59,11 @@ - #define le64toh(x) OSSwapLittleToHostInt64(x) +@@ -79,6 +79,11 @@ + #endif +// for FreeBSD @@ -9,6 +9,6 @@ +#include <sys/endian.h> +#endif + - // for illumos - #ifdef BE_64 - + union ComboAddress { + struct sockaddr_in sin4; + struct sockaddr_in6 sin6; |