Date: Thu, 5 Mar 2020 20:08:58 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527845 - in head/dns/knot2: . files Message-ID: <202003052008.025K8w38049972@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu Mar 5 20:08:57 2020 New Revision: 527845 URL: https://svnweb.freebsd.org/changeset/ports/527845 Log: dns/knot2: upgrade 2.9.1 -> 2.9.3 - removed NOT_FOR_ARCHS - removed NOT_FOR_ARCHS_REASON_i386 - removed libedit from general dependecies (because unneeded for utils- or lib-only) - removed LLD_UNSAFE (not needed, created IDN problems for a while) - removed USES= compiler - removed USES= ncurses - removed USES= python - added LICENSE_FILE - added mandir path - added USES= autoreconf for i386 - added EXTRA_PATCHES for configure.ac -- thanks to NIC.CZ - added patch for src/libdnssec/Makefile.inc (at i386, to avoid atomic problems) - fixed DOCS install (a: python dependecy, b: no install if OFF) - fixed IDN OPTION (without libidn if OFF) - switched from GNU_CONFIGURE to HAS_CONFIGURE - use libedit and liburcu only when building daemon PR: 244593 Submitted by: Leo Vandewoestijne <freebsd@dns.company> (maintainer) Relnotes: https://www.knot-dns.cz/2020-03-03-version-293.html Added: head/dns/knot2/files/extrapatch-configure.ac (contents, props changed) Modified: head/dns/knot2/Makefile head/dns/knot2/distinfo Modified: head/dns/knot2/Makefile ============================================================================== --- head/dns/knot2/Makefile Thu Mar 5 20:05:18 2020 (r527844) +++ head/dns/knot2/Makefile Thu Mar 5 20:08:57 2020 (r527845) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= knot -DISTVERSION= 2.9.1 +DISTVERSION= 2.9.3 CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ @@ -12,26 +12,29 @@ MAINTAINER= freebsd@dns.company COMMENT?= High performance authoritative-only DNS server LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 +CONFLICTS= knot-1.* knot1-[0-6].* +BUILD_DEPENDS= autoconf>=2.65:devel/autoconf + LIB_DEPENDS= libgnutls.so:security/gnutls \ - liblmdb.so:databases/lmdb \ - liburcu.so:sysutils/liburcu + liblmdb.so:databases/lmdb -CONFLICTS= knot-1.* knot1-[0-6].* +USES= alias libtool localbase pkgconfig tar:xz -USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-recvmmsg=no \ - --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig + --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) @@ -44,7 +47,6 @@ CONFIGURE_ARGS+= --disable-utilities .endif USE_LDCONFIG= yes -LLD_UNSAFE= yes INSTALL_TARGET= install-strip USERS= knot @@ -75,15 +77,26 @@ DNSTAP_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c # in higher line count. Ideally this bug should be fixed upstream. DNSTAP_CPPFLAGS= -I${LOCALBASE}/include +DOCS_USES+= python +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) Modified: head/dns/knot2/distinfo ============================================================================== --- head/dns/knot2/distinfo Thu Mar 5 20:05:18 2020 (r527844) +++ head/dns/knot2/distinfo Thu Mar 5 20:08:57 2020 (r527845) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574091844 -SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d -SIZE (knot-2.9.1.tar.xz) = 1212460 +TIMESTAMP = 1583326925 +SHA256 (knot-2.9.3.tar.xz) = f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e +SIZE (knot-2.9.3.tar.xz) = 1214512 Added: head/dns/knot2/files/extrapatch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot2/files/extrapatch-configure.ac Thu Mar 5 20:08:57 2020 (r527845) @@ -0,0 +1,12 @@ +--- 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003052008.025K8w38049972>