Date: Wed, 25 Feb 2015 14:44:42 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379920 - in head/dns/ldns: . files Message-ID: <201502251444.t1PEig7Z044705@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Wed Feb 25 14:44:41 2015 New Revision: 379920 URL: https://svnweb.freebsd.org/changeset/ports/379920 QAT: https://qat.redports.org/buildarchive/r379920/ Log: Fix issues with LibreSSL PR: 191853 Approved by: maintainer Added: head/dns/ldns/files/ head/dns/ldns/files/patch-drill_Makefile.in (contents, props changed) head/dns/ldns/files/patch-examples_Makefile.in (contents, props changed) head/dns/ldns/files/patch-examples_configure.ac (contents, props changed) head/dns/ldns/files/patch-examples_ldns-signzone.c (contents, props changed) Modified: head/dns/ldns/Makefile Modified: head/dns/ldns/Makefile ============================================================================== --- head/dns/ldns/Makefile Wed Feb 25 14:35:07 2015 (r379919) +++ head/dns/ldns/Makefile Wed Feb 25 14:44:41 2015 (r379920) @@ -3,7 +3,7 @@ PORTNAME= ldns PORTVERSION= 1.6.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \ LOCAL/ehaupt @@ -80,6 +80,7 @@ INSTALL_TARGET+=install-manpages .if ${PORT_OPTIONS:MGOST} . if ${OSVERSION} < 1000015 BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl +CONFLICTS+= libressl-* . endif .else NO_GOST= --disable-gost Added: head/dns/ldns/files/patch-drill_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/ldns/files/patch-drill_Makefile.in Wed Feb 25 14:44:41 2015 (r379920) @@ -0,0 +1,11 @@ +--- 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: Added: head/dns/ldns/files/patch-examples_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/ldns/files/patch-examples_Makefile.in Wed Feb 25 14:44:41 2015 (r379920) @@ -0,0 +1,28 @@ +--- 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 ; \ Added: head/dns/ldns/files/patch-examples_configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/ldns/files/patch-examples_configure.ac Wed Feb 25 14:44:41 2015 (r379920) @@ -0,0 +1,11 @@ +--- 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" + Added: head/dns/ldns/files/patch-examples_ldns-signzone.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/ldns/files/patch-examples_ldns-signzone.c Wed Feb 25 14:44:41 2015 (r379920) @@ -0,0 +1,18 @@ +--- 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502251444.t1PEig7Z044705>