Wed Jul 13 11:26:09 2011 UTC ()
PR/40602 -- disable GOST for OpenSSL<1.0.0

(Not MacOS-specific)


(shattered)
diff -r1.15 -r1.16 pkgsrc/net/ldns/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/net/ldns/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ldns/Makefile 2011/04/12 11:33:33 1.15
+++ pkgsrc/net/ldns/Makefile 2011/07/13 11:26:09 1.16
@@ -1,47 +1,64 @@ @@ -1,47 +1,64 @@
1# $NetBSD: Makefile,v 1.15 2011/04/12 11:33:33 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2011/07/13 11:26:09 shattered Exp $
2 2
3DISTNAME= ldns-1.6.9 3DISTNAME= ldns-1.6.9
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ 5MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/
6 6
7MAINTAINER= he@NetBSD.org 7MAINTAINER= he@NetBSD.org
8HOMEPAGE= http://www.nlnetlabs.nl/projects/ldns/ 8HOMEPAGE= http://www.nlnetlabs.nl/projects/ldns/
9COMMENT= Library for simplified DNS programming 9COMMENT= Library for simplified DNS programming
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= gmake perl 14USE_TOOLS+= gmake perl
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18REPLACE_PERL= doc/doxyparse.pl 18REPLACE_PERL= doc/doxyparse.pl
19 19
20BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.8 20BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.8
21.include "../../security/openssl/buildlink3.mk" 21.include "../../security/openssl/buildlink3.mk"
22 22
23PLIST_VARS+= sha2 23PLIST_VARS+= sha2 gost
24.if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 24.if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 25PLIST_VARS.gost!= \
 26 if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl:Q}; then \
 27 ${ECHO} "yes"; \
 28 else \
 29 ${ECHO} "no"; \
 30 fi
25PLIST_VARS.sha2!= \ 31PLIST_VARS.sha2!= \
26 if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl:Q}; then \ 32 if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl:Q}; then \
27 ${ECHO} "yes"; \ 33 ${ECHO} "yes"; \
28 else \ 34 else \
29 ${ECHO} "no"; \ 35 ${ECHO} "no"; \
30 fi 36 fi
31.else 37.else
 38PLIST_VARS.gost!= \
 39 if ${PKG_INFO} -qe 'openssl>=1.0.0'; then \
 40 ${ECHO} yes; \
 41 else \
 42 ${ECHO} no; \
 43 fi
32PLIST_VARS.sha2!= \ 44PLIST_VARS.sha2!= \
33 if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \ 45 if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \
34 ${ECHO} yes; \ 46 ${ECHO} yes; \
35 else \ 47 else \
36 ${ECHO} no; \ 48 ${ECHO} no; \
37 fi 49 fi
38.endif 50.endif
 51.if ${PLIST_VARS.gost} == "yes"
 52CONFIGURE_ARGS+= --enable-gost
 53.else
 54CONFIGURE_ARGS+= --disable-gost
 55.endif
39.if ${PLIST_VARS.sha2} == "yes" 56.if ${PLIST_VARS.sha2} == "yes"
40CONFIGURE_ARGS+= --enable-sha2 57CONFIGURE_ARGS+= --enable-sha2
41.else 58.else
42CONFIGURE_ARGS+= --disable-sha2 59CONFIGURE_ARGS+= --disable-sha2
43.endif 60.endif
44CONFIGURE_ARGS+= --with-ssl=${SSLBASE} 61CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
45CONFIGURE_ARGS+= DOXYGEN=${FALSE} 62CONFIGURE_ARGS+= DOXYGEN=${FALSE}
46 63
47.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"