--- a/ChangeLog	Mon Feb 23 00:20:38 2009 +0000
+++ b/ChangeLog	Mon Feb 23 04:09:03 2009 +0000
@@ -1,3 +1,11 @@
+2009-02-23 Ke Wang <[email protected]>
+	* manpages/man3/libproxy.3: Added some description
+	* base-specs/libproxy.spec:
+	* patches/libproxy-02-wpad-fallback.diff:
+		Make wapd-fallback plugin be built by default, but not be
+		checked against. User can enable it by adding it to the
+		PX_CONFIG_ORDER environment variable.
+
 2009-02-22  Dave Lin <[email protected]>
 
 	* cron-script.sh: Changed to build SUNWgnome-img-organizer with SS12.

--- a/base-specs/libproxy.spec	Mon Feb 23 00:20:38 2009 +0000
+++ b/base-specs/libproxy.spec	Mon Feb 23 04:09:03 2009 +0000
@@ -61,8 +61,7 @@
             --sysconfdir=%{_sysconfdir}		 \
 	    --mandir=%{_mandir}			 \
 	    --libexecdir=%{_libexecdir}		 \
-            --without-kde			 \
-            --without-wpad-fallback
+            --without-kde	
 make
 
 %install
@@ -84,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 23 2009 - [email protected]
+- make wpad-fallback be built by default, but not be check against
+  user can use PX_CONFIG_ORDER to enable it
 * Mon Feb 16 2009 - [email protected]
 - Add patch libproxy-04-py-find-lib.diff for python binding
 * Fri Feb 13 2009 - [email protected]

--- a/manpages/man3/libproxy.3	Mon Feb 23 00:20:38 2009 +0000
+++ b/manpages/man3/libproxy.3	Mon Feb 23 04:09:03 2009 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
 <!--ArborText, Inc., 1988-1999, v.4002-->
-<!--ARC : -->
+<!--ARC : LSARC 2009/088 Libproxy for Opensolaris-->
 <!ENTITY cmd "libproxy">
 <!ENTITY % commonents SYSTEM "smancommon.ent">
 %commonents;
@@ -28,6 +28,20 @@
 Libproxy provides interfaces to get proxy that should be used to access
 a network resource. It use various plugins to get proxy configuration from
 different places e.g. environment variables, GConf, PAC.
+
+The order in which each proxy configuration should be checked is determined
+by a environment PX_CONFIG_ORDER, the default order is "USER,SESSION,SYSTEM,
+envvar". USER, SESSION and SYSTEM are all categories of proxy configuration.
+envvar means the plugin who get proxy setting from environment variable.
+
+GConf plugin belongs to the SESSION category, so GConf setting will be checked
+before environment variable.
+
+Libproxy also supports the feature of WPAD. But for the consideration of security
+risk imported by WPAD, wpad-fallback plugin is disabled by default. Users who
+want to enable this feature can export PX_CONFIG_ORDER to "USER,SESSION,SYSTEM,
+envvar,wpad-fallback", so the WPAD will be tried if all the other plugins are failed
+to get a proxy.
 </para>
 </refsect1>
 <refsect1 id="libproxy-3-file"><title>&file-tt;</title>

--- a/patches/libproxy-02-wpad-fallback.diff	Mon Feb 23 00:20:38 2009 +0000
+++ b/patches/libproxy-02-wpad-fallback.diff	Mon Feb 23 04:09:03 2009 +0000
@@ -32,7 +32,7 @@
  #include "config_file.h"
  
 -#define DEFAULT_CONFIG_ORDER "USER,SESSION,SYSTEM"
-+#define DEFAULT_CONFIG_ORDER "USER,SESSION,SYSTEM,envvar,wpad-fallback"
++#define DEFAULT_CONFIG_ORDER "USER,SESSION,SYSTEM,envvar"
  
  struct _pxProxyFactoryConfig {
  	pxConfigCategory           category;