Mon Jan 20 17:42:53 2020 UTC ()
openssl: Explicitly disable afalgeng for now.

This is only supported in certain Linux configurations, so will need proper
PLIST logic if it is to be properly handled as an option.  Fixes EL7.


(jperkin)
diff -r1.1 -r0 pkgsrc/security/openssl/PLIST.Linux
diff -r1.11 -r1.12 pkgsrc/security/openssl/options.mk

File Deleted: pkgsrc/security/openssl/Attic/PLIST.Linux

cvs diff -r1.11 -r1.12 pkgsrc/security/openssl/options.mk (expand / switch to unified diff)

--- pkgsrc/security/openssl/options.mk 2020/01/16 22:45:45 1.11
+++ pkgsrc/security/openssl/options.mk 2020/01/20 17:42:53 1.12
@@ -1,34 +1,39 @@ @@ -1,34 +1,39 @@
1# $NetBSD: options.mk,v 1.11 2020/01/16 22:45:45 wiz Exp $ 1# $NetBSD: options.mk,v 1.12 2020/01/20 17:42:53 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openssl 3PKG_OPTIONS_VAR= PKG_OPTIONS.openssl
4PKG_SUPPORTED_OPTIONS= idea md2 mdc2 rc5 zlib threads 4PKG_SUPPORTED_OPTIONS= idea md2 mdc2 rc5 zlib threads
5PKG_SUGGESTED_OPTIONS= idea md2 mdc2 rc5 threads 5PKG_SUGGESTED_OPTIONS= idea md2 mdc2 rc5 threads
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
10 10
11# 11#
12# Support optional algorithms 12# Support optional algorithms
13# 13#
14.for alg in idea md2 mdc2 rc5 14.for alg in idea md2 mdc2 rc5
15. if !empty(PKG_OPTIONS:M${alg}) 15. if !empty(PKG_OPTIONS:M${alg})
16CONFIGURE_ARGS+= enable-${alg} 16CONFIGURE_ARGS+= enable-${alg}
17PLIST.${alg}= yes 17PLIST.${alg}= yes
18. else 18. else
19CONFIGURE_ARGS+= no-${alg} 19CONFIGURE_ARGS+= no-${alg}
20. endif 20. endif
21.endfor 21.endfor
 22#
 23# Only supported in certain Linux configurations, needs proper handling if
 24# it is to be supported as an option.
 25#
 26CONFIGURE_ARGS+= no-afalgeng
22 27
23.if !empty(PKG_OPTIONS:Mzlib) 28.if !empty(PKG_OPTIONS:Mzlib)
24CONFIGURE_ARGS+= zlib 29CONFIGURE_ARGS+= zlib
25.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
26.else 31.else
27CONFIGURE_ARGS+= no-zlib 32CONFIGURE_ARGS+= no-zlib
28.endif 33.endif
29 34
30.if !empty(PKG_OPTIONS:Mthreads) 35.if !empty(PKG_OPTIONS:Mthreads)
31CONFIGURE_ARGS+= threads 36CONFIGURE_ARGS+= threads
32.else 37.else
33CONFIGURE_ARGS+= no-threads 38CONFIGURE_ARGS+= no-threads
34.endif 39.endif