diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile index 2dae99633be0..cf30506e6998 100644 --- a/dns/knot3/Makefile +++ b/dns/knot3/Makefile @@ -1,122 +1,123 @@ PORTNAME= knot -DISTVERSION= 3.3.5 +DISTVERSION= ${KNOT_VERSION} CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ PKGNAMESUFFIX?= 3 MAINTAINER= freebsd@dns.company COMMENT= High performance authoritative-only DNS server WWW= https://www.knot-dns.cz/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libgnutls.so:security/gnutls \ liblmdb.so:databases/lmdb USES= alias libtool localbase pkgconfig tar:xz USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-recvmmsg=no \ --mandir=${PREFIX}/share/man \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig .if !defined(UTILS_ONLY) && !defined(LIB_ONLY) CONFIGURE_ARGS+= --with-rundir=/var/run/knot \ --with-storage=/var/db/knot LIB_DEPENDS+= liburcu.so:sysutils/liburcu USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message USES+= libedit .endif .if defined(UTILS_ONLY) || defined(LIB_ONLY) CONFIGURE_ARGS+= --disable-daemon \ --disable-modules .endif .if defined(LIB_ONLY) CONFIGURE_ARGS+= --disable-utilities .endif INSTALL_TARGET= install-strip CONFLICTS= knot-1.* knot1-[0-6].* knot2-[0-9].* BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed USERS= knot GROUPS= knot SUB_LIST+= GROUPS="${GROUPS}" \ USERS="${USERS}" PORTDOCS= COPYING NEWS OPTIONS_DEFINE= DNSTAP DOCS .if !defined(LIB_ONLY) OPTIONS_DEFINE+= DOH IDN OPTIONS_DEFAULT+= DOH IDN .endif .if !defined(UTILS_ONLY) && !defined(LIB_ONLY) OPTIONS_DEFINE+= FASTPARSER MAXMINDDB .endif DNSTAP_DESC= dnstap support (see dnstap.info) DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_CONFIGURE_WITH= module-dnstap=yes # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure # script, provide it here explicitly as patching those files would result # in higher line count. Ideally this bug should be fixed upstream. DNSTAP_CPPFLAGS= -I${LOCALBASE}/include DOCS_CONFIGURE_OFF= --disable-documentation DOH_DESC= DoH support in kdig DOH_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 FASTPARSER_DESC= Fast zone parser (demanding compilation) FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_CONFIGURE_OFF= --without-libidn IDN_CONFIGURE_WITH= libidn MAXMINDDB_DESC= Enable MaxMind for geodb module MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MAXMINDDB_CONFIGURE_ENABLE= maxminddb .include .if ${ARCH} == i386 USES+= autoreconf .endif post-patch: .if !defined(UTILS_ONLY) && !defined(LIB_ONLY) @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \ ${WRKSRC}/src/Makefile.in @${RM} -r ${WRKSRC}/src/zscanner/scanner.c .endif post-install: .if !defined(UTILS_ONLY) && !defined(LIB_ONLY) ${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \ ${STAGEDIR}${ETCDIR}/knot.conf.sample @${MKDIR} ${STAGEDIR}/var/run/knot ${STAGEDIR}/var/db/knot .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ +.include "knotdns.mk" .include diff --git a/dns/knot3/distinfo b/dns/knot3/distinfo index 73a2f056cb53..499160e437c9 100644 --- a/dns/knot3/distinfo +++ b/dns/knot3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711024049 -SHA256 (knot-3.3.5.tar.xz) = 0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad -SIZE (knot-3.3.5.tar.xz) = 1558484 +TIMESTAMP = 1718719373 +SHA256 (knot-3.3.6.tar.xz) = c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987 +SIZE (knot-3.3.6.tar.xz) = 1600484 diff --git a/dns/knot3/files/knot.in b/dns/knot3/files/knot.in index 13cf8bf266ef..df885ed7c9c2 100644 --- a/dns/knot3/files/knot.in +++ b/dns/knot3/files/knot.in @@ -1,116 +1,117 @@ #!/bin/sh # PROVIDE: knot # REQUIRE: SERVERS cleanvar # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable knot: # # knot_enable="YES": Set to NO by default. # Set it to YES to enable knot. # knot_config="": Set to %%PREFIX%%/etc/knot/knot.conf # by default. # # ----------------------------------------------------------------------------- # # This script supports running multiple instances of knot. # To run additional instances link this script to something like # % ln -s knot knot_foo # and define additional knot_foo_* variables in one of # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/knot_foo # # Below NAME should be substituted with the name of this script. By default # it is knot, so read as knot_enable. If you linked the script to # knot_foo, then read as knot_foo_enable etc. # # The following variables are supported (defaults are shown). # You can place them in any of # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable knot # # # optional: # NAME_config="%%PREFIX%%/etc/knot/NAME.conf" # (-c)onfig file # NAME_config="db:/var/db/knot/confdb" # (-C)onfig database # NAME_diruser="%%USERS%%" # /var/db/NAME and /var/run/NAME are created if they # NAME_dirgroup="%%GROUPS%%" # don't exist. These don't control the user/group knot # # runs as, the config file has a setting for that. # # You also need to set the rundir directive in the server section of the # config file to /var/run/NAME (if using a NAME other than the default) # and you will want the storage directive(s) declared in the zone section # to point to /var/db/NAME overriding the default of /var/db/knot. # # For further documentation, please see knot.conf(5). . /etc/rc.subr case "$0" in /etc/rc*) # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), # so get the name of the script from $_file name="$_file" ;; *) name="$0" ;; esac name="${name##*/}" rcvar=${name}_enable load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" +eval ": \${${name}_config:=\"%%PREFIX%%/etc/knot/${name}.conf\"}" eval ": \${${name}_diruser:=\"%%USERS%%\"}" eval ": \${${name}_dirgroup:=\"%%GROUPS%%\"}" -eval ": \${${name}_config:=\"%%PREFIX%%/etc/knot/${name}.conf\"}" +eval ": \${${name}_svcj_options:=\"net_basic\"}" configfile="$(eval echo \${${name}_config})" diruser="$(eval echo \${${name}_diruser})" dirgroup="$(eval echo \${${name}_dirgroup})" command=%%PREFIX%%/sbin/knotd case "$configfile" in db:*) config_args="-C ${configfile#db:}" ;; *) config_args="-c ${configfile}" ;; esac command_args="${config_args} -d" control="%%PREFIX%%/sbin/knotc" pidfile="/var/run/${name}/knot.pid" case "$configfile" in db:*) required_files=${configfile#db:}/data.mdb ;; *) required_files=${configfile} ;; esac extra_commands=reload reload_cmd="knot_reload" start_precmd="knot_prestart" knot_prestart() { if [ ! -d /var/run/${name} ]; then install -d -o ${diruser} -g ${dirgroup} /var/run/${name} fi if [ ! -d /var/db/${name} ]; then install -d -o ${diruser} -g ${dirgroup} /var/db/${name} fi ${control} ${config_args} conf-check } knot_reload() { echo "Reloading ${name}." ${control} ${config_args} reload } run_rc_command "$1" diff --git a/dns/knot3/files/pkg-message.in b/dns/knot3/files/pkg-message.in index 02cde6dc4373..d2722acaa4d4 100644 --- a/dns/knot3/files/pkg-message.in +++ b/dns/knot3/files/pkg-message.in @@ -1,21 +1,21 @@ [ { type: install message: <