Attachment #206584 for bug #239525




# $FreeBSD$

PORTNAME=	ldns
PORTVERSION=	1.7.1
PORTREVISION=	1
CATEGORIES=	dns
MASTER_SITES=	https://www.nlnetlabs.nl/downloads/ldns/ \
		LOCAL/ehaupt

HTMLDOCS=	doc/html/*

OPTIONS_DEFINE+=	GOST DANETAUSAGE \
		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

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


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


.include <bsd.port.pre.mk>

.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}


post-build:
.if ${PORT_OPTIONS:MDOXYGEN}
	@(cd ${WRKSRC}; ${MAKE_CMD} doxygen)
.endif

post-install:

		${STAGEDIR}${PREFIX}/man/man1
	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/ldns_*.3 \
		${STAGEDIR}${PREFIX}/man/man3
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.3
.if ${PORT_OPTIONS:MDRILL}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/drill
.endif

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488235641	1	TIMESTAMP = 1565861297
2	SHA256 (ldns-1.7.0.tar.gz) = c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc	2	SHA256 (ldns-1.7.1.tar.gz) = 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
3	SIZE (ldns-1.7.0.tar.gz) = 1304424	3	SIZE (ldns-1.7.1.tar.gz) = 1244394

Lines 1-11 Link Here

(-)files/patch-drill_Makefile.in (-11 lines)
1	--- drill/Makefile.in.orig 2014-01-10 21:04:41 UTC
2	+++ drill/Makefile.in
3	@@ -98,7 +98,7 @@ doc:
4
5	install: all
6	$(INSTALL) -d $(DESTDIR)$(bindir)
7	- $(INSTALL) drill $(DESTDIR)$(bindir)/drill
8	+ $(INSTALL) -s drill $(DESTDIR)$(bindir)/drill
9	$(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1
10
11	uninstall:




--- 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 ; \

Lines 1-11 Link Here

(-)files/patch-examples_configure.ac (-11 lines)
1	--- examples/configure.ac.orig 2014-01-10 21:04:41 UTC
2	+++ examples/configure.ac
3	@@ -207,6 +207,8 @@ case "$enable_dane" in
4	;;
5	esac
6
7	+AC_CHECK_FUNCS(ENGINE_load_cryptodev)
8	+
9	LDFLAGS="$tmp_LDFLAGS"
10	LIBS="$tmp_LIBS"
11




--- 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) {

Lines 59-66 Link Here

(-)pkg-plist (-2 / +2 lines)
59	include/ldns/zone.h	59	include/ldns/zone.h
60	lib/libldns.a	60	lib/libldns.a
61	lib/libldns.so	61	lib/libldns.so
62	lib/libldns.so.2	62	lib/libldns.so.3
63	lib/libldns.so.2.0.0	63	lib/libldns.so.3.0.0
64	libdata/pkgconfig/libldns.pc	64	libdata/pkgconfig/libldns.pc
65	%%DRILL%%man/man1/drill.1.gz	65	%%DRILL%%man/man1/drill.1.gz
66	%%EXAMPLES%%man/man1/ldns-chaos.1.gz	66	%%EXAMPLES%%man/man1/ldns-chaos.1.gz

Return to bug 239525

Lines 2-9 Link Here

(-)Makefile (-7 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ldns	4	PORTNAME= ldns
5	PORTVERSION= 1.7.0	5	PORTVERSION= 1.7.1
6	PORTREVISION= 1
7	CATEGORIES= dns	6	CATEGORIES= dns
8	MASTER_SITES= https://www.nlnetlabs.nl/downloads/ldns/ \	7	MASTER_SITES= https://www.nlnetlabs.nl/downloads/ldns/ \
9	LOCAL/ehaupt	8	LOCAL/ehaupt
Lines 34-40 Link Here
34	HTMLDOCS= doc/html/*	33	HTMLDOCS= doc/html/*
35		34
36	OPTIONS_DEFINE+= GOST DANETAUSAGE \	35	OPTIONS_DEFINE+= GOST DANETAUSAGE \
37	RRTYPENINFO RRTYPERKEY RRTYPETA RRTYPEAVC	36	RRTYPENINFO RRTYPERKEY RRTYPETA RRTYPEAVC RRTYPEAMTRELAY
38		37
39	DANETAUSAGE_DESC= Enable ta uasage, requires openssl >= 1.1.0	38	DANETAUSAGE_DESC= Enable ta uasage, requires openssl >= 1.1.0
40	GOST_DESC= GOST signatures enabled, requires openssl >= 1.0.0	39	GOST_DESC= GOST signatures enabled, requires openssl >= 1.0.0
Lines 42-47 Link Here
42	RRTYPERKEY_DESC= Enable draft RR type rkey.	41	RRTYPERKEY_DESC= Enable draft RR type rkey.
43	RRTYPETA_DESC= Enable draft RR type ta.	42	RRTYPETA_DESC= Enable draft RR type ta.
44	RRTYPEAVC_DESC= Enable draft RR type avc.	43	RRTYPEAVC_DESC= Enable draft RR type avc.
		44	RRTYPEAMTRELAY_DESC= Enable draft RR type amtrelay.
45		45
46	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
47		47
Lines 52-57 Link Here
52	RRTYPERKEY_CONFIGURE_ENABLE= rrtype-rkey	52	RRTYPERKEY_CONFIGURE_ENABLE= rrtype-rkey
53	RRTYPETA_CONFIGURE_ENABLE= rrtype-ta	53	RRTYPETA_CONFIGURE_ENABLE= rrtype-ta
54	RRTYPEAVC_CONFIGURE_ENABLE= rrtype-avc	54	RRTYPEAVC_CONFIGURE_ENABLE= rrtype-avc
		55	RRTYPEAMT_CONFIGURE_ENABLE= rrtype-amtrelay
55	EXAMPLES_CONFIGURE_WITH= examples	56	EXAMPLES_CONFIGURE_WITH= examples
56	DRILL_CONFIGURE_WITH= drill	57	DRILL_CONFIGURE_WITH= drill
57	DRILL_INSTALL_TARGET= install-drill	58	DRILL_INSTALL_TARGET= install-drill
Lines 101-108 Link Here
101		102
102	.include <bsd.port.pre.mk>	103	.include <bsd.port.pre.mk>
103		104
104	.if ${PORT_OPTIONS:MDANETAUSAGE} && ${SSL_DEFAULT} != openssl111	105	.if ${PORT_OPTIONS:MDANETAUSAGE} && \
105	BROKEN= this option requires openssl >= 1.1.0	106	((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == base))
		107	BROKEN= this option requires openssl >= 1.1.0 ${OSVERSION} ${SSL_DEFAULT}
106	.endif	108	.endif
107		109
108	.if ! ${PORT_OPTIONS:MGOST}	110	.if ! ${PORT_OPTIONS:MGOST}
Lines 113-119 Link Here
113		115
114	post-build:	116	post-build:
115	.if ${PORT_OPTIONS:MDOXYGEN}	117	.if ${PORT_OPTIONS:MDOXYGEN}
116	@(cd ${WRKSRC}; ${MAKE_CMD} doxygen)	118	@(cd ${WRKSRC}; ${MAKE_CMD} doxygen)
117	.endif	119	.endif
118		120
119	post-install:	121	post-install:
Lines 123-129 Link Here
123	${STAGEDIR}${PREFIX}/man/man1	125	${STAGEDIR}${PREFIX}/man/man1
124	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/ldns_*.3 \	126	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/ldns_*.3 \
125	${STAGEDIR}${PREFIX}/man/man3	127	${STAGEDIR}${PREFIX}/man/man3
126	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.2	128	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.3
127	.if ${PORT_OPTIONS:MDRILL}	129	.if ${PORT_OPTIONS:MDRILL}
128	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/drill	130	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/drill
129	.endif	131	.endif

Lines 1-28 Link Here

(-)files/patch-examples_Makefile.in (-28 lines)
1	--- examples/Makefile.in.orig 2014-01-10 21:04:41 UTC
2	+++ examples/Makefile.in
3	@@ -169,7 +169,7 @@ install: $(PROGRAMS) $(SSL_PROGRAMS)
4	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
5	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
6	for i in $(PROGRAMS) $(SSL_PROGRAMS); do \
7	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \
8	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i $(DESTDIR)$(bindir) ; \
9	if test -f $$i.1 ; \
10	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
11	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
12	@@ -182,14 +182,14 @@ install-static: all-static
13	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
14	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
15	for i in $(PROGRAMS); do \
16	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \
17	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc $(DESTDIR)$(bindir) ; \
18	if test -f $$i.1 ; \
19	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
20	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
21	fi ; \
22	done
23	for i in $(SSL_PROGRAMS); do \
24	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
25	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
26	if test -f $$i.1 ; \
27	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
28	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \

Lines 1-18 Link Here

(-)files/patch-examples_ldns-signzone.c (-18 lines)
1	--- examples/ldns-signzone.c.orig 2014-01-10 21:04:41 UTC
2	+++ examples/ldns-signzone.c
3	@@ -470,6 +470,7 @@ main(int argc, char *argv[])
4	case 'A':
5	signflags \|= LDNS_SIGN_DNSKEY_WITH_ZSK;
6	break;
7	+#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
8	case 'E':
9	ENGINE_load_builtin_engines();
10	ENGINE_load_dynamic();
11	@@ -494,6 +495,7 @@ main(int argc, char *argv[])
12	ENGINE_set_default(engine, 0);
13	}
14	break;
15	+#endif
16	case 'k':
17	eng_key_l = strchr(optarg, ',');
18	if (eng_key_l && strlen(eng_key_l) > 1) {