diff options
author | fredb <fredb> | 2000-09-09 19:40:14 +0000 |
---|---|---|
committer | fredb <fredb> | 2000-09-09 19:40:14 +0000 |
commit | 6db29a5f857c9c987672ac53a7b89f1ca5b2dd22 (patch) | |
tree | 31dbcd8e2d1e33503f0e30d965ede29471a3d223 /security | |
parent | 800aea04b43870a19315c5748d91cd77e97792af (diff) | |
download | pkgsrc-6db29a5f857c9c987672ac53a7b89f1ca5b2dd22.tar.gz |
Reorganize crypto handling, as discussed on tech-pkg. Remove all
RESTRICTED= variables that were predicated on former U.S. export
regulations. Add CRYPTO=, as necessary, so it's still possible to
exclude all crypto packages from a build by setting MKCRYPTO=no
(but "lintpkgsrc -R" will no longer catch them).
Specifically,
- - All packages which set USE_SSL just lose their RESTRICTED
variable, since MKCRYPTO responds to USE_SSL directly.
- - realplayer7 and ns-flash keep their RESTRICTED, which is based
on license terms, but also gain the CRYPTO variable.
- - srp-client is now marked broken, since the distfile is evidently
no longer available. On this, we're no worse off than before.
[We haven't been mirroring the distfile, or testing the build!]
- - isakmpd gets CRYPTO for RESTRICTED, but remains broken.
- - crack loses all restrictions, as it does not evidently empower
a user to utilize strong encryption (working definition: ability
to encode a message that requires a secret key plus big number
arithmetic to decode).
Diffstat (limited to 'security')
-rw-r--r-- | security/crack/Makefile | 6 | ||||
-rw-r--r-- | security/gnupg/Makefile | 10 | ||||
-rw-r--r-- | security/isakmpd/Makefile | 8 | ||||
-rw-r--r-- | security/kth-krb4/Makefile | 6 | ||||
-rw-r--r-- | security/openssh/Makefile | 7 | ||||
-rw-r--r-- | security/openssl/Makefile | 20 | ||||
-rw-r--r-- | security/pgp2/Makefile | 7 | ||||
-rw-r--r-- | security/pgp5/Makefile | 6 | ||||
-rw-r--r-- | security/py-crypto/Makefile | 5 | ||||
-rw-r--r-- | security/racoon/Makefile | 4 | ||||
-rw-r--r-- | security/rc5des/Makefile | 8 | ||||
-rw-r--r-- | security/rsaref/Makefile | 6 | ||||
-rw-r--r-- | security/srp_client/Makefile | 7 | ||||
-rw-r--r-- | security/ssh/Makefile | 5 | ||||
-rw-r--r-- | security/ssh6/Makefile | 6 |
15 files changed, 36 insertions, 75 deletions
diff --git a/security/crack/Makefile b/security/crack/Makefile index dc1e996f8a5..774c43e7f0e 100644 --- a/security/crack/Makefile +++ b/security/crack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2000/09/09 19:40:20 fredb Exp $ # FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp DISTNAME= crack5.0 @@ -11,10 +11,6 @@ MASTER_SITES= ftp://ftp.win.tue.nl/pub/security/ \ MAINTAINER= bouyer@netbsd.org -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} -MIRROR_DISTFILE= no - WRKSRC= ${WRKDIR}/c50a pre-configure: diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index f226abdd2f9..96264348292 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/08/18 22:46:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2000/09/09 19:40:21 fredb Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp # @@ -11,13 +11,9 @@ HOMEPAGE= http://www.gnupg.org/ DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext -USE_GMAKE= yes - +CRYPTO= yes GNU_CONFIGURE= yes - -RESTRICTED= "Cryptographic software" -NO_SRC_ON_FTP= ${RESTRICTED} -MIRROR_DISTFILE=no +USE_GMAKE= yes .include "../../mk/bsd.prefs.mk" diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 416ab2c7dde..05cbda40fb1 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/09/03 13:12:52 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:21 fredb Exp $ # DISTNAME= isakmpd-000220 @@ -12,9 +12,8 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= itojun@kame.net -RESTRICTED= "Crypto; export-controlled" - BROKEN= "broken by PF_KEY API change" +CRYPTO= yes # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) @@ -29,9 +28,6 @@ DEPENDS+= openssl-0.9.*:../../security/openssl .endif DEPENDS+= gmp-*:../../devel/gmp -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} - ALL_TARGET= depend all .include "../../mk/bsd.pkg.mk" diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index baffdb60361..e6e23dc3112 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2000/09/09 19:40:21 fredb Exp $ # DISTNAME= krb4-1.0.1 @@ -11,9 +11,7 @@ HOMEPAGE= http://www.pdc.kth.se/kth-krb/ CONFLICTS+= openssl-* -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} - +CRYPTO= yes GNU_CONFIGURE= yes #USE_GTEXINFO= yes #not currently needed diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 7c78ea25d0b..89813319de1 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2000/09/05 09:43:02 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2000/09/09 19:40:21 fredb Exp $ # DISTNAME= openssh-2.2.0p1 @@ -19,6 +19,8 @@ HOMEPAGE= http://www.openssh.com/ BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base BUILD_DEPENDS+= autoreconf:../../devel/autoconf +CRYPTO= yes + # Check for a usable installed version of OpenSSL. Version must be greater # than 0.9.5a. If a usable version isn't present, then use the pkgsrc # OpenSSL package. @@ -45,9 +47,6 @@ CONFLICTS= ssh-[0-9]* ssh6-[0-9]* BUILD_DEFS+= USE_INET6 BUILD_DEFS+= SSH_CONF_DIR -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} - DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL MESSAGE_FILE= ${WRKDIR}/MESSAGE diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 2d23bef1f6e..64e61a57f32 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2000/09/05 17:34:05 wennmach Exp $ +# $NetBSD: Makefile,v 1.21 2000/09/09 19:40:22 fredb Exp $ # DISTNAME= openssl-0.9.5a @@ -11,10 +11,9 @@ HOMEPAGE= http://www.openssl.org/ CONFLICTS= SSLeay-* ssleay-* kth-krb4-* -USE_PERL5= # defined - -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} +CRYPTO= YES +USE_PERL5= YES +USE_RSAREF2= NO # matches what's in `Configure' (except sparc64) ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ @@ -46,17 +45,6 @@ CONFIGURE_ARGS+= rsaref PLIST_RSAREF= ${PKGDIR}/PLIST.rsaref .endif -fetch-depends: -.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO - @${ECHO} - @${ECHO} The variable USE_RSAREF2 must be set to either YES or NO - @${ECHO} in order to build this package. People with no RSA - @${ECHO} license MUST set this variable to YES. Users outside - @${ECHO} the USA MUST set this variable to NO. RSA licensees may - @${ECHO} choose -- NO is faster. - @${FALSE} -.endif - pre-patch: ${MKDIR} ${WRKDIR}/.patches @${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index 63536171dff..0e4b9e619cb 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2000/08/18 22:46:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.25 2000/09/09 19:40:22 fredb Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp # @@ -11,6 +11,8 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \ MAINTAINER= packages@NetBSD.ORG HOMEPAGE= http://www.pgpi.com/ +CRYPTO= yes + .include "../../mk/bsd.prefs.mk" .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES @@ -28,9 +30,6 @@ RSAOBJS= rsaglue1.o CFLAGS= .endif -RESTRICTED= "Cryptographic software" -NO_SRC_ON_FTP= ${RESTRICTED} - PGPLIB= ${PREFIX}/share/pgp CFLAGS+= -DPGP_SYSTEM_DIR=\\\"${PGPLIB}/\\\" diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index 4e9bdbf970f..729e93346f4 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/09/05 09:33:16 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2000/09/09 19:40:22 fredb Exp $ # DISTNAME= pgp50i-unix-src @@ -19,9 +19,7 @@ HOMEPAGE= http://www.pgpi.com/ BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base -RESTRICTED= "Cryptographic software" -NO_SRC_ON_FTP= ${RESTRICTED} - +CRYPTO= YES GNU_CONFIGURE= YES PGPLIB= ${PREFIX}/share/pgp5 diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile index 44ce95cf57c..55cd7acf066 100644 --- a/security/py-crypto/Makefile +++ b/security/py-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/08/21 21:01:33 hubertf Exp $ +# $NetBSD: Makefile,v 1.12 2000/09/09 19:40:22 fredb Exp $ DISTNAME= pycrypt100 PKGNAME= py-crypto-1.0.0 @@ -11,8 +11,7 @@ HOMEPAGE= http://starship.skyport.net/crew/amk/writing/pct/ DEPENDS+= python-1.5.2:../../lang/python -RESTRICTED= "Cryptographic software" -NO_SRC_ON_FTP= ${RESTRICTED} +CRYPTO= yes WRKSRC= ${WRKDIR}/Extensions/Crypto MAKE_FLAGS= 'OPT=${CFLAGS}' diff --git a/security/racoon/Makefile b/security/racoon/Makefile index 9a2674e50bf..0a1f774ffbb 100644 --- a/security/racoon/Makefile +++ b/security/racoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/08/27 07:35:09 itojun Exp $ +# $NetBSD: Makefile,v 1.19 2000/09/09 19:40:22 fredb Exp $ # DISTNAME= racoon-20000731a @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/ MAINTAINER= itojun@kame.net HOMEPAGE= http:/www.kame.net/ -RESTRICTED= "Crypto, export-controlled" +CRYPTO= yes # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile index cbf9c3f60f5..daf62d8b199 100644 --- a/security/rc5des/Makefile +++ b/security/rc5des/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:23 fredb Exp $ # DISTNAME= rc5-mlg-004 @@ -11,13 +11,11 @@ HOMEPAGE= http://rc5.distributed.net/ ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} +CRYPTO= yes +NO_CONFIGURE= yes WRKSRC= ${WRKDIR}/RC5 -NO_CONFIGURE= yes - # agc - this is commented out until I can test that it works. #post-patch: # @(hostname=`/bin/hostname`; \ diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile index e79cd9b167a..e32240b54b9 100644 --- a/security/rsaref/Makefile +++ b/security/rsaref/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2000/08/18 22:46:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.20 2000/09/09 19:40:23 fredb Exp $ # DISTNAME= rsaref @@ -10,9 +10,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= tv@netbsd.org -RESTRICTED= "Cryptographic source usable only within the USA" -NO_SRC_ON_FTP= ${RESTRICTED} - +CRYPTO= yes IS_INTERACTIVE= yes # requires options to be set in order to use LICENSE= no-commercial-use diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile index 4367ce96fa3..cd36fb8cdb3 100644 --- a/security/srp_client/Makefile +++ b/security/srp_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/08/23 23:27:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2000/09/09 19:40:23 fredb Exp $ # DISTNAME= srp-1.4.4 @@ -20,9 +20,8 @@ BUILD_DEPENDS+= autoconf:../../devel/autoconf BUILD_DEPENDS+= automake:../../devel/automake DEPENDS+= gmp>=2.0.2:../../devel/gmp -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} - +BROKEN= "Distfile for srp-1.4.4 not available" +CRYPTO= yes GNU_CONFIGURE= yes CPPFLAGS+= -Dunix=1 diff --git a/security/ssh/Makefile b/security/ssh/Makefile index ac5d958d0ee..a09bc16e786 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2000/08/18 22:46:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.82 2000/09/09 19:40:24 fredb Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -18,8 +18,7 @@ HOMEPAGE= http://www.cs.hut.fi/ssh/ CONFLICTS= openssh-[0-9]* ssh6-[0-9]* -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} +CRYPTO= YES LICENSE= no-commercial-use EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile index bffe300dd3a..904c11ec070 100644 --- a/security/ssh6/Makefile +++ b/security/ssh6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:24 fredb Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -19,9 +19,7 @@ HOMEPAGE= http://www.cs.hut.fi/ssh/ CONFLICTS= openssh-[0-9]* ssh-[0-9]* -RESTRICTED= "Crypto; export-controlled" -NO_SRC_ON_FTP= ${RESTRICTED} -LICENSE= no-commercial-use +CRYPTO= YES EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} CFLAGS= -O2 |