4 files changed, 77 insertions, 66 deletions

diff --git a/release/sysinstall/help/distributions.hlp b/release/sysinstall/help/distributions.hlp
index 16c095bc8050..aa9a25fbb182 100644
--- a/release/sysinstall/help/distributions.hlp
+++ b/release/sysinstall/help/distributions.hlp
@@ -2,7 +2,7 @@ DISTRIBUTION INFORMATION
 ------------------------
 
 An ``X-'' prefixed before a distribution set means that the XFree86
-3.3.2 base distribution, libraries, manual pages, SVGA server and a
+3.3.2.1 base distribution, libraries, manual pages, SVGA server and a
 set of default fonts will be selected in addition to the set itself.
 If you select such a set, you will also be presented with a set of
 menus for customizing the selections to your desired X Window System
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index 8d67aa437c5d..bae346c61dac 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -14,8 +14,14 @@ o MSDOS FAT32 (Win95 long filename) support.
 
 Userland features:
 
+inetd(8) now allows rate-limiting for services.
+
+Many man pages and other docs updated and cleaned up.
+
 Security issues:
 
+popper and imap upgraded in ports collection to close some nasty security
+holes (see Bugtrax).
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 55559d595db4..3c7eea176e7a 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.89.2.72 1998/04/16 13:58:18 ache Exp $
+ * $Id: menus.c,v 1.89.2.73 1998/07/20 10:45:53 yokota Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -122,52 +122,57 @@ clearX11Fonts(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
-#define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
-				   (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
-#define IS_USER(dist, extra) ((((dist) & (_DIST_USER | (extra))) == (_DIST_USER | (extra))) || \
-			      (((dist) & (_DIST_USER | DIST_DES | (extra))) == (_DIST_USER | DIST_DES | (extra))))
+#define _IS_SET(dist, set) (((dist) & (set)) == (set))
+
+#define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
+	_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
+
+#define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
+	_IS_SET(dist, _DIST_USER | DIST_DES | extra))
 
 static int
 checkDistDeveloper(dialogMenuItem *self)
 {
-    return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_ALL);
+    return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_ALL);
 }
 
 static int
 checkDistXDeveloper(dialogMenuItem *self)
 {
-    return (IS_DEVELOPER(Dists, DIST_XF86) && SrcDists == DIST_SRC_ALL);
+    return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
 }
 
 static int
 checkDistKernDeveloper(dialogMenuItem *self)
 {
-    return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_SYS);
+    return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_SYS);
 }
 
 static int
 checkDistUser(dialogMenuItem *self)
 {
-    return (IS_USER(Dists, 0));
+    return IS_USER(Dists, 0);
 }
 
 static int
 checkDistXUser(dialogMenuItem *self)
 {
-    return (IS_USER(Dists, DIST_XF86));
+    return IS_USER(Dists, DIST_XF86);
 }
 
 static int
 checkDistMinimum(dialogMenuItem *self)
 {
-    return (Dists == DIST_BIN);
+    return Dists == DIST_BIN;
 }
 
 static int
 checkDistEverything(dialogMenuItem *self)
 {
-    return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
-	    XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
+    return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && \
+	_IS_SET(XF86Dists, DIST_XF86_ALL) && \
+	_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && \
+	_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
 }
 
 static int
@@ -754,7 +759,7 @@ DMenu MenuSubDistributions = {
 	srcFlagCheck,	distSetSrc },
       { "ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
-      { "XFree86",	"The XFree86 3.3.2 distribution",
+      { "XFree86",	"The XFree86 3.3.2.1 distribution",
 	x11FlagCheck,	distSetXF86 },
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
@@ -841,8 +846,8 @@ DMenu MenuSrcDistributions = {
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
-    "XFree86 3.3.2 Distribution",
-    "Please select the components you need from the XFree86 3.3.2\n"
+    "XFree86 3.3.2.1 Distribution",
+    "Please select the components you need from the XFree86 3.3.2.1\n"
     "distribution sets.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
@@ -857,7 +862,7 @@ DMenu MenuXF86Select = {
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
-    "XFree86 3.3.2 base distribution types",
+    "XFree86 3.3.2.1 base distribution types",
     "Please check off the basic XFree86 components you wish to install.\n"
     "Bin, lib, and set are recommended for a minimum installaion.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
@@ -884,9 +889,9 @@ DMenu MenuXF86SelectCore = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
       { "9set",		"XFree86 Setup Utility for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
-      { "sources",	"XFree86 3.3.2 standard sources",
+      { "sources",	"XFree86 3.3.2.1 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-      { "csources",	"XFree86 3.3.2 contrib sources",
+      { "csources",	"XFree86 3.3.2.1 contrib sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
       { "All",		"Select all of the above",
 	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index 0fc294918a63..1fc1d5f2f1c0 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.1.2.6 1998/03/07 09:09:21 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.1.2.7 1998/07/16 10:35:25 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -417,93 +417,93 @@ XFree86 official sources.
 .It Li XF86-co
 XFree86 contributed sources.
 .It Li X332bin
-XFree86 3.3.2 binaries.
+XFree86 3.3.2.1 binaries.
 .It Li X332cfg
-XFree86 3.3.2 configuration files.
+XFree86 3.3.2.1 configuration files.
 .It Li X332doc
-XFree86 3.3.2 documentation.
+XFree86 3.3.2.1 documentation.
 .It Li X332html
-XFree86 3.3.2 HTML documentation.
+XFree86 3.3.2.1 HTML documentation.
 .It Li X332lib
-XFree86 3.3.2 libraries.
+XFree86 3.3.2.1 libraries.
 .It Li X332lk98
-XFree86 3.3.2 server link-kit for PC98 machines.
+XFree86 3.3.2.1 server link-kit for PC98 machines.
 .It Li X332lkit
-XFree86 3.3.2 server link-kit for standard machines.
+XFree86 3.3.2.1 server link-kit for standard machines.
 .It Li X332man
-XFree86 3.3.2 manual pages.
+XFree86 3.3.2.1 manual pages.
 .It Li X332prog
-XFree86 3.3.2 programmer's distribution.
+XFree86 3.3.2.1 programmer's distribution.
 .It Li X332ps
-XFree86 3.3.2 postscript documentation.
+XFree86 3.3.2.1 postscript documentation.
 .It Li X332set
-XFree86 3.3.2 graphical setup tool.
+XFree86 3.3.2.1 graphical setup tool.
 .It Li X3328514
-XFree86 3.3.2 8514 server.
+XFree86 3.3.2.1 8514 server.
 .It Li X3329480
-XFree86 3.3.2 PC98 8-bit (256 color) PEGC-480 server.
+XFree86 3.3.2.1 PC98 8-bit (256 color) PEGC-480 server.
 .It Li X3329EGC
-XFree86 3.3.2 PC98 4-bit (16 color) EGC server.
+XFree86 3.3.2.1 PC98 4-bit (16 color) EGC server.
 .It Li X3329GA9
-XFree86 3.3.2 PC98 GA-968V4/PCI (S3 968) server.
+XFree86 3.3.2.1 PC98 GA-968V4/PCI (S3 968) server.
 .It Li X3329GAN
-XFree86 3.3.2 PC98 GANB-WAP (cirrus) server.
+XFree86 3.3.2.1 PC98 GANB-WAP (cirrus) server.
 .It Li X3329LPW
-XFree86 3.3.2 PC98 PowerWindowLB (S3) server.
+XFree86 3.3.2.1 PC98 PowerWindowLB (S3) server.
 .It Li X3329NKV
-XFree86 3.3.2 PC98 NKV-NEC (cirrus) server.
+XFree86 3.3.2.1 PC98 NKV-NEC (cirrus) server.
 .It Li X3329NS3
-XFree86 3.3.2 PC98 NEC (S3) server.
+XFree86 3.3.2.1 PC98 NEC (S3) server.
 .It Li X3329SPW
-XFree86 3.3.2 PC98 SKB-PowerWindow (S3) server.
+XFree86 3.3.2.1 PC98 SKB-PowerWindow (S3) server.
 .It Li X3329TGU
-XFree86 3.3.2 PC98 Cyber9320 and TGUI9680 server.
+XFree86 3.3.2.1 PC98 Cyber9320 and TGUI9680 server.
 .It Li X3329WEP
-XFree86 3.3.2 PC98 WAB-EP (cirrus) server.
+XFree86 3.3.2.1 PC98 WAB-EP (cirrus) server.
 .It Li X3329WS
-XFree86 3.3.2 PC98 WABS (cirrus) server.
+XFree86 3.3.2.1 PC98 WABS (cirrus) server.
 .It Li X3329WSN
-XFree86 3.3.2 PC98 WSN-A2F (cirrus) server.
+XFree86 3.3.2.1 PC98 WSN-A2F (cirrus) server.
 .It Li X332AGX
-XFree86 3.3.2 8 bit AGX server.
+XFree86 3.3.2.1 8 bit AGX server.
 .It Li X332I128
-XFree86 3.3.2 #9 Imagine I128 server.
+XFree86 3.3.2.1 #9 Imagine I128 server.
 .It Li X332Ma8
-XFree86 3.3.2 ATI Mach8 server.
+XFree86 3.3.2.1 ATI Mach8 server.
 .It Li X332Ma32
-XFree86 3.3.2 ATI Mach32 server.
+XFree86 3.3.2.1 ATI Mach32 server.
 .It Li X332Ma64
-XFree86 3.3.2 ATI Mach64 server.
+XFree86 3.3.2.1 ATI Mach64 server.
 .It Li X332Mono
-XFree86 3.3.2 monochrome server.
+XFree86 3.3.2.1 monochrome server.
 .It Li X332P9K
-XFree86 3.3.2 P9000 server.
+XFree86 3.3.2.1 P9000 server.
 .It Li X332S3
-XFree86 3.3.2 S3 server.
+XFree86 3.3.2.1 S3 server.
 .It Li X332S3V
-XFree86 3.3.2 S3 Virge server.
+XFree86 3.3.2.1 S3 Virge server.
 .It Li X332SVGA
-XFree86 3.3.2 SVGA server.
+XFree86 3.3.2.1 SVGA server.
 .It Li X332VG16
-XFree86 3.3.2 VGA16 server.
+XFree86 3.3.2.1 VGA16 server.
 .It Li X332W32
-XFree86 3.3.2 ET4000/W32, /W32i and /W32p server.
+XFree86 3.3.2.1 ET4000/W32, /W32i and /W32p server.
 .It Li X332nest
-XFree86 3.3.2 nested X server.
+XFree86 3.3.2.1 nested X server.
 .It Li X332vfb
-XFree86 3.3.2 virtual frame-buffer X server.
+XFree86 3.3.2.1 virtual frame-buffer X server.
 .It Li X332fnts
-XFree86 3.3.2 base font set.
+XFree86 3.3.2.1 base font set.
 .It Li X332f100
-XFree86 3.3.2 100DPI font set.
+XFree86 3.3.2.1 100DPI font set.
 .It Li X332fcyr
-XFree86 3.3.2 Cyrillic font set.
+XFree86 3.3.2.1 Cyrillic font set.
 .It Li X332fscl
-XFree86 3.3.2 scalable font set.
+XFree86 3.3.2.1 scalable font set.
 .It Li X332fnon
-XFree86 3.3.2 non-english font set.
+XFree86 3.3.2.1 non-english font set.
 .It Li X332fsrv
-XFree86 3.3.2 font server.
+XFree86 3.3.2.1 font server.
 .El
 .It distSetDeveloper
 Selects the standard Developer's distribution set.
@@ -542,7 +542,7 @@ Interactively select source subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetXF86
-Interactively select XFree86 3.3.2 subcomponents.
+Interactively select XFree86 3.3.2.1 subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distExtractAll