CVS commit: pkgsrc/security

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  3 08:15:51 UTC 2016

Modified Files:
        pkgsrc/security/libidea: Makefile
        pkgsrc/security/p5-Crypt-IDEA: Makefile
        pkgsrc/security/pgp2: Makefile
        pkgsrc/security/pgp5: Makefile

Log Message:
idea patent has expired, so set LICENSE to something more useful.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/libidea/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/p5-Crypt-IDEA/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/security/pgp2/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/pgp5/Makefile

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

Modified files:

Index: pkgsrc/security/libidea/Makefile
diff -u pkgsrc/security/libidea/Makefile:1.20 pkgsrc/security/libidea/Makefile:1.21
--- pkgsrc/security/libidea/Makefile:1.20       Fri Feb 27 14:35:01 2015
+++ pkgsrc/security/libidea/Makefile    Mon Oct  3 08:15:50 2016
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/02/27 14:35:01 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.21 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=      libidea-0.8.2b
 CATEGORIES=    security
@@ -8,13 +7,7 @@ MASTER_SITES=  ftp://ftp.funet.fi/pub/mir
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.media-crypt.com/pages/fidea.html
 COMMENT=       IDEA block cipher library
-LICENSE=       idea-license
-
-RESTRICTED=    IDEA is a patented algorithm that requires proper licensing
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+#LICENSE=      ssleay-license
 
 WRKSRC=                ${WRKDIR}/idea
 CRYPTO=                YES

Index: pkgsrc/security/p5-Crypt-IDEA/Makefile
diff -u pkgsrc/security/p5-Crypt-IDEA/Makefile:1.28 pkgsrc/security/p5-Crypt-IDEA/Makefile:1.29
--- pkgsrc/security/p5-Crypt-IDEA/Makefile:1.28 Wed Jun  8 19:24:20 2016
+++ pkgsrc/security/p5-Crypt-IDEA/Makefile      Mon Oct  3 08:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/06/08 19:24:20 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=              Crypt-IDEA-1.10
 PKGNAME=               p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=           ${MASTER_SITE_PERL_CPAN:=
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://search.cpan.org/dist/Crypt-IDEA/
 COMMENT=               Perl5 module for the IDEA symmetric key algorithm
-LICENSE=               idea-license
+LICENSE=               original-bsd
 
 USE_LANGUAGES=         c
 PERL5_PACKLIST=                auto/Crypt/IDEA/.packlist

Index: pkgsrc/security/pgp2/Makefile
diff -u pkgsrc/security/pgp2/Makefile:1.55 pkgsrc/security/pgp2/Makefile:1.56
--- pkgsrc/security/pgp2/Makefile:1.55  Tue Oct 23 18:16:49 2012
+++ pkgsrc/security/pgp2/Makefile       Mon Oct  3 08:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.56 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=      pgp263is
 PKGREVISION=   1
@@ -9,8 +9,7 @@ MASTER_SITES=   ftp://ftp.ifi.uio.no/pub/p
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.pgpi.org/
 COMMENT=       Public-key encryption and digital signature utility (v2)
-# use of IDEA as crypto function
-LICENSE=       idea-license
+LICENSE=       pgp2-license
 
 WRKSRC=                ${WRKDIR}/src
 CRYPTO=                yes

Index: pkgsrc/security/pgp5/Makefile
diff -u pkgsrc/security/pgp5/Makefile:1.44 pkgsrc/security/pgp5/Makefile:1.45
--- pkgsrc/security/pgp5/Makefile:1.44  Sat Jul  9 06:38:56 2016
+++ pkgsrc/security/pgp5/Makefile       Mon Oct  3 08:15:51 2016
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2016/07/09 06:38:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.45 2016/10/03 08:15:51 wiz Exp $
 
 DISTNAME=      pgp50i-unix-src
 PKGNAME=       pgp5-5.0i
@@ -11,8 +10,7 @@ MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.pgpi.org/
 COMMENT=       Public-key encryption and digital signature utilities (v5)
-# use of IDEA as crypto function
-LICENSE=       idea-license
+LICENSE=       pgp5-license
 
 MAKE_JOBS_SAFE=                no