Attachment #168374 for bug #208126

View | Details | Raw Unified | Return to bug 208126
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	dnsdist
DISTVERSION=	1.0.0-alpha2
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:${PORTSDIR}/devel/libatomic_ops
		ragel>0:${PORTSDIR}/devel/ragel
LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs \
		libsodium.so:${PORTSDIR}/security/libsodium


LDFLAGS+=	-L${LOCALBASE}/lib -latomic
GNU_CONFIGURE=	yes
USE_GCC=	yes
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

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (dnsdist-0.0.791gfbb356b.tar.bz2) = bbd063adb3c39dde957c4578e1b06ab79400d26764ce9d21b8afc8437fa9992b	1	SHA256 (dnsdist-1.0.0-alpha2.tar.bz2) = dcbfa4f375a856694276f11921a6007bc954edd517a1cf1311a31839ca083c50
2	SIZE (dnsdist-0.0.791gfbb356b.tar.bz2) = 803402	2	SIZE (dnsdist-1.0.0-alpha2.tar.bz2) = 789252




--- 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))

Lines 1-7 Link Here

(-)files/patch-iputils.hh (-6 / +6 lines)
1	--- iputils.hh.orig 2016-01-13 10:18:24 UTC	1	--- iputils.hh.orig 2016-02-05 09:35:08 UTC
2	+++ iputils.hh	2	+++ iputils.hh
3	@@ -59,6 +59,11 @@	3	@@ -79,6 +79,11 @@
4	#define le64toh(x) OSSwapLittleToHostInt64(x)	4
5	#endif	5	#endif
6		6
7	+// for FreeBSD	7	+// for FreeBSD
Lines 9-14 Link Here
9	+#include <sys/endian.h>	9	+#include <sys/endian.h>
10	+#endif	10	+#endif
11	+	11	+
12	// for illumos	12	union ComboAddress {
13	#ifdef BE_64	13	struct sockaddr_in sin4;
14		14	struct sockaddr_in6 sin6;

Return to bug 208126

Lines 2-19 Link Here

(-)Makefile (-7 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dnsdist	4	PORTNAME= dnsdist
5	DISTVERSION= 0.0.791gfbb356b	5	DISTVERSION= 1.0.0-alpha2
6	CATEGORIES= dns net	6	CATEGORIES= dns net
7	MASTER_SITES= http://builder.powerdns.com/files/dnsdist/dist/ \	7	MASTER_SITES= https://downloads.powerdns.com/releases/ \
8	LOCAL/cpm	8	LOCAL/cpm
9		9
10	MAINTAINER= cpm@FreeBSD.org	10	MAINTAINER= cpm@FreeBSD.org
11	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer	11	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2 UNLICENSE
		14	LICENSE_COMB= multi
		15	LICENSE_NAME_UNLICENSE= The Unlicense
		16	LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE
		17	LICENSE_PERMS_UNLICENSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
14		18
15	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \	19	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
16	ragel>0:${PORTSDIR}/devel/ragel
17	LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs \	20	LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs \
18	libsodium.so:${PORTSDIR}/security/libsodium	21	libsodium.so:${PORTSDIR}/security/libsodium
19		22
Lines 21-28 Link Here
21	LDFLAGS+= -L${LOCALBASE}/lib -latomic	24	LDFLAGS+= -L${LOCALBASE}/lib -latomic
22	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
23	USE_GCC= yes	26	USE_GCC= yes
24	USES= bison cpe gmake libtool lua:52 pkgconfig readline tar:bz2	27	USES= bison cpe gmake libedit libtool lua:52 pkgconfig tar:bz2
25	CONFIGURE_ARGS= --enable-libsodium	28	CONFIGURE_ARGS= --enable-dnscrypt --enable-libsodium
26	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
27		30
28	USE_RC_SUBR= dnsdist	31	USE_RC_SUBR= dnsdist

Line 0 Link Here

(-)files/patch-dnsname.cc (+13 lines)
	1	--- dnsname.cc.orig 2016-03-18 18:34:07 UTC
	2	+++ dnsname.cc
	3	@@ -142,8 +142,8 @@ bool DNSName::isPartOf(const DNSName& pa
	4	return false;
	5
	6	// this is slightly complicated since we can't start from the end, since we can't see where a label begins/ends then
	7	- 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) {
	8	- if (std::distance(us,d_storage.cend()) == static_cast<unsigned int>(parent.d_storage.size())) {
	9	+ 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) {
	10	+ if (std::distance(us,d_storage.cend()) == static_cast<int>(parent.d_storage.size())) {
	11	auto p = parent.d_storage.cbegin();
	12	for(; us != d_storage.cend(); ++us, ++p) {
	13	if(dns2_tolower(p) != dns2_tolower(us))