View | Details | Raw Unified | Return to bug 281087 | Differences between
and this patch

Collapse All | Expand All

(-)b/dns/knot3/Makefile (-26 / +27 lines)
Lines 12-22 WWW= https://www.knot-dns.cz/ Link Here
12
LICENSE=	GPLv3
12
LICENSE=	GPLv3
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
BUILD_DEPENDS=	gsed:textproc/gsed
15
BUILD_DEPENDS=	gnutls>=3.7.3:security/gnutls \
16
		gsed:textproc/gsed \
17
		lmdb>=0.9.15:databases/lmdb \
18
		nettle>=3.6.0:security/nettle
16
LIB_DEPENDS=	libgnutls.so:security/gnutls \
19
LIB_DEPENDS=	libgnutls.so:security/gnutls \
17
		liblmdb.so:databases/lmdb
20
		liblmdb.so:databases/lmdb \
21
		libnettle.so:security/nettle
18
22
19
USES=		alias libtool localbase pkgconfig tar:xz
23
USES=		alias compiler:c11 libtool localbase pkgconfig tar:xz
20
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
21
25
22
HAS_CONFIGURE=	yes
26
HAS_CONFIGURE=	yes
Lines 31-59 CONFLICTS= knot-1.* knot1-[0-6].* knot2-[0-9].* Link Here
31
DATADIR=	/var/db/${PORTNAME}
35
DATADIR=	/var/db/${PORTNAME}
32
RUNDIR=		/var/run/${PORTNAME}
36
RUNDIR=		/var/run/${PORTNAME}
33
BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
37
BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
34
SUB_LIST=	DATADIR=${DATADIR} \
35
		ETCDIR=${ETCDIR} \
36
		GROUPS=${GROUPS} \
37
		RUNDIR=${RUNDIR} \
38
		USERS=${USERS}
39
38
40
USERS=		knot
39
USERS=		knot
41
GROUPS=		knot
40
GROUPS=		knot
42
41
43
PLIST_SUB=	DATADIR=${DATADIR} \
42
PLIST_SUB=	RUNDIR=${RUNDIR} \
44
		ETCDIR=${ETCDIR} \
43
		GROUPS="${GROUPS}" \
45
		GROUPS=${GROUPS} \
44
		USERS="${USERS}"
46
		RUNDIR=${RUNDIR} \
47
		USERS=${USERS}
48
45
49
PORTDOCS=	COPYING NEWS
46
PORTDOCS=	COPYING NEWS
50
47
51
OPTIONS_DEFINE=			DAEMON UTILS DOCS EXAMPLES
48
OPTIONS_DEFINE=			DAEMON UTILS DOCS EXAMPLES
52
OPTIONS_DEFAULT=		DAEMON UTILS FASTPARSER DOH DOQ IDN MODACL MODAUTH MODCOOKIES
49
OPTIONS_DEFAULT=		DAEMON UTILS FASTPARSER DOH DOQ IDN MODACL \
53
OPTIONS_DEFAULT+=		MODPROXY MODNOUDP MODPROBE MODRRL MODSIGN MODSTATS MODSYNTH MODWHOAMI
50
				MODAUTH MODCOOKIES MODPROXY MODNOUDP MODPROBE \
51
				MODRRL MODSIGN MODSTATS MODSYNTH MODWHOAMI
54
OPTIONS_GROUP=			DAEMONGR UTILGR
52
OPTIONS_GROUP=			DAEMONGR UTILGR
55
OPTIONS_GROUP_DAEMONGR=		DNSTAP FASTPARSER MODACL MODAUTH MODCOOKIES MODPROXY MODGEO
53
OPTIONS_GROUP_DAEMONGR=		DNSTAP FASTPARSER MODACL MODAUTH MODCOOKIES \
56
OPTIONS_GROUP_DAEMONGR+=	MODNOUDP MODPROBE MODRRL MODSIGN MODSTATS MODSYNTH MODWHOAMI
54
				MODPROXY MODGEO MODNOUDP MODPROBE MODRRL \
55
				MODSIGN MODSTATS MODSYNTH MODWHOAMI
57
OPTIONS_GROUP_UTILGR=		DOH DOQ IDN
56
OPTIONS_GROUP_UTILGR=		DOH DOQ IDN
58
NO_OPTIONS_SORT=		yes
57
NO_OPTIONS_SORT=		yes
59
OPTIONS_SUB=			yes
58
OPTIONS_SUB=			yes
Lines 81-92 MODWHOAMI_DESC= Build 'whoami' module Link Here
81
UTILGR_DESC=			Options for utilities
80
UTILGR_DESC=			Options for utilities
82
UTILS_DESC=			Install utulities
81
UTILS_DESC=			Install utulities
83
82
83
DAEMON_BUILD_DEPENDS=		liburcu>=0.5.4:sysutils/liburcu
84
DAEMON_LIB_DEPENDS=		liburcu.so:sysutils/liburcu
84
DAEMON_LIB_DEPENDS=		liburcu.so:sysutils/liburcu
85
DAEMON_USES=			libedit
85
DAEMON_USES=			libedit
86
DAEMON_CONFIGURE_ENABLE=	daemon
86
DAEMON_CONFIGURE_ENABLE=	daemon modules
87
DAEMON_CONFIGURE_ENABLE+=	modules
87
DAEMON_CONFIGURE_WITH=		rundir=${RUNDIR} storage=${DATADIR}
88
DAEMON_CONFIGURE_WITH=		rundir=${RUNDIR}
89
DAEMON_CONFIGURE_WITH+=		storage=${DATADIR}
90
DAEMON_SUB_FILES=		pkg-message
88
DAEMON_SUB_FILES=		pkg-message
91
DAEMON_VARS=			USE_RC_SUBR=${PORTNAME}
89
DAEMON_VARS=			USE_RC_SUBR=${PORTNAME}
92
90
Lines 102-112 DNSTAP_CONFIGURE_WITH= module-dnstap=yes Link Here
102
# in higher line count.  Ideally this bug should be fixed upstream.
100
# in higher line count.  Ideally this bug should be fixed upstream.
103
DNSTAP_CPPFLAGS=		-I${LOCALBASE}/include
101
DNSTAP_CPPFLAGS=		-I${LOCALBASE}/include
104
102
103
# Currently (3.4.0) broken - cause unknown (yet)
105
DOCS_CONFIGURE_ENABLE=		documentation
104
DOCS_CONFIGURE_ENABLE=		documentation
106
105
107
DOH_LIB_DEPENDS=		libnghttp2.so:www/libnghttp2
106
DOH_LIB_DEPENDS=		libnghttp2.so:www/libnghttp2
108
107
108
DOQ_BUILD_DEPENDS=		libngtcp2>=1.6.0:net/libngtcp2
109
DOQ_LIB_DEPENDS=		libngtcp2.so:net/libngtcp2
109
DOQ_LIB_DEPENDS=		libngtcp2.so:net/libngtcp2
110
DOQ_CONFIGURE_OFF=		--enable-quic=no
111
DOQ_CONFIGURE_ON=		--enable-quic=yes
110
112
111
FASTPARSER_CONFIGURE_ENABLE=	fastparser
113
FASTPARSER_CONFIGURE_ENABLE=	fastparser
112
114
Lines 156-161 post-patch: Link Here
156
	@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
158
	@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
157
.endif
159
.endif
158
160
161
do-install-DOCS-on:
162
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
163
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
164
159
post-install:
165
post-install:
160
.if ${PORT_OPTIONS:MDAEMON}
166
.if ${PORT_OPTIONS:MDAEMON}
161
	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDIR}
167
	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDIR}
Lines 166-175 post-install: Link Here
166
	${RM} ${STAGEDIR}${ETCDIR}/knot.sample.conf
172
	${RM} ${STAGEDIR}${ETCDIR}/knot.sample.conf
167
.endif
173
.endif
168
174
169
.if ${PORT_OPTIONS:MDOCS}
170
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
171
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
172
.endif
173
174
.include "knotdns.mk"
175
.include "knotdns.mk"
175
.include <bsd.port.mk>
176
.include <bsd.port.mk>
(-)b/dns/knot3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1721655384
1
TIMESTAMP = 1725278778
2
SHA256 (knot-3.3.8.tar.xz) = 498de8338489a625673797f7ecc921fa4490c826afbfa42fa66922b525089e6a
2
SHA256 (knot-3.4.0.tar.xz) = 2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736
3
SIZE (knot-3.3.8.tar.xz) = 1608360
3
SIZE (knot-3.4.0.tar.xz) = 1628620
(-)b/dns/knot3/distinfo.py-libknot (+3 lines)
Added Link Here
1
TIMESTAMP = 1725278941
2
SHA256 (libknot-3.4.0.tar.gz) = 06d11273d04865e0cd34f258c8c2d378cb0d1e6fb105c2ee7b227bff5897168b
3
SIZE (libknot-3.4.0.tar.gz) = 11065
(-)b/dns/knot3/knotdns.mk (-1 / +1 lines)
Line 1 Link Here
1
KNOT_VERSION=	3.3.8
1
KNOT_VERSION=	3.4.0
(-)b/dns/knot3/pkg-plist (-14 / +19 lines)
Lines 45-50 include/libknot/packet/rrset-wire.h Link Here
45
include/libknot/packet/wire.h
45
include/libknot/packet/wire.h
46
include/libknot/probe/data.h
46
include/libknot/probe/data.h
47
include/libknot/probe/probe.h
47
include/libknot/probe/probe.h
48
%%DOQ%%include/libknot/quic/quic.h
49
%%DOQ%%include/libknot/quic/quic_conn.h
50
%%DOQ%%include/libknot/quic/tls.h
51
%%DOQ%%include/libknot/quic/tls_common.h
48
include/libknot/rdata.h
52
include/libknot/rdata.h
49
include/libknot/rdataset.h
53
include/libknot/rdataset.h
50
include/libknot/rrset-dump.h
54
include/libknot/rrset-dump.h
Lines 81-88 lib/libdnssec.so.9 Link Here
81
lib/libdnssec.so.9.0.0
85
lib/libdnssec.so.9.0.0
82
lib/libknot.a
86
lib/libknot.a
83
lib/libknot.so
87
lib/libknot.so
84
lib/libknot.so.14
88
lib/libknot.so.15
85
lib/libknot.so.14.0.0
89
lib/libknot.so.15.0.0
86
lib/libzscanner.a
90
lib/libzscanner.a
87
lib/libzscanner.so
91
lib/libzscanner.so
88
lib/libzscanner.so.4
92
lib/libzscanner.so.4
Lines 91-108 lib/libzscanner.so.4.0.0 Link Here
91
libdata/pkgconfig/libdnssec.pc
95
libdata/pkgconfig/libdnssec.pc
92
libdata/pkgconfig/libknot.pc
96
libdata/pkgconfig/libknot.pc
93
libdata/pkgconfig/libzscanner.pc
97
libdata/pkgconfig/libzscanner.pc
94
%%DOCS%%share/man/man1/kdig.1.gz
98
@comment Since 3.4.0 manual is broken - cause unknown (yet)
95
%%DOCS%%share/man/man1/khost.1.gz
99
@comment %%DOCS%%share/man/man1/kdig.1.gz
96
%%DOCS%%share/man/man1/knsec3hash.1.gz
100
@comment %%DOCS%%share/man/man1/khost.1.gz
97
%%DOCS%%share/man/man1/knsupdate.1.gz
101
@comment %%DOCS%%share/man/man1/knsec3hash.1.gz
98
%%DOCS%%share/man/man1/kzonecheck.1.gz
102
@comment %%DOCS%%share/man/man1/knsupdate.1.gz
99
%%DOCS%%share/man/man1/kzonesign.1.gz
103
@comment %%DOCS%%share/man/man1/kzonecheck.1.gz
100
%%DOCS%%share/man/man5/knot.conf.5.gz
104
@comment %%DOCS%%share/man/man1/kzonesign.1.gz
101
%%DOCS%%share/man/man8/kcatalogprint.8.gz
105
@comment %%DOCS%%share/man/man5/knot.conf.5.gz
102
%%DOCS%%share/man/man8/keymgr.8.gz
106
@comment %%DOCS%%share/man/man8/kcatalogprint.8.gz
103
%%DOCS%%share/man/man8/kjournalprint.8.gz
107
@comment %%DOCS%%share/man/man8/keymgr.8.gz
104
%%DOCS%%share/man/man8/knotc.8.gz
108
@comment %%DOCS%%share/man/man8/kjournalprint.8.gz
105
%%DOCS%%share/man/man8/knotd.8.gz
109
@comment %%DOCS%%share/man/man8/knotc.8.gz
110
@comment %%DOCS%%share/man/man8/knotd.8.gz
106
%%DAEMON%%sbin/kcatalogprint
111
%%DAEMON%%sbin/kcatalogprint
107
%%DAEMON%%sbin/keymgr
112
%%DAEMON%%sbin/keymgr
108
%%DAEMON%%sbin/kjournalprint
113
%%DAEMON%%sbin/kjournalprint
(-)b/dns/py-libknot/Makefile (+2 lines)
Lines 18-22 USE_PYTHON= autoplist concurrent pep517 Link Here
18
18
19
NO_ARCH=	yes
19
NO_ARCH=	yes
20
20
21
DISTINFO_FILE= ${.CURDIR}/../knot3/distinfo.py-libknot
22
21
.include "${.CURDIR}/../knot3/knotdns.mk"
23
.include "${.CURDIR}/../knot3/knotdns.mk"
22
.include <bsd.port.mk>
24
.include <bsd.port.mk>
(-)a/dns/py-libknot/distinfo (-3 lines)
Removed Link Here
1
TIMESTAMP = 1721721718
2
SHA256 (libknot-3.3.8.tar.gz) = 446d8d385402eabc5ebad6b09f702b672f6e34b9fe80f984aabbf5134618271e
3
SIZE (libknot-3.3.8.tar.gz) = 11110

Return to bug 281087