Attachment 218002 Details for Bug 249367 – delete knot2

[patch] delete knot2

knot2.diff (text/plain), 12.84 KB, created by Leo Vandewoestijne on 2020-09-16 10:44:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2020-09-16 10:44:20 UTC

Size: 12.84 KB

patch

obsolete

>diff -ruN /usr/ports.orig/dns/knot2/Makefile /usr/ports/dns/knot2/Makefile
>--- /usr/ports.orig/dns/knot2/Makefile	2020-09-16 10:01:24.698108000 +0000
>+++ /usr/ports/dns/knot2/Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,120 +0,0 @@
>-# Created by: Leo Vandewoestijne <freebsd@dns.company>
>-# $FreeBSD: head/dns/knot2/Makefile 548443 2020-09-13 01:55:26Z dbaio $
>-
>-PORTNAME=	knot
>-DISTVERSION=	2.9.6
>-CATEGORIES=	dns
>-MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
>-		https://dns.company/downloads/knot-dns/
>-PKGNAMESUFFIX?=	2
>-
>-MAINTAINER=	freebsd@dns.company
>-COMMENT?=	High performance authoritative-only DNS server
>-
>-LICENSE=	GPLv3
>-LICENSE_FILE=	${WRKSRC}/COPYING
>-
>-CONFLICTS=	knot-1.* knot1-[0-6].*
>-
>-BUILD_DEPENDS=	autoconf>=2.65:devel/autoconf \
>-		gsed:textproc/gsed
>-
>-LIB_DEPENDS=	libgnutls.so:security/gnutls \
>-		liblmdb.so:databases/lmdb
>-
>-USES=		alias libtool localbase pkgconfig tar:xz
>-
>-HAS_CONFIGURE=	yes
>-BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
>-CONFIGURE_ARGS=	--enable-recvmmsg=no \
>-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
>-		--mandir=${MANPREFIX}/man
>-
>-.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
>-CONFIGURE_ARGS+=	--with-rundir=/var/run/knot \
>-			--with-storage=/var/db/knot
>-USE_RC_SUBR=	${PORTNAME}
>-SUB_FILES=	pkg-message
>-USES+=		libedit
>-LIB_DEPENDS+=	liburcu.so:sysutils/liburcu
>-.endif
>-
>-.if defined(UTILS_ONLY) || defined(LIB_ONLY)
>-CONFIGURE_ARGS+=	--disable-daemon \
>-			--disable-modules
>-.endif
>-
>-.if defined(LIB_ONLY)
>-CONFIGURE_ARGS+=	--disable-utilities
>-.endif
>-
>-USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
>-
>-USERS=		knot
>-GROUPS=		knot
>-SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
>-
>-PORTDOCS=	COPYING NEWS README
>-
>-OPTIONS_DEFINE=			DNSTAP DOCS
>-
>-.if !defined(LIB_ONLY)
>-OPTIONS_DEFINE+=		IDN
>-.endif
>-
>-.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
>-OPTIONS_DEFINE+=		FASTPARSER MAXMINDDB
>-.endif
>-
>-DNSTAP_DESC=			dnstap support (see dnstap.info)
>-DNSTAP_CONFIGURE_ENABLE=	dnstap
>-DNSTAP_CONFIGURE_WITH=		module-dnstap=yes
>-DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c \
>-				libfstrm.so:devel/fstrm
>-# 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
>-
>-FASTPARSER_DESC=		Fast zone parser (demanding compilation)
>-FASTPARSER_CONFIGURE_ENABLE=	fastparser
>-
>-IDN_CONFIGURE_WITH=		libidn
>-IDN_CONFIGURE_OFF=		--without-libidn
>-IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
>-
>-MAXMINDDB_DESC=			Enable MaxMind for geodb module
>-MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
>-MAXMINDDB_CONFIGURE_ENABLE=	maxminddb
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${ARCH} == i386
>-USES+=				autoreconf
>-EXTRA_PATCHES+=			${PATCHDIR}/extrapatch-configure.ac
>-.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 <bsd.port.mk>
>diff -ruN /usr/ports.orig/dns/knot2/distinfo /usr/ports/dns/knot2/distinfo
>--- /usr/ports.orig/dns/knot2/distinfo	2020-09-16 10:01:24.698414000 +0000
>+++ /usr/ports/dns/knot2/distinfo	1970-01-01 00:00:00.000000000 +0000
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1599955330
>-SHA256 (knot-2.9.6.tar.xz) = bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7
>-SIZE (knot-2.9.6.tar.xz) = 1188412
>diff -ruN /usr/ports.orig/dns/knot2/files/extrapatch-configure.ac /usr/ports/dns/knot2/files/extrapatch-configure.ac
>--- /usr/ports.orig/dns/knot2/files/extrapatch-configure.ac	2020-09-16 10:01:24.698222000 +0000
>+++ /usr/ports/dns/knot2/files/extrapatch-configure.ac	1970-01-01 00:00:00.000000000 +0000
>@@ -1,12 +0,0 @@
>---- configure.ac.orig	2020-02-03 00:11:36 UTC
>-+++ configure.ac
>-@@ -636,7 +636,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]]
>- AC_LINK_IFELSE(
>-   [AC_LANG_PROGRAM([[#include <stdint.h>]],
>-                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
>--  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
>-+  [AS_IF([test -z "$CC_CLANG_VERSION" -o $host_cpu != "i386"],
>-+         [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])])]
>- )
>- 
>- # Check for '__sync' compiler builtin atomic functions.
>diff -ruN /usr/ports.orig/dns/knot2/files/knot.in /usr/ports/dns/knot2/files/knot.in
>--- /usr/ports.orig/dns/knot2/files/knot.in	2020-09-16 10:01:24.698270000 +0000
>+++ /usr/ports/dns/knot2/files/knot.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,118 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: head/dns/knot2/files/knot.in 489774 2019-01-09 12:33:30Z swills $
>-#
>-# 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}_diruser:=\"%%USERS%%\"}"
>-eval ": \${${name}_dirgroup:=\"%%GROUPS%%\"}"
>-eval ": \${${name}_config:=\"%%PREFIX%%/etc/knot/${name}.conf\"}"
>-
>-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 -ruN /usr/ports.orig/dns/knot2/files/pkg-message.in /usr/ports/dns/knot2/files/pkg-message.in
>--- /usr/ports.orig/dns/knot2/files/pkg-message.in	2020-09-16 10:01:24.698320000 +0000
>+++ /usr/ports/dns/knot2/files/pkg-message.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,21 +0,0 @@
>-[
>-{ type: install
>-  message: <<EOM
>-  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
>-
>-  Please consult the documentation:
>-   - man knotd
>-   - https://www.knot-dns.cz/documentation/
>-
>-  When upgrading from 2.4.x read:
>-   - https://www.knot-dns.cz/docs/2.5/html/migration.html#upgrade-2-4-x-to-2-5-x
>-EOM
>-}
>-]
>diff -ruN /usr/ports.orig/dns/knot2/pkg-descr /usr/ports/dns/knot2/pkg-descr
>--- /usr/ports.orig/dns/knot2/pkg-descr	2020-09-16 10:01:24.698367000 +0000
>+++ /usr/ports/dns/knot2/pkg-descr	1970-01-01 00:00:00.000000000 +0000
>@@ -1,14 +0,0 @@
>-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: https://www.knot-dns.cz/
>diff -ruN /usr/ports.orig/dns/knot2/pkg-plist /usr/ports/dns/knot2/pkg-plist
>--- /usr/ports.orig/dns/knot2/pkg-plist	2020-09-16 10:01:24.698062000 +0000
>+++ /usr/ports/dns/knot2/pkg-plist	1970-01-01 00:00:00.000000000 +0000
>@@ -1,100 +0,0 @@
>-bin/kdig
>-bin/khost
>-bin/knsec3hash
>-bin/knsupdate
>-bin/kzonecheck
>-%%ETCDIR%%/example.com.zone
>-%%ETCDIR%%/knot.conf.sample
>-include/knot/module.h
>-include/libdnssec/binary.h
>-include/libdnssec/crypto.h
>-include/libdnssec/dnssec.h
>-include/libdnssec/error.h
>-include/libdnssec/key.h
>-include/libdnssec/keyid.h
>-include/libdnssec/keystore.h
>-include/libdnssec/keytag.h
>-include/libdnssec/nsec.h
>-include/libdnssec/pem.h
>-include/libdnssec/random.h
>-include/libdnssec/sign.h
>-include/libdnssec/tsig.h
>-include/libdnssec/version.h
>-include/libknot/attribute.h
>-include/libknot/codes.h
>-include/libknot/consts.h
>-include/libknot/control/control.h
>-include/libknot/cookies.h
>-include/libknot/db/db.h
>-include/libknot/db/db_lmdb.h
>-include/libknot/db/db_trie.h
>-include/libknot/descriptor.h
>-include/libknot/dname.h
>-include/libknot/endian.h
>-include/libknot/errcode.h
>-include/libknot/error.h
>-include/libknot/libknot.h
>-include/libknot/lookup.h
>-include/libknot/mm_ctx.h
>-include/libknot/packet/compr.h
>-include/libknot/packet/pkt.h
>-include/libknot/packet/rrset-wire.h
>-include/libknot/packet/wire.h
>-include/libknot/rdata.h
>-include/libknot/rdataset.h
>-include/libknot/rrset-dump.h
>-include/libknot/rrset.h
>-include/libknot/rrtype/dnskey.h
>-include/libknot/rrtype/ds.h
>-include/libknot/rrtype/naptr.h
>-include/libknot/rrtype/nsec.h
>-include/libknot/rrtype/nsec3.h
>-include/libknot/rrtype/nsec3param.h
>-include/libknot/rrtype/opt.h
>-include/libknot/rrtype/rdname.h
>-include/libknot/rrtype/rrsig.h
>-include/libknot/rrtype/soa.h
>-include/libknot/rrtype/tsig.h
>-include/libknot/tsig-op.h
>-include/libknot/tsig.h
>-include/libknot/version.h
>-include/libknot/wire.h
>-include/libknot/yparser/yparser.h
>-include/libknot/yparser/ypformat.h
>-include/libknot/yparser/ypschema.h
>-include/libknot/yparser/yptrafo.h
>-include/libzscanner/error.h
>-include/libzscanner/scanner.h
>-include/libzscanner/version.h
>-lib/libdnssec.a
>-lib/libdnssec.so
>-lib/libdnssec.so.7
>-lib/libdnssec.so.7.0.0
>-lib/libknot.a
>-lib/libknot.so
>-lib/libknot.so.10
>-lib/libknot.so.10.0.0
>-lib/libzscanner.a
>-lib/libzscanner.so
>-lib/libzscanner.so.3
>-lib/libzscanner.so.3.0.0
>-libdata/pkgconfig/knotd.pc
>-libdata/pkgconfig/libdnssec.pc
>-libdata/pkgconfig/libknot.pc
>-libdata/pkgconfig/libzscanner.pc
>-man/man1/kdig.1.gz
>-man/man1/khost.1.gz
>-man/man1/knsec3hash.1.gz
>-man/man1/knsupdate.1.gz
>-man/man1/kzonecheck.1.gz
>-man/man5/knot.conf.5.gz
>-man/man8/keymgr.8.gz
>-man/man8/kjournalprint.8.gz
>-man/man8/knotc.8.gz
>-man/man8/knotd.8.gz
>-sbin/keymgr
>-sbin/kjournalprint
>-sbin/knotc
>-sbin/knotd
>-@dir(knot,knot,750) /var/db/knot
>-@dir(knot,knot,750) /var/run/knot

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 249367: 218002 | 220573