Index: branches/2018Q1/dns/knot2/Makefile =================================================================== --- branches/2018Q1/dns/knot2/Makefile (revision 460930) +++ branches/2018Q1/dns/knot2/Makefile (revision 460931) @@ -1,86 +1,84 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot -PORTVERSION= 2.6.1 +PORTVERSION= 2.6.4 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://dns-lab.com/downloads/knot-dns/ PKGNAMESUFFIX= 2 MAINTAINER= freebsd@dns-lab.com COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 LIB_DEPENDS= libgnutls.so:security/gnutls \ liblmdb.so:databases/lmdb \ libnettle.so:security/nettle \ liburcu.so:sysutils/liburcu CONFLICTS= knot-1.* knot1-[0-6].* USES= autoreconf alias compiler:c11 libedit libtool localbase pkgconfig python shebangfix tar:xz SHEBANG_FILES= src/utils/pykeymgr/pykeymgr.in USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rundir=/var/run/knot \ --with-storage=/var/db/knot \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-recvmmsg=no INSTALL_TARGET= install-strip USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message USERS= knot GROUPS= knot SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS OPTIONS_DEFINE= DNSTAP FASTPARSER IDN 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 FASTPARSER_DESC= Fast zone parser (demanding compilation) FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn +# starting at 2.6.5 this block will already be absolete .include - .if ${ARCH} == "i386" -CPUTYPE= i686 -CFLAGS+= -march=i686 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 -USE_GCC= yes +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure.ac +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_Makefile.am .endif -.endif post-patch: @${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 post-install: ${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \ ${STAGEDIR}${ETCDIR}/knot.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ +#.include .include Index: branches/2018Q1/dns/knot2/distinfo =================================================================== --- branches/2018Q1/dns/knot2/distinfo (revision 460930) +++ branches/2018Q1/dns/knot2/distinfo (revision 460931) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509693720 -SHA256 (knot-2.6.1.tar.xz) = 3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3 -SIZE (knot-2.6.1.tar.xz) = 1112956 +TIMESTAMP = 1517244504 +SHA256 (knot-2.6.4.tar.xz) = 1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a +SIZE (knot-2.6.4.tar.xz) = 1116928 Index: branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-configure.ac =================================================================== --- branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-configure.ac (nonexistent) +++ branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-configure.ac (revision 460931) @@ -0,0 +1,24 @@ +--- configure.ac.orig 2018-01-29 16:11:32 UTC ++++ configure.ac +@@ -501,19 +501,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#inclu + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[cpuset_t* set = cpuset_create(); cpuset_destroy(set);]])], + [AC_DEFINE(HAVE_CPUSET_NETBSD, 1, [Define if cpuset_t and cpuset(3) exists.])]) + +-AC_COMPILE_IFELSE( ++AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], +- [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.]) +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], +- [atomic_LIBS=""], +- [atomic_LIBS="-latomic"] +- )], +- [atomic_LIBS=""] ++ [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])] + ) +-AC_SUBST([atomic_LIBS]) + + # Prepare CFLAG_VISIBILITY to be used where needed + gl_VISIBILITY() Property changes on: branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am =================================================================== --- branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am (nonexistent) +++ branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am (revision 460931) @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2018-01-29 16:11:17 UTC ++++ src/Makefile.am +@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $( + $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC + libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' + libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \ +- $(liburcu_LIBS) $(atomic_LIBS) ++ $(liburcu_LIBS) + + ################### + # Knot DNS Daemon # Property changes on: branches/2018Q1/dns/knot2/dns/knot2/files/extra-patch-src_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/dns/knot2/files/extra-patch-configure.ac =================================================================== --- branches/2018Q1/dns/knot2/files/extra-patch-configure.ac (nonexistent) +++ branches/2018Q1/dns/knot2/files/extra-patch-configure.ac (revision 460931) @@ -0,0 +1,24 @@ +--- configure.ac.orig 2018-01-29 16:11:32 UTC ++++ configure.ac +@@ -501,19 +501,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#inclu + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[cpuset_t* set = cpuset_create(); cpuset_destroy(set);]])], + [AC_DEFINE(HAVE_CPUSET_NETBSD, 1, [Define if cpuset_t and cpuset(3) exists.])]) + +-AC_COMPILE_IFELSE( ++AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], +- [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.]) +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], +- [atomic_LIBS=""], +- [atomic_LIBS="-latomic"] +- )], +- [atomic_LIBS=""] ++ [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])] + ) +-AC_SUBST([atomic_LIBS]) + + # Prepare CFLAG_VISIBILITY to be used where needed + gl_VISIBILITY() Property changes on: branches/2018Q1/dns/knot2/files/extra-patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am =================================================================== --- branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am (nonexistent) +++ branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am (revision 460931) @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2018-01-29 16:11:17 UTC ++++ src/Makefile.am +@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $( + $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC + libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' + libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \ +- $(liburcu_LIBS) $(atomic_LIBS) ++ $(liburcu_LIBS) + + ################### + # Knot DNS Daemon # Property changes on: branches/2018Q1/dns/knot2/files/extra-patch-src_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 460930) +++ branches/2018Q1 (revision 460931) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r460797