CVS commit: pkgsrc/security/openssl

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 16 22:45:45 UTC 2020

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

Log Message:
openssl: rc5 patents expired some years ago

Remove its LICENSE line and enable rc5 option by default.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 pkgsrc/security/openssl/Makefile
cvs rdiff -u -r1.10 -r1.11 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.248 pkgsrc/security/openssl/Makefile:1.249
--- pkgsrc/security/openssl/Makefile:1.248      Thu Jan 16 13:30:29 2020
+++ pkgsrc/security/openssl/Makefile    Thu Jan 16 22:45:45 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.248 2020/01/16 13:30:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.249 2020/01/16 22:45:45 wiz Exp $
 
 DISTNAME=      openssl-1.1.1d
+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.10 pkgsrc/security/openssl/options.mk:1.11
--- pkgsrc/security/openssl/options.mk:1.10     Mon Oct  3 11:55:11 2016
+++ pkgsrc/security/openssl/options.mk  Thu Jan 16 22:45:45 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.10 2016/10/03 11:55:11 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2020/01/16 22:45:45 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openssl
 PKG_SUPPORTED_OPTIONS= idea md2 mdc2 rc5 zlib threads
-PKG_SUGGESTED_OPTIONS= idea md2 mdc2 threads
+PKG_SUGGESTED_OPTIONS= idea md2 mdc2 rc5 threads
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,12 +20,6 @@ CONFIGURE_ARGS+=     no-${alg}
 .  endif
 .endfor
 
-# A license file is needed.
-# US Patent: 5724428, 5835600, 6269163
-.if !empty(PKG_OPTIONS:Mrc5)
-LICENSE+=      AND rc5-nonlicense
-.endif
-
 .if !empty(PKG_OPTIONS:Mzlib)
 CONFIGURE_ARGS+=       zlib
 .include "../../devel/zlib/buildlink3.mk"