Terminate, with extreme prejudice, the USAResident hack which

does bad things to /etc/make.conf in certain situations.  Also
soften the "don't install crypto from the USA!" messages since,
except for RSA (which is still noted), that's not so true anymore.

1 files changed, 0 insertions, 38 deletions

diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 7c43f65..888151f 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -584,43 +584,6 @@ nodisks:
 	(void)configLinux(self);
 #endif
 
-#ifdef notyet
-    dialog_clear();
-    if (USAResident) {
-	if (!msgYesNo("I see that you are \"USA_RESIDENT\" according to your earlier\n"
-	    "response to the CRYPTO distribution dialog.  Do you want to try and\n"
-	    "load the rsaref package from the current media?  Some restrictions on\n"
-	    "usage may apply, so be sure to read the package installation output!")) {
-	    dialog_clear();
-	    _interactiveHack = 1;
-	    if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
-		msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
-		    	   "This is probably because you are installing from a CDROM which\n"
-			   "was produced for world-wide use, in which case the RSA patent\n"
-			   "prevents distribution of RSA code on CD.  Please change your\n"
-			   "media device to point to an International FTP server and install\n"
-			   "the rsaref package manually through the Packages menu.");
-	    }
-	    dialog_clear();
-	    _interactiveHack = 0;
-	}
-    }
-    else {
-	if (!msgYesNo("I see that you are not \"USA_RESIDENT\" according to your earlier\n"
-	    "response to the CRYPTO distribution dialog.  Do you want to try and\n"
-	    "load the rsaintl package from the current media?")) {
-	    if (DITEM_STATUS(package_add("rsaintl")) != DITEM_SUCCESS) {
-		msgConfirm("Unable to find an rsaintl package on the current intallation media.\n"
-		    	   "This is probably because you are installing from a CDROM which\n"
-			   "was produced for use in the USA, in which case the RSA patent\n"
-			   "prevents distribution of RSA code on CD.  Please change your\n"
-			   "media device to point to an International FTP server and install\n"
-			   "the rsaintl package manually through the Packages menu.");
-	    }
-	}
-    }
-#endif	/* notyet */
-
     dialog_clear_norefresh();
     if (!msgYesNo("Does this system have a non-USB mouse attached to it?"))
 	dmenuOpenSimple(&MenuMouse, FALSE);
@@ -1119,7 +1082,6 @@ installEnvironment(void)
     configEnvironmentRC_conf();
     if (file_readable("/etc/resolv.conf"))
 	configEnvironmentResolv("/etc/resolv.conf");
-    configMake_conf("/etc/make.conf");
 }
 
 /* Copy the boot floppy contents into /stand */