View | Details | Raw Unified | Return to bug 195674 | Differences between
and this patch

Collapse All | Expand All

(-)unbound/Makefile (-8 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/dns/unbound/Makefile 373710 2014-12-01 15:05:05Z feld $
2
# $FreeBSD: head/dns/unbound/Makefile 373710 2014-12-01 15:05:05Z feld $
3
3
4
PORTNAME=	unbound
4
PORTNAME=	unbound
5
PORTVERSION=	1.4.22
5
PORTVERSION=	1.5.0
6
PORTREVISION=	5
7
CATEGORIES=	dns
6
CATEGORIES=	dns
8
MASTER_SITES=	http://unbound.net/downloads/
7
MASTER_SITES=	http://unbound.net/downloads/
9
8
Lines 32-38 Link Here
32
OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT
31
OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT
33
OPTIONS_DEFAULT=THREADS ECDSA
32
OPTIONS_DEFAULT=THREADS ECDSA
34
33
35
LIBEVENT_DESC=	Build against libevent (BROKEN on =10.0-RELEASE)
34
LIBEVENT_DESC=	Build against libevent
36
GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
35
GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
37
ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
36
ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
38
MUNIN_DESC=	Install Munin plugin
37
MUNIN_DESC=	Install Munin plugin
Lines 79-89 Link Here
79
.endif
78
.endif
80
79
81
.if ${PORT_OPTIONS:MLIBEVENT}
80
.if ${PORT_OPTIONS:MLIBEVENT}
82
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000015
83
SUB_LIST+=	BROKEN="WARNING: Unbound with LIBEVENT crashes if run on FreeBSD 10.0-RELEASE. Update to 10.1-RELEASE or stable/10 after r273137."
84
.else
85
SUB_LIST+=	BROKEN=""
86
.endif
87
LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
81
LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
88
USES+=		pkgconfig
82
USES+=		pkgconfig
89
CONFIGURE_ARGS+=--with-libevent
83
CONFIGURE_ARGS+=--with-libevent
Lines 100-105 Link Here
100
post-patch:
94
post-patch:
101
	@${MKDIR} ${WRKSRC}/balancer
95
	@${MKDIR} ${WRKSRC}/balancer
102
	@${RM} ${WRKSRC}/util/configlexer.c
96
	@${RM} ${WRKSRC}/util/configlexer.c
97
	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
98
		s|$$(configfile); fi|$$(configfile).sample|' \
99
		${WRKSRC}/Makefile.in
103
100
104
post-build:
101
post-build:
105
	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
102
	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
(-)unbound/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (unbound-1.4.22.tar.gz) = 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f
1
SHA256 (unbound-1.5.0.tar.gz) = 9fde4aeb8258bc864cd5e5d6d9b8bcf8fa12a57059424fece1c6adcc6387b876
2
SIZE (unbound-1.4.22.tar.gz) = 4735801
2
SIZE (unbound-1.5.0.tar.gz) = 4811349
(-)unbound/files/patch-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	2014-01-31 14:19:01.000000000 +0400
2
+++ Makefile.in	2014-03-13 14:27:03.613703943 +0400
3
@@ -497,7 +497,7 @@
4
 	$(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
5
 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
6
 	$(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup
7
-	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
8
+	$(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile).sample
9
 
10
 pythonmod-uninstall:
11
 	rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py
(-)unbound/files/pkg-message.in (-2 lines)
Lines 8-12 Link Here
8
env.unbound_control %%PREFIX%%/sbin/unbound-control
8
env.unbound_control %%PREFIX%%/sbin/unbound-control
9
env.spoof_warn 1000
9
env.spoof_warn 1000
10
env.spoof_crit 100000
10
env.spoof_crit 100000
11
12
%%BROKEN%%
(-)unbound/pkg-plist (-2 / +2 lines)
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.2.1
3
lib/libunbound.so.2.3.3
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
Lines 51-57 Link Here
51
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.a
51
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.a
52
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
52
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
53
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2
53
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2
54
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2.2.1
54
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2.3.3
55
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
55
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
56
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
56
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
57
%%MUNIN%%etc/munin/plugins/unbound_munin_by_class
57
%%MUNIN%%etc/munin/plugins/unbound_munin_by_class

Return to bug 195674