diff options
| author | wiz <wiz@pkgsrc.org> | 2016-10-03 11:55:11 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-10-03 11:55:11 +0000 |
| commit | 98cc447cf272e413fd9467175a84610f35272c35 (patch) | |
| tree | eedd00bfc0c7b9f9fec1cee4376192bb3d3164f7 /security | |
| parent | ae8a5cf93860fbc682666816ddc9a8d27d8b216a (diff) | |
| download | pkgsrc-98cc447cf272e413fd9467175a84610f35272c35.tar.gz | |
Remove incorrect comment and resulting weird license.
idea and mdc2 patents expired, so enable them by default.
rc5 looks like it might be expired as well, but I didn't find
anything relevant on that topic, so I left it alone.
Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 3 | ||||
| -rw-r--r-- | security/openssl/options.mk | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index daa9fbd7cf2..4b816173792 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.227 2016/09/26 12:27:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.228 2016/10/03 11:55:11 wiz Exp $ DISTNAME= openssl-1.0.2j +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openssl.org/source/ diff --git a/security/openssl/options.mk b/security/openssl/options.mk index d6bfe818334..24d3aba8248 100644 --- a/security/openssl/options.mk +++ b/security/openssl/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.9 2013/02/06 21:40:33 jperkin Exp $ +# $NetBSD: options.mk,v 1.10 2016/10/03 11:55:11 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openssl PKG_SUPPORTED_OPTIONS= idea md2 mdc2 rc5 zlib threads -PKG_SUGGESTED_OPTIONS= md2 threads +PKG_SUGGESTED_OPTIONS= idea md2 mdc2 threads .include "../../mk/bsd.options.mk" -OPENSSL_LICENSE= # empty - PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} # @@ -25,7 +23,7 @@ CONFIGURE_ARGS+= no-${alg} # A license file is needed. # US Patent: 5724428, 5835600, 6269163 .if !empty(PKG_OPTIONS:Mrc5) -OPENSSL_LICENSE+= rc5-nonlicense +LICENSE+= AND rc5-nonlicense .endif .if !empty(PKG_OPTIONS:Mzlib) @@ -40,8 +38,3 @@ CONFIGURE_ARGS+= threads .else CONFIGURE_ARGS+= no-threads .endif - -.if !empty(OPENSSL_LICENSE) -# pkgsrc does not handle multiple licenses -LICENSE= openssl-patented-algorithms-nonlicense -.endif |