diff options
| author | cperciva <cperciva@FreeBSD.org> | 2004-08-06 07:27:08 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2004-08-06 07:27:08 +0000 |
| commit | e629b376037f3ea6c6c000e8c0767496ab0778d0 (patch) | |
| tree | 5a94c4ef976cf82b4cbfdbeb1c0fb7f04c05c3bf /usr.sbin/sysinstall/dist.h | |
| parent | b665823aa48f879cf1c50bc634515bae59b6dc32 (diff) | |
| download | FreeBSD-src-e629b376037f3ea6c6c000e8c0767496ab0778d0.zip FreeBSD-src-e629b376037f3ea6c6c000e8c0767496ab0778d0.tar.gz | |
Join the 21st century: Cryptography is no longer an optional component
of releases. The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.
Approved by: re (scottl), markm
Discussed on: freebsd-current, in late April 2004
Diffstat (limited to 'usr.sbin/sysinstall/dist.h')
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 15 |
1 files changed, 5 insertions, 10 deletions
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 ) |
