Index: Makefile =================================================================== --- Makefile (revision 508907) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ldns -PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTVERSION= 1.7.1 CATEGORIES= dns MASTER_SITES= https://www.nlnetlabs.nl/downloads/ldns/ \ LOCAL/ehaupt @@ -34,7 +33,7 @@ HTMLDOCS= doc/html/* OPTIONS_DEFINE+= GOST DANETAUSAGE \ - RRTYPENINFO RRTYPERKEY RRTYPETA RRTYPEAVC + RRTYPENINFO RRTYPERKEY RRTYPETA RRTYPEAVC RRTYPEAMTRELAY DANETAUSAGE_DESC= Enable ta uasage, requires openssl >= 1.1.0 GOST_DESC= GOST signatures enabled, requires openssl >= 1.0.0 @@ -42,6 +41,7 @@ RRTYPERKEY_DESC= Enable draft RR type rkey. RRTYPETA_DESC= Enable draft RR type ta. RRTYPEAVC_DESC= Enable draft RR type avc. +RRTYPEAMTRELAY_DESC= Enable draft RR type amtrelay. OPTIONS_SUB= yes @@ -52,6 +52,7 @@ RRTYPERKEY_CONFIGURE_ENABLE= rrtype-rkey RRTYPETA_CONFIGURE_ENABLE= rrtype-ta RRTYPEAVC_CONFIGURE_ENABLE= rrtype-avc +RRTYPEAMT_CONFIGURE_ENABLE= rrtype-amtrelay EXAMPLES_CONFIGURE_WITH= examples DRILL_CONFIGURE_WITH= drill DRILL_INSTALL_TARGET= install-drill @@ -101,8 +102,9 @@ .include -.if ${PORT_OPTIONS:MDANETAUSAGE} && ${SSL_DEFAULT} != openssl111 -BROKEN= this option requires openssl >= 1.1.0 +.if ${PORT_OPTIONS:MDANETAUSAGE} && \ + ((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == base)) +BROKEN= this option requires openssl >= 1.1.0 ${OSVERSION} ${SSL_DEFAULT} .endif .if ! ${PORT_OPTIONS:MGOST} @@ -113,7 +115,7 @@ post-build: .if ${PORT_OPTIONS:MDOXYGEN} - @(cd ${WRKSRC}; ${MAKE_CMD} doxygen) + @(cd ${WRKSRC}; ${MAKE_CMD} doxygen) .endif post-install: @@ -123,7 +125,7 @@ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/ldns_*.3 \ ${STAGEDIR}${PREFIX}/man/man3 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.2 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.3 .if ${PORT_OPTIONS:MDRILL} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/drill .endif Index: distinfo =================================================================== --- distinfo (revision 508907) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488235641 -SHA256 (ldns-1.7.0.tar.gz) = c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc -SIZE (ldns-1.7.0.tar.gz) = 1304424 +TIMESTAMP = 1565861297 +SHA256 (ldns-1.7.1.tar.gz) = 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 +SIZE (ldns-1.7.1.tar.gz) = 1244394 Index: files/patch-drill_Makefile.in =================================================================== --- files/patch-drill_Makefile.in (revision 508907) +++ files/patch-drill_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- drill/Makefile.in.orig 2014-01-10 21:04:41 UTC -+++ drill/Makefile.in -@@ -98,7 +98,7 @@ doc: - - install: all - $(INSTALL) -d $(DESTDIR)$(bindir) -- $(INSTALL) drill $(DESTDIR)$(bindir)/drill -+ $(INSTALL) -s drill $(DESTDIR)$(bindir)/drill - $(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1 - - uninstall: Property changes on: files/patch-drill_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-examples_Makefile.in =================================================================== --- files/patch-examples_Makefile.in (revision 508907) +++ files/patch-examples_Makefile.in (nonexistent) @@ -1,28 +0,0 @@ ---- examples/Makefile.in.orig 2014-01-10 21:04:41 UTC -+++ examples/Makefile.in -@@ -169,7 +169,7 @@ install: $(PROGRAMS) $(SSL_PROGRAMS) - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir) - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 - for i in $(PROGRAMS) $(SSL_PROGRAMS); do \ -- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \ -+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i $(DESTDIR)$(bindir) ; \ - if test -f $$i.1 ; \ - then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ - else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ -@@ -182,14 +182,14 @@ install-static: all-static - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir) - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 - for i in $(PROGRAMS); do \ -- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \ -+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc $(DESTDIR)$(bindir) ; \ - if test -f $$i.1 ; \ - then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ - else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ - fi ; \ - done - for i in $(SSL_PROGRAMS); do \ -- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \ -+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \ - if test -f $$i.1 ; \ - then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ - else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \ Property changes on: files/patch-examples_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-examples_configure.ac =================================================================== --- files/patch-examples_configure.ac (revision 508907) +++ files/patch-examples_configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- examples/configure.ac.orig 2014-01-10 21:04:41 UTC -+++ examples/configure.ac -@@ -207,6 +207,8 @@ case "$enable_dane" in - ;; - esac - -+AC_CHECK_FUNCS(ENGINE_load_cryptodev) -+ - LDFLAGS="$tmp_LDFLAGS" - LIBS="$tmp_LIBS" - Property changes on: files/patch-examples_configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-examples_ldns-signzone.c =================================================================== --- files/patch-examples_ldns-signzone.c (revision 508907) +++ files/patch-examples_ldns-signzone.c (nonexistent) @@ -1,18 +0,0 @@ ---- examples/ldns-signzone.c.orig 2014-01-10 21:04:41 UTC -+++ examples/ldns-signzone.c -@@ -470,6 +470,7 @@ main(int argc, char *argv[]) - case 'A': - signflags |= LDNS_SIGN_DNSKEY_WITH_ZSK; - break; -+#ifdef HAVE_ENGINE_LOAD_CRYPTODEV - case 'E': - ENGINE_load_builtin_engines(); - ENGINE_load_dynamic(); -@@ -494,6 +495,7 @@ main(int argc, char *argv[]) - ENGINE_set_default(engine, 0); - } - break; -+#endif - case 'k': - eng_key_l = strchr(optarg, ','); - if (eng_key_l && strlen(eng_key_l) > 1) { Property changes on: files/patch-examples_ldns-signzone.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 508907) +++ pkg-plist (working copy) @@ -59,8 +59,8 @@ include/ldns/zone.h lib/libldns.a lib/libldns.so -lib/libldns.so.2 -lib/libldns.so.2.0.0 +lib/libldns.so.3 +lib/libldns.so.3.0.0 libdata/pkgconfig/libldns.pc %%DRILL%%man/man1/drill.1.gz %%EXAMPLES%%man/man1/ldns-chaos.1.gz