Attachment #165731 for bug #206347

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




# $FreeBSD$

PORTNAME=	unbound
PORTVERSION=	1.5.7
CATEGORIES=	dns
MASTER_SITES=	http://unbound.net/downloads/


LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES+=		autoreconf cpe libtool
CPE_VENDOR=	nlnetlabs
USE_OPENSSL=	yes
GNU_CONFIGURE=	yes

.endif

post-patch:
	@${MKDIR} ${WRKSRC}/balancer
	@${RM} ${WRKSRC}/util/configlexer.c
	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
		s|$$(configfile); fi|$$(configfile).sample|' \

	@${CAT} ${WRKDIR}/pkg-message
	@${ECHO_MSG} "============================================================="
.endif
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
	for f in ${PORTDOCS}; do \
		cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${STAGEDIR}${DOCSDIR}/; \
	done
.endif

post-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}

regression-test: build
	cd ${WRKSRC} && ${MAKE} test


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (unbound-1.5.5.tar.gz) = f3bd7d3bc9519e8717abdc35c26cb2d84c3c3a3e2cd657604307e6860b37da5e	1	SHA256 (unbound-1.5.7.tar.gz) = 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8
2	SIZE (unbound-1.5.5.tar.gz) = 4849969	2	SIZE (unbound-1.5.7.tar.gz) = 4859573




--- contrib/aaaa-filter-iterator.patch.orig	2016-01-04 12:57:42 UTC
+++ contrib/aaaa-filter-iterator.patch
@@ -1,8 +1,10 @@
---- unbound-1.4.17.orig/doc/unbound.conf.5.in
-+++ unbound-1.4.17/doc/unbound.conf.5.in
-@@ -519,6 +519,13 @@ authority servers and checks if the repl
- Disabled by default. 
- This feature is an experimental implementation of draft dns\-0x20.
+Index: trunk/doc/unbound.conf.5.in
+===================================================================
+--- trunk/doc/unbound.conf.5.in	(revision 3587)
++++ trunk/doc/unbound.conf.5.in	(working copy)
+@@ -593,6 +593,13 @@
+ possible. Best effort approach, full QNAME and original QTYPE will be sent when
+ upstream replies with a RCODE other than NOERROR. Default is off.
  .TP
 +.B aaaa\-filter: \fI<yes or no>
 +Activate behavior similar to BIND's AAAA-filter.
@@ -13,20 +15,12 @@
 +.TP
  .B private\-address: \fI<IP address or subnet>
  Give IPv4 of IPv6 addresses or classless subnets. These are addresses
- on your private network, and are not allowed to be returned for public
---- unbound-1.4.17.orig/util/config_file.c
-+++ unbound-1.4.17/util/config_file.c
-@@ -160,6 +160,7 @@ config_create(void)
- 	cfg->harden_below_nxdomain = 0;
- 	cfg->harden_referral_path = 0;
- 	cfg->use_caps_bits_for_id = 0;
-+	cfg->aaaa_filter = 0; /* ASN: default is disabled */
- 	cfg->private_address = NULL;
- 	cfg->private_domain = NULL;
+ 	cfg->caps_whitelist = NULL;
  	cfg->private_address = NULL;
  	cfg->private_domain = NULL;
- 	cfg->unwanted_threshold = 0;
---- unbound-1.4.17.orig/iterator/iter_scrub.c
-+++ unbound-1.4.17/iterator/iter_scrub.c
-@@ -580,6 +580,32 @@ static int sanitize_nsec_is_overreach(st
+ on your private network, and are not allowed to be returned for
+Index: trunk/iterator/iter_scrub.c
+===================================================================
+--- trunk/iterator/iter_scrub.c	(revision 3587)
++++ trunk/iterator/iter_scrub.c	(working copy)
+@@ -617,6 +617,32 @@
  }
  
  /**
@@ -38,7 +32,7 @@
 + */
 +static int
 +asn_lookup_a_record_from_cache(struct query_info* qinfo,
-+	struct module_env* env, struct iter_env* ie)

etc/unbound/unbound.conf.sample
include/unbound.h
lib/libunbound.so.2.3.10
lib/libunbound.so.2
lib/libunbound.so
lib/libunbound.a

Return to bug 206347

Lines 2-8 Link Here

(-)Makefile (-9 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= unbound	4	PORTNAME= unbound
5	PORTVERSION= 1.5.5	5	PORTVERSION= 1.5.7
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= http://unbound.net/downloads/	7	MASTER_SITES= http://unbound.net/downloads/
8		8
Lines 12-18 Link Here
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	USES+= autoreconf cpe gmake libtool	15	USES+= autoreconf cpe libtool
16	CPE_VENDOR= nlnetlabs	16	CPE_VENDOR= nlnetlabs
17	USE_OPENSSL= yes	17	USE_OPENSSL= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
Lines 95-101 Link Here
95	.endif	95	.endif
96		96
97	post-patch:	97	post-patch:
98	@${MKDIR} ${WRKSRC}/balancer
99	@${RM} ${WRKSRC}/util/configlexer.c	98	@${RM} ${WRKSRC}/util/configlexer.c
100	@${REINPLACE_CMD} -e 's\|if test ! -e $$(DESTDIR)$$(configfile); then \|\| ; \	99	@${REINPLACE_CMD} -e 's\|if test ! -e $$(DESTDIR)$$(configfile); then \|\| ; \
101	s\|$$(configfile); fi\|$$(configfile).sample\|' \	100	s\|$$(configfile); fi\|$$(configfile).sample\|' \
Lines 125-137 Link Here
125	@${CAT} ${WRKDIR}/pkg-message	124	@${CAT} ${WRKDIR}/pkg-message
126	@${ECHO_MSG} "============================================================="	125	@${ECHO_MSG} "============================================================="
127	.endif	126	.endif
128	.if ${PORT_OPTIONS:MDOCS}
129	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
130	for f in ${PORTDOCS}; do \
131	cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${STAGEDIR}${DOCSDIR}/; \
132	done
133	.endif
134		127
		128	post-install-DOCS-on:
		129	${MKDIR} ${STAGEDIR}${DOCSDIR}
		130	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/doc/\|} ${STAGEDIR}${DOCSDIR}
		131
135	regression-test: build	132	regression-test: build
136	cd ${WRKSRC} && ${MAKE} test	133	cd ${WRKSRC} && ${MAKE} test
137		134

Lines 1-39 Link Here

(-)pkg-plist (-19 / +48 lines)
1	--- contrib/aaaa-filter-iterator.patch.orig 2015-08-19 18:27:55.176868361 +0300	1	--- contrib/aaaa-filter-iterator.patch.orig 2016-01-04 12:57:42 UTC
2	+++ contrib/aaaa-filter-iterator.patch 2015-08-19 18:28:04.744973136 +0300	2	+++ contrib/aaaa-filter-iterator.patch
3	@@ -16,14 +16,14 @@	3	@@ -1,8 +1,10 @@
4	on your private network, and are not allowed to be returned for public	4	---- unbound-1.4.17.orig/doc/unbound.conf.5.in
5	--- unbound-1.4.17.orig/util/config_file.c	5	-+++ unbound-1.4.17/doc/unbound.conf.5.in
6	+++ unbound-1.4.17/util/config_file.c	6	-@@ -519,6 +519,13 @@ authority servers and checks if the repl
		7	- Disabled by default.
		8	- This feature is an experimental implementation of draft dns\-0x20.
		9	+Index: trunk/doc/unbound.conf.5.in
		10	+===================================================================
		11	+--- trunk/doc/unbound.conf.5.in (revision 3587)
		12	++++ trunk/doc/unbound.conf.5.in (working copy)
		13	+@@ -593,6 +593,13 @@
		14	+ possible. Best effort approach, full QNAME and original QTYPE will be sent when
		15	+ upstream replies with a RCODE other than NOERROR. Default is off.
		16	.TP
		17	+.B aaaa\-filter: \fI<yes or no>
		18	+Activate behavior similar to BIND's AAAA-filter.
		19	@@ -13,20 +15,12 @@
		20	+.TP
		21	.B private\-address: \fI<IP address or subnet>
		22	Give IPv4 of IPv6 addresses or classless subnets. These are addresses
		23	- on your private network, and are not allowed to be returned for public
		24	---- unbound-1.4.17.orig/util/config_file.c
		25	-+++ unbound-1.4.17/util/config_file.c
7	-@@ -160,6 +160,7 @@ config_create(void)	26	-@@ -160,6 +160,7 @@ config_create(void)
8	- cfg->harden_below_nxdomain = 0;	27	- cfg->harden_below_nxdomain = 0;
9	+@@ -174,6 +174,7 @@	28	- cfg->harden_referral_path = 0;
10	cfg->harden_referral_path = 0;	29	- cfg->use_caps_bits_for_id = 0;
11	+ cfg->harden_algo_downgrade = 1;	30	-+ cfg->aaaa_filter = 0; /* ASN: default is disabled */
12	cfg->use_caps_bits_for_id = 0;	31	- cfg->private_address = NULL;
13	+ cfg->aaaa_filter = 0; /* ASN: default is disabled */	32	- cfg->private_domain = NULL;
14	+ cfg->caps_whitelist = NULL;
15	cfg->private_address = NULL;
16	cfg->private_domain = NULL;
17	- cfg->unwanted_threshold = 0;	33	- cfg->unwanted_threshold = 0;
18	--- unbound-1.4.17.orig/iterator/iter_scrub.c	34	---- unbound-1.4.17.orig/iterator/iter_scrub.c
19	+++ unbound-1.4.17/iterator/iter_scrub.c	35	-+++ unbound-1.4.17/iterator/iter_scrub.c
20	@@ -580,6 +580,32 @@ static int sanitize_nsec_is_overreach(st	36	-@@ -580,6 +580,32 @@ static int sanitize_nsec_is_overreach(st
21	@@ -329,15 +329,15 @@	37	+ on your private network, and are not allowed to be returned for
		38	+Index: trunk/iterator/iter_scrub.c
		39	+===================================================================
		40	+--- trunk/iterator/iter_scrub.c (revision 3587)
		41	++++ trunk/iterator/iter_scrub.c (working copy)
		42	+@@ -617,6 +617,32 @@
		43	}
		44
		45	/**
		46	@@ -38,7 +32,7 @@
		47	+ */
		48	+static int
		49	+asn_lookup_a_record_from_cache(struct query_info* qinfo,
		50	-+ struct module_env* env, struct iter_env* ie)
Lines 1-6 Link Here
1	etc/unbound/unbound.conf.sample	1	etc/unbound/unbound.conf.sample
2	include/unbound.h	2	include/unbound.h
3	lib/libunbound.so.2.3.8	3	lib/libunbound.so.2.3.10
4	lib/libunbound.so.2	4	lib/libunbound.so.2
5	lib/libunbound.so	5	lib/libunbound.so
6	lib/libunbound.a	6	lib/libunbound.a