Attachment 194872 Details for Bug 229485 – patch

[patch] patch

knot.diff (text/plain), 4.14 KB, created by Kurt Jaeger on 2018-07-04 09:45:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2018-07-04 09:45:33 UTC

Size: 4.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 473869)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	knot-resolver
>-DISTVERSION=	2.3.0
>-PORTREVISION=	2
>+DISTVERSION=	2.4.0
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
> 		https://dns.company/downloads/knot-resolver/
>@@ -13,11 +12,14 @@
> 
> LICENSE=	GPLv3
> 
>+BUILD_DEPENDS=	bash:shells/bash \
>+		git:devel/git
> LIB_DEPENDS=	libgnutls.so:security/gnutls \
> 		libknot.so:dns/knot2 \
> 		liblmdb.so:databases/lmdb \
> 		libluajit-5.1.so:lang/luajit \
> 		libuv.so:devel/libuv
>+TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
> 
> CONFLICTS=	knot-1.* knot1-[0-6].*
> 
>@@ -27,7 +29,8 @@
> MAKE_ARGS+=	PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
> MAKE_ARGS+=	lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
> 
>-USES=		gmake libedit libtool ncurses pkgconfig tar:xz
>+USES=		gmake libedit libtool ncurses pkgconfig shebangfix tar:xz
>+SHEBANG_FILES=	scripts/coverage_env.sh
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS TRUSTANCHOR
>@@ -89,6 +92,7 @@
> 		sbin/kresc			\
> 		lib/libkres.so.7		\
> 		lib/kdns_modules/ahocorasick.so	\
>+		lib/kdns_modules/bogus_log.so	\
> 		lib/kdns_modules/cookies.so	\
> 		lib/kdns_modules/dnstap.so	\
> 		lib/kdns_modules/hints.so	\
>Index: distinfo
>===================================================================
>--- distinfo	(revision 473869)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1529357112
>-SHA256 (knot-resolver-2.3.0.tar.xz) = 2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b
>-SIZE (knot-resolver-2.3.0.tar.xz) = 1522788
>+TIMESTAMP = 1530684661
>+SHA256 (knot-resolver-2.4.0.tar.xz) = 8c88c73dd50dad6f371bfc170f49cd374022e59f8005ac1fa6cd99764f72b4d1
>+SIZE (knot-resolver-2.4.0.tar.xz) = 1560856
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(nonexistent)
>+++ files/patch-Makefile	(working copy)
>@@ -0,0 +1,30 @@
>+--- Makefile.orig	2018-07-02 17:45:52.000000000 +0200
>++++ Makefile	2018-07-04 10:35:57.228161000 +0200
>+@@ -1,4 +1,4 @@
>+-SHELL=/bin/bash -o pipefail -o errexit
>++SHELL=/usr/local/bin/bash -o pipefail -o errexit
>+ 
>+ include config.mk
>+ include platform.mk
>+@@ -32,8 +32,8 @@
>+ $(eval $(call find_bin,doxygen))
>+ $(eval $(call find_bin,sphinx-build))
>+ $(eval $(call find_pythonpkg,breathe))
>+-#$(eval $(call find_lib,libmemcached,1.0))
>+-#$(eval $(call find_lib,hiredis,,yes))
>++$(eval $(call find_lib,libmemcached,1.0))
>++$(eval $(call find_lib,hiredis,,yes))
>+ $(eval $(call find_lib,socket_wrapper))
>+ $(eval $(call find_lib,libsystemd,227))
>+ $(eval $(call find_lib,gnutls))
>+@@ -118,8 +118,8 @@
>+ 	$(info [$(HAS_sphinx-build)] sphinx-build (doc))
>+ 	$(info [$(HAS_breathe)] python-breathe (doc))
>+ 	$(info [$(HAS_go)] go (modules/go, Go buildmode=c-shared support))
>+-#	$(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
>+-#	$(info [$(HAS_hiredis)] hiredis (modules/redis))
>++	$(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
>++	$(info [$(HAS_hiredis)] hiredis (modules/redis))
>+ 	$(info [$(HAS_cmocka)] cmocka (tests/unit))
>+ 	$(info [$(HAS_libsystemd)] systemd (daemon))
>+ 	$(info [$(HAS_nettle)] nettle (modules/cookies))
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 473869)
>+++ pkg-plist	(working copy)
>@@ -28,6 +28,7 @@
> include/libkres/utils.h
> include/libkres/zonecut.h
> lib/kdns_modules/ahocorasick.so
>+lib/kdns_modules/bogus_log.so
> lib/kdns_modules/daf.lua
> lib/kdns_modules/daf/daf.js
> lib/kdns_modules/detect_time_jump.lua
>@@ -64,6 +65,7 @@
> lib/kdns_modules/prefill.lua
> lib/kdns_modules/priming.lua
> lib/kdns_modules/prometheus.lua
>+lib/kdns_modules/rebinding.lua
> lib/kdns_modules/renumber.lua
> lib/kdns_modules/serve_stale.lua
> lib/kdns_modules/stats.so

Actions: View | Diff

Attachments on bug 229485: 194872 | 196151