It has been mentioned many times that we shouldn't have to require
"ACCEPTABLE_LICENSES+=fee-based-commercial-use" for using pkgsrc (because
openssl is needed a lot).

In November, I mentioned that Red Hat and Debian Linux provide their
openssl with no-idea, no-rc5 and no-mdc2. And the feedback I received
seemed this should be done with pkgsrc too.

May I commit the following? (This was not tested with USE_RSAREF2 and if
desired I could add a "OPENSSL_USE_COMMERCIAL" or "OPENSSL_USE_IDEA" etc
switches.)

cvs diff: Diffing security/openssl
Index: security/openssl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/Makefile,v
retrieving revision 1.86
diff -b -u -r1.86 Makefile
--- security/openssl/Makefile	17 Feb 2004 14:26:47 -0000	1.86
+++ security/openssl/Makefile	1 Mar 2004 21:10:30 -0000
@@ -2,6 +2,7 @@

 DISTNAME=		openssl-0.9.6l
 SVR4_PKGNAME=		ossl
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssl.org/source/

@@ -13,9 +14,6 @@

 CRYPTO=			YES

-# openssl supplies IDEA/RC5.  IDEA/RC5 need license for commercial use.
-LICENCE=		fee-based-commercial-use
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 .include "../../mk/bsd.prefs.mk"
@@ -28,6 +26,8 @@
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	shared
+# No commercial code
+CONFIGURE_ARGS+=	no-idea no-rc5 no-mdc2

 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == "YES"
 .  include "../../security/rsaref/buildlink3.mk"
Index: security/openssl/PLIST.common
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/PLIST.common,v
retrieving revision 1.6
diff -b -u -r1.6 PLIST.common
--- security/openssl/PLIST.common	25 Aug 2002 19:23:17 -0000	1.6
+++ security/openssl/PLIST.common	1 Mar 2004 21:10:31 -0000
@@ -26,12 +26,10 @@
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/hmac.h
-include/openssl/idea.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
-include/openssl/mdc2.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
@@ -43,7 +41,6 @@
 include/openssl/rand.h
 include/openssl/rc2.h
 include/openssl/rc4.h
-include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
cvs diff: Diffing security/openssl/patches



   Jeremy C. Reed
   http://www.reedmedia.net/