remove restrictions related to idea and mdc2 patents - both are expired

This commit is contained in:
drochner 2012-01-20 17:07:38 +00:00
parent 255289df12
commit 4c730d5c32
3 changed files with 3 additions and 20 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.13 2008/04/12 22:43:09 jlam Exp $ # $NetBSD: options.mk,v 1.14 2012/01/20 17:07:38 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg
PKG_SUPPORTED_OPTIONS= curl idea ldap PKG_SUPPORTED_OPTIONS= curl idea ldap
@ -29,11 +29,6 @@ CONFIGURE_ARGS+= --without-libcurl
.if !empty(PKG_OPTIONS:Midea) .if !empty(PKG_OPTIONS:Midea)
# use of IDEA as crypto function # use of IDEA as crypto function
LICENSE= idea-license
RESTRICTED= Commercial distribution is claimed to require a license.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
DISTFILES+= idea.c.gz DISTFILES+= idea.c.gz
SITES.idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \ SITES.idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \
http://www.gnupg.dk/contrib-dk/ http://www.gnupg.dk/contrib-dk/

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.6 2011/02/19 00:55:31 jmcneill Exp $ # $NetBSD: options.mk,v 1.7 2012/01/20 17:07:38 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libgcrypt PKG_OPTIONS_VAR= PKG_OPTIONS.libgcrypt
PKG_SUPPORTED_OPTIONS= idea PKG_SUPPORTED_OPTIONS= idea
@ -27,11 +27,6 @@ CONFIGURE_ARGS+= --disable-padlock-support
.if !empty(PKG_OPTIONS:Midea) .if !empty(PKG_OPTIONS:Midea)
# use of IDEA as crypto function # use of IDEA as crypto function
LICENSE= idea-license
RESTRICTED= Commercial distribution is claimed to require a license.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
DISTFILES+= gcrypt.tar.bz2 DISTFILES+= gcrypt.tar.bz2
SITES.gcrypt.tar.bz2= http://www.kfwebs.com/ SITES.gcrypt.tar.bz2= http://www.kfwebs.com/
CFLAGS+= -DUSE_IDEA CFLAGS+= -DUSE_IDEA

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.7 2011/11/02 22:51:07 jnemeth Exp $ # $NetBSD: options.mk,v 1.8 2012/01/20 17:07:38 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openssl PKG_OPTIONS_VAR= PKG_OPTIONS.openssl
PKG_SUPPORTED_OPTIONS= idea mdc2 rc5 zlib threads PKG_SUPPORTED_OPTIONS= idea mdc2 rc5 zlib threads
@ -12,12 +12,8 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
### ###
### Support for the IDEA algorithm ### Support for the IDEA algorithm
### US Patent: 5214703
### Europe Patent: EP0482154
### Japan Patent: 508119/1991
### ###
.if !empty(PKG_OPTIONS:Midea) .if !empty(PKG_OPTIONS:Midea)
OPENSSL_LICENSE+= idea-license
PLIST.idea= yes PLIST.idea= yes
.else .else
CONFIGURE_ARGS+= no-idea CONFIGURE_ARGS+= no-idea
@ -25,11 +21,8 @@ CONFIGURE_ARGS+= no-idea
### ###
### Support for the MDC2 algorithm ### Support for the MDC2 algorithm
### US Patent: 4908861
### ###
.if !empty(PKG_OPTIONS:Mmdc2) .if !empty(PKG_OPTIONS:Mmdc2)
# A license file is needed.
OPENSSL_LICENSE+= mdc2-nonlicense
CONFIGURE_ARGS+= enable-mdc2 CONFIGURE_ARGS+= enable-mdc2
PLIST.mdc2= yes PLIST.mdc2= yes
.else .else