Attachment 168188 Details for Bug 207948 – Improved up date patch

[patch] Improved up date patch

new-unbound.patch (text/plain), 5.41 KB, created by Jaap Akkerhuis on 2016-03-14 22:13:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaap Akkerhuis

Created: 2016-03-14 22:13:00 UTC

Size: 5.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 409917)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	unbound
>-PORTVERSION=	1.5.7
>+PORTVERSION=	1.5.8
> CATEGORIES=	dns
> MASTER_SITES=	http://unbound.net/downloads/
> 
>@@ -27,16 +27,17 @@
> PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
> 		README.tests TODO control_proto_spec.txt ietf67-design-02.odp \
> 		ietf67-design-02.pdf requirements.txt
>-PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUNIN}
> 
>-OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA
>+OPTIONS_SUB=	yes
>+OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT FILTER_AAAA DNSTAP
> OPTIONS_DEFAULT=THREADS ECDSA
> 
> LIBEVENT_DESC=	Build against libevent
> GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
> ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
>-MUNIN_DESC=	Install Munin plugin
>+MUNIN_PLUGIN_DESC=	Install Munin plugin
> FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
>+DNSTAP_DESC=	Enable dnstap logging support
> 
> .include <bsd.port.options.mk>
> 
>@@ -51,9 +52,6 @@
> CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
> BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
> STRIP_FILES+=	.libs/_unbound.so
>-PYTHON=
>-.else
>-PYTHON=		"@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MGOST}
>@@ -71,13 +69,16 @@
> CONFIGURE_ARGS+=--disable-ecdsa
> .endif
> 
>-.if ${PORT_OPTIONS:MMUNIN}
>+.if ${PORT_OPTIONS:MDNSTAP}
>+CONFIGURE_ARGS+=--enable-dnstap
>+LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
>+LIB_DEPENDS+=	libfstrm.so:${PORTSDIR}/devel/fstrm
>+.endif
>+
>+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
> SUB_FILES+=	pkg-message
>-MUNIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
>+MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
> 		by_flags histogram
>-MUNIN=
>-.else
>-MUNIN=		"@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MLIBEVENT}
>@@ -99,31 +100,28 @@
> 	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
> 		s|$$(configfile); fi|$$(configfile).sample|' \
> 		${WRKSRC}/Makefile.in
>-.if ${PORT_OPTIONS:MFILTER_AAAA}
>+
>+post-patch-FILTER_AAAA-on:
> 	${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s
>-.endif
> 
> post-build:
> 	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
> 
>-post-install:
>-.if ${PORT_OPTIONS:MPYTHON}
>+post-install-PYTHON-on:
> 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
>-.endif
>-.if ${PORT_OPTIONS:MMUNIN}
>+
>+post-install-MUNIN_PLUGIN-on:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
>-	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_\
>+	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_ \
> 		${STAGEDIR}${PREFIX}/share/munin/plugins/
>-	@for i in ${MUNIN_ALL}; do\
>-		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_\
>-			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
>-	done
>+	@for i in ${MUNIN_PLUGIN_ALL}; do \
>+		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_ \
>+			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i; done
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "============================================================="
> 	@${CAT} ${WRKDIR}/pkg-message
> 	@${ECHO_MSG} "============================================================="
>-.endif
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 409917)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (unbound-1.5.7.tar.gz) = 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8
>-SIZE (unbound-1.5.7.tar.gz) = 4859573
>+SHA256 (unbound-1.5.8.tar.gz) = 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be
>+SIZE (unbound-1.5.8.tar.gz) = 4895649
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 409917)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,6 @@
>-etc/unbound/unbound.conf.sample
>+@sample etc/unbound/unbound.conf.sample
> include/unbound.h
>-lib/libunbound.so.2.3.10
>+lib/libunbound.so.2.4.0
> lib/libunbound.so.2
> lib/libunbound.so
> lib/libunbound.a
>@@ -51,14 +51,14 @@
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
>-%%MUNIN%%etc/munin/plugins/unbound_munin_by_class
>-%%MUNIN%%etc/munin/plugins/unbound_munin_by_flags
>-%%MUNIN%%etc/munin/plugins/unbound_munin_by_opcode
>-%%MUNIN%%etc/munin/plugins/unbound_munin_by_rcode
>-%%MUNIN%%etc/munin/plugins/unbound_munin_by_type
>-%%MUNIN%%etc/munin/plugins/unbound_munin_histogram
>-%%MUNIN%%etc/munin/plugins/unbound_munin_hits
>-%%MUNIN%%etc/munin/plugins/unbound_munin_memory
>-%%MUNIN%%etc/munin/plugins/unbound_munin_queue
>-%%MUNIN%%share/munin/plugins/unbound_munin_
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_class
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_flags
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_opcode
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_rcode
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_type
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_histogram
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_hits
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_memory
>+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_queue
>+%%MUNIN_PLUGIN%%share/munin/plugins/unbound_munin_
> @dir(unbound,,) %%ETCDIR%%

Actions: View | Diff

Attachments on bug 207948: 168085 | 168086 | 168113 | 168188