diff options
36 files changed, 32 insertions, 147 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile index eb82c39..608d1cd 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -6,7 +6,6 @@ LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION=crypto CFLAGS+=-DDES WARNS?= 2 DPADD= ${LIBCRYPTO} diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index f683009..fcdc754 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -38,7 +38,6 @@ CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} -DISTRIBUTION= crypto .endif # diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 04e4eb5..6f6a41c 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,6 +1,5 @@ # $FreeBSD$ -DISTRIBUTION?= crypto NOLINT= KRB5DIR= ${.CURDIR}/../../../crypto/heimdal diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index e45be24..3f9ca1c 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -10,7 +10,6 @@ MAN= fetch.3 CLEANFILES= ftperr.h httperr.h .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index efff986..2d6498a 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -41,10 +41,6 @@ OPENPAM= ${.CURDIR}/../../../contrib/openpam LIB= pam NOPROFILE= YES -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto -.endif - SRCS= openpam_borrow_cred.c \ openpam_configure.c \ openpam_dispatch.c \ diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 909569b4..9bbe345 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -28,7 +28,6 @@ LIB= pam_krb5 SRCS= pam_krb5.c MAN= pam_krb5.8 -DISTRIBUTION= crypto DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index 39fd1c4..1cb1999 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -28,7 +28,6 @@ LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 -DISTRIBUTION= crypto DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 008aa5f..c7e4c33 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -10,7 +10,6 @@ SRCS= pam_ssh.c WARNS?= 0 CFLAGS+= -I${SSHSRC} -DISTRIBUTION= crypto DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} LDADD= -lssh -lcrypto -lcrypt diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 9e88ac2..0f2eb88 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -35,7 +35,6 @@ MAN= libradius.3 radius.conf.5 DPADD= ${LIBMD} LDADD= -lmd .else -DISTRIBUTION= crypto DPADD= ${LIBSSL} LDADD= -lssl CFLAGS+= -DWITH_SSL diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 9447960..a875367 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -15,7 +15,6 @@ WARNS?= 0 .if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .if !defined(NO_KERBEROS) diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 3390093..8b6ebf8 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -30,7 +30,6 @@ LDADD= -lutil -ltermcap ${LIBTELNET} .if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} diff --git a/release/Makefile b/release/Makefile index 458bd92..0af4b4b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -159,9 +159,8 @@ COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x COMPAT_DISTS?= compat4x .endif OTHER_DISTS?= catpages manpages games proflibs dict info doc -CRYPTO_DISTS?= crypto BASE_DISTS?= base -DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} +DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} # mountpoint for filesystems. MNT= /mnt @@ -221,11 +220,6 @@ DISKLABEL?= disklabel ZIPNSPLIT= gzip --no-name -9 -c | split -b 1392k - -# Things that need to be compiled without crypto support in releases -.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease) -FIXCRYPTO!= cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS -.endif - # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree _R?= /R @@ -440,7 +434,6 @@ release rerelease: DOC_LANG \ DOMINIMALDOCPORTS \ EXTRA_SRC \ - FIXCRYPTO \ FTP_PASSIVE_MODE \ FTP_PROXY \ HTTP_PROXY \ @@ -544,16 +537,6 @@ release.2: cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees touch ${.TARGET} -# Build and install non-crypto versions of some tools. -release.3: - # Handle some grief caused by the munition braindeadness. - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${WORLD_FLAGS} -DNOCRYPT \ - SUBDIR_OVERRIDE="${FIXCRYPTO}" \ - buildworld distributeworld DISTDIR=${RD}/trees - -chflags -R noschg ${RD}/trees - touch ${.TARGET} - # Make and install the generic kernel(s). release.4: .for kernel in ${KERNELS} @@ -609,7 +592,7 @@ release.6: # Remove all the directories we don't need. -cd ${RD}/trees && \ - find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir + find ${OTHER_DISTS} ${COMPAT_DISTS} -depth -type d -print | xargs rmdir touch ${.TARGET} # @@ -668,12 +651,6 @@ release.8: fi && shift && shift ; \ done .endif - if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \ - if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \ - if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \ - if [ -f skrb5.aa ] ; then mv skrb5.* ../crypto ; fi ; \ - cd ${RD}/dists/crypto; rm -f CHECKSUM.MD5; \ - md5 * > CHECKSUM.MD5 ) ; fi (cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5) @echo "src distribution is finished." .endif @@ -1029,7 +1006,7 @@ doTARBALL: md5 * > CHECKSUM.MD5 ) \ ) -doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ +doRELEASE: release.1 release.2 ${DOCREL} release.4 release.5 \ release.6 release.7 release.8 release.9 ${EXTRAS} @echo "Release done" diff --git a/secure/Makefile.inc b/secure/Makefile.inc index 4d43279..346c0ee 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,7 +1,5 @@ # $FreeBSD$ -DISTRIBUTION?=crypto - .if exists(${.CURDIR}/../../lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj .else diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index 93855ed..8cf1ef2 100644 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -5,7 +5,6 @@ PROG= chkey SRCS= chkey.c generic.c update.c CFLAGS+=-DYP -I${.CURDIR}/../newkey -DISTRIBUTION= crypto DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO} LDADD= -lrpcsvc -lmp -lcrypto diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 695013d..7b92352 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -6,7 +6,6 @@ WARNS?= 6 DPADD= ${LIBFETCH} LDADD= -lfetch .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile index c9972d0..6fa5f96 100644 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -4,7 +4,6 @@ PROG= newkey SRCS= newkey.c generic.c update.c CFLAGS+= -DYP MAN= newkey.8 -DISTRIBUTION= crypto DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO} LDADD= -lrpcsvc -lmp -lcrypto diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 74ccd8a..687f490 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -32,7 +32,6 @@ CFLAGS+= -DHAS_CGETENT .if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index ea0a3d8..54075da 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -6,7 +6,6 @@ SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. -DISTRIBUTION= crypto DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} LDADD= -lmp -lcrypto -lrpcsvc diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index bd9b34e..4b931a8 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -10,7 +10,6 @@ CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) CFLAGS+= -DOPENSSL -DISTRIBUTION= crypto .endif .if exists(${.OBJDIR}/../libparse) diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index e6715ce..89c2593 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -8,7 +8,6 @@ LIBINSTALL= ${.CURDIR}/../lib/libinstall.a .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \ defined(LDADD) && ${LDADD:M-lfetch} != "" -DISTRIBUTION= crypto DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/sign/Makefile b/usr.sbin/pkg_install/sign/Makefile index 7355535..7821b52 100644 --- a/usr.sbin/pkg_install/sign/Makefile +++ b/usr.sbin/pkg_install/sign/Makefile @@ -9,7 +9,6 @@ SRCS= main.c check.c common.c gzip.c pgp_check.c pgp_sign.c \ CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -DISTRIBUTION= crypto DPADD= ${LIBINSTALL} ${LIBMD} ${LIBCRYPTO} LDADD= ${LIBINSTALL} -lmd -lcrypto diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index aebeac8..0739818 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -74,7 +74,6 @@ SRCS+= id.c .if defined(RELEASE_CRUNCH) || defined(NOCRYPT) || defined(NO_OPENSSL) CFLAGS+=-DNODES .else -DISTRIBUTION=crypto SRCS+= chap_ms.c mppe.c LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index b6b52af..e2f4bd8 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -31,7 +31,6 @@ LDADD+= -lpcap # MS-CHAP support. Requires the DES library. .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) -DISTRIBUTION=crypto CFLAGS+= -DCHAPMS SRCS+= chap_ms.c LDADD+= -lcrypto diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 7166eb9..7365c57 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -786,7 +786,7 @@ installCustomCommit(dialogMenuItem *self) * installation but come back here again to load more distributions, * perhaps from a different media type. This would allow, for * example, the user to load the majority of the system from CDROM and - * then use ftp to load just the CRYPTO dist. + * then use ftp to load a different dist. */ int installCommit(dialogMenuItem *self) diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 6830754..038355a 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -45,8 +45,6 @@ setSrc(dialogMenuItem *self) { Dists |= DIST_SRC; SrcDists = DIST_SRC_ALL; - CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE | - DIST_CRYPTO_SKERBEROS5); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -55,8 +53,6 @@ clearSrc(dialogMenuItem *self) { Dists &= ~DIST_SRC; SrcDists = 0; - CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE | - DIST_CRYPTO_SKERBEROS5); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -156,13 +152,13 @@ checkDistXUser(dialogMenuItem *self) static int checkDistMinimum(dialogMenuItem *self) { - return Dists == (DIST_BASE | DIST_CRYPTO); + return Dists == (DIST_BASE); } static int checkDistEverything(dialogMenuItem *self) { - return Dists == DIST_ALL && CRYPTODists == DIST_CRYPTO_ALL && + return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && _IS_SET(XF86Dists, DIST_XF86_ALL) && _IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && @@ -976,8 +972,6 @@ DMenu MenuSubDistributions = { { " compat4x", "FreeBSD 4.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X }, #endif - { " crypto", "Basic encryption services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", @@ -1022,6 +1016,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, + { " crypto", "/usr/src/crypto (contrib encryption sources)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SCRYPTO }, { " gnu", "/usr/src/gnu (software from the GNU Project)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU }, { " etc", "/usr/src/etc (miscellaneous system files)", @@ -1030,6 +1026,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES }, { " include", "/usr/src/include (header files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE }, + { " krb5", "/usr/src/kerberos5 (sources for Kerberos5)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SKERBEROS5 }, { " lib", "/usr/src/lib (system libraries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, { " libexec", "/usr/src/libexec (system programs)", @@ -1040,14 +1038,10 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN }, { " sbin", "/usr/src/sbin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN }, - { " scrypto", "/usr/src/crypto (contrib encryption sources)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO }, + { " secure", "/usr/src/secure (BSD encryption sources)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SSECURE }, { " share", "/usr/src/share (documents and shared files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE }, - { " skrb5", "/usr/src/kerberos5 (sources for Kerberos5)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 }, - { " ssecure", "/usr/src/secure (BSD encryption sources)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE }, { " sys", "/usr/src/sys (FreeBSD kernel)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS }, { " tools", "/usr/src/tools (miscellaneous tools)", diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8 index 9a68698..078f0cc 100644 --- a/usr.sbin/sade/sade.8 +++ b/usr.sbin/sade/sade.8 @@ -429,8 +429,6 @@ Profiled libraries for developers. Dictionary information (for tools like spell). .It Li info GNU info files and other extra docs. -.It Li crypto -Encryption binaries and libraries. .It Li compat1x Compatibility with .Fx @@ -635,11 +633,6 @@ Selects the full whack - all available distributions. .Pp .Sy Variables : None -.It distSetCRYPTO -Interactively select encryption subcomponents. -.Pp -.Sy Variables : -None .It distSetSrc Interactively select source subcomponents. .Pp diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 8655ea7..8ae783e 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -108,7 +108,6 @@ #define VAR_DISKINTERACTIVE "diskInteractive" #define VAR_DISTS "dists" #define VAR_DIST_MAIN "distMain" -#define VAR_DIST_CRYPTO "distCRYPTO" #define VAR_DIST_SRC "distSRC" #define VAR_DIST_X11 "distX11" #define VAR_DIST_XSERVER "distXserver" @@ -416,7 +415,6 @@ extern Boolean OnVTY; /* On a syscons VTY? */ extern Variable *VarHead; /* The head of the variable chain */ extern Device *mediaDevice; /* Where we're getting our distribution from */ extern unsigned int Dists; /* Which distributions we want */ -extern unsigned int CRYPTODists; /* Which naughty distributions we want */ extern unsigned int SrcDists; /* Which src distributions we want */ extern unsigned int XF86Dists; /* Which XFree86 dists we want */ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */ diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 01496f8..86e7eda 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -63,7 +63,6 @@ CLEANFILES+=sm_os.h .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) # STARTTLS support -DISTRIBUTION= crypto CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index bcf3bf9..5619e13 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -43,7 +43,6 @@ #include <libutil.h> unsigned int Dists; -unsigned int CRYPTODists; unsigned int SrcDists; unsigned int XF86Dists; unsigned int XF86ServerDists; @@ -63,7 +62,6 @@ typedef struct _dist { } Distribution; extern Distribution DistTable[]; -extern Distribution CRYPTODistTable[]; extern Distribution SrcDistTable[]; extern Distribution XF86DistTable[]; extern Distribution XF86FontDistTable[]; @@ -89,7 +87,6 @@ static Distribution DistTable[] = { DTE_TARBALL("dict", &Dists, DICT, "/"), DTE_TARBALL("info", &Dists, INFO, "/"), DTE_SUBDIST("src", &Dists, SRC, SrcDistTable), - DTE_SUBDIST("crypto", &Dists, CRYPTO, CRYPTODistTable), #ifdef __i386__ DTE_TARBALL("compat1x", &Dists, COMPAT1X, "/"), DTE_TARBALL("compat20", &Dists, COMPAT20, "/"), @@ -107,27 +104,21 @@ static Distribution DistTable[] = { { NULL }, }; -/* The CRYPTO distribution */ -static Distribution CRYPTODistTable[] = { - DTE_TARBALL("crypto", &CRYPTODists, CRYPTO_CRYPTO, "/"), - DTE_TARBALL("ssecure", &CRYPTODists, CRYPTO_SSECURE, "/usr/src"), - DTE_TARBALL("scrypto", &CRYPTODists, CRYPTO_SCRYPTO, "/usr/src"), - DTE_TARBALL("skrb5", &CRYPTODists, CRYPTO_SKERBEROS5, "/usr/src"), - { NULL }, -}; - /* The /usr/src distribution */ static Distribution SrcDistTable[] = { DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"), DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"), + DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"), DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"), DTE_TARBALL("setc", &SrcDists, SRC_ETC, "/usr/src"), DTE_TARBALL("sgames", &SrcDists, SRC_GAMES, "/usr/src"), DTE_TARBALL("sinclude", &SrcDists, SRC_INCLUDE, "/usr/src"), + DTE_TARBALL("skrb5", &SrcDists, SRC_SKERBEROS5, "/usr/src"), DTE_TARBALL("slib", &SrcDists, SRC_LIB, "/usr/src"), DTE_TARBALL("slibexec", &SrcDists, SRC_LIBEXEC, "/usr/src"), DTE_TARBALL("srelease", &SrcDists, SRC_RELEASE, "/usr/src"), DTE_TARBALL("sbin", &SrcDists, SRC_BIN, "/usr/src"), + DTE_TARBALL("ssecure", &SrcDists, SRC_SSECURE, "/usr/src"), DTE_TARBALL("ssbin", &SrcDists, SRC_SBIN, "/usr/src"), DTE_TARBALL("sshare", &SrcDists, SRC_SHARE, "/usr/src"), DTE_TARBALL("ssys", &SrcDists, SRC_SYS, "/usr/src"), @@ -176,10 +167,6 @@ distVerifyFlags(void) { if (SrcDists) Dists |= DIST_SRC; - if (CRYPTODists) - Dists |= DIST_CRYPTO; - else if ((Dists & DIST_CRYPTO) && !CRYPTODists) - CRYPTODists |= DIST_CRYPTO_ALL; if (XF86ServerDists) XF86Dists |= DIST_XF86_SERVER; if (XF86FontDists) @@ -187,8 +174,8 @@ distVerifyFlags(void) if (XF86Dists || XF86ServerDists || XF86FontDists) Dists |= DIST_XF86; if (isDebug()) { - msgDebug("Dist Masks: Dists: %0x, CRYPTO: %0x, Srcs: %0x\n", Dists, - CRYPTODists, SrcDists); + msgDebug("Dist Masks: Dists: %0x, Srcs: %0x\n", Dists, + SrcDists); msgDebug("XServer: %0x, XFonts: %0x, XDists: %0x\n", XF86ServerDists, XF86FontDists, XF86Dists); } @@ -198,7 +185,6 @@ int distReset(dialogMenuItem *self) { Dists = 0; - CRYPTODists = 0; SrcDists = 0; XF86Dists = 0; XF86ServerDists = 0; @@ -216,9 +202,6 @@ distConfig(dialogMenuItem *self) if ((cp = variable_get(VAR_DIST_MAIN)) != NULL) Dists = atoi(cp); - if ((cp = variable_get(VAR_DIST_CRYPTO)) != NULL) - CRYPTODists = atoi(cp); - if ((cp = variable_get(VAR_DIST_SRC)) != NULL) SrcDists = atoi(cp); @@ -252,7 +235,6 @@ distSetDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; - CRYPTODists = DIST_CRYPTO_ALL; i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -277,7 +259,6 @@ distSetKernDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_SYS; - CRYPTODists |= DIST_CRYPTO_CRYPTO; i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -301,7 +282,6 @@ distSetUser(dialogMenuItem *self) distReset(NULL); Dists = _DIST_USER; - CRYPTODists |= DIST_CRYPTO_CRYPTO; i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -322,8 +302,7 @@ int distSetMinimum(dialogMenuItem *self) { distReset(NULL); - Dists = DIST_BASE | DIST_CRYPTO; - CRYPTODists |= DIST_CRYPTO_CRYPTO; + Dists = DIST_BASE; distVerifyFlags(); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -335,7 +314,6 @@ distSetEverything(dialogMenuItem *self) Dists = DIST_ALL | DIST_XF86; SrcDists = DIST_SRC_ALL; - CRYPTODists = DIST_CRYPTO_ALL; XF86Dists = DIST_XF86_ALL; XF86ServerDists = DIST_XF86_SERVER_ALL; XF86FontDists = DIST_XF86_FONTS_ALL; diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 13265f5..df94357 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -23,20 +23,12 @@ #define DIST_COMPAT4X 0x02000 #endif #define DIST_XF86 0x04000 -#define DIST_CRYPTO 0x08000 #define DIST_CATPAGES 0x10000 #define DIST_PORTS 0x20000 #define DIST_LOCAL 0x40000 #define DIST_PERL 0x80000 #define DIST_ALL 0xFFFFF -/* Subtypes for CRYPTO distribution */ -#define DIST_CRYPTO_CRYPTO 0x0001 -#define DIST_CRYPTO_SCRYPTO 0x0002 -#define DIST_CRYPTO_SSECURE 0x0004 -#define DIST_CRYPTO_SKERBEROS5 0x0008 -#define DIST_CRYPTO_ALL 0x000F - /* Subtypes for SRC distribution */ #define DIST_SRC_BASE 0x00001 #define DIST_SRC_CONTRIB 0x00002 @@ -54,7 +46,10 @@ #define DIST_SRC_UBIN 0x02000 #define DIST_SRC_USBIN 0x04000 #define DIST_SRC_BIN 0x08000 -#define DIST_SRC_ALL 0x0FFFF +#define DIST_SRC_SCRYPTO 0x10000 +#define DIST_SRC_SSECURE 0x20000 +#define DIST_SRC_SKERBEROS5 0x40000 +#define DIST_SRC_ALL 0x7FFFF /* Subtypes for XFree86 packages */ #define DIST_XF86_CLIENTS 0x0001 @@ -81,7 +76,7 @@ /* Canned distribution sets */ #define _DIST_USER \ - ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO | DIST_PERL ) + ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PERL ) #define _DIST_DEVELOPER \ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp index 53b691f..b6bae5c 100644 --- a/usr.sbin/sysinstall/help/distributions.hlp +++ b/usr.sbin/sysinstall/help/distributions.hlp @@ -11,9 +11,6 @@ setup. Any distribution may be further customized by selecting the `Custom' item before leaving the menu. -N.B. All references in this document to `complete source' mean the -complete source tree minus any legally encumbered cryptography code. - The current "canned" installations are provided: Developer: Base ("bin") distribution, man pages, dictionary @@ -32,10 +29,6 @@ Everything: The base distribution, man pages, dictionary files, the complete source tree, games and your choice of XFree86 distribution components. - Note that the cryptography source code is NOT included - in this collection. You will need to select that by - hand if you're inside the United States. - Custom: Allows you to create or modify your distribution set on a piece-by-piece basis. diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 7166eb9..7365c57 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -786,7 +786,7 @@ installCustomCommit(dialogMenuItem *self) * installation but come back here again to load more distributions, * perhaps from a different media type. This would allow, for * example, the user to load the majority of the system from CDROM and - * then use ftp to load just the CRYPTO dist. + * then use ftp to load a different dist. */ int installCommit(dialogMenuItem *self) diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 6830754..038355a 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -45,8 +45,6 @@ setSrc(dialogMenuItem *self) { Dists |= DIST_SRC; SrcDists = DIST_SRC_ALL; - CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE | - DIST_CRYPTO_SKERBEROS5); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -55,8 +53,6 @@ clearSrc(dialogMenuItem *self) { Dists &= ~DIST_SRC; SrcDists = 0; - CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE | - DIST_CRYPTO_SKERBEROS5); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -156,13 +152,13 @@ checkDistXUser(dialogMenuItem *self) static int checkDistMinimum(dialogMenuItem *self) { - return Dists == (DIST_BASE | DIST_CRYPTO); + return Dists == (DIST_BASE); } static int checkDistEverything(dialogMenuItem *self) { - return Dists == DIST_ALL && CRYPTODists == DIST_CRYPTO_ALL && + return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && _IS_SET(XF86Dists, DIST_XF86_ALL) && _IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && @@ -976,8 +972,6 @@ DMenu MenuSubDistributions = { { " compat4x", "FreeBSD 4.x binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X }, #endif - { " crypto", "Basic encryption services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", @@ -1022,6 +1016,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, + { " crypto", "/usr/src/crypto (contrib encryption sources)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SCRYPTO }, { " gnu", "/usr/src/gnu (software from the GNU Project)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU }, { " etc", "/usr/src/etc (miscellaneous system files)", @@ -1030,6 +1026,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES }, { " include", "/usr/src/include (header files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE }, + { " krb5", "/usr/src/kerberos5 (sources for Kerberos5)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SKERBEROS5 }, { " lib", "/usr/src/lib (system libraries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, { " libexec", "/usr/src/libexec (system programs)", @@ -1040,14 +1038,10 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN }, { " sbin", "/usr/src/sbin (system binaries)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN }, - { " scrypto", "/usr/src/crypto (contrib encryption sources)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO }, + { " secure", "/usr/src/secure (BSD encryption sources)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SSECURE }, { " share", "/usr/src/share (documents and shared files)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE }, - { " skrb5", "/usr/src/kerberos5 (sources for Kerberos5)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 }, - { " ssecure", "/usr/src/secure (BSD encryption sources)", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE }, { " sys", "/usr/src/sys (FreeBSD kernel)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS }, { " tools", "/usr/src/tools (miscellaneous tools)", diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 9a68698..078f0cc 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -429,8 +429,6 @@ Profiled libraries for developers. Dictionary information (for tools like spell). .It Li info GNU info files and other extra docs. -.It Li crypto -Encryption binaries and libraries. .It Li compat1x Compatibility with .Fx @@ -635,11 +633,6 @@ Selects the full whack - all available distributions. .Pp .Sy Variables : None -.It distSetCRYPTO -Interactively select encryption subcomponents. -.Pp -.Sy Variables : -None .It distSetSrc Interactively select source subcomponents. .Pp diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 8655ea7..8ae783e 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -108,7 +108,6 @@ #define VAR_DISKINTERACTIVE "diskInteractive" #define VAR_DISTS "dists" #define VAR_DIST_MAIN "distMain" -#define VAR_DIST_CRYPTO "distCRYPTO" #define VAR_DIST_SRC "distSRC" #define VAR_DIST_X11 "distX11" #define VAR_DIST_XSERVER "distXserver" @@ -416,7 +415,6 @@ extern Boolean OnVTY; /* On a syscons VTY? */ extern Variable *VarHead; /* The head of the variable chain */ extern Device *mediaDevice; /* Where we're getting our distribution from */ extern unsigned int Dists; /* Which distributions we want */ -extern unsigned int CRYPTODists; /* Which naughty distributions we want */ extern unsigned int SrcDists; /* Which src distributions we want */ extern unsigned int XF86Dists; /* Which XFree86 dists we want */ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */ diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index bbdb21b..1117f17a 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -43,7 +43,6 @@ CFLAGS+= -DLBL_ALIGN DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) -DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H |
