CVS commit: pkgsrc/security/openssl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  3 11:55:12 UTC 2016

Modified Files:
        pkgsrc/security/openssl: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/openssl/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.227 pkgsrc/security/openssl/Makefile:1.228
--- pkgsrc/security/openssl/Makefile:1.227      Mon Sep 26 12:27:55 2016
+++ pkgsrc/security/openssl/Makefile    Mon Oct  3 11:55:11 2016
@@ -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/
 

Index: pkgsrc/security/openssl/options.mk
diff -u pkgsrc/security/openssl/options.mk:1.9 pkgsrc/security/openssl/options.mk:1.10
--- pkgsrc/security/openssl/options.mk:1.9      Wed Feb  6 21:40:33 2013
+++ pkgsrc/security/openssl/options.mk  Mon Oct  3 11:55:11 2016
@@ -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