svn commit: r383940 - in head/dns/knot: . files

Alexey Dokuchaev danfe at FreeBSD.org
Mon Apr 13 17:43:15 UTC 2015 

Author: danfe
Date: Mon Apr 13 17:43:12 2015
New Revision: 383940
URL: https://svnweb.freebsd.org/changeset/ports/383940

Log:
  - Update to version 1.6.3; remove "foo is" from COMMENT text
  - Move bison(1) from BUILD_DEPENDS to USES
  - Register CONFLICTS with knot-devel-1.*
  - Enable compiler messages in batch (package building) mode
  - Add new options (DNSTAP, GOST, LMDB)
  - Rename IDNA option to our standard (shared) IDN
  - Allow to build against `security/libressl' as OPENSSL_PORT
  - Switch to using @sample keyword for knot.sample.conf
  - Sort pkg-plist and reformat pkg-descr while I'm at it
  - Update files/pkg-message.in to include instructions for both new
    and legacy rc systems (e.g. FreeBSD 8.4 has service(8), but no
    sysrc(8) utility)
  
  PR:		199298
  Submitted by:	maintainer

Added:
  head/dns/knot/files/patch-src_libknot_dnssec_config.h   (contents, props changed)
Modified:
  head/dns/knot/Makefile
  head/dns/knot/distinfo
  head/dns/knot/files/pkg-message.in
  head/dns/knot/pkg-descr
  head/dns/knot/pkg-plist

Modified: head/dns/knot/Makefile
==============================================================================
--- head/dns/knot/Makefile	Mon Apr 13 17:34:10 2015	(r383939)
+++ head/dns/knot/Makefile	Mon Apr 13 17:43:12 2015	(r383940)
@@ -2,52 +2,69 @@
 # $FreeBSD$
 
 PORTNAME=	knot
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
 
 MAINTAINER=	freebsd at dns-lab.com
-COMMENT=	Knot DNS is a high performance authoritative-only DNS server
+COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		flex>=2.5.35_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
+CONFLICTS=	knot-devel-1.*
 
-USES=		alias libtool tar:xz
+BUILD_DEPENDS=	flex>=2.5.35_1:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
 
+USES=		alias bison libtool pkgconfig tar:xz
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-storage=/var/db/knot \
+		--with-rundir=/var/run/knot \
+		--with-openssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
-
-USE_OPENSSL=		yes
+USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=	yes
 
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--disable-silent-rules
+.endif
+
 INSTALL_TARGET=	install-strip
 
-GNU_CONFIGURE=	yes
+USE_RC_SUBR=	${PORTNAME}
+SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=	--with-storage=/var/db/knot
-CONFIGURE_ARGS+=	--with-rundir=/var/run/knot
+USERS=		knot
+GROUPS=		knot
+SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-OPTIONS_DEFINE=	FASTPARSER IDNA
+PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
 
-FASTPARSER_CONFIGURE_ENABLE=	fastparser
-FASTPARSER_DESC=		Fast zone parser (demanding compilation)
+OPTIONS_DEFINE=	DNSTAP FASTPARSER GOST IDN LMDB
 
-IDNA_CONFIGURE_WITH=	libidn
-IDNA_DESC=		IDN support in knot utilities
-IDNA_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+DNSTAP_DESC=		dnstap support (see dnstap.info)
+FASTPARSER_DESC=	Fast zone parser (demanding compilation)
+GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
+LMDB_DESC=		Enable LMDB backend
+
+DNSTAP_CONFIGURE_ENABLE=	dnstap
+DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
+			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
-SUB_FILES=	pkg-message
+FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
-USE_RC_SUBR=	${PORTNAME}
+IDN_CONFIGURE_WITH=	libidn
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 
-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+LMDB_CONFIGURE_ENABLE=	lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
 
-USERS=		knot
-GROUPS=		knot
-SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGOST} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
+IGNORE=	cannot use both LibreSSL and GOST (not installing correctly); either don't use GOST or do use OpenSSL
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
@@ -57,8 +74,8 @@ post-patch:
 	@${RM} -rf ${WRKSRC}/src/zscanner/scanner.c
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
+	${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
+		${STAGEDIR}${ETCDIR}/knot.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 

Modified: head/dns/knot/distinfo
==============================================================================
--- head/dns/knot/distinfo	Mon Apr 13 17:34:10 2015	(r383939)
+++ head/dns/knot/distinfo	Mon Apr 13 17:43:12 2015	(r383940)
@@ -1,2 +1,2 @@
-SHA256 (knot-1.6.2.tar.xz) = 01fe0ae8081992c8b378045e31a2d03452d0ae6d8afaa1905fd767f7e2376ad4
-SIZE (knot-1.6.2.tar.xz) = 782416
+SHA256 (knot-1.6.3.tar.xz) = 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86
+SIZE (knot-1.6.3.tar.xz) = 785052

Added: head/dns/knot/files/patch-src_libknot_dnssec_config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/knot/files/patch-src_libknot_dnssec_config.h	Mon Apr 13 17:43:12 2015	(r383940)
@@ -0,0 +1,11 @@
+--- src/libknot/dnssec/config.h.orig	2015-04-08 11:57:44 UTC
++++ src/libknot/dnssec/config.h
+@@ -40,7 +40,7 @@
+   #undef KNOT_ENABLE_ECDSA
+ #endif
+ 
+-#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL
++#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL && !defined(LIBRESSL_VERSION_NUMBER)
+   #define KNOT_ENABLE_GOST 1
+ #else
+   #undef KNOT_ENABLE_GOST

Modified: head/dns/knot/files/pkg-message.in
==============================================================================
--- head/dns/knot/files/pkg-message.in	Mon Apr 13 17:34:10 2015	(r383939)
+++ head/dns/knot/files/pkg-message.in	Mon Apr 13 17:43:12 2015	(r383940)
@@ -1,11 +1,17 @@
-####################################################################
-#
-# To start using Knot DNS, you should complete the following tasks:
-#
-# cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
-# $EDITOR %%ETCDIR%%/knot.conf
-# echo knot_enable=\"YES\" >> /etc/rc.conf
-# echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
-# %%PREFIX%%/etc/rc.d/knot start
-#
-####################################################################
+######################################################################
+
+  To start using Knot DNS, you should complete the following tasks:
+
+    cp %%ETCDIR%%/knot.conf.sample %%ETCDIR%%/knot.conf
+    $EDITOR %%ETCDIR%%/knot.conf
+    sysrc knot_enable=YES
+    sysrc knot_config=%%ETCDIR%%/knot.conf
+    service knot start
+
+  Traditional (pre-FreeBSD 9.2) method, for last three commands:
+
+    echo knot_enable=\"YES\" >> /etc/rc.conf
+    echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
+    %%PREFIX%%/etc/rc.d/knot start
+
+######################################################################

Modified: head/dns/knot/pkg-descr
==============================================================================
--- head/dns/knot/pkg-descr	Mon Apr 13 17:34:10 2015	(r383939)
+++ head/dns/knot/pkg-descr	Mon Apr 13 17:43:12 2015	(r383940)
@@ -1,20 +1,14 @@
-Knot DNS is a high-performance authoritative-only DNS server
-which supports all key features of the domain name system
-including zone AXFR and IXFR, DDNS and DNSSEC.
-
-Key features:
-
- - Open source
-
- - High-performance, multi-threaded, and mostly
-   lock-free implementation which scales well on SMPs
-
- - Object-oriented design
-
- - Support for all important DNS protocols:
-     - Full and incremental zone transfers
-     - EDNS0 and DNSSEC extensions, including NSEC3
-     - NSID
-
+Knot DNS is a high-performance authoritative-only DNS server which
+supports all key features of the domain name system including zone
+AXFR and IXFR, DDNS and DNSSEC.  Its key features:
+
+ * Open source
+ * High-performance, multi-threaded, and mostly lock-free
+   implementation which scales well on SMPs
+ * Object-oriented design
+ * Support for all important DNS protocols:
+   - Full and incremental zone transfers
+   - EDNS0 and DNSSEC extensions, including NSEC3
+   - NSID
 
 WWW: http://www.knot-dns.cz/

Modified: head/dns/knot/pkg-plist
==============================================================================
--- head/dns/knot/pkg-plist	Mon Apr 13 17:34:10 2015	(r383939)
+++ head/dns/knot/pkg-plist	Mon Apr 13 17:43:12 2015	(r383940)
@@ -1,14 +1,5 @@
- at unexec if cmp -s %D/%%ETCDIR%%/knot.sample.conf %D/%%ETCDIR%%/knot.conf; then rm -f %D/%%ETCDIR%%/knot.conf; fi
-%%ETCDIR%%/knot.sample.conf
- at exec [ -f %B/knot.conf ] || cp %B/%f %B/knot.conf
 %%ETCDIR%%/example.com.zone
-man/man1/kdig.1.gz
-man/man1/khost.1.gz
-man/man1/knsec3hash.1.gz
-man/man1/knsupdate.1.gz
-man/man5/knot.conf.5.gz
-man/man8/knotc.8.gz
-man/man8/knotd.8.gz
+ at sample %%ETCDIR%%/knot.conf.sample
 bin/kdig
 bin/khost
 bin/knsec3hash
@@ -19,5 +10,12 @@ lib/libknot.so.0.0.1
 lib/libzscanner.so
 lib/libzscanner.so.0
 lib/libzscanner.so.0.0.1
+man/man1/kdig.1.gz
+man/man1/khost.1.gz
+man/man1/knsec3hash.1.gz
+man/man1/knsupdate.1.gz
+man/man5/knot.conf.5.gz
+man/man8/knotc.8.gz
+man/man8/knotd.8.gz
 sbin/knotc
 sbin/knotd

More information about the svn-ports-head mailing list