From 6e611c2e750cfb594a5741881382e5edce269592 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 20 Apr 2008 16:46:17 +0000
Subject: Try to make clear that SOCKS proxying is currently BROKEN.

 /trunk/config/global/download_extract.in |   36    19    17     0 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/config/global/download_extract.in b/config/global/download_extract.in
index 0b4855d..2bd524e 100644
--- a/config/global/download_extract.in
+++ b/config/global/download_extract.in
@@ -60,7 +60,7 @@ config PROXY_HOST
 config PROXY_PORT
     int
     prompt "port"
-    default 0
+    default 8080
     
 config PROXY_USER
     string
@@ -82,13 +82,15 @@ config PROXY_TYPE_SOCKS
       on your proxy configuration, so;e do not allow all protocols, but
       chances are that protocols needed by crosstool-NG are allowed).
 
-      Alternatively to setting this option, you can set and export the
-      following variable in your environment:
-        LD_PRELOAD=/path/to/your/tsocks-library.so
+      Please note that the proxy you are using MUST be on the same subnet
+      as your machine. That is, it must be reachable without a hop through
+      any gate. If this is not the case, then do NOT use this option, and
+      setup tsocks system-wide.
 
-      In any case, wether you set this option or you export the aforementionned
-      variable, you will _have_ to  configure the /etc/tsocks.conf file
-      accordingly to your network setup.
+      Alternatively to setting this option, you can configure tsocks
+      system-wide, and set and export the following variable in your
+      environment:
+        LD_PRELOAD=/path/to/your/tsocks-library.so
 
       This option makes use of the tsocks library. You will have to have tsocks
       installed on your system, of course.
@@ -107,30 +109,30 @@ config PROXY_TYPE_SOCKS_SYS
     bool
     prompt "Use system settings"
     help
-      Use that if your system is already configured to
-      connect to SOCKS 4/5 proxies.
+      Use that if tsocks is already configured on your system.
 
 config PROXY_TYPE_SOCKS_AUTO
     bool
-    prompt "Auto"
+    prompt "Auto (BROKEN)"
+    depends on BROKEN
     help
-      crosstool-NG will attempt to guess what type of
-      SOCKS version the proxy speaks.
+      crosstool-NG will attempt to guess what type of SOCKS version
+      the proxy speaks.
 
 config PROXY_TYPE_SOCKS_4
     bool
-    prompt "SOCKS 4"
+    prompt "SOCKS 4 (BROKEN)"
+    depends on BROKEN
 
 config PROXY_TYPE_SOCKS_5
     bool
-    prompt "SOCKS 5"
+    prompt "SOCKS 5 (BROKEN)"
+    depends on BROKEN
 
 endchoice
 
 if ! PROXY_TYPE_SOCKS_SYS
 
-comment "THIS IS HIGHLY EXPERIMENTAL!!!"
-
 config PROXY_HOST
     string
     prompt "hostname/IP"
@@ -138,7 +140,7 @@ config PROXY_HOST
 config PROXY_PORT
     int
     prompt "port"
-    default 0
+    default 1080
 
 config PROXY_USER
     string
-- 
cgit v0.10.2-6-g49f6