pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssl Remove incorrect comment and resultin...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fea0ba5c1707
branches: trunk
changeset: 353342:fea0ba5c1707
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Oct 03 11:55:11 2016 +0000
description:
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:
security/openssl/Makefile | 3 ++-
security/openssl/options.mk | 13 +++----------
2 files changed, 5 insertions(+), 11 deletions(-)
diffs (49 lines):
diff -r 36ba02b77d1e -r fea0ba5c1707 security/openssl/Makefile
--- a/security/openssl/Makefile Mon Oct 03 11:49:31 2016 +0000
+++ b/security/openssl/Makefile Mon Oct 03 11:55:11 2016 +0000
@@ -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 -r 36ba02b77d1e -r fea0ba5c1707 security/openssl/options.mk
--- a/security/openssl/options.mk Mon Oct 03 11:49:31 2016 +0000
+++ b/security/openssl/options.mk Mon Oct 03 11:55:11 2016 +0000
@@ -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 @@
# 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 @@
.else
CONFIGURE_ARGS+= no-threads
.endif
-
-.if !empty(OPENSSL_LICENSE)
-# pkgsrc does not handle multiple licenses
-LICENSE= openssl-patented-algorithms-nonlicense
-.endif
Home |
Main Index |
Thread Index |
Old Index