7022166 userland patches should move to subdirs
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 01 Mar 2011 14:19:15 -0800
changeset 115 c360825c3a3f
parent 114 6cc95ec7b1bb
child 116 ae6a90899b42
7022166 userland patches should move to subdirs
components/a2ps/patches/sheets.map.patch
components/a2ps/sheets.map.patch
components/bash/bash41-001.patch
components/bash/bash41-002.patch
components/bash/bash41-003.patch
components/bash/bash41-004.patch
components/bash/bash41-005.patch
components/bash/bash41-006.patch
components/bash/bash41-007.patch
components/bash/bash41-008.patch
components/bash/bash41-009.patch
components/bash/patches/bash41-001.patch
components/bash/patches/bash41-002.patch
components/bash/patches/bash41-003.patch
components/bash/patches/bash41-004.patch
components/bash/patches/bash41-005.patch
components/bash/patches/bash41-006.patch
components/bash/patches/bash41-007.patch
components/bash/patches/bash41-008.patch
components/bash/patches/bash41-009.patch
components/bash/patches/solaris-000.config.h.in.patch
components/bash/patches/solaris-001.config-top.h.patch
components/bash/patches/solaris-002.Makefile.in.3.patch
components/bash/patches/solaris-003.glob.c.patch
components/bash/patches/solaris-004.snprintf.c.patch
components/bash/patches/solaris-005.variables.c.patch
components/bash/patches/solaris-006.signames.c.patch
components/bash/patches/solaris-007.rlprivate.h.patch
components/bash/patches/solaris-008.xmbsrtowcs.c.patch
components/bash/patches/solaris-009.configure.patch
components/bash/patches/solaris-010.input.c.patch
components/bash/patches/solaris-011.input_avail.c.patch
components/bash/patches/solaris-012.rlconf.h.patch
components/bash/patches/solaris-013.bashref.info.patch
components/bash/patches/solaris-014.bash.man.patch
components/bash/patches/solaris-015.rbash.man.patch
components/bash/solaris-000.config.h.in.patch
components/bash/solaris-001.config-top.h.patch
components/bash/solaris-002.Makefile.in.3.patch
components/bash/solaris-003.glob.c.patch
components/bash/solaris-004.snprintf.c.patch
components/bash/solaris-005.variables.c.patch
components/bash/solaris-006.signames.c.patch
components/bash/solaris-007.rlprivate.h.patch
components/bash/solaris-008.xmbsrtowcs.c.patch
components/bash/solaris-009.configure.patch
components/bash/solaris-010.input.c.patch
components/bash/solaris-011.input_avail.c.patch
components/bash/solaris-012.rlconf.h.patch
components/bash/solaris-013.bashref.info.patch
components/bash/solaris-014.bash.man.patch
components/bash/solaris-015.rbash.man.patch
components/bzip2/Makefile.patch
components/bzip2/bzip2.patch
components/bzip2/patches/Makefile.patch
components/bzip2/patches/bzip2.patch
components/coreutils/coreutils-8_5.patch
components/coreutils/patches/coreutils-8_5.patch
components/elinks/Makefile.lib.patch
components/elinks/patches/Makefile.lib.patch
components/gawk/gawk_manpage1.patch
components/gawk/igawk_manpage1.patch
components/gawk/patches/gawk_manpage1.patch
components/gawk/patches/igawk_manpage1.patch
components/ggrep/ggrep.patch
components/ggrep/patches/ggrep.patch
components/gtar/patches/verify.patch
components/gtar/patches/xgetcwd.patch
components/gtar/verify.patch
components/gtar/xgetcwd.patch
components/gzip/6294656-6283819.patch
components/gzip/6470484.patch
components/gzip/patches/6294656-6283819.patch
components/gzip/patches/6470484.patch
components/gzip/patches/version.patch
components/gzip/version.patch
components/lua/1.Makefile.patch
components/lua/2.lua.pc.patch
components/lua/3.headers.patch
components/lua/patches/1.Makefile.patch
components/lua/patches/2.lua.pc.patch
components/lua/patches/3.headers.patch
components/mercurial/manpages.patch
components/mercurial/patches/manpages.patch
components/patch/DESTDIR.patch
components/patch/patches/DESTDIR.patch
components/python/pyopenssl/no-zip_safe.patch
components/python/pyopenssl/patches/no-zip_safe.patch
components/python/python26/Python26-00-filemagic.patch
components/python/python26/Python26-01-solaris-lib-dirs.patch
components/python/python26/Python26-02-pycc.patch
components/python/python26/Python26-03-distutils-pycc.patch
components/python/python26/Python26-04-distutils-log.patch
components/python/python26/Python26-05-isalibs.patch
components/python/python26/Python26-06-write_compiled_module-atomic.patch
components/python/python26/Python26-07-dtrace.patch
components/python/python26/Python26-08-ctypes.patch
components/python/python26/Python26-09-ucred.patch
components/python/python26/Python26-10-gethostname.patch
components/python/python26/Python26-11-dlpi.patch
components/python/python26/Python26-12-encoding-alias.patch
components/python/python26/Python26-13-cflags.patch
components/python/python26/Python26-14-ctypes-util-find-library.patch
components/python/python26/Python26-15-getcwd.patch
components/python/python26/Python26-16-privrbac.patch
components/python/python26/Python26-17-netpacket-packet-h.patch
components/python/python26/Python26-18-readline.patch
components/python/python26/Python26-19-ext-stdio.patch
components/python/python26/Python26-20-py_db.patch
components/python/python26/Python26-21-getpass.patch
components/python/python26/Python26-22-bindir.patch
components/python/python26/patches/Python26-00-filemagic.patch
components/python/python26/patches/Python26-01-solaris-lib-dirs.patch
components/python/python26/patches/Python26-02-pycc.patch
components/python/python26/patches/Python26-03-distutils-pycc.patch
components/python/python26/patches/Python26-04-distutils-log.patch
components/python/python26/patches/Python26-05-isalibs.patch
components/python/python26/patches/Python26-06-write_compiled_module-atomic.patch
components/python/python26/patches/Python26-07-dtrace.patch
components/python/python26/patches/Python26-08-ctypes.patch
components/python/python26/patches/Python26-09-ucred.patch
components/python/python26/patches/Python26-10-gethostname.patch
components/python/python26/patches/Python26-11-dlpi.patch
components/python/python26/patches/Python26-12-encoding-alias.patch
components/python/python26/patches/Python26-13-cflags.patch
components/python/python26/patches/Python26-14-ctypes-util-find-library.patch
components/python/python26/patches/Python26-15-getcwd.patch
components/python/python26/patches/Python26-16-privrbac.patch
components/python/python26/patches/Python26-17-netpacket-packet-h.patch
components/python/python26/patches/Python26-18-readline.patch
components/python/python26/patches/Python26-19-ext-stdio.patch
components/python/python26/patches/Python26-20-py_db.patch
components/python/python26/patches/Python26-21-getpass.patch
components/python/python26/patches/Python26-22-bindir.patch
components/screen/misc.c.patch
components/screen/patches/misc.c.patch
components/screen/patches/terminfo.patch
components/screen/terminfo.patch
components/tcsh/001.config_f.h.patch
components/tcsh/002.sol-8bit.patch
components/tcsh/003.locale.patch
components/tcsh/patches/001.config_f.h.patch
components/tcsh/patches/002.sol-8bit.patch
components/tcsh/patches/003.locale.patch
components/wget/CVE-2010-2252.patch
components/wget/patches/CVE-2010-2252.patch
components/wget/patches/sysdep.h.patch
components/wget/patches/wgetrc.patch
components/wget/sysdep.h.patch
components/wget/wgetrc.patch
make-rules/prep.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/a2ps/patches/sheets.map.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,52 @@
+*** a2ps-4.13/sheets/sheets.map.orig	Wed May 12 15:37:37 2004
+--- a2ps-4.13/sheets/sheets.map	Wed May 12 15:48:45 2004
+***************
+*** 237,242 ****
+--- 237,243 ----
+  # GIF Images
+  gif:	/*.gif/i
+  	<GIF image*>
++ 	<GIF file*>
+  
+  # Haskell programs
+  haskell:
+***************
+*** 326,331 ****
+--- 327,333 ----
+  # PDF documents
+  pdf:	/*.pdf/i
+  	<PDF document*>
++ 	<* (PDF) *>
+  
+  # Perl files
+  perl:	/*.p[ml]/
+***************
+*** 338,343 ****
+--- 340,346 ----
+  # PNG files
+  png:	/*.png/i
+  	<PNG image*>
++ 	<PNG file*>
+  
+  # Portable Object (Gettext)
+  po:	/*.po/
+***************
+*** 474,481 ****
+  	<*vtcl*>
+  
+  # TIFF images
+! tiff:	/.tif/i  /.tiff/i
+  	<TIFF image*>
+  
+  # tk files
+  tk:	/*.tk/
+--- 477,485 ----
+  	<*vtcl*>
+  
+  # TIFF images
+! tiff:	/*.tif/i  /*.tiff/i
+  	<TIFF image*>
++ 	<TIFF file*>
+  
+  # tk files
+  tk:	/*.tk/
--- a/components/a2ps/sheets.map.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-*** a2ps-4.13/sheets/sheets.map.orig	Wed May 12 15:37:37 2004
---- a2ps-4.13/sheets/sheets.map	Wed May 12 15:48:45 2004
-***************
-*** 237,242 ****
---- 237,243 ----
-  # GIF Images
-  gif:	/*.gif/i
-  	<GIF image*>
-+ 	<GIF file*>
-  
-  # Haskell programs
-  haskell:
-***************
-*** 326,331 ****
---- 327,333 ----
-  # PDF documents
-  pdf:	/*.pdf/i
-  	<PDF document*>
-+ 	<* (PDF) *>
-  
-  # Perl files
-  perl:	/*.p[ml]/
-***************
-*** 338,343 ****
---- 340,346 ----
-  # PNG files
-  png:	/*.png/i
-  	<PNG image*>
-+ 	<PNG file*>
-  
-  # Portable Object (Gettext)
-  po:	/*.po/
-***************
-*** 474,481 ****
-  	<*vtcl*>
-  
-  # TIFF images
-! tiff:	/.tif/i  /.tiff/i
-  	<TIFF image*>
-  
-  # tk files
-  tk:	/*.tk/
---- 477,485 ----
-  	<*vtcl*>
-  
-  # TIFF images
-! tiff:	/*.tif/i  /*.tiff/i
-  	<TIFF image*>
-+ 	<TIFF file*>
-  
-  # tk files
-  tk:	/*.tk/
--- a/components/bash/bash41-001.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-001
-
-Bug-Reported-by:	Yann Rouillard <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html
-
-Bug-Description:
-
-A prototype for vsnprintf was incorrect, and caused compilation failures
-on systems that did not have a suitable vsnprintf, but had a declaration in
-one of the system header files.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
---- builtins/printf.def	2010-01-07 08:50:06.000000000 -0500
-***************
-*** 173,177 ****
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-  #endif
-  
---- 173,177 ----
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
-  #endif
-  
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-002.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-002
-
-Bug-Reported-by:	[email protected]
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html
-
-Bug-Description:
-
-Bash-4.1/Readline-6.1 introduced a hook function that allows applications
-to rewrite or modify filenames read from the file system before comparing
-them with a word to be completed.  The converted filename, if it matches,
-needs to be inserted into the line buffer, replacing the original contents.
-
-This fixes a completion bug on Mac OS X involving filenames containing
-UTF-8 characters.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500
---- lib/readline/complete.c	2010-01-06 08:30:23.000000000 -0500
-***************
-*** 2139,2143 ****
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
-  	    continue;
-  
---- 2139,2143 ----
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
-  	    continue;
-  
-***************
-*** 2220,2224 ****
-  	    }
-  
-! 	  strcpy (temp + dirlen, entry->d_name);
-  	}
-        else
---- 2220,2224 ----
-  	    }
-  
-! 	  strcpy (temp + dirlen, convfn);
-  	}
-        else
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-003.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-003
-
-Bug-Reported-by:	[email protected]
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html
-
-Bug-Description:
-
-If command completion is attempted on a word with a quoted globbing
-character (e.g., `*' or `?'), bash can reference a NULL pointer and
-dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/bashline.c	2009-10-24 14:10:19.000000000 -0400
---- bashline.c	2010-01-30 21:53:49.000000000 -0500
-***************
-*** 1681,1685 ****
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (glob_pattern_p (hint))
-      {
-        if (state == 0)
---- 1681,1685 ----
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (globpat)
-      {
-        if (state == 0)
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-004.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-004
-
-Bug-Reported-by:	Crestez Dan Leonard <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html
-
-Bug-Description:
-
-When running in Posix mode and executing a shell function without local
-variables, bash will not propagate a variable in a special builtin's temporary
-environment to have global scope.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/variables.c	2009-11-03 14:13:58.000000000 -0500
---- variables.c	2010-02-08 17:36:18.000000000 -0500
-***************
-*** 3809,3812 ****
---- 3809,3817 ----
-    if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-      {
-+       /* Make sure we have a hash table to store the variable in while it is
-+ 	 being propagated down to the global variables table.  Create one if
-+ 	 we have to */
-+       if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
-+ 	shell_variables->table = hash_create (0);
-        /* XXX - should we set v->context here? */
-        v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-005.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-005
-
-Bug-Reported-by:	[email protected]
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html
-
-Bug-Description:
-
-When the `read' builtin times out after the timeout specified with -t is
-exceeded, it does not reset the flags that tell signal handlers to process
-signals immediately instead of deferring their handling.  This can result
-in unsafe functions being called from signal handlers, which can cause bash
-to hang or dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/read.def	2009-10-08 11:35:46.000000000 -0400
---- builtins/read.def	2010-03-17 17:35:39.000000000 -0400
-***************
-*** 616,621 ****
-      zsyncfd (fd);
-  
--   interrupt_immediately--;
--   terminate_immediately--;
-    discard_unwind_frame ("read_builtin");
-  
---- 616,619 ----
-***************
-*** 624,627 ****
---- 622,628 ----
-  assign_vars:
-  
-+   interrupt_immediately--;
-+   terminate_immediately--;
-+ 
-  #if defined (ARRAY_VARS)
-    /* If -a was given, take the string read, break it into a list of words,
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-006.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-006
-
-Bug-Reported-by:	Mike Frysinger <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
-
-Bug-Description:
-
-Bash did not correctly print/reproduce here documents attached to commands
-inside compound commands such as for and while.  This affected the
-execution of such commands inside a shell function when the function
-definition is saved and later restored using `.' or `eval'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
---- print_cmd.c	2010-03-22 21:15:30.000000000 -0400
-***************
-*** 114,117 ****
---- 114,123 ----
-  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
-  
-+ #define PRINT_DEFERRED_HEREDOCS(x) \
-+   do { \
-+     if (deferred_heredocs) \
-+       print_deferred_heredocs (x); \
-+   } while (0)
-+ 
-  /* Non-zero means the stuff being printed is inside of a function def. */
-  static int inside_function_def;
-***************
-*** 561,571 ****
-  {
-    print_for_command_head (for_command);
-- 
-    cprintf (";");
-    newline ("do\n");
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-    semicolon ();
-    indentation -= indentation_amount;
-    newline ("done");
-  }
---- 566,578 ----
-  {
-    print_for_command_head (for_command);
-    cprintf (";");
-    newline ("do\n");
-+ 
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-+   PRINT_DEFERRED_HEREDOCS ("");
-    semicolon ();
-    indentation -= indentation_amount;
-+ 
-    newline ("done");
-  }
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-007.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-007
-
-Bug-Reported-by:	Rob Robason <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
-
-Bug-Description:
-
-A typo caused bash to not honor a precision specification in a printf
-format.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2010-01-18 10:50:22.000000000 -0500
---- builtins/printf.def	2010-03-25 09:40:56.000000000 -0400
-***************
-*** 118,122 ****
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
---- 118,122 ----
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-008.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-008
-
-Bug-Reported-by:	Dennis van Dok <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
-
-Bug-Description:
-
-When declaring an associative array and implicitly assigning a value
-to element "0", bash does not correctly allocate memory, leading to
-a segmentation violation when that element or the array itself is
-unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
---- builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
-***************
-*** 513,517 ****
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, "0", value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
---- 519,523 ----
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/bash41-009.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-009
-
-Bug-Reported-by:	Tomas Trnka <[email protected]>
-Bug-Reference-ID:	<[email protected]>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
-
-Bug-Description:
-
-An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
-or read(2) from a terminal.  This results in an error message and truncated
-input or output.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
---- sig.c	Fri Mar 26 22:34:11 2010
-***************
-*** 655,660 ****
---- 655,663 ----
-      act.sa_flags |= SA_INTERRUPT;	/* XXX */
-    else
-      act.sa_flags |= SA_RESTART;		/* XXX */
-+ #else
-+   if (sig == SIGCHLD)
-+     act.sa_flags |= SA_RESTART;
-  #endif
-    sigemptyset (&act.sa_mask);
-    sigemptyset (&oact.sa_mask);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-001.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-001
+
+Bug-Reported-by:	Yann Rouillard <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html
+
+Bug-Description:
+
+A prototype for vsnprintf was incorrect, and caused compilation failures
+on systems that did not have a suitable vsnprintf, but had a declaration in
+one of the system header files.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
+--- builtins/printf.def	2010-01-07 08:50:06.000000000 -0500
+***************
+*** 173,177 ****
+  
+  #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
+  #endif
+  
+--- 173,177 ----
+  
+  #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
+  #endif
+  
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 0
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-002.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,65 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-002
+
+Bug-Reported-by:	[email protected]
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html
+
+Bug-Description:
+
+Bash-4.1/Readline-6.1 introduced a hook function that allows applications
+to rewrite or modify filenames read from the file system before comparing
+them with a word to be completed.  The converted filename, if it matches,
+needs to be inserted into the line buffer, replacing the original contents.
+
+This fixes a completion bug on Mac OS X involving filenames containing
+UTF-8 characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500
+--- lib/readline/complete.c	2010-01-06 08:30:23.000000000 -0500
+***************
+*** 2139,2143 ****
+        if (filename_len == 0)
+  	{
+! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
+  	    continue;
+  
+--- 2139,2143 ----
+        if (filename_len == 0)
+  	{
+! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
+  	    continue;
+  
+***************
+*** 2220,2224 ****
+  	    }
+  
+! 	  strcpy (temp + dirlen, entry->d_name);
+  	}
+        else
+--- 2220,2224 ----
+  	    }
+  
+! 	  strcpy (temp + dirlen, convfn);
+  	}
+        else
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-003.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-003
+
+Bug-Reported-by:	[email protected]
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html
+
+Bug-Description:
+
+If command completion is attempted on a word with a quoted globbing
+character (e.g., `*' or `?'), bash can reference a NULL pointer and
+dump core.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/bashline.c	2009-10-24 14:10:19.000000000 -0400
+--- bashline.c	2010-01-30 21:53:49.000000000 -0500
+***************
+*** 1681,1685 ****
+       characters in the common prefix are bad) will ever be returned on
+       regular completion. */
+!   if (glob_pattern_p (hint))
+      {
+        if (state == 0)
+--- 1681,1685 ----
+       characters in the common prefix are bad) will ever be returned on
+       regular completion. */
+!   if (globpat)
+      {
+        if (state == 0)
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-004.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-004
+
+Bug-Reported-by:	Crestez Dan Leonard <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html
+
+Bug-Description:
+
+When running in Posix mode and executing a shell function without local
+variables, bash will not propagate a variable in a special builtin's temporary
+environment to have global scope.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/variables.c	2009-11-03 14:13:58.000000000 -0500
+--- variables.c	2010-02-08 17:36:18.000000000 -0500
+***************
+*** 3809,3812 ****
+--- 3809,3817 ----
+    if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
+      {
++       /* Make sure we have a hash table to store the variable in while it is
++ 	 being propagated down to the global variables table.  Create one if
++ 	 we have to */
++       if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
++ 	shell_variables->table = hash_create (0);
+        /* XXX - should we set v->context here? */
+        v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-005.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,56 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-005
+
+Bug-Reported-by:	[email protected]
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html
+
+Bug-Description:
+
+When the `read' builtin times out after the timeout specified with -t is
+exceeded, it does not reset the flags that tell signal handlers to process
+signals immediately instead of deferring their handling.  This can result
+in unsafe functions being called from signal handlers, which can cause bash
+to hang or dump core.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/read.def	2009-10-08 11:35:46.000000000 -0400
+--- builtins/read.def	2010-03-17 17:35:39.000000000 -0400
+***************
+*** 616,621 ****
+      zsyncfd (fd);
+  
+-   interrupt_immediately--;
+-   terminate_immediately--;
+    discard_unwind_frame ("read_builtin");
+  
+--- 616,619 ----
+***************
+*** 624,627 ****
+--- 622,628 ----
+  assign_vars:
+  
++   interrupt_immediately--;
++   terminate_immediately--;
++ 
+  #if defined (ARRAY_VARS)
+    /* If -a was given, take the string read, break it into a list of words,
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-006.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,76 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-006
+
+Bug-Reported-by:	Mike Frysinger <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
+
+Bug-Description:
+
+Bash did not correctly print/reproduce here documents attached to commands
+inside compound commands such as for and while.  This affected the
+execution of such commands inside a shell function when the function
+definition is saved and later restored using `.' or `eval'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
+--- print_cmd.c	2010-03-22 21:15:30.000000000 -0400
+***************
+*** 114,117 ****
+--- 114,123 ----
+  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
+  
++ #define PRINT_DEFERRED_HEREDOCS(x) \
++   do { \
++     if (deferred_heredocs) \
++       print_deferred_heredocs (x); \
++   } while (0)
++ 
+  /* Non-zero means the stuff being printed is inside of a function def. */
+  static int inside_function_def;
+***************
+*** 561,571 ****
+  {
+    print_for_command_head (for_command);
+- 
+    cprintf (";");
+    newline ("do\n");
+    indentation += indentation_amount;
+    make_command_string_internal (for_command->action);
+    semicolon ();
+    indentation -= indentation_amount;
+    newline ("done");
+  }
+--- 566,578 ----
+  {
+    print_for_command_head (for_command);
+    cprintf (";");
+    newline ("do\n");
++ 
+    indentation += indentation_amount;
+    make_command_string_internal (for_command->action);
++   PRINT_DEFERRED_HEREDOCS ("");
+    semicolon ();
+    indentation -= indentation_amount;
++ 
+    newline ("done");
+  }
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-007.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-007
+
+Bug-Reported-by:	Rob Robason <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
+
+Bug-Description:
+
+A typo caused bash to not honor a precision specification in a printf
+format.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/printf.def	2010-01-18 10:50:22.000000000 -0500
+--- builtins/printf.def	2010-03-25 09:40:56.000000000 -0400
+***************
+*** 118,122 ****
+        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
+      else if (have_precision) \
+!       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
+      else \
+        nw = vflag ? vbprintf (f, func) : printf (f, func); \
+--- 118,122 ----
+        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
+      else if (have_precision) \
+!       nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
+      else \
+        nw = vflag ? vbprintf (f, func) : printf (f, func); \
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-008.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,49 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-008
+
+Bug-Reported-by:	Dennis van Dok <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
+
+Bug-Description:
+
+When declaring an associative array and implicitly assigning a value
+to element "0", bash does not correctly allocate memory, leading to
+a segmentation violation when that element or the array itself is
+unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
+--- builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
+***************
+*** 513,517 ****
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, "0", value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+--- 519,523 ----
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash41-009.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-009
+
+Bug-Reported-by:	Tomas Trnka <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
+
+Bug-Description:
+
+An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
+or read(2) from a terminal.  This results in an error message and truncated
+input or output.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
+--- sig.c	Fri Mar 26 22:34:11 2010
+***************
+*** 655,660 ****
+--- 655,663 ----
+      act.sa_flags |= SA_INTERRUPT;	/* XXX */
+    else
+      act.sa_flags |= SA_RESTART;		/* XXX */
++ #else
++   if (sig == SIGCHLD)
++     act.sa_flags |= SA_RESTART;
+  #endif
+    sigemptyset (&act.sa_mask);
+    sigemptyset (&oact.sa_mask);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-000.config.h.in.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- config.h.in	2009-08-18 20:34:36.000000000 -0700
++++ config.h.in	2010-09-01 10:21:00.756734104 -0700
[email protected]@ -21,6 +21,8 @@
+ #ifndef _CONFIG_H_
+ #define _CONFIG_H_
+ 
++#include "config-top.h"
++
+ /* Configuration feature settings controllable by autoconf. */
+ 
+ /* Define JOB_CONTROL if your operating system supports
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-001.config-top.h.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,37 @@
+--- config-top.h	2009-12-22 12:29:39.000000000 -0800
++++ config-top.h	2010-09-01 10:24:03.070928602 -0700
[email protected]@ -54,14 +54,14 @@
+ /* The default value of the PATH variable. */
+ #ifndef DEFAULT_PATH_VALUE
+ #define DEFAULT_PATH_VALUE \
+-  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
++  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:."
+ #endif
+ 
+ /* The value for PATH when invoking `command -p'.  This is only used when
+    the Posix.2 confstr () function, or CS_PATH define are not present. */
+ #ifndef STANDARD_UTILS_PATH
+ #define STANDARD_UTILS_PATH \
+-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
++  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:/etc:/etc/bash"
+ #endif
+ 
+ /* Default primary and secondary prompt strings. */
[email protected]@ -75,14 +75,14 @@
+ #define KSH_COMPATIBLE_SELECT
+ 
+ /* System-wide .bashrc file for interactive shells. */
+-/* #define SYS_BASHRC "/etc/bash.bashrc" */
++#define SYS_BASHRC "/etc/bash/bashrc"
+ 
+ /* System-wide .bash_logout for login shells. */
+-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
++#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"
+ 
+ /* Define this to make non-interactive shells begun with argv[0][0] == '-'
+    run the startup files when not in posix mode. */
+-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
++#define NON_INTERACTIVE_LOGIN_SHELLS 1
+ 
+ /* Define this if you want bash to try to check whether it's being run by
+    sshd and source the .bashrc if so (like the rshd behavior).  This checks
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-002.Makefile.in.3.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,35 @@
+--- Makefile.in	2009-12-30 10:05:40.000000000 -0800
++++ Makefile.in	2011-02-04 16:31:01.659698136 -0800
[email protected]@ -137,7 +137,7 @@
+ STATIC_LD = @[email protected]
+ LOCAL_LDFLAGS = @[email protected]
+ 
+-SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
++SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
+ 
+ BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
+ 	  $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
[email protected]@ -535,7 +535,7 @@
+ 
+ $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
+ 	$(RM) [email protected]
+-	$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
++	$(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
+ 	ls -l $(Program)
+ 	-$(SIZE) $(Program)
+ 
[email protected]@ -549,10 +549,10 @@
+ 	@echo
+ 
+ bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
+-	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
+-	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
+-	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
+-	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
++	@sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
++	    -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
++	    -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
++	    -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
+ 	     $(SUPPORT_SRC)bashbug.sh > [email protected]
+ 	@chmod a+rx bashbug
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-003.glob.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,13 @@
+--- lib/glob/glob.c	2009-11-14 15:39:30.000000000 -0800
++++ lib/glob/glob.c	2010-09-01 10:28:10.161379481 -0700
[email protected]@ -34,6 +34,10 @@
+ #  include <unistd.h>
+ #endif
+ 
++#if defined (HAVE_ALLOCA) && defined (HAVE_ALLOCA_H)
++#  include <alloca.h>
++#endif
++
+ #include "bashansi.h"
+ #include "posixdir.h"
+ #include "posixstat.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-004.snprintf.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- lib/sh/snprintf.c	2008-08-12 12:02:14.000000000 -0400
++++ lib/sh/snprintf.c	2009-08-10 15:16:30.000000000 -0400
[email protected]@ -116,6 +116,8 @@
+ #  include <locale.h>
+ #endif
+ 
++#include <math.h>
++
+ #include "stdc.h"
+ #include <shmbutil.h>
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-005.variables.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,17 @@
+--- variables.c	2009-01-04 14:32:46.000000000 -0500
++++ variables.c	2009-08-15 14:53:56.426776000 -0400
[email protected]@ -402,14 +402,10 @@
+   /* Now make our own defaults in case the vars that we think are
+      important are missing. */
+   temp_var = set_if_not ("PATH", DEFAULT_PATH_VALUE);
+-#if 0
+   set_auto_export (temp_var);	/* XXX */
+-#endif
+ 
+   temp_var = set_if_not ("TERM", "dumb");
+-#if 0
+   set_auto_export (temp_var);	/* XXX */
+-#endif
+ 
+ #if defined (__QNX__)
+   /* set node id -- don't import it from the environment */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-006.signames.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,17 @@
+--- support/signames.c	2008-08-13 08:31:48.000000000 -0400
++++ support/signames.c	2009-08-15 16:40:01.729682000 -0400
[email protected]@ -212,6 +212,14 @@
+   signal_names[SIGXRES] = "SIGXRES";
+ #endif
+ 
++#if defined (SIGJVM1) /* Solaris Java Virtual Machine 1 */
++  signal_names[SIGJVM1] = "SIGJVM1";
++#endif
++
++#if defined (SIGJVM2) /* Solaris Java Virtual Machine 2 */
++  signal_names[SIGJVM2] = "SIGJVM2";
++#endif
++
+ /* HP-UX */
+ #if defined (SIGDIL)	/* DIL signal (?) */
+   signal_names[SIGDIL] = "SIGDIL";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-007.rlprivate.h.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,21 @@
+--- lib/readline/rlprivate.h	2009-01-22 21:56:49.000000000 -0500
++++ lib/readline/rlprivate.h	2009-08-16 10:55:56.178609000 -0400
[email protected]@ -23,6 +23,18 @@
+ #if !defined (_RL_PRIVATE_H_)
+ #define _RL_PRIVATE_H_
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#if defined(HANDLE_MULTIBYTE)
++
++#include <limits.h>
++#include <wchar.h>
++#include <wctype.h>
++
++#endif /* HANDLE_MULTIBYTE */
++
+ #include "rlconf.h"	/* for VISIBLE_STATS */
+ #include "rlstdc.h"
+ #include "posixjmp.h"	/* defines procenv_t */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-008.xmbsrtowcs.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- lib/glob/xmbsrtowcs.c	2008-08-12 10:17:54.000000000 -0400
++++ lib/glob/xmbsrtowcs.c	2009-08-10 15:46:18.000000000 -0400
[email protected]@ -30,7 +30,7 @@
+ #if HANDLE_MULTIBYTE
+ 
+ #ifndef FREE
+-#  define FREE(x)	do { if (x) free (x); } while (0)
++#  define FREE(x)	do { if (x) free (x);  x = 0; } while (0)
+ #endif
+ /* On some locales (ex. ja_JP.sjis), mbsrtowc doesn't convert 0x5c to U<0x5c>.
+    So, this function is made for converting 0x5c to U<0x5c>. */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-009.configure.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,321 @@
+--- configure	2009-12-29 05:34:51.000000000 -0800
++++ configure	2010-09-01 10:45:06.225859891 -0700
[email protected]@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # From configure.in for Bash 4.1, version 4.019.
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.63 for bash 4.1-release.
[email protected]@ -13,6 +13,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
++export LD_OPTIONS="-lc -lm -lgen -lsocket -lnsl -lresolv -z ignore"
++
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
[email protected]@ -592,7 +594,7 @@
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='bash'
[email protected]@ -3500,7 +3502,7 @@
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+-   CFLAGS="-g"
++   CFLAGS=""
+    cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
[email protected]@ -3579,7 +3581,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_c_werror_flag=$ac_save_c_werror_flag
+-	 CFLAGS="-g"
++	 CFLAGS=""
+ 	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
[email protected]@ -3638,7 +3640,7 @@
+   if test "$GCC" = yes; then
+     CFLAGS="-g -O2"
+   else
+-    CFLAGS="-g"
++    CFLAGS=""
+   fi
+ else
+   if test "$GCC" = yes; then
[email protected]@ -5092,7 +5094,7 @@
+ 
+ if test -z "$CC_FOR_BUILD"; then
+     if test "x$cross_compiling" = "xno"; then
+-	CC_FOR_BUILD='$(CC)'
++	CC_FOR_BUILD='$(CC) $(CPPFLAGS) $(CFLAGS)'
+     else
+ 	CC_FOR_BUILD=gcc
+     fi
[email protected]@ -5100,7 +5102,7 @@
+ 
+ 
+ 
+-test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
++test -z "$CFLAGS" && CFLAGS="${CFLAGS}" auto_cflags=1
+ 
+ test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O2"
+ 
[email protected]@ -5132,7 +5134,7 @@
+ 	LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-""}
+ fi
+ 
+-test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD="-g"
++test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD=""
+ 
+ 
+ 
[email protected]@ -5257,9 +5259,14 @@
+ int
+ main ()
+ {
++#if defined(sun) || defined(__sun) || defined(__sun__)
++#error "we want to use libcurses."
++return 255;
++#else
+ return tgetent ();
+   ;
+   return 0;
++#endif
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
[email protected]@ -6164,7 +6171,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+-SHELL = /bin/sh
++SHELL = /bin/bash
+ all:
+ 	@echo '@@@%%%=$(MAKE)[email protected]@@%%%'
+ _ACEOF
[email protected]@ -6190,7 +6197,7 @@
+ 
+ case "$host_os" in
+ opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
+-*)			MAKE_SHELL=/bin/sh ;;
++*)			MAKE_SHELL=/bin/bash ;;
+ esac
+ 
+ 
[email protected]@ -7177,7 +7184,7 @@
+ # Prepare PATH_SEPARATOR.
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
++  echo "#! /bin/bash" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7191,7 +7198,7 @@
+ # Find out how to test for executable files. Don't use a zero-byte file,
+ # as systems may use methods other than mode bits to determine executability.
+ cat >conf$$.file <<_ASEOF
+-#! /bin/sh
++#! /bin/bash
+ exit 0
+ _ASEOF
+ chmod +x conf$$.file
[email protected]@ -7288,7 +7295,7 @@
+ # Prepare PATH_SEPARATOR.
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
++  echo "#! /bin/bash" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7302,7 +7309,7 @@
+ # Find out how to test for executable files. Don't use a zero-byte file,
+ # as systems may use methods other than mode bits to determine executability.
+ cat >conf$$.file <<_ASEOF
+-#! /bin/sh
++#! /bin/bash
+ exit 0
+ _ASEOF
+ chmod +x conf$$.file
[email protected]@ -7359,7 +7366,7 @@
+ # Prepare PATH_SEPARATOR.
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
++  echo "#! /bin/bash" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7373,7 +7380,7 @@
+ # Find out how to test for executable files. Don't use a zero-byte file,
+ # as systems may use methods other than mode bits to determine executability.
+ cat >conf$$.file <<_ASEOF
+-#! /bin/sh
++#! /bin/bash
+ exit 0
+ _ASEOF
+ chmod +x conf$$.file
[email protected]@ -8992,7 +8999,7 @@
+ # Prepare PATH_SEPARATOR.
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
++  echo "#! /bin/bash" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -9102,7 +9109,7 @@
+ else
+ 
+     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++    ${CONFIG_SHELL-/bin/bash} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+     . ./conftest.sh
+     rm -f ./conftest.sh
+     acl_cv_rpath=done
[email protected]@ -13042,39 +13049,18 @@
+ /* end confdefs.h.  */
+ /* Define isinf to an innocuous variant, in case <limits.h> declares isinf.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define isinf innocuous_isinf
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char isinf (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef isinf
+-
++#include <math.h>
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char isinf ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined __stub_isinf || defined __stub___isinf
+-choke me
+-#endif
+ 
+ int
+ main ()
+ {
+-return isinf ();
++return isinf(0.0);
+   ;
+   return 0;
+ }
[email protected]@ -13134,39 +13120,26 @@
+ /* end confdefs.h.  */
+ /* Define isnan to an innocuous variant, in case <limits.h> declares isnan.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define isnan innocuous_isnan
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char isnan (); below.
+     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+     <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef isnan
++#include <math.h>
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char isnan ();
++
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined __stub_isnan || defined __stub___isnan
+-choke me
+-#endif
+ 
+ int
+ main ()
+ {
+-return isnan ();
++return isnan(0.0);
+   ;
+   return 0;
+ }
[email protected]@ -25521,7 +25494,7 @@
+ exit 69
+ ' >conftest
+ chmod u+x conftest
+-(SHELL=/bin/sh; export SHELL; ./conftest >/dev/null 2>&1)
++(SHELL=/bin/bash; export SHELL; ./conftest >/dev/null 2>&1)
+ if test $? -ne 69; then
+    ac_cv_sys_interpreter=yes
+ else
[email protected]@ -30117,9 +30090,14 @@
+ int
+ main ()
+ {
++#if defined(sun) || defined(__sun) || defined(__sun__)
++#error "we want to use libcurses"
++return 255;
++#else
+ return tgetent ();
+   ;
+   return 0;
++#endif
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
[email protected]@ -30302,7 +30280,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses  $LIBS"
++LIBS="/usr/lib/libcurses.so.1  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
[email protected]@ -30468,7 +30446,7 @@
+ TERMCAP_LIB=
+ TERMCAP_DEP=
+ else
+-TERMCAP_LIB=-lcurses
++TERMCAP_LIB=/usr/lib/libcurses.so.1
+ TERMCAP_DEP=
+ fi
+ 
[email protected]@ -30676,7 +30654,7 @@
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking shared object configuration for loadable builtins" >&5
+ $as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
+-	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
++	eval `${CONFIG_SHELL-/bin/bash} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
+ 
+ 
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-010.input.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,13 @@
+--- lib/readline/input.c	2009-04-19 10:12:03.000000000 -0700
++++ lib/readline/input.c	2010-09-01 10:46:23.386144948 -0700
[email protected]@ -51,6 +51,10 @@
+ #  include <sys/ioctl.h>
+ #endif
+ 
++#if defined(SOLARIS)
++#  include <sys/filio.h>
++#endif
++
+ #include <stdio.h>
+ #include <errno.h>
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-011.input_avail.c.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,13 @@
+--- lib/sh/input_avail.c	2009-04-19 10:01:14.000000000 -0700
++++ lib/sh/input_avail.c	2010-09-01 10:47:30.418016819 -0700
[email protected]@ -45,6 +45,10 @@
+ #  include <sys/ioctl.h>
+ #endif
+ 
++#if defined(SOLARIS)
++#  include <sys/filio.h> /* Solaris FIONREAD */
++#endif
++
+ #include <stdio.h>
+ #include <errno.h>
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-012.rlconf.h.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- lib/readline/rlconf.h	2009-01-04 11:32:33.000000000 -0800
++++ lib/readline/rlconf.h	2010-09-01 10:48:13.018894232 -0700
[email protected]@ -39,7 +39,7 @@
+ #define DEFAULT_INPUTRC "~/.inputrc"
+ 
+ /* The ultimate last-ditch filenname for an init file -- system-wide. */
+-#define SYS_INPUTRC "/etc/inputrc"
++#define SYS_INPUTRC "/etc/bash/inputrc"
+ 
+ /* If defined, expand tabs to spaces. */
+ #define DISPLAY_TABS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-013.bashref.info.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,22 @@
+--- doc/bashref.info	2009-12-29 12:59:33.000000000 -0800
++++ doc/bashref.info	2010-09-01 10:49:49.070499702 -0700
[email protected]@ -6387,7 +6387,7 @@
+ directory.  The name of this file is taken from the value of the shell
+ variable `INPUTRC'.  If that variable is unset, the default is
+ `~/.inputrc'.  If that file does not exist or cannot be read, the
+-ultimate default is `/etc/inputrc'.
++ultimate default is `/etc/bash/inputrc'.
+ 
+    When a program which uses the Readline library starts up, the init
+ file is read, and the key bindings are set.
[email protected]@ -6812,8 +6812,8 @@
+ `$include'
+      This directive takes a single filename as an argument and reads
+      commands and bindings from that file.  For example, the following
+-     directive reads from `/etc/inputrc':
+-          $include /etc/inputrc
++     directive reads from `/etc/bash/inputrc':
++          $include /etc/bash/inputrc
+ 
+ 
+ File: bashref.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-014.bash.man.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,16 @@
+--- doc/bash.1	2009-12-30 10:01:31.000000000 -0800
++++ doc/bash.1	2010-09-01 10:50:49.912191287 -0700
[email protected]@ -5235,11 +5235,11 @@
+ .IP \fB$include\fP
+ This directive takes a single filename as an argument and reads commands
+ and bindings from that file.  For example, the following directive
+-would read \fI/etc/inputrc\fP:
++would read \fI/etc/bash/inputrc\fP:
+ .sp 1
+ .RS
+ .nf
+-\fB$include\fP \^ \fI/etc/inputrc\fP
++\fB$include\fP \^ \fI/etc/bash/inputrc\fP
+ .fi
+ .RE
+ .SS Searching
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-015.rbash.man.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,13 @@
+--- doc/rbash.1	2008-08-12 06:24:51.000000000 -0700
++++ doc/rbash.1	2010-09-01 10:52:04.397206373 -0700
[email protected]@ -1,8 +1,8 @@
+-.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.0"
++.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.1"
+ .SH NAME
+ rbash \- restricted bash, see \fBbash\fR(1)
+ .SH RESTRICTED SHELL
+ .nr zY 1
+-.so bash.1
++.so /usr/share/man/man1/bash.1
+ .SH SEE ALSO
+ bash(1)
--- a/components/bash/solaris-000.config.h.in.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- config.h.in	2009-08-18 20:34:36.000000000 -0700
-+++ config.h.in	2010-09-01 10:21:00.756734104 -0700
[email protected]@ -21,6 +21,8 @@
- #ifndef _CONFIG_H_
- #define _CONFIG_H_
- 
-+#include "config-top.h"
-+
- /* Configuration feature settings controllable by autoconf. */
- 
- /* Define JOB_CONTROL if your operating system supports
--- a/components/bash/solaris-001.config-top.h.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- config-top.h	2009-12-22 12:29:39.000000000 -0800
-+++ config-top.h	2010-09-01 10:24:03.070928602 -0700
[email protected]@ -54,14 +54,14 @@
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
- #define DEFAULT_PATH_VALUE \
--  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
-+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:."
- #endif
- 
- /* The value for PATH when invoking `command -p'.  This is only used when
-    the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
--  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
-+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:/etc:/etc/bash"
- #endif
- 
- /* Default primary and secondary prompt strings. */
[email protected]@ -75,14 +75,14 @@
- #define KSH_COMPATIBLE_SELECT
- 
- /* System-wide .bashrc file for interactive shells. */
--/* #define SYS_BASHRC "/etc/bash.bashrc" */
-+#define SYS_BASHRC "/etc/bash/bashrc"
- 
- /* System-wide .bash_logout for login shells. */
--/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
-+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"
- 
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
-    run the startup files when not in posix mode. */
--/* #define NON_INTERACTIVE_LOGIN_SHELLS */
-+#define NON_INTERACTIVE_LOGIN_SHELLS 1
- 
- /* Define this if you want bash to try to check whether it's being run by
-    sshd and source the .bashrc if so (like the rshd behavior).  This checks
--- a/components/bash/solaris-002.Makefile.in.3.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- Makefile.in	2009-12-30 10:05:40.000000000 -0800
-+++ Makefile.in	2011-02-04 16:31:01.659698136 -0800
[email protected]@ -137,7 +137,7 @@
- STATIC_LD = @[email protected]
- LOCAL_LDFLAGS = @[email protected]
- 
--SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
-+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
- 
- BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
- 	  $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
[email protected]@ -535,7 +535,7 @@
- 
- $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
- 	$(RM) [email protected]
--	$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
-+	$(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
- 	ls -l $(Program)
- 	-$(SIZE) $(Program)
- 
[email protected]@ -549,10 +549,10 @@
- 	@echo
- 
- bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
--	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
--	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
--	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
--	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
-+	@sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
-+	    -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
-+	    -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
-+	    -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
- 	     $(SUPPORT_SRC)bashbug.sh > [email protected]
- 	@chmod a+rx bashbug
- 
--- a/components/bash/solaris-003.glob.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- lib/glob/glob.c	2009-11-14 15:39:30.000000000 -0800
-+++ lib/glob/glob.c	2010-09-01 10:28:10.161379481 -0700
[email protected]@ -34,6 +34,10 @@
- #  include <unistd.h>
- #endif
- 
-+#if defined (HAVE_ALLOCA) && defined (HAVE_ALLOCA_H)
-+#  include <alloca.h>
-+#endif
-+
- #include "bashansi.h"
- #include "posixdir.h"
- #include "posixstat.h"
--- a/components/bash/solaris-004.snprintf.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- lib/sh/snprintf.c	2008-08-12 12:02:14.000000000 -0400
-+++ lib/sh/snprintf.c	2009-08-10 15:16:30.000000000 -0400
[email protected]@ -116,6 +116,8 @@
- #  include <locale.h>
- #endif
- 
-+#include <math.h>
-+
- #include "stdc.h"
- #include <shmbutil.h>
- 
--- a/components/bash/solaris-005.variables.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- variables.c	2009-01-04 14:32:46.000000000 -0500
-+++ variables.c	2009-08-15 14:53:56.426776000 -0400
[email protected]@ -402,14 +402,10 @@
-   /* Now make our own defaults in case the vars that we think are
-      important are missing. */
-   temp_var = set_if_not ("PATH", DEFAULT_PATH_VALUE);
--#if 0
-   set_auto_export (temp_var);	/* XXX */
--#endif
- 
-   temp_var = set_if_not ("TERM", "dumb");
--#if 0
-   set_auto_export (temp_var);	/* XXX */
--#endif
- 
- #if defined (__QNX__)
-   /* set node id -- don't import it from the environment */
--- a/components/bash/solaris-006.signames.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- support/signames.c	2008-08-13 08:31:48.000000000 -0400
-+++ support/signames.c	2009-08-15 16:40:01.729682000 -0400
[email protected]@ -212,6 +212,14 @@
-   signal_names[SIGXRES] = "SIGXRES";
- #endif
- 
-+#if defined (SIGJVM1) /* Solaris Java Virtual Machine 1 */
-+  signal_names[SIGJVM1] = "SIGJVM1";
-+#endif
-+
-+#if defined (SIGJVM2) /* Solaris Java Virtual Machine 2 */
-+  signal_names[SIGJVM2] = "SIGJVM2";
-+#endif
-+
- /* HP-UX */
- #if defined (SIGDIL)	/* DIL signal (?) */
-   signal_names[SIGDIL] = "SIGDIL";
--- a/components/bash/solaris-007.rlprivate.h.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- lib/readline/rlprivate.h	2009-01-22 21:56:49.000000000 -0500
-+++ lib/readline/rlprivate.h	2009-08-16 10:55:56.178609000 -0400
[email protected]@ -23,6 +23,18 @@
- #if !defined (_RL_PRIVATE_H_)
- #define _RL_PRIVATE_H_
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#if defined(HANDLE_MULTIBYTE)
-+
-+#include <limits.h>
-+#include <wchar.h>
-+#include <wctype.h>
-+
-+#endif /* HANDLE_MULTIBYTE */
-+
- #include "rlconf.h"	/* for VISIBLE_STATS */
- #include "rlstdc.h"
- #include "posixjmp.h"	/* defines procenv_t */
--- a/components/bash/solaris-008.xmbsrtowcs.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- lib/glob/xmbsrtowcs.c	2008-08-12 10:17:54.000000000 -0400
-+++ lib/glob/xmbsrtowcs.c	2009-08-10 15:46:18.000000000 -0400
[email protected]@ -30,7 +30,7 @@
- #if HANDLE_MULTIBYTE
- 
- #ifndef FREE
--#  define FREE(x)	do { if (x) free (x); } while (0)
-+#  define FREE(x)	do { if (x) free (x);  x = 0; } while (0)
- #endif
- /* On some locales (ex. ja_JP.sjis), mbsrtowc doesn't convert 0x5c to U<0x5c>.
-    So, this function is made for converting 0x5c to U<0x5c>. */
--- a/components/bash/solaris-009.configure.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +0,0 @@
---- configure	2009-12-29 05:34:51.000000000 -0800
-+++ configure	2010-09-01 10:45:06.225859891 -0700
[email protected]@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # From configure.in for Bash 4.1, version 4.019.
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for bash 4.1-release.
[email protected]@ -13,6 +13,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+export LD_OPTIONS="-lc -lm -lgen -lsocket -lnsl -lresolv -z ignore"
-+
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
[email protected]@ -592,7 +594,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME='bash'
[email protected]@ -3500,7 +3502,7 @@
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
--   CFLAGS="-g"
-+   CFLAGS=""
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -3579,7 +3581,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
--	 CFLAGS="-g"
-+	 CFLAGS=""
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -3638,7 +3640,7 @@
-   if test "$GCC" = yes; then
-     CFLAGS="-g -O2"
-   else
--    CFLAGS="-g"
-+    CFLAGS=""
-   fi
- else
-   if test "$GCC" = yes; then
[email protected]@ -5092,7 +5094,7 @@
- 
- if test -z "$CC_FOR_BUILD"; then
-     if test "x$cross_compiling" = "xno"; then
--	CC_FOR_BUILD='$(CC)'
-+	CC_FOR_BUILD='$(CC) $(CPPFLAGS) $(CFLAGS)'
-     else
- 	CC_FOR_BUILD=gcc
-     fi
[email protected]@ -5100,7 +5102,7 @@
- 
- 
- 
--test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
-+test -z "$CFLAGS" && CFLAGS="${CFLAGS}" auto_cflags=1
- 
- test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O2"
- 
[email protected]@ -5132,7 +5134,7 @@
- 	LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-""}
- fi
- 
--test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD="-g"
-+test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD=""
- 
- 
- 
[email protected]@ -5257,9 +5259,14 @@
- int
- main ()
- {
-+#if defined(sun) || defined(__sun) || defined(__sun__)
-+#error "we want to use libcurses."
-+return 255;
-+#else
- return tgetent ();
-   ;
-   return 0;
-+#endif
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
[email protected]@ -6164,7 +6171,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
-+SHELL = /bin/bash
- all:
- 	@echo '@@@%%%=$(MAKE)[email protected]@@%%%'
- _ACEOF
[email protected]@ -6190,7 +6197,7 @@
- 
- case "$host_os" in
- opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
--*)			MAKE_SHELL=/bin/sh ;;
-+*)			MAKE_SHELL=/bin/bash ;;
- esac
- 
- 
[email protected]@ -7177,7 +7184,7 @@
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7191,7 +7198,7 @@
- # Find out how to test for executable files. Don't use a zero-byte file,
- # as systems may use methods other than mode bits to determine executability.
- cat >conf$$.file <<_ASEOF
--#! /bin/sh
-+#! /bin/bash
- exit 0
- _ASEOF
- chmod +x conf$$.file
[email protected]@ -7288,7 +7295,7 @@
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7302,7 +7309,7 @@
- # Find out how to test for executable files. Don't use a zero-byte file,
- # as systems may use methods other than mode bits to determine executability.
- cat >conf$$.file <<_ASEOF
--#! /bin/sh
-+#! /bin/bash
- exit 0
- _ASEOF
- chmod +x conf$$.file
[email protected]@ -7359,7 +7366,7 @@
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -7373,7 +7380,7 @@
- # Find out how to test for executable files. Don't use a zero-byte file,
- # as systems may use methods other than mode bits to determine executability.
- cat >conf$$.file <<_ASEOF
--#! /bin/sh
-+#! /bin/bash
- exit 0
- _ASEOF
- chmod +x conf$$.file
[email protected]@ -8992,7 +8999,7 @@
- # Prepare PATH_SEPARATOR.
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
[email protected]@ -9102,7 +9109,7 @@
- else
- 
-     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+    ${CONFIG_SHELL-/bin/bash} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-     . ./conftest.sh
-     rm -f ./conftest.sh
-     acl_cv_rpath=done
[email protected]@ -13042,39 +13049,18 @@
- /* end confdefs.h.  */
- /* Define isinf to an innocuous variant, in case <limits.h> declares isinf.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define isinf innocuous_isinf
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char isinf (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef isinf
--
-+#include <math.h>
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char isinf ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined __stub_isinf || defined __stub___isinf
--choke me
--#endif
- 
- int
- main ()
- {
--return isinf ();
-+return isinf(0.0);
-   ;
-   return 0;
- }
[email protected]@ -13134,39 +13120,26 @@
- /* end confdefs.h.  */
- /* Define isnan to an innocuous variant, in case <limits.h> declares isnan.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define isnan innocuous_isnan
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char isnan (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef isnan
-+#include <math.h>
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char isnan ();
-+
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined __stub_isnan || defined __stub___isnan
--choke me
--#endif
- 
- int
- main ()
- {
--return isnan ();
-+return isnan(0.0);
-   ;
-   return 0;
- }
[email protected]@ -25521,7 +25494,7 @@
- exit 69
- ' >conftest
- chmod u+x conftest
--(SHELL=/bin/sh; export SHELL; ./conftest >/dev/null 2>&1)
-+(SHELL=/bin/bash; export SHELL; ./conftest >/dev/null 2>&1)
- if test $? -ne 69; then
-    ac_cv_sys_interpreter=yes
- else
[email protected]@ -30117,9 +30090,14 @@
- int
- main ()
- {
-+#if defined(sun) || defined(__sun) || defined(__sun__)
-+#error "we want to use libcurses"
-+return 255;
-+#else
- return tgetent ();
-   ;
-   return 0;
-+#endif
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
[email protected]@ -30302,7 +30280,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcurses  $LIBS"
-+LIBS="/usr/lib/libcurses.so.1  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -30468,7 +30446,7 @@
- TERMCAP_LIB=
- TERMCAP_DEP=
- else
--TERMCAP_LIB=-lcurses
-+TERMCAP_LIB=/usr/lib/libcurses.so.1
- TERMCAP_DEP=
- fi
- 
[email protected]@ -30676,7 +30654,7 @@
- then
- 	{ $as_echo "$as_me:$LINENO: checking shared object configuration for loadable builtins" >&5
- $as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
--	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
-+	eval `${CONFIG_SHELL-/bin/bash} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
- 
- 
- 
--- a/components/bash/solaris-010.input.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- lib/readline/input.c	2009-04-19 10:12:03.000000000 -0700
-+++ lib/readline/input.c	2010-09-01 10:46:23.386144948 -0700
[email protected]@ -51,6 +51,10 @@
- #  include <sys/ioctl.h>
- #endif
- 
-+#if defined(SOLARIS)
-+#  include <sys/filio.h>
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
- 
--- a/components/bash/solaris-011.input_avail.c.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- lib/sh/input_avail.c	2009-04-19 10:01:14.000000000 -0700
-+++ lib/sh/input_avail.c	2010-09-01 10:47:30.418016819 -0700
[email protected]@ -45,6 +45,10 @@
- #  include <sys/ioctl.h>
- #endif
- 
-+#if defined(SOLARIS)
-+#  include <sys/filio.h> /* Solaris FIONREAD */
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
- 
--- a/components/bash/solaris-012.rlconf.h.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- lib/readline/rlconf.h	2009-01-04 11:32:33.000000000 -0800
-+++ lib/readline/rlconf.h	2010-09-01 10:48:13.018894232 -0700
[email protected]@ -39,7 +39,7 @@
- #define DEFAULT_INPUTRC "~/.inputrc"
- 
- /* The ultimate last-ditch filenname for an init file -- system-wide. */
--#define SYS_INPUTRC "/etc/inputrc"
-+#define SYS_INPUTRC "/etc/bash/inputrc"
- 
- /* If defined, expand tabs to spaces. */
- #define DISPLAY_TABS
--- a/components/bash/solaris-013.bashref.info.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- doc/bashref.info	2009-12-29 12:59:33.000000000 -0800
-+++ doc/bashref.info	2010-09-01 10:49:49.070499702 -0700
[email protected]@ -6387,7 +6387,7 @@
- directory.  The name of this file is taken from the value of the shell
- variable `INPUTRC'.  If that variable is unset, the default is
- `~/.inputrc'.  If that file does not exist or cannot be read, the
--ultimate default is `/etc/inputrc'.
-+ultimate default is `/etc/bash/inputrc'.
- 
-    When a program which uses the Readline library starts up, the init
- file is read, and the key bindings are set.
[email protected]@ -6812,8 +6812,8 @@
- `$include'
-      This directive takes a single filename as an argument and reads
-      commands and bindings from that file.  For example, the following
--     directive reads from `/etc/inputrc':
--          $include /etc/inputrc
-+     directive reads from `/etc/bash/inputrc':
-+          $include /etc/bash/inputrc
- 
- 
- File: bashref.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
--- a/components/bash/solaris-014.bash.man.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- doc/bash.1	2009-12-30 10:01:31.000000000 -0800
-+++ doc/bash.1	2010-09-01 10:50:49.912191287 -0700
[email protected]@ -5235,11 +5235,11 @@
- .IP \fB$include\fP
- This directive takes a single filename as an argument and reads commands
- and bindings from that file.  For example, the following directive
--would read \fI/etc/inputrc\fP:
-+would read \fI/etc/bash/inputrc\fP:
- .sp 1
- .RS
- .nf
--\fB$include\fP \^ \fI/etc/inputrc\fP
-+\fB$include\fP \^ \fI/etc/bash/inputrc\fP
- .fi
- .RE
- .SS Searching
--- a/components/bash/solaris-015.rbash.man.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- doc/rbash.1	2008-08-12 06:24:51.000000000 -0700
-+++ doc/rbash.1	2010-09-01 10:52:04.397206373 -0700
[email protected]@ -1,8 +1,8 @@
--.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.0"
-+.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.1"
- .SH NAME
- rbash \- restricted bash, see \fBbash\fR(1)
- .SH RESTRICTED SHELL
- .nr zY 1
--.so bash.1
-+.so /usr/share/man/man1/bash.1
- .SH SEE ALSO
- bash(1)
--- a/components/bzip2/Makefile.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
---- bzip2-1.0.6/Makefile.orig	Wed Jan 12 13:53:06 2011
-+++ bzip2-1.0.6/Makefile	Thu Jan 13 13:01:30 2011
[email protected]@ -33,34 +33,33 @@
-       randtable.o  \
-       compress.o   \
-       decompress.o \
--      bzlib.o
-+      bzlib.o	\
-+      oldapi.o
- 
--all: libbz2.a bzip2 bzip2recover test
-+all: libbz2.so bzip2 bzip2recover test
- 
--bzip2: libbz2.a bzip2.o
-+bzip2: libbz2.so bzip2.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
- 
- bzip2recover: bzip2recover.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
- 
--libbz2.a: $(OBJS)
--	rm -f libbz2.a
--	$(AR) cq libbz2.a $(OBJS)
--	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
--		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
--		echo $(RANLIB) libbz2.a ; \
--		$(RANLIB) libbz2.a ; \
--	fi
-+libbz2.so: $(OBJS)
-+	rm -f libbz2.so libbz2.so.1
-+	$(CC) $(CFLAGS) -G -h libbz2.so.1 -o libbz2.so.1 \
-+	    -z defs -z text -zcombreloc $(OBJS) -M ../../mapfile -L. \
-+	    -lc
-+	ln -s libbz2.so.1 libbz2.so
- 
- check: test
- test: bzip2
- 	@cat words1
--	./bzip2 -1  < sample1.ref > sample1.rb2
--	./bzip2 -2  < sample2.ref > sample2.rb2
--	./bzip2 -3  < sample3.ref > sample3.rb2
--	./bzip2 -d  < sample1.bz2 > sample1.tst
--	./bzip2 -d  < sample2.bz2 > sample2.tst
--	./bzip2 -ds < sample3.bz2 > sample3.tst
-+	env LD_LIBRARY_PATH=. ./bzip2 -1  < sample1.ref > sample1.rb2
-+	env LD_LIBRARY_PATH=. ./bzip2 -2  < sample2.ref > sample2.rb2
-+	env LD_LIBRARY_PATH=. ./bzip2 -3  < sample3.ref > sample3.rb2
-+	env LD_LIBRARY_PATH=. ./bzip2 -d  < sample1.bz2 > sample1.tst
-+	env LD_LIBRARY_PATH=. ./bzip2 -d  < sample2.bz2 > sample2.tst
-+	env LD_LIBRARY_PATH=. ./bzip2 -ds < sample3.bz2 > sample3.tst
- 	cmp sample1.bz2 sample1.rb2 
- 	cmp sample2.bz2 sample2.rb2
- 	cmp sample3.bz2 sample3.rb2
[email protected]@ -72,8 +71,8 @@
- install: bzip2 bzip2recover
- 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
- 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
-+	if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi
-+	if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi
- 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
- 	cp -f bzip2 $(PREFIX)/bin/bzip2
- 	cp -f bzip2 $(PREFIX)/bin/bunzip2
[email protected]@ -83,30 +82,28 @@
- 	chmod a+x $(PREFIX)/bin/bunzip2
- 	chmod a+x $(PREFIX)/bin/bzcat
- 	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
-+	cp -f bzip2.1 $(PREFIX)/share/man/man1
-+	chmod a+r $(PREFIX)/share/man/man1/bzip2.1
- 	cp -f bzlib.h $(PREFIX)/include
- 	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
- 	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-+	ln -s -f ./bzgrep $(PREFIX)/bin/bzegrep
-+	ln -s -f ./bzgrep $(PREFIX)/bin/bzfgrep
- 	chmod a+x $(PREFIX)/bin/bzgrep
- 	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
-+	ln -s -f ./bzmore $(PREFIX)/bin/bzless
- 	chmod a+x $(PREFIX)/bin/bzmore
- 	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
-+	ln -s -f ./bzdiff $(PREFIX)/bin/bzcmp
- 	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1
-+	chmod a+r $(PREFIX)/share/man/man1/bzgrep.1
-+	chmod a+r $(PREFIX)/share/man/man1/bzmore.1
-+	chmod a+r $(PREFIX)/share/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \
[email protected]@ -132,6 +129,8 @@
- 	$(CC) $(CFLAGS) -c bzip2.c
- bzip2recover.o: bzip2recover.c
- 	$(CC) $(CFLAGS) -c bzip2recover.c
-+oldapi.o: oldapi.c
-+	$(CC) $(CFLAGS) -c oldapi.c
- 
- 
- distclean: clean
--- a/components/bzip2/bzip2.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
---- bzip2-1.0.5/bzip2.c.orig	2008-11-28 05:47:09.537546000 -0800
-+++ bzip2-1.0.5/bzip2.c	2008-11-28 05:50:37.075934000 -0800
[email protected]@ -221,6 +221,7 @@
- static void    copyFileName ( Char*, Char* );
- static void*   myMalloc     ( Int32 );
- static void    applySavedFileAttrToOutputFile ( IntNative fd );
-+static void    applySavedTimeInfoToOutputFile ( Char *dstName );
- 
- 
- 
[email protected]@ -368,6 +369,7 @@
-    if (zStream != stdout) {
-       Int32 fd = fileno ( zStream );
-       if (fd < 0) goto errhandler_io;
-+      applySavedTimeInfoToOutputFile ( outName ); 
-       applySavedFileAttrToOutputFile ( fd );
-       ret = fclose ( zStream );
-       outputHandleJustInCase = NULL;
[email protected]@ -481,17 +483,18 @@
- 
-    closeok:
-    if (ferror(zStream)) goto errhandler_io;
-+   ret = fflush ( stream );
-+   if (ret != 0) goto errhandler_io;
-    if (stream != stdout) {
-       Int32 fd = fileno ( stream );
-       if (fd < 0) goto errhandler_io;
-+      applySavedTimeInfoToOutputFile ( outName );
-       applySavedFileAttrToOutputFile ( fd );
-    }
-    ret = fclose ( zStream );
-    if (ret == EOF) goto errhandler_io;
- 
-    if (ferror(stream)) goto errhandler_io;
--   ret = fflush ( stream );
--   if (ret != 0) goto errhandler_io;
-    if (stream != stdout) {
-       ret = fclose ( stream );
-       outputHandleJustInCase = NULL;
[email protected]@ -1297,7 +1300,6 @@
- 
-    /*--- If there was an I/O error, we won't get here. ---*/
-    if ( srcMode == SM_F2F ) {
--      applySavedTimeInfoToOutputFile ( outName );
-       deleteOutputOnInterrupt = False;
-       if ( !keepInputFiles ) {
-          IntNative retVal = remove ( inName );
[email protected]@ -1475,7 +1477,6 @@
-    /*--- If there was an I/O error, we won't get here. ---*/
-    if ( magicNumberOK ) {
-       if ( srcMode == SM_F2F ) {
--         applySavedTimeInfoToOutputFile ( outName );
-          deleteOutputOnInterrupt = False;
-          if ( !keepInputFiles ) {
-             IntNative retVal = remove ( inName );
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bzip2/patches/Makefile.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,118 @@
+--- bzip2-1.0.6/Makefile.orig	Wed Jan 12 13:53:06 2011
++++ bzip2-1.0.6/Makefile	Thu Jan 13 13:01:30 2011
[email protected]@ -33,34 +33,33 @@
+       randtable.o  \
+       compress.o   \
+       decompress.o \
+-      bzlib.o
++      bzlib.o	\
++      oldapi.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.so bzip2 bzip2recover test
+ 
+-bzip2: libbz2.a bzip2.o
++bzip2: libbz2.so bzip2.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+ 
+ bzip2recover: bzip2recover.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+ 
+-libbz2.a: $(OBJS)
+-	rm -f libbz2.a
+-	$(AR) cq libbz2.a $(OBJS)
+-	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
+-		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
+-		echo $(RANLIB) libbz2.a ; \
+-		$(RANLIB) libbz2.a ; \
+-	fi
++libbz2.so: $(OBJS)
++	rm -f libbz2.so libbz2.so.1
++	$(CC) $(CFLAGS) -G -h libbz2.so.1 -o libbz2.so.1 \
++	    -z defs -z text -zcombreloc $(OBJS) -M ../../mapfile -L. \
++	    -lc
++	ln -s libbz2.so.1 libbz2.so
+ 
+ check: test
+ test: bzip2
+ 	@cat words1
+-	./bzip2 -1  < sample1.ref > sample1.rb2
+-	./bzip2 -2  < sample2.ref > sample2.rb2
+-	./bzip2 -3  < sample3.ref > sample3.rb2
+-	./bzip2 -d  < sample1.bz2 > sample1.tst
+-	./bzip2 -d  < sample2.bz2 > sample2.tst
+-	./bzip2 -ds < sample3.bz2 > sample3.tst
++	env LD_LIBRARY_PATH=. ./bzip2 -1  < sample1.ref > sample1.rb2
++	env LD_LIBRARY_PATH=. ./bzip2 -2  < sample2.ref > sample2.rb2
++	env LD_LIBRARY_PATH=. ./bzip2 -3  < sample3.ref > sample3.rb2
++	env LD_LIBRARY_PATH=. ./bzip2 -d  < sample1.bz2 > sample1.tst
++	env LD_LIBRARY_PATH=. ./bzip2 -d  < sample2.bz2 > sample2.tst
++	env LD_LIBRARY_PATH=. ./bzip2 -ds < sample3.bz2 > sample3.tst
+ 	cmp sample1.bz2 sample1.rb2 
+ 	cmp sample2.bz2 sample2.rb2
+ 	cmp sample3.bz2 sample3.rb2
[email protected]@ -72,8 +71,8 @@
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+ 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+-	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
++	if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi
++	if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi
+ 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+ 	cp -f bzip2 $(PREFIX)/bin/bzip2
+ 	cp -f bzip2 $(PREFIX)/bin/bunzip2
[email protected]@ -83,30 +82,28 @@
+ 	chmod a+x $(PREFIX)/bin/bunzip2
+ 	chmod a+x $(PREFIX)/bin/bzcat
+ 	chmod a+x $(PREFIX)/bin/bzip2recover
+-	cp -f bzip2.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzip2.1
++	cp -f bzip2.1 $(PREFIX)/share/man/man1
++	chmod a+r $(PREFIX)/share/man/man1/bzip2.1
+ 	cp -f bzlib.h $(PREFIX)/include
+ 	chmod a+r $(PREFIX)/include/bzlib.h
+-	cp -f libbz2.a $(PREFIX)/lib
+-	chmod a+r $(PREFIX)/lib/libbz2.a
+ 	cp -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
++	ln -s -f ./bzgrep $(PREFIX)/bin/bzegrep
++	ln -s -f ./bzgrep $(PREFIX)/bin/bzfgrep
+ 	chmod a+x $(PREFIX)/bin/bzgrep
+ 	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
++	ln -s -f ./bzmore $(PREFIX)/bin/bzless
+ 	chmod a+x $(PREFIX)/bin/bzmore
+ 	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
++	ln -s -f ./bzdiff $(PREFIX)/bin/bzcmp
+ 	chmod a+x $(PREFIX)/bin/bzdiff
+-	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+-	chmod a+r $(PREFIX)/man/man1/bzmore.1
+-	chmod a+r $(PREFIX)/man/man1/bzdiff.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+-	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+-	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
++	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1
++	chmod a+r $(PREFIX)/share/man/man1/bzgrep.1
++	chmod a+r $(PREFIX)/share/man/man1/bzmore.1
++	chmod a+r $(PREFIX)/share/man/man1/bzdiff.1
++	echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1
++	echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1
++	echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1
++	echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
[email protected]@ -132,6 +129,8 @@
+ 	$(CC) $(CFLAGS) -c bzip2.c
+ bzip2recover.o: bzip2recover.c
+ 	$(CC) $(CFLAGS) -c bzip2recover.c
++oldapi.o: oldapi.c
++	$(CC) $(CFLAGS) -c oldapi.c
+ 
+ 
+ distclean: clean
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bzip2/patches/bzip2.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,55 @@
+--- bzip2-1.0.5/bzip2.c.orig	2008-11-28 05:47:09.537546000 -0800
++++ bzip2-1.0.5/bzip2.c	2008-11-28 05:50:37.075934000 -0800
[email protected]@ -221,6 +221,7 @@
+ static void    copyFileName ( Char*, Char* );
+ static void*   myMalloc     ( Int32 );
+ static void    applySavedFileAttrToOutputFile ( IntNative fd );
++static void    applySavedTimeInfoToOutputFile ( Char *dstName );
+ 
+ 
+ 
[email protected]@ -368,6 +369,7 @@
+    if (zStream != stdout) {
+       Int32 fd = fileno ( zStream );
+       if (fd < 0) goto errhandler_io;
++      applySavedTimeInfoToOutputFile ( outName ); 
+       applySavedFileAttrToOutputFile ( fd );
+       ret = fclose ( zStream );
+       outputHandleJustInCase = NULL;
[email protected]@ -481,17 +483,18 @@
+ 
+    closeok:
+    if (ferror(zStream)) goto errhandler_io;
++   ret = fflush ( stream );
++   if (ret != 0) goto errhandler_io;
+    if (stream != stdout) {
+       Int32 fd = fileno ( stream );
+       if (fd < 0) goto errhandler_io;
++      applySavedTimeInfoToOutputFile ( outName );
+       applySavedFileAttrToOutputFile ( fd );
+    }
+    ret = fclose ( zStream );
+    if (ret == EOF) goto errhandler_io;
+ 
+    if (ferror(stream)) goto errhandler_io;
+-   ret = fflush ( stream );
+-   if (ret != 0) goto errhandler_io;
+    if (stream != stdout) {
+       ret = fclose ( stream );
+       outputHandleJustInCase = NULL;
[email protected]@ -1297,7 +1300,6 @@
+ 
+    /*--- If there was an I/O error, we won't get here. ---*/
+    if ( srcMode == SM_F2F ) {
+-      applySavedTimeInfoToOutputFile ( outName );
+       deleteOutputOnInterrupt = False;
+       if ( !keepInputFiles ) {
+          IntNative retVal = remove ( inName );
[email protected]@ -1475,7 +1477,6 @@
+    /*--- If there was an I/O error, we won't get here. ---*/
+    if ( magicNumberOK ) {
+       if ( srcMode == SM_F2F ) {
+-         applySavedTimeInfoToOutputFile ( outName );
+          deleteOutputOnInterrupt = False;
+          if ( !keepInputFiles ) {
+             IntNative retVal = remove ( inName );
--- a/components/coreutils/coreutils-8_5.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
---- coreutils-8.5/configure_orig	2011-02-08 16:13:56.850317000 -0800
-+++ coreutils-8.5/configure	2011-02-08 16:14:04.872411000 -0800
[email protected]@ -53254,11 +53254,10 @@
-     optional_bin_progs="$optional_bin_progs df"
-   fi
- }
- fi
- 
--# Limit stdbuf to ELF systems with GCC
- optional_pkglib_progs=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
- $as_echo_n "checking whether this is an ELF system... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
[email protected]@ -53274,28 +53273,24 @@
- fi
- rm -f conftest*
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
- $as_echo "$elf_sys" >&6; }
--if test "$elf_sys" = "yes" && \
--   test "$GCC" = "yes"; then
--  {
--  if test -z "$optional_bin_progs"; then
--    optional_bin_progs=stdbuf
--  else
--    optional_bin_progs="$optional_bin_progs stdbuf"
--  fi
--}
--  {
--  if test -z "$optional_pkglib_progs"; then
--    optional_pkglib_progs=libstdbuf.so
--  else
--    optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
--  fi
--}
-+
-+if test -z "$optional_bin_progs"; then
-+  optional_bin_progs=stdbuf
-+else
-+  optional_bin_progs="$optional_bin_progs stdbuf"
- fi
- 
-+if test -z "$optional_pkglib_progs"; then
-+  optional_pkglib_progs=libstdbuf.so
-+else
-+  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
-+fi
-+
-+
- ############################################################################
- mk="$srcdir/src/Makefile.am"
- # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
- # in $mk but don't expand the variable references.
- # Append each literal name to $optional_bin_progs.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/coreutils-8_5.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,55 @@
+--- coreutils-8.5/configure_orig	2011-02-08 16:13:56.850317000 -0800
++++ coreutils-8.5/configure	2011-02-08 16:14:04.872411000 -0800
[email protected]@ -53254,11 +53254,10 @@
+     optional_bin_progs="$optional_bin_progs df"
+   fi
+ }
+ fi
+ 
+-# Limit stdbuf to ELF systems with GCC
+ optional_pkglib_progs=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
+ $as_echo_n "checking whether this is an ELF system... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
[email protected]@ -53274,28 +53273,24 @@
+ fi
+ rm -f conftest*
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
+ $as_echo "$elf_sys" >&6; }
+-if test "$elf_sys" = "yes" && \
+-   test "$GCC" = "yes"; then
+-  {
+-  if test -z "$optional_bin_progs"; then
+-    optional_bin_progs=stdbuf
+-  else
+-    optional_bin_progs="$optional_bin_progs stdbuf"
+-  fi
+-}
+-  {
+-  if test -z "$optional_pkglib_progs"; then
+-    optional_pkglib_progs=libstdbuf.so
+-  else
+-    optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
+-  fi
+-}
++
++if test -z "$optional_bin_progs"; then
++  optional_bin_progs=stdbuf
++else
++  optional_bin_progs="$optional_bin_progs stdbuf"
+ fi
+ 
++if test -z "$optional_pkglib_progs"; then
++  optional_pkglib_progs=libstdbuf.so
++else
++  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
++fi
++
++
+ ############################################################################
+ mk="$srcdir/src/Makefile.am"
+ # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
+ # in $mk but don't expand the variable references.
+ # Append each literal name to $optional_bin_progs.
--- a/components/elinks/Makefile.lib.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- elinks-0.11.7/Makefile.lib.orig   Wed Jan 26 13:36:42 2011
-+++ elinks-0.11.7/Makefile.lib        Wed Jan 26 13:37:29 2011
[email protected]@ -39,7 +39,7 @@
- 
- quiet_cmd_compile = '      [$(CC_COLOR)CC$(END_COLOR)]   $(RELPATH)[email protected]'
-  masq_cmd_compile = $(COMPILE) -o $(@) -c $< $(2)
--      cmd_compile = $(COMPILE) -o $(@) -Wp,-MD,.deps/$(*F).pp -c $< $(2)
-+      cmd_compile = $(COMPILE) -o $(@) -c $< $(2)
- 
- # Rule to compile a set of .o files into one .o file
- quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)[email protected]"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/elinks/patches/Makefile.lib.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,12 @@
+--- elinks-0.11.7/Makefile.lib.orig   Wed Jan 26 13:36:42 2011
++++ elinks-0.11.7/Makefile.lib        Wed Jan 26 13:37:29 2011
[email protected]@ -39,7 +39,7 @@
+ 
+ quiet_cmd_compile = '      [$(CC_COLOR)CC$(END_COLOR)]   $(RELPATH)[email protected]'
+  masq_cmd_compile = $(COMPILE) -o $(@) -c $< $(2)
+-      cmd_compile = $(COMPILE) -o $(@) -Wp,-MD,.deps/$(*F).pp -c $< $(2)
++      cmd_compile = $(COMPILE) -o $(@) -c $< $(2)
+ 
+ # Rule to compile a set of .o files into one .o file
+ quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)[email protected]"
+
--- a/components/gawk/gawk_manpage1.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gawk-3.1.5/doc/gawk.1_orig	Sun Jun 26 06:42:14 2005
-+++ gawk-3.1.5/doc/gawk.1	Wed Feb 23 13:10:34 2011
[email protected]@ -1,3 +1,8 @@
-+'\" t
-+.\"
-+.\" Modified for Solaris to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\" 
- .ds PX \s-1POSIX\s+1
- .ds UX \s-1UNIX\s+1
- .ds AN \s-1ANSI\s+1
[email protected]@ -3456,3 +3461,23 @@
- manual page into another language, under the above conditions for
- modified versions, except that this permission notice may be stated in
- a translation approved by the Foundation.
-+.\" Begin Oracle update
-+.SH ATTRIBUTES
-+See
-+.BR attributes (5)
-+for descriptions of the following attributes:
-+.sp
-+.TS
-+box;
-+cbp-1 | cbp-1
-+l | l .
-+ATTRIBUTE TYPE	ATTRIBUTE VALUE
-+=
-+Availability	text/gawk
-+=
-+Interface Stability	Volatile
-+.TE 
-+.PP
-+.SH NOTES
-+Source for gawk is available on http://opensolaris.org.
-+.\" End Oracle update
--- a/components/gawk/igawk_manpage1.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gawk-3.1.5/doc/igawk.1_orig	Wed May 11 08:28:14 2005
-+++ gawk-3.1.5/doc/igawk.1	Wed Feb 23 13:10:41 2011
[email protected]@ -1,3 +1,8 @@
-+'\" t
-+.\"
-+.\" Modified for Solaris to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\" 
- .TH IGAWK 1 "Nov 3 1999" "Free Software Foundation" "Utility Commands"
- .SH NAME
- igawk \- gawk with include files
[email protected]@ -71,3 +76,23 @@
- .SH AUTHOR
- Arnold Robbins
- .RB ( [email protected] ).
-+.\" Begin Oracle update
-+.SH ATTRIBUTES
-+See
-+.BR attributes (5)
-+for descriptions of the following attributes:
-+.sp
-+.TS
-+box;
-+cbp-1 | cbp-1
-+l | l .
-+ATTRIBUTE TYPE	ATTRIBUTE VALUE
-+=
-+Availability	text/gawk
-+=
-+Interface Stability	Volatile
-+.TE 
-+.PP
-+.SH NOTES
-+Source for gawk is available on http://opensolaris.org.
-+.\" End Oracle update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gawk/patches/gawk_manpage1.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,35 @@
+--- gawk-3.1.5/doc/gawk.1_orig	Sun Jun 26 06:42:14 2005
++++ gawk-3.1.5/doc/gawk.1	Wed Feb 23 13:10:34 2011
[email protected]@ -1,3 +1,8 @@
++'\" t
++.\"
++.\" Modified for Solaris to add the Solaris stability classification,
++.\" and to add a note about source availability.
++.\" 
+ .ds PX \s-1POSIX\s+1
+ .ds UX \s-1UNIX\s+1
+ .ds AN \s-1ANSI\s+1
[email protected]@ -3456,3 +3461,23 @@
+ manual page into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated in
+ a translation approved by the Foundation.
++.\" Begin Oracle update
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	text/gawk
++=
++Interface Stability	Volatile
++.TE 
++.PP
++.SH NOTES
++Source for gawk is available on http://opensolaris.org.
++.\" End Oracle update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gawk/patches/igawk_manpage1.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,35 @@
+--- gawk-3.1.5/doc/igawk.1_orig	Wed May 11 08:28:14 2005
++++ gawk-3.1.5/doc/igawk.1	Wed Feb 23 13:10:41 2011
[email protected]@ -1,3 +1,8 @@
++'\" t
++.\"
++.\" Modified for Solaris to add the Solaris stability classification,
++.\" and to add a note about source availability.
++.\" 
+ .TH IGAWK 1 "Nov 3 1999" "Free Software Foundation" "Utility Commands"
+ .SH NAME
+ igawk \- gawk with include files
[email protected]@ -71,3 +76,23 @@
+ .SH AUTHOR
+ Arnold Robbins
+ .RB ( [email protected] ).
++.\" Begin Oracle update
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	text/gawk
++=
++Interface Stability	Volatile
++.TE 
++.PP
++.SH NOTES
++Source for gawk is available on http://opensolaris.org.
++.\" End Oracle update
--- a/components/ggrep/ggrep.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- grep-2.5.4/tests/foad1.sh.orig	Fri Jan 28 16:47:12 2011
-+++ grep-2.5.4/tests/foad1.sh	Fri Jan 28 16:45:00 2011
[email protected]@ -23,7 +23,7 @@
-   INPUT="$1"
-   EXPECT="$2"
-   shift 2
--  OUTPUT=`echo -n "$INPUT" | tr "/" "\n" | "$GREP" "[email protected]" | tr "\n" "/"`
-+  OUTPUT=`printf "$INPUT" | tr "/" "\n" | "$GREP" "[email protected]" | tr "\n" "/"`
-   if test "$OUTPUT" != "$EXPECT" || test "$VERBOSE" = "1"; then
-     echo "Testing:  $GREP [email protected]"
-     test "$LC_ALL" != C && test "$LC_ALL" != "" && echo "  LC_ALL: \"$LC_ALL\""
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ggrep/patches/ggrep.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- grep-2.5.4/tests/foad1.sh.orig	Fri Jan 28 16:47:12 2011
++++ grep-2.5.4/tests/foad1.sh	Fri Jan 28 16:45:00 2011
[email protected]@ -23,7 +23,7 @@
+   INPUT="$1"
+   EXPECT="$2"
+   shift 2
+-  OUTPUT=`echo -n "$INPUT" | tr "/" "\n" | "$GREP" "[email protected]" | tr "\n" "/"`
++  OUTPUT=`printf "$INPUT" | tr "/" "\n" | "$GREP" "[email protected]" | tr "\n" "/"`
+   if test "$OUTPUT" != "$EXPECT" || test "$VERBOSE" = "1"; then
+     echo "Testing:  $GREP [email protected]"
+     test "$LC_ALL" != C && test "$LC_ALL" != "" && echo "  LC_ALL: \"$LC_ALL\""
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gtar/patches/verify.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,25 @@
+From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <[email protected]>
+Date: Mon, 15 Nov 2010 08:07:53 +0000
+Subject: tar: fix --verify option, which broke in 1.24
+
+* src/compare.c (verify_volume): Decode the header before invoking
+diff_archive, as diff_archive no longer does this as of the
+2010-06-28 commit.  Also, don't try to invoke diff_archive on a
+zero block.
+---
+diff --git a/src/compare.c b/src/compare.c
+index 6b7e6d8..f3112c6 100644
+--- a/src/compare.c
++++ b/src/compare.c
[email protected]@ -611,8 +611,10 @@ verify_volume (void)
+ 		       (0, 0, _("A lone zero block at %s"),
+ 			STRINGIFY_BIGINT (current_block_ordinal (), buf)));
+             }
++	  continue;
+ 	}
+ 
++      decode_header (current_header, &current_stat_info, &current_format, 1);
+       diff_archive ();
+       tar_stat_destroy (&current_stat_info);
+     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gtar/patches/xgetcwd.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,18 @@
+--- tar-1.25/gnu/xgetcwd.c.orig	Mon Nov  8 06:23:04 2010
++++ tar-1.25/gnu/xgetcwd.c	Mon Nov  8 06:29:04 2010
[email protected]@ -36,7 +36,14 @@
+ char *
+ xgetcwd (void)
+ {
+-  char *cwd = getcwd (NULL, 0);
++  char *cwd;
++#ifdef HAVE_PARTLY_WORKING_GETCWD
++  cwd = getcwd (NULL, 0);
++#else
++  cwd = malloc(PATH_MAX);
++  if (cwd)
++    getcwd (cwd, PATH_MAX);
++#endif
+   if (! cwd && errno == ENOMEM)
+     xalloc_die ();
+   return cwd;
--- a/components/gtar/verify.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <[email protected]>
-Date: Mon, 15 Nov 2010 08:07:53 +0000
-Subject: tar: fix --verify option, which broke in 1.24
-
-* src/compare.c (verify_volume): Decode the header before invoking
-diff_archive, as diff_archive no longer does this as of the
-2010-06-28 commit.  Also, don't try to invoke diff_archive on a
-zero block.
----
-diff --git a/src/compare.c b/src/compare.c
-index 6b7e6d8..f3112c6 100644
---- a/src/compare.c
-+++ b/src/compare.c
[email protected]@ -611,8 +611,10 @@ verify_volume (void)
- 		       (0, 0, _("A lone zero block at %s"),
- 			STRINGIFY_BIGINT (current_block_ordinal (), buf)));
-             }
-+	  continue;
- 	}
- 
-+      decode_header (current_header, &current_stat_info, &current_format, 1);
-       diff_archive ();
-       tar_stat_destroy (&current_stat_info);
-     }
--- a/components/gtar/xgetcwd.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- tar-1.25/gnu/xgetcwd.c.orig	Mon Nov  8 06:23:04 2010
-+++ tar-1.25/gnu/xgetcwd.c	Mon Nov  8 06:29:04 2010
[email protected]@ -36,7 +36,14 @@
- char *
- xgetcwd (void)
- {
--  char *cwd = getcwd (NULL, 0);
-+  char *cwd;
-+#ifdef HAVE_PARTLY_WORKING_GETCWD
-+  cwd = getcwd (NULL, 0);
-+#else
-+  cwd = malloc(PATH_MAX);
-+  if (cwd)
-+    getcwd (cwd, PATH_MAX);
-+#endif
-   if (! cwd && errno == ENOMEM)
-     xalloc_die ();
-   return cwd;
--- a/components/gzip/6294656-6283819.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
---- gzip-1.3.5.orig/gzip.c
-+++ gzip-1.3.5/gzip.c
[email protected]@ -878,8 +878,11 @@
-     }
- 
-     close(ifd);
--    if (!to_stdout && close(ofd)) {
--	write_error();
-+    if (!to_stdout) {
-+        /* Copy modes, times, ownership, and remove the input file */
-+        copy_stat(&istat);
-+	if (close(ofd))
-+		write_error();
-     }
-     if (method == -1) {
- 	if (!to_stdout) xunlink (ofname);
[email protected]@ -899,10 +902,6 @@
- 	}
- 	fprintf(stderr, "\n");
-     }
--    /* Copy modes, times, ownership, and remove the input file */
--    if (!to_stdout) {
--	copy_stat(&istat);
--    }
- }
- 
- /* ========================================================================
[email protected]@ -1322,6 +1321,7 @@
- 		/* Copy the base name. Keep a directory prefix intact. */
-                 char *p = base_name (ofname);
-                 char *base = p;
-+                char *base2;
- 		for (;;) {
- 		    *p = (char)get_char();
- 		    if (*p++ == '\0') break;
[email protected]@ -1329,6 +1329,8 @@
- 			error("corrupted input -- file name too large");
- 		    }
- 		}
-+		base2 = base_name (base);
-+		strcpy(base, base2);
-                 /* If necessary, adapt the name to local OS conventions: */
-                 if (!list) {
-                    MAKE_LEGAL_NAME(base);
[email protected]@ -1730,7 +1732,7 @@
-     reset_times(ofname, ifstat);
- #endif
-     /* Copy the protection modes */
--    if (chmod(ofname, ifstat->st_mode & 07777)) {
-+    if (fchmod(ofd, ifstat->st_mode & 07777)) {
- 	int e = errno;
- 	WARN((stderr, "%s: ", progname));
- 	if (!quiet) {
[email protected]@ -1739,7 +1741,7 @@
- 	}
-     }
- #ifndef NO_CHOWN
--    chown(ofname, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
-+    (void) fchown(ofd, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
- #endif
-     remove_ofname = 0;
-     /* It's now safe to remove the input file: */
--- a/components/gzip/6470484.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-Index: gnu/usr.bin/gzip/gzip.h
-===================================================================
-RCS file: /home/ncvs/src/gnu/usr.bin/gzip/gzip.h,v
-retrieving revision 1.4
-diff -u -d -r1.4 gzip.h
---- gzip/gzip.h	2 May 2004 23:07:49 -0000	1.4
-+++ gzip/gzip.h	17 Sep 2006 10:58:37 -0000
[email protected]@ -202,6 +202,8 @@
- extern int to_stdout;      /* output to stdout (-c) */
- extern int save_orig_name; /* set if original name must be saved */
- 
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-+
- #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
- #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
- 
-Index: gnu/usr.bin/gzip/inflate.c
-===================================================================
-RCS file: /home/ncvs/src/gnu/usr.bin/gzip/inflate.c,v
-retrieving revision 1.9
-diff -u -d -r1.9 inflate.c
---- gzip/inflate.c	13 Aug 2004 05:38:44 -0000	1.9
-+++ gzip/inflate.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -316,7 +316,7 @@
-   {
-     *t = (struct huft *)NULL;
-     *m = 0;
--    return 0;
-+    return 2;
-   }
- 
- 
-Index: gnu/usr.bin/gzip/unlzh.c
-===================================================================
-RCS file: /home/ncvs/src/gnu/usr.bin/gzip/unlzh.c,v
-retrieving revision 1.5
-diff -u -d -r1.5 unlzh.c
---- gzip/unlzh.c	27 Aug 1999 23:35:53 -0000	1.5
-+++ gzip/unlzh.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -148,13 +148,17 @@
-     unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
- 
-     for (i = 1; i <= 16; i++) count[i] = 0;
--    for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
-+    for (i = 0; i < (unsigned)nchar; i++) {
-+        if (bitlen[i] > 16)
-+        error("Bad table (case a)\n");
-+        else count[bitlen[i]]++;
-+    }
- 
-     start[1] = 0;
-     for (i = 1; i <= 16; i++)
- 	start[i + 1] = start[i] + (count[i] << (16 - i));
--    if ((start[17] & 0xffff) != 0)
--	error("Bad table\n");
-+    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
-+	error("Bad table (case b)\n");
- 
-     jutbits = 16 - tablebits;
-     for (i = 1; i <= (unsigned)tablebits; i++) {
[email protected]@ -168,15 +172,15 @@
- 
-     i = start[tablebits + 1] >> jutbits;
-     if (i != 0) {
--	k = 1 << tablebits;
--	while (i != k) table[i++] = 0;
-+	k = MIN(1 << tablebits, DIST_BUFSIZE);
-+	while (i < k) table[i++] = 0;
-     }
- 
-     avail = nchar;
-     mask = (unsigned) 1 << (15 - tablebits);
-     for (ch = 0; ch < (unsigned)nchar; ch++) {
- 	if ((len = bitlen[ch]) == 0) continue;
--	nextcode = start[len] + weight[len];
-+	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
- 	if (len <= (unsigned)tablebits) {
- 	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
- 	} else {
[email protected]@ -217,7 +221,7 @@
- 	for (i = 0; i < 256; i++) pt_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NPT)) {
- 	    c = bitbuf >> (BITBUFSIZ - 3);
- 	    if (c == 7) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
[email protected]@ -227,7 +231,7 @@
- 	    pt_len[i++] = c;
- 	    if (i == i_special) {
- 		c = getbits(2);
--		while (--c >= 0) pt_len[i++] = 0;
-+		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
- 	    }
- 	}
- 	while (i < nn) pt_len[i++] = 0;
[email protected]@ -247,7 +251,7 @@
- 	for (i = 0; i < 4096; i++) c_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NC)) {
- 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
- 	    if (c >= NT) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
[email protected]@ -255,14 +259,14 @@
- 		    if (bitbuf & mask) c = right[c];
- 		    else               c = left [c];
- 		    mask >>= 1;
--		} while (c >= NT);
-+		} while (c >= NT && (mask || c != left[c]));
- 	    }
- 	    fillbuf((int) pt_len[c]);
- 	    if (c <= 2) {
- 		if      (c == 0) c = 1;
- 		else if (c == 1) c = getbits(4) + 3;
- 		else             c = getbits(CBIT) + 20;
--		while (--c >= 0) c_len[i++] = 0;
-+		while (--c >= 0 && i < NC) c_len[i++] = 0;
- 	    } else c_len[i++] = c - 2;
- 	}
- 	while (i < NC) c_len[i++] = 0;
[email protected]@ -291,7 +295,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NC);
-+	} while (j >= NC && (mask || j != left[j]));
-     }
-     fillbuf((int) c_len[j]);
-     return j;
[email protected]@ -308,7 +312,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NP);
-+	} while (j >= NP && (mask || j != left[j]));
-     }
-     fillbuf((int) pt_len[j]);
-     if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
[email protected]@ -355,7 +359,7 @@
-     while (--j >= 0) {
- 	buffer[r] = buffer[i];
- 	i = (i + 1) & (DICSIZ - 1);
--	if (++r == count) return r;
-+	if (++r >= count) return r;
-     }
-     for ( ; ; ) {
- 	c = decode_c();
[email protected]@ -365,14 +369,14 @@
- 	}
- 	if (c <= UCHAR_MAX) {
- 	    buffer[r] = c;
--	    if (++r == count) return r;
-+	    if (++r >= count) return r;
- 	} else {
- 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
- 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
- 	    while (--j >= 0) {
- 		buffer[r] = buffer[i];
- 		i = (i + 1) & (DICSIZ - 1);
--		if (++r == count) return r;
-+		if (++r >= count) return r;
- 	    }
- 	}
-     }
-Index: gnu/usr.bin/gzip/unpack.c
-===================================================================
-RCS file: /home/ncvs/src/gnu/usr.bin/gzip/unpack.c,v
-retrieving revision 1.6
-diff -u -d -r1.6 unpack.c
---- gzip/unpack.c	27 Aug 1999 23:35:54 -0000	1.6
-+++ gzip/unpack.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -12,7 +12,6 @@
- #include "gzip.h"
- #include "crypt.h"
- 
--#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- /* The arguments must not have side effects. */
- 
- #define MAX_BITLEN 25
[email protected]@ -132,7 +131,7 @@
- 	/* Remember where the literals of this length start in literal[] : */
- 	lit_base[len] = base;
- 	/* And read the literals: */
--	for (n = leaves[len]; n > 0; n--) {
-+	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
- 	    literal[base++] = (uch)get_byte();
- 	}
-     }
[email protected]@ -168,7 +167,7 @@
-     prefixp = &prefix_len[1<<peek_bits];
-     for (len = 1; len <= peek_bits; len++) {
- 	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
--	while (prefixes--) *--prefixp = (uch)len;
-+	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
-     }
-     /* The length of all other codes is unknown: */
-     while (prefixp > prefix_len) *--prefixp = 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gzip/patches/6294656-6283819.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,62 @@
+--- gzip-1.3.5.orig/gzip.c
++++ gzip-1.3.5/gzip.c
[email protected]@ -878,8 +878,11 @@
+     }
+ 
+     close(ifd);
+-    if (!to_stdout && close(ofd)) {
+-	write_error();
++    if (!to_stdout) {
++        /* Copy modes, times, ownership, and remove the input file */
++        copy_stat(&istat);
++	if (close(ofd))
++		write_error();
+     }
+     if (method == -1) {
+ 	if (!to_stdout) xunlink (ofname);
[email protected]@ -899,10 +902,6 @@
+ 	}
+ 	fprintf(stderr, "\n");
+     }
+-    /* Copy modes, times, ownership, and remove the input file */
+-    if (!to_stdout) {
+-	copy_stat(&istat);
+-    }
+ }
+ 
+ /* ========================================================================
[email protected]@ -1322,6 +1321,7 @@
+ 		/* Copy the base name. Keep a directory prefix intact. */
+                 char *p = base_name (ofname);
+                 char *base = p;
++                char *base2;
+ 		for (;;) {
+ 		    *p = (char)get_char();
+ 		    if (*p++ == '\0') break;
[email protected]@ -1329,6 +1329,8 @@
+ 			error("corrupted input -- file name too large");
+ 		    }
+ 		}
++		base2 = base_name (base);
++		strcpy(base, base2);
+                 /* If necessary, adapt the name to local OS conventions: */
+                 if (!list) {
+                    MAKE_LEGAL_NAME(base);
[email protected]@ -1730,7 +1732,7 @@
+     reset_times(ofname, ifstat);
+ #endif
+     /* Copy the protection modes */
+-    if (chmod(ofname, ifstat->st_mode & 07777)) {
++    if (fchmod(ofd, ifstat->st_mode & 07777)) {
+ 	int e = errno;
+ 	WARN((stderr, "%s: ", progname));
+ 	if (!quiet) {
[email protected]@ -1739,7 +1741,7 @@
+ 	}
+     }
+ #ifndef NO_CHOWN
+-    chown(ofname, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
++    (void) fchown(ofd, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
+ #endif
+     remove_ofname = 0;
+     /* It's now safe to remove the input file: */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gzip/patches/6470484.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,200 @@
+Index: gnu/usr.bin/gzip/gzip.h
+===================================================================
+RCS file: /home/ncvs/src/gnu/usr.bin/gzip/gzip.h,v
+retrieving revision 1.4
+diff -u -d -r1.4 gzip.h
+--- gzip/gzip.h	2 May 2004 23:07:49 -0000	1.4
++++ gzip/gzip.h	17 Sep 2006 10:58:37 -0000
[email protected]@ -202,6 +202,8 @@
+ extern int to_stdout;      /* output to stdout (-c) */
+ extern int save_orig_name; /* set if original name must be saved */
+ 
++#define MIN(a,b) ((a) <= (b) ? (a) : (b))
++
+ #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
+ #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
+ 
+Index: gnu/usr.bin/gzip/inflate.c
+===================================================================
+RCS file: /home/ncvs/src/gnu/usr.bin/gzip/inflate.c,v
+retrieving revision 1.9
+diff -u -d -r1.9 inflate.c
+--- gzip/inflate.c	13 Aug 2004 05:38:44 -0000	1.9
++++ gzip/inflate.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -316,7 +316,7 @@
+   {
+     *t = (struct huft *)NULL;
+     *m = 0;
+-    return 0;
++    return 2;
+   }
+ 
+ 
+Index: gnu/usr.bin/gzip/unlzh.c
+===================================================================
+RCS file: /home/ncvs/src/gnu/usr.bin/gzip/unlzh.c,v
+retrieving revision 1.5
+diff -u -d -r1.5 unlzh.c
+--- gzip/unlzh.c	27 Aug 1999 23:35:53 -0000	1.5
++++ gzip/unlzh.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -148,13 +148,17 @@
+     unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
+ 
+     for (i = 1; i <= 16; i++) count[i] = 0;
+-    for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
++    for (i = 0; i < (unsigned)nchar; i++) {
++        if (bitlen[i] > 16)
++        error("Bad table (case a)\n");
++        else count[bitlen[i]]++;
++    }
+ 
+     start[1] = 0;
+     for (i = 1; i <= 16; i++)
+ 	start[i + 1] = start[i] + (count[i] << (16 - i));
+-    if ((start[17] & 0xffff) != 0)
+-	error("Bad table\n");
++    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
++	error("Bad table (case b)\n");
+ 
+     jutbits = 16 - tablebits;
+     for (i = 1; i <= (unsigned)tablebits; i++) {
[email protected]@ -168,15 +172,15 @@
+ 
+     i = start[tablebits + 1] >> jutbits;
+     if (i != 0) {
+-	k = 1 << tablebits;
+-	while (i != k) table[i++] = 0;
++	k = MIN(1 << tablebits, DIST_BUFSIZE);
++	while (i < k) table[i++] = 0;
+     }
+ 
+     avail = nchar;
+     mask = (unsigned) 1 << (15 - tablebits);
+     for (ch = 0; ch < (unsigned)nchar; ch++) {
+ 	if ((len = bitlen[ch]) == 0) continue;
+-	nextcode = start[len] + weight[len];
++	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
+ 	if (len <= (unsigned)tablebits) {
+ 	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
+ 	} else {
[email protected]@ -217,7 +221,7 @@
+ 	for (i = 0; i < 256; i++) pt_table[i] = c;
+     } else {
+ 	i = 0;
+-	while (i < n) {
++	while (i < MIN(n,NPT)) {
+ 	    c = bitbuf >> (BITBUFSIZ - 3);
+ 	    if (c == 7) {
+ 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
[email protected]@ -227,7 +231,7 @@
+ 	    pt_len[i++] = c;
+ 	    if (i == i_special) {
+ 		c = getbits(2);
+-		while (--c >= 0) pt_len[i++] = 0;
++		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
+ 	    }
+ 	}
+ 	while (i < nn) pt_len[i++] = 0;
[email protected]@ -247,7 +251,7 @@
+ 	for (i = 0; i < 4096; i++) c_table[i] = c;
+     } else {
+ 	i = 0;
+-	while (i < n) {
++	while (i < MIN(n,NC)) {
+ 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
+ 	    if (c >= NT) {
+ 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
[email protected]@ -255,14 +259,14 @@
+ 		    if (bitbuf & mask) c = right[c];
+ 		    else               c = left [c];
+ 		    mask >>= 1;
+-		} while (c >= NT);
++		} while (c >= NT && (mask || c != left[c]));
+ 	    }
+ 	    fillbuf((int) pt_len[c]);
+ 	    if (c <= 2) {
+ 		if      (c == 0) c = 1;
+ 		else if (c == 1) c = getbits(4) + 3;
+ 		else             c = getbits(CBIT) + 20;
+-		while (--c >= 0) c_len[i++] = 0;
++		while (--c >= 0 && i < NC) c_len[i++] = 0;
+ 	    } else c_len[i++] = c - 2;
+ 	}
+ 	while (i < NC) c_len[i++] = 0;
[email protected]@ -291,7 +295,7 @@
+ 	    if (bitbuf & mask) j = right[j];
+ 	    else               j = left [j];
+ 	    mask >>= 1;
+-	} while (j >= NC);
++	} while (j >= NC && (mask || j != left[j]));
+     }
+     fillbuf((int) c_len[j]);
+     return j;
[email protected]@ -308,7 +312,7 @@
+ 	    if (bitbuf & mask) j = right[j];
+ 	    else               j = left [j];
+ 	    mask >>= 1;
+-	} while (j >= NP);
++	} while (j >= NP && (mask || j != left[j]));
+     }
+     fillbuf((int) pt_len[j]);
+     if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
[email protected]@ -355,7 +359,7 @@
+     while (--j >= 0) {
+ 	buffer[r] = buffer[i];
+ 	i = (i + 1) & (DICSIZ - 1);
+-	if (++r == count) return r;
++	if (++r >= count) return r;
+     }
+     for ( ; ; ) {
+ 	c = decode_c();
[email protected]@ -365,14 +369,14 @@
+ 	}
+ 	if (c <= UCHAR_MAX) {
+ 	    buffer[r] = c;
+-	    if (++r == count) return r;
++	    if (++r >= count) return r;
+ 	} else {
+ 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
+ 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
+ 	    while (--j >= 0) {
+ 		buffer[r] = buffer[i];
+ 		i = (i + 1) & (DICSIZ - 1);
+-		if (++r == count) return r;
++		if (++r >= count) return r;
+ 	    }
+ 	}
+     }
+Index: gnu/usr.bin/gzip/unpack.c
+===================================================================
+RCS file: /home/ncvs/src/gnu/usr.bin/gzip/unpack.c,v
+retrieving revision 1.6
+diff -u -d -r1.6 unpack.c
+--- gzip/unpack.c	27 Aug 1999 23:35:54 -0000	1.6
++++ gzip/unpack.c	17 Sep 2006 10:58:37 -0000
[email protected]@ -12,7 +12,6 @@
+ #include "gzip.h"
+ #include "crypt.h"
+ 
+-#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+ /* The arguments must not have side effects. */
+ 
+ #define MAX_BITLEN 25
[email protected]@ -132,7 +131,7 @@
+ 	/* Remember where the literals of this length start in literal[] : */
+ 	lit_base[len] = base;
+ 	/* And read the literals: */
+-	for (n = leaves[len]; n > 0; n--) {
++	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
+ 	    literal[base++] = (uch)get_byte();
+ 	}
+     }
[email protected]@ -168,7 +167,7 @@
+     prefixp = &prefix_len[1<<peek_bits];
+     for (len = 1; len <= peek_bits; len++) {
+ 	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
+-	while (prefixes--) *--prefixp = (uch)len;
++	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
+     }
+     /* The length of all other codes is unknown: */
+     while (prefixp > prefix_len) *--prefixp = 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gzip/patches/version.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,11 @@
+--- gzip-1.3.5/gzip.c-orig	Fri Oct  6 05:44:06 2006
++++ gzip-1.3.5/gzip.c	Fri Oct  6 05:48:53 2006
[email protected]@ -427,6 +427,8 @@
+ #endif
+     printf ("\n");
+     printf ("Written by Jean-loup Gailly.\n");
++    printf ("patched for Sun BugIDs 6294656 6283819\n");
++    printf ("patched for CVE-2006-4334, CVE-2006-4335, CVE-2006-4336, CVE-2006-4337, CVE-2006-4338\n");
+ }
+ 
+ local void progerror (string)
--- a/components/gzip/version.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gzip-1.3.5/gzip.c-orig	Fri Oct  6 05:44:06 2006
-+++ gzip-1.3.5/gzip.c	Fri Oct  6 05:48:53 2006
[email protected]@ -427,6 +427,8 @@
- #endif
-     printf ("\n");
-     printf ("Written by Jean-loup Gailly.\n");
-+    printf ("patched for Sun BugIDs 6294656 6283819\n");
-+    printf ("patched for CVE-2006-4334, CVE-2006-4335, CVE-2006-4336, CVE-2006-4337, CVE-2006-4338\n");
- }
- 
- local void progerror (string)
--- a/components/lua/1.Makefile.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
---- lua-5.1.4/Makefile.orig	Mon Aug 11 17:40:48 2008
-+++ lua-5.1.4/Makefile	Fri Feb 18 13:00:25 2011
[email protected]@ -5,15 +5,17 @@
- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
- 
- # Your platform. See PLATS for possible values.
--PLAT= none
-+PLAT= solaris
- 
- # Where to install. The installation starts in the src and doc directories,
- # so take care if INSTALL_TOP is not an absolute path.
--INSTALL_TOP= /usr/local
-+INSTALL_TOP= $(ROOT)/usr
- INSTALL_BIN= $(INSTALL_TOP)/bin
- INSTALL_INC= $(INSTALL_TOP)/include
- INSTALL_LIB= $(INSTALL_TOP)/lib
--INSTALL_MAN= $(INSTALL_TOP)/man/man1
-+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
-+INSTALL_DOC= $(INSTALL_TOP)/share/doc/lua
-+INSTALL_TEST= $(INSTALL_TOP)/demo/lua/test
- #
- # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
[email protected]@ -22,9 +24,9 @@
- 
- # How to install. If your install program does not support "-p", then you
- # may have to run ranlib on the installed liblua.a (do "make ranlib").
--INSTALL= install -p
--INSTALL_EXEC= $(INSTALL) -m 0755
--INSTALL_DATA= $(INSTALL) -m 0644
-+INSTALL= ginstall -p
-+INSTALL_EXEC= $(INSTALL) -m 0555
-+INSTALL_DATA= $(INSTALL) -m 0444
- #
- # If you don't have install you can use cp instead.
- # INSTALL= cp -p
[email protected]@ -38,13 +40,15 @@
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
- # Convenience platforms targets.
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= solaris
- 
- # What to install.
- TO_BIN= lua luac
--TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
--TO_LIB= liblua.a
-+TO_INC= lua.h luaconf.h lualib.h lauxlib.h
-+TO_LIB= liblua.so
- TO_MAN= lua.1 luac.1
-+TO_DOC= amazon.gif contents.html cover.png logo.gif lua.css lua.html luac.html manual.css manual.html readme.html
-+TO_TEST= bisect.lua cf.lua echo.lua env.lua factorial.lua fib.lua fibfor.lua globals.lua hello.lua life.lua luac.lua printf.lua readonly.lua sieve.lua sort.lua table.lua trace-calls.lua trace-globals.lua xd.lua
- 
- # Lua version and release.
- V= 5.1
[email protected]@ -55,16 +59,18 @@
- $(PLATS) clean:
- 	cd src && $(MAKE) [email protected]
- 
-+check:  test
- test:	dummy
- 	src/lua test/hello.lua
- 
- install: dummy
--	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
-+	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_DOC) $(INSTALL_MAN) $(INSTALL_TEST)
- 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
- 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
--	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-+	cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB)
- 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
--
-+	cd doc && $(INSTALL_DATA) $(TO_DOC) $(INSTALL_DOC)
-+	cd test && $(INSTALL_DATA) $(TO_TEST) $(INSTALL_TEST)
- ranlib:
- 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
-
---- lua-5.1.4/src/Makefile.orig	Sat Jan 19 11:37:58 2008
-+++ lua-5.1.4/src/Makefile	Wed Feb 16 15:43:24 2011
[email protected]@ -4,25 +4,24 @@
- 
- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
- 
--# Your platform. See PLATS for possible values.
--PLAT= none
--
--CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
-+CC=$(CC)
-+CFLAGS= -xO3 -Xc -Kpic $(MYCFLAGS)
-+FLAG_SPARC:sh=	if [ ${MACH64} = "sparcv9" ]; then echo -xcode=pic13; fi
-+CFLAGS= $(FLAG_SPARC)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
--LIBS= -lm $(MYLIBS)
-+LIBS= -lm -lc $(MYLIBS)
- 
- MYCFLAGS=
--MYLDFLAGS=
-+MYLDFLAGS= -zdefs -ztext
- MYLIBS=
- 
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= solaris
- 
--LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
[email protected]@ -36,10 +35,10 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
--ALL_A= $(LUA_A)
-+ALL_T= $(LUA_SO) $(LUA_T) $(LUAC_T)
-+ALL_A= $(LUA_SO)
- 
--default: $(PLAT)
-+default: solaris
- 
- all:	$(ALL_T)
- 
[email protected]@ -47,15 +46,15 @@
- 
- a:	$(ALL_A)
- 
--$(LUA_A): $(CORE_O) $(LIB_O)
--	$(AR) [email protected] $?
--	$(RANLIB) [email protected]
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $(LUA_SO) -G -h $(LUA_SO) $(CFLAGS) $(MYLDFLAGS) $(CORE_O) \
-+	$(LIB_O) $(LIBS)
- 
--$(LUA_T): $(LUA_O) $(LUA_A)
--	$(CC) -o [email protected] $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+$(LUA_T): $(LUA_O) $(LUA_SO)
-+	$(CC) -o [email protected] $(MYLDFLAGS) $(LUA_O) $(LUA_SO) $(LIBS)
- 
--$(LUAC_T): $(LUAC_O) $(LUA_A)
--	$(CC) -o [email protected] $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+$(LUAC_T): $(LUAC_O) $(LUA_SO)
-+	$(CC) -o [email protected] $(MYLDFLAGS) $(LUAC_O) $(LUA_SO) $(LIBS)
- 
- clean:
- 	$(RM) $(ALL_T) $(ALL_O)
[email protected]@ -74,46 +73,8 @@
- 	@echo "MYLDFLAGS = $(MYLDFLAGS)"
- 	@echo "MYLIBS = $(MYLIBS)"
- 
--# convenience targets for popular platforms
--
--none:
--	@echo "Please choose a platform:"
--	@echo "   $(PLATS)"
--
--aix:
--	$(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
--
--ansi:
--	$(MAKE) all MYCFLAGS=-DLUA_ANSI
--
--bsd:
--	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
--
--freebsd:
--	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
--
--generic:
--	$(MAKE) all MYCFLAGS=
--
--linux:
--	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
--
--macosx:
--	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
--# use this on Mac OS X 10.3-
--#	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
--
--mingw:
--	$(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
--	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
--	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
--	$(MAKE) "LUAC_T=luac.exe" luac.exe
--
--posix:
--	$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
--
- solaris:
--	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
-+	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
- 
- # list targets that do not create files (but not all makes understand .PHONY)
- .PHONY: all $(PLATS) default o a clean depend echo none
- 
--- a/components/lua/2.lua.pc.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- lua-5.1.4/etc/lua.pc.orig	Fri Aug  8 05:46:11 2008
-+++ lua-5.1.4/etc/lua.pc	Tue Feb 15 18:30:23 2011
[email protected]@ -1,22 +1,6 @@
- # lua.pc -- pkg-config data for Lua
- 
--# vars from install Makefile
--
--# grep '^V=' ../Makefile
--V= 5.1
--# grep '^R=' ../Makefile
--R= 5.1.4
--
--# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
--prefix= /usr/local
--INSTALL_BIN= ${prefix}/bin
--INSTALL_INC= ${prefix}/include
--INSTALL_LIB= ${prefix}/lib
--INSTALL_MAN= ${prefix}/man/man1
--INSTALL_LMOD= ${prefix}/share/lua/${V}
--INSTALL_CMOD= ${prefix}/lib/lua/${V}
--
--# canonical vars
-+prefix=${PROTO_DIR}/usr
- exec_prefix=${prefix}
- libdir=${exec_prefix}/lib
- includedir=${prefix}/include
[email protected]@ -23,7 +7,7 @@
- 
- Name: Lua
- Description: An Extensible Extension Language
--Version: ${R}
-+Version: 5.1.4
- Requires: 
- Libs: -L${libdir} -llua -lm
- Cflags: -I${includedir}
--- a/components/lua/3.headers.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- lua-5.1.4/src/lua.h.orig	2009-01-06 02:15:11.179130113 -0800
-+++ lua-5.1.4/src/lua.h	2009-01-06 02:15:56.570695998 -0800
[email protected]@ -9,6 +9,10 @@
- #ifndef lua_h
- #define lua_h
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #include <stdarg.h>
- #include <stddef.h>
- 
[email protected]@ -384,5 +388,8 @@
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- ******************************************************************************/
- 
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif
---- lua-5.1.4/src/lualib.h.orig	2009-01-06 02:15:19.193417835 -0800
-+++ lua-5.1.4/src/lualib.h	2009-01-06 02:16:20.502288036 -0800
[email protected]@ -8,6 +8,10 @@
- #ifndef lualib_h
- #define lualib_h
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #include "lua.h"
- 
- 
[email protected]@ -49,5 +53,8 @@
- #define lua_assert(x)	((void)0)
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif
---- lua-5.1.4/src/lauxlib.h.orig	2009-01-06 02:15:37.967244620 -0800
-+++ lua-5.1.4/src/lauxlib.h	2009-01-06 02:16:26.398180986 -0800
[email protected]@ -8,6 +8,9 @@
- #ifndef lauxlib_h
- #define lauxlib_h
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #include <stddef.h>
- #include <stdio.h>
[email protected]@ -169,6 +172,10 @@
- 
- #define luaL_reg	luaL_Reg
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
- 
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lua/patches/1.Makefile.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,199 @@
+--- lua-5.1.4/Makefile.orig	Mon Aug 11 17:40:48 2008
++++ lua-5.1.4/Makefile	Fri Feb 18 13:00:25 2011
[email protected]@ -5,15 +5,17 @@
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+ # Your platform. See PLATS for possible values.
+-PLAT= none
++PLAT= solaris
+ 
+ # Where to install. The installation starts in the src and doc directories,
+ # so take care if INSTALL_TOP is not an absolute path.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= $(ROOT)/usr
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
++INSTALL_DOC= $(INSTALL_TOP)/share/doc/lua
++INSTALL_TEST= $(INSTALL_TOP)/demo/lua/test
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
[email protected]@ -22,9 +24,9 @@
+ 
+ # How to install. If your install program does not support "-p", then you
+ # may have to run ranlib on the installed liblua.a (do "make ranlib").
+-INSTALL= install -p
+-INSTALL_EXEC= $(INSTALL) -m 0755
+-INSTALL_DATA= $(INSTALL) -m 0644
++INSTALL= ginstall -p
++INSTALL_EXEC= $(INSTALL) -m 0555
++INSTALL_DATA= $(INSTALL) -m 0444
+ #
+ # If you don't have install you can use cp instead.
+ # INSTALL= cp -p
[email protected]@ -38,13 +40,15 @@
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+ # Convenience platforms targets.
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
++PLATS= solaris
+ 
+ # What to install.
+ TO_BIN= lua luac
+-TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
++TO_INC= lua.h luaconf.h lualib.h lauxlib.h
++TO_LIB= liblua.so
+ TO_MAN= lua.1 luac.1
++TO_DOC= amazon.gif contents.html cover.png logo.gif lua.css lua.html luac.html manual.css manual.html readme.html
++TO_TEST= bisect.lua cf.lua echo.lua env.lua factorial.lua fib.lua fibfor.lua globals.lua hello.lua life.lua luac.lua printf.lua readonly.lua sieve.lua sort.lua table.lua trace-calls.lua trace-globals.lua xd.lua
+ 
+ # Lua version and release.
+ V= 5.1
[email protected]@ -55,16 +59,18 @@
+ $(PLATS) clean:
+ 	cd src && $(MAKE) [email protected]
+ 
++check:  test
+ test:	dummy
+ 	src/lua test/hello.lua
+ 
+ install: dummy
+-	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
++	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_DOC) $(INSTALL_MAN) $(INSTALL_TEST)
+ 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+-	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++	cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+-
++	cd doc && $(INSTALL_DATA) $(TO_DOC) $(INSTALL_DOC)
++	cd test && $(INSTALL_DATA) $(TO_TEST) $(INSTALL_TEST)
+ ranlib:
+ 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+
+--- lua-5.1.4/src/Makefile.orig	Sat Jan 19 11:37:58 2008
++++ lua-5.1.4/src/Makefile	Wed Feb 16 15:43:24 2011
[email protected]@ -4,25 +4,24 @@
+ 
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+-# Your platform. See PLATS for possible values.
+-PLAT= none
+-
+-CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CC=$(CC)
++CFLAGS= -xO3 -Xc -Kpic $(MYCFLAGS)
++FLAG_SPARC:sh=	if [ ${MACH64} = "sparcv9" ]; then echo -xcode=pic13; fi
++CFLAGS= $(FLAG_SPARC)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
+-LIBS= -lm $(MYLIBS)
++LIBS= -lm -lc $(MYLIBS)
+ 
+ MYCFLAGS=
+-MYLDFLAGS=
++MYLDFLAGS= -zdefs -ztext
+ MYLIBS=
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
++PLATS= solaris
+ 
+-LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
[email protected]@ -36,10 +35,10 @@
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+-ALL_A= $(LUA_A)
++ALL_T= $(LUA_SO) $(LUA_T) $(LUAC_T)
++ALL_A= $(LUA_SO)
+ 
+-default: $(PLAT)
++default: solaris
+ 
+ all:	$(ALL_T)
+ 
[email protected]@ -47,15 +46,15 @@
+ 
+ a:	$(ALL_A)
+ 
+-$(LUA_A): $(CORE_O) $(LIB_O)
+-	$(AR) [email protected] $?
+-	$(RANLIB) [email protected]
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $(LUA_SO) -G -h $(LUA_SO) $(CFLAGS) $(MYLDFLAGS) $(CORE_O) \
++	$(LIB_O) $(LIBS)
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o [email protected] $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++$(LUA_T): $(LUA_O) $(LUA_SO)
++	$(CC) -o [email protected] $(MYLDFLAGS) $(LUA_O) $(LUA_SO) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o [email protected] $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++$(LUAC_T): $(LUAC_O) $(LUA_SO)
++	$(CC) -o [email protected] $(MYLDFLAGS) $(LUAC_O) $(LUA_SO) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
[email protected]@ -74,46 +73,8 @@
+ 	@echo "MYLDFLAGS = $(MYLDFLAGS)"
+ 	@echo "MYLIBS = $(MYLIBS)"
+ 
+-# convenience targets for popular platforms
+-
+-none:
+-	@echo "Please choose a platform:"
+-	@echo "   $(PLATS)"
+-
+-aix:
+-	$(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
+-
+-ansi:
+-	$(MAKE) all MYCFLAGS=-DLUA_ANSI
+-
+-bsd:
+-	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+-
+-freebsd:
+-	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
+-
+-generic:
+-	$(MAKE) all MYCFLAGS=
+-
+-linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+-
+-macosx:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
+-# use this on Mac OS X 10.3-
+-#	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+-
+-mingw:
+-	$(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
+-	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+-	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
+-	$(MAKE) "LUAC_T=luac.exe" luac.exe
+-
+-posix:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
+-
+ solaris:
+-	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
++	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
+ 
+ # list targets that do not create files (but not all makes understand .PHONY)
+ .PHONY: all $(PLATS) default o a clean depend echo none
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lua/patches/2.lua.pc.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,35 @@
+--- lua-5.1.4/etc/lua.pc.orig	Fri Aug  8 05:46:11 2008
++++ lua-5.1.4/etc/lua.pc	Tue Feb 15 18:30:23 2011
[email protected]@ -1,22 +1,6 @@
+ # lua.pc -- pkg-config data for Lua
+ 
+-# vars from install Makefile
+-
+-# grep '^V=' ../Makefile
+-V= 5.1
+-# grep '^R=' ../Makefile
+-R= 5.1.4
+-
+-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
+-INSTALL_BIN= ${prefix}/bin
+-INSTALL_INC= ${prefix}/include
+-INSTALL_LIB= ${prefix}/lib
+-INSTALL_MAN= ${prefix}/man/man1
+-INSTALL_LMOD= ${prefix}/share/lua/${V}
+-INSTALL_CMOD= ${prefix}/lib/lua/${V}
+-
+-# canonical vars
++prefix=${PROTO_DIR}/usr
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
[email protected]@ -23,7 +7,7 @@
+ 
+ Name: Lua
+ Description: An Extensible Extension Language
+-Version: ${R}
++Version: 5.1.4
+ Requires: 
+ Libs: -L${libdir} -llua -lm
+ Cflags: -I${includedir}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lua/patches/3.headers.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,67 @@
+--- lua-5.1.4/src/lua.h.orig	2009-01-06 02:15:11.179130113 -0800
++++ lua-5.1.4/src/lua.h	2009-01-06 02:15:56.570695998 -0800
[email protected]@ -9,6 +9,10 @@
+ #ifndef lua_h
+ #define lua_h
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include <stdarg.h>
+ #include <stddef.h>
+ 
[email protected]@ -384,5 +388,8 @@
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ******************************************************************************/
+ 
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+--- lua-5.1.4/src/lualib.h.orig	2009-01-06 02:15:19.193417835 -0800
++++ lua-5.1.4/src/lualib.h	2009-01-06 02:16:20.502288036 -0800
[email protected]@ -8,6 +8,10 @@
+ #ifndef lualib_h
+ #define lualib_h
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include "lua.h"
+ 
+ 
[email protected]@ -49,5 +53,8 @@
+ #define lua_assert(x)	((void)0)
+ #endif
+ 
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+--- lua-5.1.4/src/lauxlib.h.orig	2009-01-06 02:15:37.967244620 -0800
++++ lua-5.1.4/src/lauxlib.h	2009-01-06 02:16:26.398180986 -0800
[email protected]@ -8,6 +8,9 @@
+ #ifndef lauxlib_h
+ #define lauxlib_h
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ #include <stddef.h>
+ #include <stdio.h>
[email protected]@ -169,6 +172,10 @@
+ 
+ #define luaL_reg	luaL_Reg
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+ 
+ 
--- a/components/mercurial/manpages.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
---- mercurial-1.3.1/doc/hg.1	Thu Jul 23 10:58:26 2009
-+++ /usr/share/man/man1/hg.1	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hg
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -757,7 +762,7 @@
- .RS 4
- .\}
- .nf
--$ cp \-al REPO REPOCLONE
-+$ /usr/gnu/bin/cp \-al REPO REPOCLONE
- .fi
- .if n \{\
- .RE
[email protected]@ -4331,6 +4336,12 @@
- .RE
- .sp
- Some commands (e\&.g\&. revert) produce backup files ending in \&.orig, if the \&.orig file already exists and is not tracked by Mercurial, it will be overwritten\&.
-+.TP
-+/usr/demo/mercurial
-+This directory contains assorted files which are part of the Mercurial
-+distribution, but not core to its functionality&.  They will generally
-+need to be copied elsewhere to be of use.
-+
- .SH "BUGS"
- .sp
- Probably lots, please post them to the mailing list (See Resources below) when you find them\&.
[email protected]@ -4376,3 +4387,23 @@
- .RS 4
- \%http://selenic.com/mailman/listinfo/mercurial
- .RE
-+.\" Begin Sun update
-+.SH ATTRIBUTES
-+See
-+.BR attributes (5)
-+for descriptions of the following attributes:
-+.sp
-+.TS
-+box;
-+cbp-1 | cbp-1
-+l | l .
-+ATTRIBUTE TYPE	ATTRIBUTE VALUE
-+=
-+Availability	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
---- mercurial-1.3.1/doc/hgrc.5	Thu Jul 23 10:58:38 2009
-+++ /usr/share/man/man5/hgrc.5	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hgrc
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -27,7 +32,7 @@
- .sp
- Mercurial reads configuration data from several files, if they exist\&. The names of these files depend on the system on which Mercurial is installed\&. *\&.rc files from a single directory are read in alphabetical order, later ones overriding earlier ones\&. Where multiple paths are given below, settings from later paths override earlier ones\&.
- .PP
--(Unix) <install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, (Unix) <install\-root>/etc/mercurial/hgrc
-+<install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, <install\-root>/etc/mercurial/hgrc
- .RS 4
- Per\-installation configuration files, searched for in the directory where Mercurial is installed\&.
- <install\-root>
[email protected]@ -36,12 +41,12 @@
- /shared/tools/etc/mercurial/hgrc\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&.
- .RE
- .PP
--(Unix) /etc/mercurial/hgrc\&.d/*\&.rc, (Unix) /etc/mercurial/hgrc
-+/etc/mercurial/hgrc\&.d/*\&.rc, /etc/mercurial/hgrc
- .RS 4
- Per\-system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Options in these files override per\-installation options\&.
- .RE
- .PP
--(Windows) <install\-dir>\eMercurial\&.ini, or else, (Windows) HKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial, or else, (Windows) C:\eMercurial\eMercurial\&.ini
-+(Windows) <install\-dir>\eMercurial\&.ini, or else
- .RS 4
- Per\-installation/system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Registry keys contain PATH\-like strings, every part of which must reference a
- Mercurial\&.ini
[email protected]@ -50,7 +55,7 @@
- files will be read\&.
- .RE
- .PP
--(Unix) $HOME/\&.hgrc, (Windows) %HOME%\eMercurial\&.ini, (Windows) %HOME%\e\&.hgrc, (Windows) %USERPROFILE%\eMercurial\&.ini, (Windows) %USERPROFILE%\e\&.hgrc
-+$HOME/\&.hgrc
- .RS 4
- Per\-user configuration file(s), for the user running Mercurial\&. On Windows 9x,
- %HOME%
[email protected]@ -58,7 +63,7 @@
- %APPDATA%\&. Options in these files apply to all Mercurial commands executed by this user in any directory\&. Options in these files override per\-installation and per\-system options\&.
- .RE
- .PP
--(Unix, Windows) <repo>/\&.hg/hgrc
-+<repo>/\&.hg/hgrc
- .RS 4
- Per\-repository configuration options that only apply in a particular repository\&. This file is not version\-controlled, and will not get transferred during a "clone" operation\&. Options in this file override options in all other configuration files\&. On Unix, most of this file will be ignored if it doesn\(cqt belong to a trusted user or to a trusted group\&. See the documentation for the trusted section below for more details\&.
- .RE
[email protected]@ -874,7 +879,7 @@
- patch content and patched files end of lines are preserved\&. When set to
- \fIlf\fR
- or
--\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF (Unix) or CRLF (Windows)\&. Default: strict\&.
-+\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF or CRLF (Windows)\&. Default: strict\&.
- .RE
- .RE
- .PP
[email protected]@ -1275,3 +1280,23 @@
- .RS 4
- \%mailto:[email protected]
- .RE
-+.\" Begin Sun update
-+.SH ATTRIBUTES
-+See
-+.BR attributes (5)
-+for descriptions of the following attributes:
-+.sp
-+.TS
-+box;
-+cbp-1 | cbp-1
-+l | l .
-+ATTRIBUTE TYPE	ATTRIBUTE VALUE
-+=
-+Availability	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
---- mercurial-1.3.1/doc/hgignore.5	Thu Jul 23 10:58:30 2009
-+++ /usr/share/man/man5/hgignore.5	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hgignore
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -119,3 +124,23 @@
- .RS 4
- \%mailto:[email protected]
- .RE
-+.\" Begin Sun update
-+.SH ATTRIBUTES
-+See
-+.BR attributes (5)
-+for descriptions of the following attributes:
-+.sp
-+.TS
-+box;
-+cbp-1 | cbp-1
-+l | l .
-+ATTRIBUTE TYPE	ATTRIBUTE VALUE
-+=
-+Availability	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/manpages.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,181 @@
+--- mercurial-1.3.1/doc/hg.1	Thu Jul 23 10:58:26 2009
++++ /usr/share/man/man1/hg.1	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
+ '\" t
++.\"
++.\" Modified for Solaris to to add the Solaris stability classification,
++.\" and to add a note about source availability.
++.\"
++'\" t
+ .\"     Title: hg
+ .\"    Author: [see the "AUTHOR" section]
+ .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -757,7 +762,7 @@
+ .RS 4
+ .\}
+ .nf
+-$ cp \-al REPO REPOCLONE
++$ /usr/gnu/bin/cp \-al REPO REPOCLONE
+ .fi
+ .if n \{\
+ .RE
[email protected]@ -4331,6 +4336,12 @@
+ .RE
+ .sp
+ Some commands (e\&.g\&. revert) produce backup files ending in \&.orig, if the \&.orig file already exists and is not tracked by Mercurial, it will be overwritten\&.
++.TP
++/usr/demo/mercurial
++This directory contains assorted files which are part of the Mercurial
++distribution, but not core to its functionality&.  They will generally
++need to be copied elsewhere to be of use.
++
+ .SH "BUGS"
+ .sp
+ Probably lots, please post them to the mailing list (See Resources below) when you find them\&.
[email protected]@ -4376,3 +4387,23 @@
+ .RS 4
+ \%http://selenic.com/mailman/listinfo/mercurial
+ .RE
++.\" Begin Sun update
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	developer/versioning/mercurial
++=
++Interface Stability	Volatile
++.TE
++.PP
++.SH NOTES
++Source for Mercurial is available on http://opensolaris.org.
++.\" End Sun update
+--- mercurial-1.3.1/doc/hgrc.5	Thu Jul 23 10:58:38 2009
++++ /usr/share/man/man5/hgrc.5	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
+ '\" t
++.\"
++.\" Modified for Solaris to to add the Solaris stability classification,
++.\" and to add a note about source availability.
++.\"
++'\" t
+ .\"     Title: hgrc
+ .\"    Author: [see the "AUTHOR" section]
+ .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -27,7 +32,7 @@
+ .sp
+ Mercurial reads configuration data from several files, if they exist\&. The names of these files depend on the system on which Mercurial is installed\&. *\&.rc files from a single directory are read in alphabetical order, later ones overriding earlier ones\&. Where multiple paths are given below, settings from later paths override earlier ones\&.
+ .PP
+-(Unix) <install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, (Unix) <install\-root>/etc/mercurial/hgrc
++<install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, <install\-root>/etc/mercurial/hgrc
+ .RS 4
+ Per\-installation configuration files, searched for in the directory where Mercurial is installed\&.
+ <install\-root>
[email protected]@ -36,12 +41,12 @@
+ /shared/tools/etc/mercurial/hgrc\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&.
+ .RE
+ .PP
+-(Unix) /etc/mercurial/hgrc\&.d/*\&.rc, (Unix) /etc/mercurial/hgrc
++/etc/mercurial/hgrc\&.d/*\&.rc, /etc/mercurial/hgrc
+ .RS 4
+ Per\-system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Options in these files override per\-installation options\&.
+ .RE
+ .PP
+-(Windows) <install\-dir>\eMercurial\&.ini, or else, (Windows) HKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial, or else, (Windows) C:\eMercurial\eMercurial\&.ini
++(Windows) <install\-dir>\eMercurial\&.ini, or else
+ .RS 4
+ Per\-installation/system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Registry keys contain PATH\-like strings, every part of which must reference a
+ Mercurial\&.ini
[email protected]@ -50,7 +55,7 @@
+ files will be read\&.
+ .RE
+ .PP
+-(Unix) $HOME/\&.hgrc, (Windows) %HOME%\eMercurial\&.ini, (Windows) %HOME%\e\&.hgrc, (Windows) %USERPROFILE%\eMercurial\&.ini, (Windows) %USERPROFILE%\e\&.hgrc
++$HOME/\&.hgrc
+ .RS 4
+ Per\-user configuration file(s), for the user running Mercurial\&. On Windows 9x,
+ %HOME%
[email protected]@ -58,7 +63,7 @@
+ %APPDATA%\&. Options in these files apply to all Mercurial commands executed by this user in any directory\&. Options in these files override per\-installation and per\-system options\&.
+ .RE
+ .PP
+-(Unix, Windows) <repo>/\&.hg/hgrc
++<repo>/\&.hg/hgrc
+ .RS 4
+ Per\-repository configuration options that only apply in a particular repository\&. This file is not version\-controlled, and will not get transferred during a "clone" operation\&. Options in this file override options in all other configuration files\&. On Unix, most of this file will be ignored if it doesn\(cqt belong to a trusted user or to a trusted group\&. See the documentation for the trusted section below for more details\&.
+ .RE
[email protected]@ -874,7 +879,7 @@
+ patch content and patched files end of lines are preserved\&. When set to
+ \fIlf\fR
+ or
+-\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF (Unix) or CRLF (Windows)\&. Default: strict\&.
++\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF or CRLF (Windows)\&. Default: strict\&.
+ .RE
+ .RE
+ .PP
[email protected]@ -1275,3 +1280,23 @@
+ .RS 4
+ \%mailto:[email protected]
+ .RE
++.\" Begin Sun update
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	developer/versioning/mercurial
++=
++Interface Stability	Volatile
++.TE
++.PP
++.SH NOTES
++Source for Mercurial is available on http://opensolaris.org.
++.\" End Sun update
+--- mercurial-1.3.1/doc/hgignore.5	Thu Jul 23 10:58:30 2009
++++ /usr/share/man/man5/hgignore.5	Tue Feb 19 05:28:30 2002
[email protected]@ -1,4 +1,9 @@
+ '\" t
++.\"
++.\" Modified for Solaris to to add the Solaris stability classification,
++.\" and to add a note about source availability.
++.\"
++'\" t
+ .\"     Title: hgignore
+ .\"    Author: [see the "AUTHOR" section]
+ .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
[email protected]@ -119,3 +124,23 @@
+ .RS 4
+ \%mailto:[email protected]
+ .RE
++.\" Begin Sun update
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	developer/versioning/mercurial
++=
++Interface Stability	Volatile
++.TE
++.PP
++.SH NOTES
++Source for Mercurial is available on http://opensolaris.org.
++.\" End Sun update
--- a/components/patch/DESTDIR.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- patch-2.5.9/Makefile.in.orig	Tue May 20 09:15:48 2003
-+++ patch-2.5.9/Makefile.in	Thu Feb  3 13:41:39 2011
[email protected]@ -112,11 +112,11 @@
- 	$(CC) -o [email protected] $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install:: all installdirs
--	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
--	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
-+	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)/$(bindir)/$(patch_name)$(EXEEXT)
-+	-$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)/$(man1dir)/$(patch_name)$(man1ext)
- 
- installdirs::
--	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir)
-+	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir)
- 
- install-strip::
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/patch/patches/DESTDIR.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,17 @@
+--- patch-2.5.9/Makefile.in.orig	Tue May 20 09:15:48 2003
++++ patch-2.5.9/Makefile.in	Thu Feb  3 13:41:39 2011
[email protected]@ -112,11 +112,11 @@
+ 	$(CC) -o [email protected] $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+ install:: all installdirs
+-	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
+-	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
++	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)/$(bindir)/$(patch_name)$(EXEEXT)
++	-$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)/$(man1dir)/$(patch_name)$(man1ext)
+ 
+ installdirs::
+-	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir)
++	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir)
+ 
+ install-strip::
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
--- a/components/python/pyopenssl/no-zip_safe.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- pyOpenSSL-0.11/setup.py.orig	Mon Feb 14 23:17:02 2011
-+++ pyOpenSSL-0.11/setup.py	Mon Feb 14 23:17:31 2011
[email protected]@ -203,7 +203,6 @@
-                      'OpenSSL.test.test_crypto',
-                      'OpenSSL.test.test_rand',
-                      'OpenSSL.test.test_ssl'],
--      zip_safe = False,
-       cmdclass = {"build_ext": BuildExtension},
-       description = 'Python wrapper module around the OpenSSL library',
-       author = 'Martin Sjögren, AB Strakt',
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/patches/no-zip_safe.patch	Tue Mar 01 14:19:15 2011 -0800
@@ -0,0 +1,10 @@
+--- pyOpenSSL-0.11/setup.py.orig	Mon Feb 14 23:17:02 2011
++++ pyOpenSSL-0.11/setup.py	Mon Feb 14 23:17:31 2011
[email protected]@ -203,7 +203,6 @@
+                      'OpenSSL.test.test_crypto',
+                      'OpenSSL.test.test_rand',
+                      'OpenSSL.test.test_ssl'],
+-      zip_safe = False,
+       cmdclass = {"build_ext": BuildExtension},
+       description = 'Python wrapper module around the OpenSSL library',
+       author = 'Martin Sjögren, AB Strakt',
--- a/components/python/python26/Python26-00-filemagic.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2232 +0,0 @@
-diff -u Python-2.6.4/Lib/platform.py.orig Python-2.6.4/Lib/platform.py
---- Python-2.6.4/Lib/platform.py.orig	Mon Feb 21 10:46:30 2011
-+++ Python-2.6.4/Lib/platform.py	Mon Feb 21 10:46:30 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """ This module tries to retrieve as much platform-identifying data as
-     possible. It makes this information available via function APIs.
-diff -u Python-2.6.4/Lib/profile.py.orig Python-2.6.4/Lib/profile.py
---- Python-2.6.4/Lib/profile.py.orig	Mon Feb 21 10:46:25 2011
-+++ Python-2.6.4/Lib/profile.py	Mon Feb 21 10:46:25 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # Class for profiling python code. rev 1.0  6/2/94
- #
-diff -u Python-2.6.4/Lib/trace.py.orig Python-2.6.4/Lib/trace.py
---- Python-2.6.4/Lib/trace.py.orig	Mon Feb 21 10:46:29 2011
-+++ Python-2.6.4/Lib/trace.py	Mon Feb 21 10:46:29 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # portions copyright 2001, Autonomous Zones Industries, Inc., all rights...
- # err...  reserved and offered to the public under the terms of the
-diff -u Python-2.6.4/Lib/cProfile.py.orig Python-2.6.4/Lib/cProfile.py
---- Python-2.6.4/Lib/cProfile.py.orig	Mon Feb 21 10:46:29 2011
-+++ Python-2.6.4/Lib/cProfile.py	Mon Feb 21 10:46:29 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Python interface for the 'lsprof' profiler.
-    Compatible with the 'profile' module.
-diff -u Python-2.6.4/Lib/idlelib/PyShell.py.orig Python-2.6.4/Lib/idlelib/PyShell.py
---- Python-2.6.4/Lib/idlelib/PyShell.py.orig	Mon Feb 21 10:46:23 2011
-+++ Python-2.6.4/Lib/idlelib/PyShell.py	Mon Feb 21 10:46:23 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import os
- import os.path
-diff -u Python-2.6.4/Lib/UserString.py.orig Python-2.6.4/Lib/UserString.py
---- Python-2.6.4/Lib/UserString.py.orig	Mon Feb 21 10:46:27 2011
-+++ Python-2.6.4/Lib/UserString.py	Mon Feb 21 10:46:27 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- ## vim:ts=4:et:nowrap
- """A user-defined wrapper around string objects
- 
-diff -u Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py.orig Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py
---- Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- # Copyright 2006 Google, Inc. All Rights Reserved.
- # Licensed to PSF under a Contributor Agreement.
- 
-diff -u Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py.orig Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py
---- Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- """Tests that run all fixer modules over an input stream.
- 
- This has been broken out into its own test module because of its
-diff -u Python-2.6.4/Lib/lib2to3/tests/test_util.py.orig Python-2.6.4/Lib/lib2to3/tests/test_util.py
---- Python-2.6.4/Lib/lib2to3/tests/test_util.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/test_util.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- """ Test suite for the code in fixes.util """
- # Author: Collin Winter
- 
-diff -u Python-2.6.4/Lib/lib2to3/tests/test_parser.py.orig Python-2.6.4/Lib/lib2to3/tests/test_parser.py
---- Python-2.6.4/Lib/lib2to3/tests/test_parser.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/test_parser.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- """Test suite for 2to3's parser and grammar files.
- 
- This is the place to add tests for changes to 2to3's grammar, such as those
-diff -u Python-2.6.4/Lib/lib2to3/tests/test_pytree.py.orig Python-2.6.4/Lib/lib2to3/tests/test_pytree.py
---- Python-2.6.4/Lib/lib2to3/tests/test_pytree.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/test_pytree.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- # Copyright 2006 Google, Inc. All Rights Reserved.
- # Licensed to PSF under a Contributor Agreement.
- 
-diff -u Python-2.6.4/Lib/lib2to3/tests/test_fixers.py.orig Python-2.6.4/Lib/lib2to3/tests/test_fixers.py
---- Python-2.6.4/Lib/lib2to3/tests/test_fixers.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/tests/test_fixers.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- """ Test suite for the fixer modules """
- # Author: Collin Winter
- 
-diff -u Python-2.6.4/Lib/lib2to3/refactor.py.orig Python-2.6.4/Lib/lib2to3/refactor.py
---- Python-2.6.4/Lib/lib2to3/refactor.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/lib2to3/refactor.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
-+#!/usr/bin/python2.6
- # Copyright 2006 Google, Inc. All Rights Reserved.
- # Licensed to PSF under a Contributor Agreement.
- 
-diff -u Python-2.6.4/Lib/lib2to3/pgen2/token.py.orig Python-2.6.4/Lib/lib2to3/pgen2/token.py
---- Python-2.6.4/Lib/lib2to3/pgen2/token.py.orig	Mon Feb 21 10:46:25 2011
-+++ Python-2.6.4/Lib/lib2to3/pgen2/token.py	Mon Feb 21 10:46:25 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Token constants (from "token.h")."""
- 
-diff -u Python-2.6.4/Lib/cgi.py.orig Python-2.6.4/Lib/cgi.py
---- Python-2.6.4/Lib/cgi.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/cgi.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#!/usr/bin/python2.6
- 
- # NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
- # intentionally NOT "/usr/bin/env python".  On many systems
-diff -u Python-2.6.4/Lib/base64.py.orig Python-2.6.4/Lib/base64.py
---- Python-2.6.4/Lib/base64.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/base64.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """RFC 3548: Base16, Base32, Base64 Data Encodings"""
- 
-diff -u Python-2.6.4/Lib/encodings/rot_13.py.orig Python-2.6.4/Lib/encodings/rot_13.py
---- Python-2.6.4/Lib/encodings/rot_13.py.orig	Mon Feb 21 10:46:26 2011
-+++ Python-2.6.4/Lib/encodings/rot_13.py	Mon Feb 21 10:46:26 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- """ Python Character Mapping Codec for ROT13.
- 
-     See http://ucsub.colorado.edu/~kominek/rot13/ for details.
-diff -u Python-2.6.4/Lib/tabnanny.py.orig Python-2.6.4/Lib/tabnanny.py
---- Python-2.6.4/Lib/tabnanny.py.orig	Mon Feb 21 10:46:27 2011
-+++ Python-2.6.4/Lib/tabnanny.py	Mon Feb 21 10:46:27 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """The Tab Nanny despises ambiguous indentation.  She knows no mercy.
- 
-diff -u Python-2.6.4/Lib/timeit.py.orig Python-2.6.4/Lib/timeit.py
---- Python-2.6.4/Lib/timeit.py.orig	Mon Feb 21 10:46:23 2011
-+++ Python-2.6.4/Lib/timeit.py	Mon Feb 21 10:46:23 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Tool for measuring execution time of small code snippets.
- 
-diff -u Python-2.6.4/Lib/pydoc.py.orig Python-2.6.4/Lib/pydoc.py
---- Python-2.6.4/Lib/pydoc.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/pydoc.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: latin-1 -*-
- """Generate Python documentation in HTML or text for interactive use.
- 
-diff -u Python-2.6.4/Lib/quopri.py.orig Python-2.6.4/Lib/quopri.py
---- Python-2.6.4/Lib/quopri.py.orig	Mon Feb 21 10:46:29 2011
-+++ Python-2.6.4/Lib/quopri.py	Mon Feb 21 10:46:29 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Conversions to/from quoted-printable transport encoding as per RFC 1521."""
- 
-diff -u Python-2.6.4/Lib/keyword.py.orig Python-2.6.4/Lib/keyword.py
---- Python-2.6.4/Lib/keyword.py.orig	Mon Feb 21 10:46:24 2011
-+++ Python-2.6.4/Lib/keyword.py	Mon Feb 21 10:46:24 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Keywords (from "graminit.c")
- 
-diff -u Python-2.6.4/Lib/mailbox.py.orig Python-2.6.4/Lib/mailbox.py
---- Python-2.6.4/Lib/mailbox.py.orig	Mon Feb 21 10:46:27 2011
-+++ Python-2.6.4/Lib/mailbox.py	Mon Feb 21 10:46:27 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Read/write support for Maildir, mbox, MH, Babyl, and MMDF mailboxes."""
- 
-diff -u Python-2.6.4/Lib/difflib.py.orig Python-2.6.4/Lib/difflib.py
---- Python-2.6.4/Lib/difflib.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/difflib.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- Module difflib -- helpers for computing deltas between objects.
-diff -u Python-2.6.4/Lib/webbrowser.py.orig Python-2.6.4/Lib/webbrowser.py
---- Python-2.6.4/Lib/webbrowser.py.orig	Mon Feb 21 10:46:26 2011
-+++ Python-2.6.4/Lib/webbrowser.py	Mon Feb 21 10:46:26 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Interfaces for launching and remotely controlling Web browsers."""
- # Maintained by Georg Brandl.
- 
-diff -u Python-2.6.4/Lib/unittest.py.orig Python-2.6.4/Lib/unittest.py
---- Python-2.6.4/Lib/unittest.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/unittest.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- '''
- Python unit testing framework, based on Erich Gamma's JUnit and Kent Beck's
- Smalltalk testing framework.
-diff -u Python-2.6.4/Lib/bsddb/test/test_dbtables.py.orig Python-2.6.4/Lib/bsddb/test/test_dbtables.py
---- Python-2.6.4/Lib/bsddb/test/test_dbtables.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/bsddb/test/test_dbtables.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- #-----------------------------------------------------------------------
- # A test suite for the table interface built on bsddb.db
-diff -u Python-2.6.4/Lib/bsddb/dbshelve.py.orig Python-2.6.4/Lib/bsddb/dbshelve.py
---- Python-2.6.4/Lib/bsddb/dbshelve.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/bsddb/dbshelve.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/python2.6
- #------------------------------------------------------------------------
- #           Copyright (c) 1997-2001 by Total Control Software
- #                         All Rights Reserved
-diff -u Python-2.6.4/Lib/token.py.orig Python-2.6.4/Lib/token.py
---- Python-2.6.4/Lib/token.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/token.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Token constants (from "token.h")."""
- 
-diff -u Python-2.6.4/Lib/Cookie.py.orig Python-2.6.4/Lib/Cookie.py
---- Python-2.6.4/Lib/Cookie.py.orig	Mon Feb 21 10:46:25 2011
-+++ Python-2.6.4/Lib/Cookie.py	Mon Feb 21 10:46:25 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- 
- ####
-diff -u Python-2.6.4/Lib/smtplib.py.orig Python-2.6.4/Lib/smtplib.py
---- Python-2.6.4/Lib/smtplib.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/smtplib.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- '''SMTP/ESMTP client class.
- 
-diff -u Python-2.6.4/Lib/smtpd.py.orig Python-2.6.4/Lib/smtpd.py
---- Python-2.6.4/Lib/smtpd.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/smtpd.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """An RFC 2821 smtp proxy.
- 
- Usage: %(program)s [options] [localhost:localport [remotehost:remoteport]]
-diff -u Python-2.6.4/Lib/test/regrtest.py.orig Python-2.6.4/Lib/test/regrtest.py
---- Python-2.6.4/Lib/test/regrtest.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/regrtest.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Regression test.
- 
-diff -u Python-2.6.4/Lib/test/test_sets.py.orig Python-2.6.4/Lib/test/test_sets.py
---- Python-2.6.4/Lib/test/test_sets.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_sets.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import warnings
- warnings.filterwarnings("ignore", "the sets module is deprecated",
-diff -u Python-2.6.4/Lib/test/test_dl.py.orig Python-2.6.4/Lib/test/test_dl.py
---- Python-2.6.4/Lib/test/test_dl.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_dl.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test dlmodule.c
-    Roger E. Masse  revised strategy by Barry Warsaw
- """
-diff -u Python-2.6.4/Lib/test/test_multiprocessing.py.orig Python-2.6.4/Lib/test/test_multiprocessing.py
---- Python-2.6.4/Lib/test/test_multiprocessing.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_multiprocessing.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- #
- # Unit tests for the multiprocessing package
-diff -u Python-2.6.4/Lib/test/test_cmd.py.orig Python-2.6.4/Lib/test/test_cmd.py
---- Python-2.6.4/Lib/test/test_cmd.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/test/test_cmd.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- """
- Test script for the 'cmd' module
- Original by Michael Schneider
-diff -u Python-2.6.4/Lib/test/test_userstring.py.orig Python-2.6.4/Lib/test/test_userstring.py
---- Python-2.6.4/Lib/test/test_userstring.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_userstring.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # UserString is a wrapper around the native builtin string type.
- # UserString instances should behave similar to builtin string objects.
- 
-diff -u Python-2.6.4/Lib/test/test_popen.py.orig Python-2.6.4/Lib/test/test_popen.py
---- Python-2.6.4/Lib/test/test_popen.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_popen.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Basic tests for os.popen()
- 
-   Particularly useful for platforms that fake popen.
-diff -u Python-2.6.4/Lib/test/test_cd.py.orig Python-2.6.4/Lib/test/test_cd.py
---- Python-2.6.4/Lib/test/test_cd.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_cd.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Whimpy test script for the cd module
-    Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/test/test_cl.py.orig Python-2.6.4/Lib/test/test_cl.py
---- Python-2.6.4/Lib/test/test_cl.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_cl.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Whimpy test script for the cl module
-    Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/test/test_imgfile.py.orig Python-2.6.4/Lib/test/test_imgfile.py
---- Python-2.6.4/Lib/test/test_imgfile.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_imgfile.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Simple test script for imgfile.c
-    Roger E. Masse
-diff -u Python-2.6.4/Lib/test/test_random.py.orig Python-2.6.4/Lib/test/test_random.py
---- Python-2.6.4/Lib/test/test_random.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_random.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- import random
-diff -u Python-2.6.4/Lib/test/curses_tests.py.orig Python-2.6.4/Lib/test/curses_tests.py
---- Python-2.6.4/Lib/test/curses_tests.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/curses_tests.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # $Id: ncurses.py 36559 2004-07-18 05:56:09Z tim_one $
- #
-diff -u Python-2.6.4/Lib/test/test_codecmaps_cn.py.orig Python-2.6.4/Lib/test/test_codecmaps_cn.py
---- Python-2.6.4/Lib/test/test_codecmaps_cn.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_codecmaps_cn.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecmaps_cn.py
- #   Codec mapping tests for PRC encodings
-diff -u Python-2.6.4/Lib/test/test_whichdb.py.orig Python-2.6.4/Lib/test/test_whichdb.py
---- Python-2.6.4/Lib/test/test_whichdb.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/test/test_whichdb.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the whichdb module
-    based on test_anydbm.py
- """
-diff -u Python-2.6.4/Lib/test/test_eof.py.orig Python-2.6.4/Lib/test/test_eof.py
---- Python-2.6.4/Lib/test/test_eof.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_eof.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """test script for a few new invalid token catches"""
- 
- import unittest
-diff -u Python-2.6.4/Lib/test/test_imageop.py.orig Python-2.6.4/Lib/test/test_imageop.py
---- Python-2.6.4/Lib/test/test_imageop.py.orig	Mon Feb 21 10:46:31 2011
-+++ Python-2.6.4/Lib/test/test_imageop.py	Mon Feb 21 10:46:31 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Test script for the imageop module.  This has the side
-    effect of partially testing the imgfile module as well.
-diff -u Python-2.6.4/Lib/test/test_codecmaps_tw.py.orig Python-2.6.4/Lib/test/test_codecmaps_tw.py
---- Python-2.6.4/Lib/test/test_codecmaps_tw.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_codecmaps_tw.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecmaps_tw.py
- #   Codec mapping tests for ROC encodings
-diff -u Python-2.6.4/Lib/test/test_codecencodings_hk.py.orig Python-2.6.4/Lib/test/test_codecencodings_hk.py
---- Python-2.6.4/Lib/test/test_codecencodings_hk.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_codecencodings_hk.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecencodings_hk.py
- #   Codec encoding tests for HongKong encodings.
-diff -u Python-2.6.4/Lib/test/test_codecencodings_jp.py.orig Python-2.6.4/Lib/test/test_codecencodings_jp.py
---- Python-2.6.4/Lib/test/test_codecencodings_jp.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_codecencodings_jp.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecencodings_jp.py
- #   Codec encoding tests for Japanese encodings.
-diff -u Python-2.6.4/Lib/test/test_with.py.orig Python-2.6.4/Lib/test/test_with.py
---- Python-2.6.4/Lib/test/test_with.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_with.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Unit tests for the with statement specified in PEP 343."""
- 
-diff -u Python-2.6.4/Lib/test/crashers/recursive_call.py.orig Python-2.6.4/Lib/test/crashers/recursive_call.py
---- Python-2.6.4/Lib/test/crashers/recursive_call.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/crashers/recursive_call.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # No bug report AFAIK, mail on python-dev on 2006-01-10
- 
-diff -u Python-2.6.4/Lib/test/test_codecmaps_kr.py.orig Python-2.6.4/Lib/test/test_codecmaps_kr.py
---- Python-2.6.4/Lib/test/test_codecmaps_kr.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_codecmaps_kr.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecmaps_kr.py
- #   Codec mapping tests for ROK encodings
-diff -u Python-2.6.4/Lib/test/test_array.py.orig Python-2.6.4/Lib/test/test_array.py
---- Python-2.6.4/Lib/test/test_array.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_array.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test the arraymodule.
-    Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/test/test_pep263.py.orig Python-2.6.4/Lib/test/test_pep263.py
---- Python-2.6.4/Lib/test/test_pep263.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_pep263.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#! -*- coding: koi8-r -*-
-+#!/usr/bin/python2.6
- # This file is marked as binary in SVN, to prevent MacCVS from recoding it.
- 
- import unittest
-diff -u Python-2.6.4/Lib/test/test_anydbm.py.orig Python-2.6.4/Lib/test/test_anydbm.py
---- Python-2.6.4/Lib/test/test_anydbm.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_anydbm.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the anydbm module
-    based on testdumbdbm.py
- """
-diff -u Python-2.6.4/Lib/test/test_smtpnet.py.orig Python-2.6.4/Lib/test/test_smtpnet.py
---- Python-2.6.4/Lib/test/test_smtpnet.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_smtpnet.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- from test import test_support
-diff -u Python-2.6.4/Lib/test/test_al.py.orig Python-2.6.4/Lib/test/test_al.py
---- Python-2.6.4/Lib/test/test_al.py.orig	Mon Feb 21 10:46:31 2011
-+++ Python-2.6.4/Lib/test/test_al.py	Mon Feb 21 10:46:31 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Whimpy test script for the al module
-    Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/test/test_urllib2net.py.orig Python-2.6.4/Lib/test/test_urllib2net.py
---- Python-2.6.4/Lib/test/test_urllib2net.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_urllib2net.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- from test import test_support
-diff -u Python-2.6.4/Lib/test/test_marshal.py.orig Python-2.6.4/Lib/test/test_marshal.py
---- Python-2.6.4/Lib/test/test_marshal.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_marshal.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: iso-8859-1 -*-
- 
- from test import test_support
-diff -u Python-2.6.4/Lib/test/test_urlparse.py.orig Python-2.6.4/Lib/test/test_urlparse.py
---- Python-2.6.4/Lib/test/test_urlparse.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_urlparse.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- from test import test_support
- import unittest
-diff -u Python-2.6.4/Lib/test/test_bz2.py.orig Python-2.6.4/Lib/test/test_bz2.py
---- Python-2.6.4/Lib/test/test_bz2.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_bz2.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- from test import test_support
- from test.test_support import TESTFN
- 
-diff -u Python-2.6.4/Lib/test/test_urllibnet.py.orig Python-2.6.4/Lib/test/test_urllibnet.py
---- Python-2.6.4/Lib/test/test_urllibnet.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_urllibnet.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- from test import test_support
-diff -u Python-2.6.4/Lib/test/test_logging.py.orig Python-2.6.4/Lib/test/test_logging.py
---- Python-2.6.4/Lib/test/test_logging.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_logging.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # Copyright 2001-2004 by Vinay Sajip. All Rights Reserved.
- #
-diff -u Python-2.6.4/Lib/test/test_socket.py.orig Python-2.6.4/Lib/test/test_socket.py
---- Python-2.6.4/Lib/test/test_socket.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_socket.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- from test import test_support
-diff -u Python-2.6.4/Lib/test/pystone.py.orig Python-2.6.4/Lib/test/pystone.py
---- Python-2.6.4/Lib/test/pystone.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/pystone.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- "PYSTONE" Benchmark Program
-diff -u Python-2.6.4/Lib/test/test_multibytecodec.py.orig Python-2.6.4/Lib/test/test_multibytecodec.py
---- Python-2.6.4/Lib/test/test_multibytecodec.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_multibytecodec.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_multibytecodec.py
- #   Unit test for multibytecodec itself
-diff -u Python-2.6.4/Lib/test/test_popen2.py.orig Python-2.6.4/Lib/test/test_popen2.py
---- Python-2.6.4/Lib/test/test_popen2.py.orig	Mon Feb 21 10:46:33 2011
-+++ Python-2.6.4/Lib/test/test_popen2.py	Mon Feb 21 10:46:33 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for popen2.py"""
- 
- import warnings
-diff -u Python-2.6.4/Lib/test/test_binhex.py.orig Python-2.6.4/Lib/test/test_binhex.py
---- Python-2.6.4/Lib/test/test_binhex.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_binhex.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the binhex C module
- 
-    Uses the mechanism of the python binhex module
-diff -u Python-2.6.4/Lib/test/test_gzip.py.orig Python-2.6.4/Lib/test/test_gzip.py
---- Python-2.6.4/Lib/test/test_gzip.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/test/test_gzip.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the gzip module.
- """
- 
-diff -u Python-2.6.4/Lib/test/re_tests.py.orig Python-2.6.4/Lib/test/re_tests.py
---- Python-2.6.4/Lib/test/re_tests.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/re_tests.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- mode: python -*-
- 
- # Re test suite and benchmark suite v1.5
-diff -u Python-2.6.4/Lib/test/test_urllib2_localnet.py.orig Python-2.6.4/Lib/test/test_urllib2_localnet.py
---- Python-2.6.4/Lib/test/test_urllib2_localnet.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_urllib2_localnet.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import mimetools
- import threading
-diff -u Python-2.6.4/Lib/test/test_codecencodings_kr.py.orig Python-2.6.4/Lib/test/test_codecencodings_kr.py
---- Python-2.6.4/Lib/test/test_codecencodings_kr.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_codecencodings_kr.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecencodings_kr.py
- #   Codec encoding tests for ROK encodings.
-diff -u Python-2.6.4/Lib/test/test_multibytecodec_support.py.orig Python-2.6.4/Lib/test/test_multibytecodec_support.py
---- Python-2.6.4/Lib/test/test_multibytecodec_support.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_multibytecodec_support.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_multibytecodec_support.py
- #   Common Unittest Routines for CJK codecs
-diff -u Python-2.6.4/Lib/test/test_tcl.py.orig Python-2.6.4/Lib/test/test_tcl.py
---- Python-2.6.4/Lib/test/test_tcl.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/test/test_tcl.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import unittest
- import os
-diff -u Python-2.6.4/Lib/test/test_codecencodings_cn.py.orig Python-2.6.4/Lib/test/test_codecencodings_cn.py
---- Python-2.6.4/Lib/test/test_codecencodings_cn.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_codecencodings_cn.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecencodings_cn.py
- #   Codec encoding tests for PRC encodings.
-diff -u Python-2.6.4/Lib/test/test_gl.py.orig Python-2.6.4/Lib/test/test_gl.py
---- Python-2.6.4/Lib/test/test_gl.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_gl.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Very simple test script for the SGI gl library extension module
-     taken mostly from the documentation.
-     Roger E. Masse
-diff -u Python-2.6.4/Lib/test/test___future__.py.orig Python-2.6.4/Lib/test/test___future__.py
---- Python-2.6.4/Lib/test/test___future__.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test___future__.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- import unittest
- from test import test_support
- import __future__
-diff -u Python-2.6.4/Lib/test/test_bsddb.py.orig Python-2.6.4/Lib/test/test_bsddb.py
---- Python-2.6.4/Lib/test/test_bsddb.py.orig	Mon Feb 21 10:46:36 2011
-+++ Python-2.6.4/Lib/test/test_bsddb.py	Mon Feb 21 10:46:36 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the bsddb C module by Roger E. Masse
-    Adapted to unittest format and expanded scope by Raymond Hettinger
- """
-diff -u Python-2.6.4/Lib/test/test_errno.py.orig Python-2.6.4/Lib/test/test_errno.py
---- Python-2.6.4/Lib/test/test_errno.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_errno.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test the errno module
-    Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/test/test_optparse.py.orig Python-2.6.4/Lib/test/test_optparse.py
---- Python-2.6.4/Lib/test/test_optparse.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_optparse.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- 
- #
- # Test suite for Optik.  Supplied by Johannes Gijsbers
-diff -u Python-2.6.4/Lib/test/test_codecencodings_tw.py.orig Python-2.6.4/Lib/test/test_codecencodings_tw.py
---- Python-2.6.4/Lib/test/test_codecencodings_tw.py.orig	Mon Feb 21 10:46:35 2011
-+++ Python-2.6.4/Lib/test/test_codecencodings_tw.py	Mon Feb 21 10:46:35 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecencodings_tw.py
- #   Codec encoding tests for ROC encodings.
-diff -u Python-2.6.4/Lib/test/test_codecmaps_jp.py.orig Python-2.6.4/Lib/test/test_codecmaps_jp.py
---- Python-2.6.4/Lib/test/test_codecmaps_jp.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_codecmaps_jp.py	Mon Feb 21 10:46:32 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecmaps_jp.py
- #   Codec mapping tests for Japanese encodings
-diff -u Python-2.6.4/Lib/test/test_codecmaps_hk.py.orig Python-2.6.4/Lib/test/test_codecmaps_hk.py
---- Python-2.6.4/Lib/test/test_codecmaps_hk.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_codecmaps_hk.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # test_codecmaps_hk.py
- #   Codec mapping tests for HongKong encodings
-diff -u Python-2.6.4/Lib/test/test_dumbdbm.py.orig Python-2.6.4/Lib/test/test_dumbdbm.py
---- Python-2.6.4/Lib/test/test_dumbdbm.py.orig	Mon Feb 21 10:46:34 2011
-+++ Python-2.6.4/Lib/test/test_dumbdbm.py	Mon Feb 21 10:46:34 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Test script for the dumbdbm module
-    Original by Roger E. Masse
- """
-diff -u Python-2.6.4/Lib/tarfile.py.orig Python-2.6.4/Lib/tarfile.py
---- Python-2.6.4/Lib/tarfile.py.orig	Mon Feb 21 10:46:38 2011
-+++ Python-2.6.4/Lib/tarfile.py	Mon Feb 21 10:46:38 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: iso-8859-1 -*-
- #-------------------------------------------------------------------
- # tarfile.py
-diff -u Python-2.6.4/Lib/uu.py.orig Python-2.6.4/Lib/uu.py
---- Python-2.6.4/Lib/uu.py.orig	Mon Feb 21 10:46:25 2011
-+++ Python-2.6.4/Lib/uu.py	Mon Feb 21 10:46:25 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Copyright 1994 by Lance Ellinghouse
- # Cathedral City, California Republic, United States of America.
-diff -u Python-2.6.4/Lib/symbol.py.orig Python-2.6.4/Lib/symbol.py
---- Python-2.6.4/Lib/symbol.py.orig	Mon Feb 21 10:46:27 2011
-+++ Python-2.6.4/Lib/symbol.py	Mon Feb 21 10:46:27 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Non-terminal symbols of Python grammar (from "graminit.h")."""
- 
-diff -u Python-2.6.4/Lib/mimify.py.orig Python-2.6.4/Lib/mimify.py
---- Python-2.6.4/Lib/mimify.py.orig	Mon Feb 21 10:46:28 2011
-+++ Python-2.6.4/Lib/mimify.py	Mon Feb 21 10:46:28 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Mimification and unmimification of mail messages.
- 
-diff -u Python-2.6.4/Lib/pdb.py.orig Python-2.6.4/Lib/pdb.py
---- Python-2.6.4/Lib/pdb.py.orig	Mon Feb 21 10:46:38 2011
-+++ Python-2.6.4/Lib/pdb.py	Mon Feb 21 10:46:38 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """A Python debugger."""
- 
-diff -u Python-2.6.4/Lib/plat-mac/bundlebuilder.py.orig Python-2.6.4/Lib/plat-mac/bundlebuilder.py
---- Python-2.6.4/Lib/plat-mac/bundlebuilder.py.orig	Mon Feb 21 10:46:38 2011
-+++ Python-2.6.4/Lib/plat-mac/bundlebuilder.py	Mon Feb 21 10:46:38 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """\
- bundlebuilder.py -- Tools to assemble MacOS X (application) bundles.
-diff -u Python-2.6.4/Lib/plat-mac/appletrunner.py.orig Python-2.6.4/Lib/plat-mac/appletrunner.py
---- Python-2.6.4/Lib/plat-mac/appletrunner.py.orig	Mon Feb 21 10:46:38 2011
-+++ Python-2.6.4/Lib/plat-mac/appletrunner.py	Mon Feb 21 10:46:38 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # This file is meant as an executable script for running applets.
- # BuildApplet will use it as the main executable in the .app bundle if
- # we are not running in a framework build.
-diff -u Python-2.6.4/Demo/scripts/primes.py.orig Python-2.6.4/Demo/scripts/primes.py
---- Python-2.6.4/Demo/scripts/primes.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/primes.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Print prime numbers in a given range
- 
-diff -u Python-2.6.4/Demo/scripts/mkrcs.py.orig Python-2.6.4/Demo/scripts/mkrcs.py
---- Python-2.6.4/Demo/scripts/mkrcs.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/mkrcs.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # A rather specialized script to make sure that a symbolic link named
- # RCS exists pointing to a real RCS directory in a parallel tree
-diff -u Python-2.6.4/Demo/scripts/queens.py.orig Python-2.6.4/Demo/scripts/queens.py
---- Python-2.6.4/Demo/scripts/queens.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/queens.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """N queens problem.
- 
-diff -u Python-2.6.4/Demo/scripts/pi.py.orig Python-2.6.4/Demo/scripts/pi.py
---- Python-2.6.4/Demo/scripts/pi.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/pi.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Print digits of pi forever.
- #
-diff -u Python-2.6.4/Demo/scripts/mboxconvert.py.orig Python-2.6.4/Demo/scripts/mboxconvert.py
---- Python-2.6.4/Demo/scripts/mboxconvert.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/mboxconvert.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Convert  MH directories (1 message per file) or MMDF mailboxes (4x^A
- # delimited) to unix mailbox (From ... delimited) on stdout.
-diff -u Python-2.6.4/Demo/scripts/eqfix.py.orig Python-2.6.4/Demo/scripts/eqfix.py
---- Python-2.6.4/Demo/scripts/eqfix.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/eqfix.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Fix Python source files to use the new equality test operator, i.e.,
- #       if x = y: ...
-diff -u Python-2.6.4/Demo/scripts/find-uname.py.orig Python-2.6.4/Demo/scripts/find-uname.py
---- Python-2.6.4/Demo/scripts/find-uname.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/find-uname.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- For each argument on the command line, look for it in the set of all Unicode
-diff -u Python-2.6.4/Demo/scripts/pp.py.orig Python-2.6.4/Demo/scripts/pp.py
---- Python-2.6.4/Demo/scripts/pp.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/pp.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Emulate some Perl command line options.
- # Usage: pp [-a] [-c] [-d] [-e scriptline] [-F fieldsep] [-n] [-p] [file] ...
-diff -u Python-2.6.4/Demo/scripts/unbirthday.py.orig Python-2.6.4/Demo/scripts/unbirthday.py
---- Python-2.6.4/Demo/scripts/unbirthday.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/unbirthday.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Calculate your unbirthday count (see Alice in Wonderland).
- # This is defined as the number of days from your birth until today
-diff -u Python-2.6.4/Demo/scripts/update.py.orig Python-2.6.4/Demo/scripts/update.py
---- Python-2.6.4/Demo/scripts/update.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/update.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Update a bunch of files according to a script.
- # The input file contains lines of the form <filename>:<lineno>:<text>,
-diff -u Python-2.6.4/Demo/scripts/markov.py.orig Python-2.6.4/Demo/scripts/markov.py
---- Python-2.6.4/Demo/scripts/markov.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/markov.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- class Markov:
-     def __init__(self, histsize, choice):
-diff -u Python-2.6.4/Demo/scripts/from.py.orig Python-2.6.4/Demo/scripts/from.py
---- Python-2.6.4/Demo/scripts/from.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/from.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Print From and Subject of messages in $MAIL.
- # Extension to multiple mailboxes and other bells & whistles are left
-diff -u Python-2.6.4/Demo/scripts/script.py.orig Python-2.6.4/Demo/scripts/script.py
---- Python-2.6.4/Demo/scripts/script.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/script.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # script.py -- Make typescript of terminal session.
- # Usage:
- #       -a      Append to typescript.
-diff -u Python-2.6.4/Demo/scripts/lpwatch.py.orig Python-2.6.4/Demo/scripts/lpwatch.py
---- Python-2.6.4/Demo/scripts/lpwatch.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/lpwatch.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Watch line printer queue(s).
- # Intended for BSD 4.3 lpq.
-diff -u Python-2.6.4/Demo/scripts/fact.py.orig Python-2.6.4/Demo/scripts/fact.py
---- Python-2.6.4/Demo/scripts/fact.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/fact.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Factorize numbers.
- # The algorithm is not efficient, but easy to understand.
-diff -u Python-2.6.4/Demo/scripts/beer.py.orig Python-2.6.4/Demo/scripts/beer.py
---- Python-2.6.4/Demo/scripts/beer.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/beer.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # By GvR, demystified after a version by Fredrik Lundh.
- import sys
- n = 100
-diff -u Python-2.6.4/Demo/scripts/newslist.py.orig Python-2.6.4/Demo/scripts/newslist.py
---- Python-2.6.4/Demo/scripts/newslist.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/newslist.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- #######################################################################
- # Newslist  $Revision: 66429 $
- #
-diff -u Python-2.6.4/Demo/scripts/ftpstats.py.orig Python-2.6.4/Demo/scripts/ftpstats.py
---- Python-2.6.4/Demo/scripts/ftpstats.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/ftpstats.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Extract statistics from ftp daemon log.
- 
-diff -u Python-2.6.4/Demo/scripts/makedir.py.orig Python-2.6.4/Demo/scripts/makedir.py
---- Python-2.6.4/Demo/scripts/makedir.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/scripts/makedir.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Like mkdir, but also make intermediate directories if necessary.
- # It is not an error if the given directory already exists (as long
-diff -u Python-2.6.4/Demo/turtle/tdemo_clock.py.orig Python-2.6.4/Demo/turtle/tdemo_clock.py
---- Python-2.6.4/Demo/turtle/tdemo_clock.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_clock.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- # -*- coding: cp1252 -*-
- """       turtle-example-suite:
- 
-diff -u Python-2.6.4/Demo/turtle/tdemo_planet_and_moon.py.orig Python-2.6.4/Demo/turtle/tdemo_planet_and_moon.py
---- Python-2.6.4/Demo/turtle/tdemo_planet_and_moon.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_planet_and_moon.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-         tdemo_planets_and_moon.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_lindenmayer_indian.py.orig Python-2.6.4/Demo/turtle/tdemo_lindenmayer_indian.py
---- Python-2.6.4/Demo/turtle/tdemo_lindenmayer_indian.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_lindenmayer_indian.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-         xtx_lindenmayer_indian.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_penrose.py.orig Python-2.6.4/Demo/turtle/tdemo_penrose.py
---- Python-2.6.4/Demo/turtle/tdemo_penrose.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_penrose.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       xturtle-example-suite:
- 
-           xtx_kites_and_darts.py
-diff -u Python-2.6.4/Demo/turtle/turtleDemo.py.orig Python-2.6.4/Demo/turtle/turtleDemo.py
---- Python-2.6.4/Demo/turtle/turtleDemo.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/turtleDemo.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- import sys
- import os
- 
-diff -u Python-2.6.4/Demo/turtle/tdemo_yinyang.py.orig Python-2.6.4/Demo/turtle/tdemo_yinyang.py
---- Python-2.6.4/Demo/turtle/tdemo_yinyang.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_yinyang.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-             tdemo_yinyang.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_tree.py.orig Python-2.6.4/Demo/turtle/tdemo_tree.py
---- Python-2.6.4/Demo/turtle/tdemo_tree.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_tree.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """      turtle-example-suite:
- 
-              tdemo_tree.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_fractalcurves.py.orig Python-2.6.4/Demo/turtle/tdemo_fractalcurves.py
---- Python-2.6.4/Demo/turtle/tdemo_fractalcurves.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_fractalcurves.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """      turtle-example-suite:
- 
-         tdemo_fractalCurves.py
-diff -u Python-2.6.4/Demo/turtle/turtledemo_two_canvases.py.orig Python-2.6.4/Demo/turtle/turtledemo_two_canvases.py
---- Python-2.6.4/Demo/turtle/turtledemo_two_canvases.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/turtledemo_two_canvases.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- ## DEMONSTRATES USE OF 2 CANVASES, SO CANNOT BE RUN IN DEMOVIEWER!
- """turtle example: Using TurtleScreen and RawTurtle
- for drawing on two distinct canvases.
-diff -u Python-2.6.4/Demo/turtle/tdemo_minimal_hanoi.py.orig Python-2.6.4/Demo/turtle/tdemo_minimal_hanoi.py
---- Python-2.6.4/Demo/turtle/tdemo_minimal_hanoi.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_minimal_hanoi.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-          tdemo_minimal_hanoi.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_peace.py.orig Python-2.6.4/Demo/turtle/tdemo_peace.py
---- Python-2.6.4/Demo/turtle/tdemo_peace.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_peace.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-               tdemo_peace.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_bytedesign.py.orig Python-2.6.4/Demo/turtle/tdemo_bytedesign.py
---- Python-2.6.4/Demo/turtle/tdemo_bytedesign.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_bytedesign.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """      turtle-example-suite:
- 
-         tdemo_bytedesign.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_paint.py.orig Python-2.6.4/Demo/turtle/tdemo_paint.py
---- Python-2.6.4/Demo/turtle/tdemo_paint.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_paint.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-             tdemo_paint.py
-diff -u Python-2.6.4/Demo/turtle/tdemo_I_dontlike_tiltdemo.py.orig Python-2.6.4/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
---- Python-2.6.4/Demo/turtle/tdemo_I_dontlike_tiltdemo.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/turtle/tdemo_I_dontlike_tiltdemo.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """       turtle-example-suite:
- 
-      tdemo-I_dont_like_tiltdemo.py
-diff -u Python-2.6.4/Demo/cgi/cgi1.py.orig Python-2.6.4/Demo/cgi/cgi1.py
---- Python-2.6.4/Demo/cgi/cgi1.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/cgi/cgi1.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2.6
- 
- """CGI test 1 - check server setup."""
- 
-diff -u Python-2.6.4/Demo/cgi/cgi3.py.orig Python-2.6.4/Demo/cgi/cgi3.py
---- Python-2.6.4/Demo/cgi/cgi3.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/cgi/cgi3.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2.6
- 
- """CGI test 3 (persistent data)."""
- 
-diff -u Python-2.6.4/Demo/cgi/cgi2.py.orig Python-2.6.4/Demo/cgi/cgi2.py
---- Python-2.6.4/Demo/cgi/cgi2.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/cgi/cgi2.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2.6
- 
- """CGI test 2 - basic use of cgi module."""
- 
-diff -u Python-2.6.4/Demo/comparisons/sortingtest.py.orig Python-2.6.4/Demo/comparisons/sortingtest.py
---- Python-2.6.4/Demo/comparisons/sortingtest.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/comparisons/sortingtest.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # 2)  Sorting Test
- #
-diff -u Python-2.6.4/Demo/comparisons/regextest.py.orig Python-2.6.4/Demo/comparisons/regextest.py
---- Python-2.6.4/Demo/comparisons/regextest.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/comparisons/regextest.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # 1)  Regular Expressions Test
- #
-diff -u Python-2.6.4/Demo/comparisons/systemtest.py.orig Python-2.6.4/Demo/comparisons/systemtest.py
---- Python-2.6.4/Demo/comparisons/systemtest.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/comparisons/systemtest.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # 3)  System Test
- #
-diff -u Python-2.6.4/Demo/pysvr/pysvr.py.orig Python-2.6.4/Demo/pysvr/pysvr.py
---- Python-2.6.4/Demo/pysvr/pysvr.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/pysvr/pysvr.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """A multi-threaded telnet-like server that gives a Python prompt.
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/sortvisu.py.orig Python-2.6.4/Demo/tkinter/guido/sortvisu.py
---- Python-2.6.4/Demo/tkinter/guido/sortvisu.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/sortvisu.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Sorting algorithms visualizer using Tkinter.
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/dialog.py.orig Python-2.6.4/Demo/tkinter/guido/dialog.py
---- Python-2.6.4/Demo/tkinter/guido/dialog.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/dialog.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # A Python function that generates dialog boxes with a text message,
- # optional bitmap, and any number of buttons.
-diff -u Python-2.6.4/Demo/tkinter/guido/electrons.py.orig Python-2.6.4/Demo/tkinter/guido/electrons.py
---- Python-2.6.4/Demo/tkinter/guido/electrons.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/electrons.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Simulate "electrons" migrating across the screen.
- # An optional bitmap file in can be in the background.
-diff -u Python-2.6.4/Demo/tkinter/guido/newmenubardemo.py.orig Python-2.6.4/Demo/tkinter/guido/newmenubardemo.py
---- Python-2.6.4/Demo/tkinter/guido/newmenubardemo.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/newmenubardemo.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Play with the new Tk 8.0 toplevel menu option."""
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/canvasevents.py.orig Python-2.6.4/Demo/tkinter/guido/canvasevents.py
---- Python-2.6.4/Demo/tkinter/guido/canvasevents.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/canvasevents.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- from Tkinter import *
- from Canvas import Oval, Group, CanvasText
-diff -u Python-2.6.4/Demo/tkinter/guido/tkman.py.orig Python-2.6.4/Demo/tkinter/guido/tkman.py
---- Python-2.6.4/Demo/tkinter/guido/tkman.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/tkman.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Tk man page browser -- currently only shows the Tcl/Tk man pages
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/solitaire.py.orig Python-2.6.4/Demo/tkinter/guido/solitaire.py
---- Python-2.6.4/Demo/tkinter/guido/solitaire.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/solitaire.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Solitaire game, much like the one that comes with MS Windows.
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/kill.py.orig Python-2.6.4/Demo/tkinter/guido/kill.py
---- Python-2.6.4/Demo/tkinter/guido/kill.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/kill.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # Tkinter interface to Linux `kill' command.
- 
- from Tkinter import *
-diff -u Python-2.6.4/Demo/tkinter/guido/MimeViewer.py.orig Python-2.6.4/Demo/tkinter/guido/MimeViewer.py
---- Python-2.6.4/Demo/tkinter/guido/MimeViewer.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/MimeViewer.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # View a single MIME multipart message.
- # Display each part as a box.
-diff -u Python-2.6.4/Demo/tkinter/guido/mbox.py.orig Python-2.6.4/Demo/tkinter/guido/mbox.py
---- Python-2.6.4/Demo/tkinter/guido/mbox.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/mbox.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Scan MH folder, display results in window
- 
-diff -u Python-2.6.4/Demo/tkinter/guido/rmt.py.orig Python-2.6.4/Demo/tkinter/guido/rmt.py
---- Python-2.6.4/Demo/tkinter/guido/rmt.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/rmt.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # A Python program implementing rmt, an application for remotely
- # controlling other Tk applications.
-diff -u Python-2.6.4/Demo/tkinter/guido/svkill.py.orig Python-2.6.4/Demo/tkinter/guido/svkill.py
---- Python-2.6.4/Demo/tkinter/guido/svkill.py.orig	Mon Feb 21 10:46:39 2011
-+++ Python-2.6.4/Demo/tkinter/guido/svkill.py	Mon Feb 21 10:46:39 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Tkinter interface to SYSV `ps' and `kill' commands.
- 
-diff -u Python-2.6.4/Demo/pdist/rrcs.py.orig Python-2.6.4/Demo/pdist/rrcs.py
---- Python-2.6.4/Demo/pdist/rrcs.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/pdist/rrcs.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- "Remote RCS -- command line interface"
- 
-diff -u Python-2.6.4/Demo/pdist/rcvs.py.orig Python-2.6.4/Demo/pdist/rcvs.py
---- Python-2.6.4/Demo/pdist/rcvs.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/pdist/rcvs.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Remote CVS -- command line interface"""
- 
-diff -u Python-2.6.4/Demo/pdist/RCSProxy.py.orig Python-2.6.4/Demo/pdist/RCSProxy.py
---- Python-2.6.4/Demo/pdist/RCSProxy.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/pdist/RCSProxy.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """RCS Proxy.
- 
-diff -u Python-2.6.4/Demo/pdist/makechangelog.py.orig Python-2.6.4/Demo/pdist/makechangelog.py
---- Python-2.6.4/Demo/pdist/makechangelog.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/pdist/makechangelog.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Turn a pile of RCS log output into ChangeLog file entries.
- 
-diff -u Python-2.6.4/Demo/zlib/zlibdemo.py.orig Python-2.6.4/Demo/zlib/zlibdemo.py
---- Python-2.6.4/Demo/zlib/zlibdemo.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/zlib/zlibdemo.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Takes an optional filename, defaulting to this file itself.
- # Reads the file and compresses the content using level 1 and level 9
-diff -u Python-2.6.4/Demo/zlib/minigzip.py.orig Python-2.6.4/Demo/zlib/minigzip.py
---- Python-2.6.4/Demo/zlib/minigzip.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/zlib/minigzip.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # Demo program for zlib; it compresses or decompresses files, but *doesn't*
- # delete the original.  This doesn't support all of gzip's options.
- #
-diff -u Python-2.6.4/Demo/curses/life.py.orig Python-2.6.4/Demo/curses/life.py
---- Python-2.6.4/Demo/curses/life.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/curses/life.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # life.py -- A curses-based version of Conway's Game of Life.
- # Contributed by AMK
- #
-diff -u Python-2.6.4/Demo/curses/rain.py.orig Python-2.6.4/Demo/curses/rain.py
---- Python-2.6.4/Demo/curses/rain.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/curses/rain.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # $Id: rain.py 46625 2006-06-03 23:02:15Z andrew.kuchling $
- #
-diff -u Python-2.6.4/Demo/curses/repeat.py.orig Python-2.6.4/Demo/curses/repeat.py
---- Python-2.6.4/Demo/curses/repeat.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/curses/repeat.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """repeat <shell-command>
- 
-diff -u Python-2.6.4/Demo/curses/ncurses.py.orig Python-2.6.4/Demo/curses/ncurses.py
---- Python-2.6.4/Demo/curses/ncurses.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/curses/ncurses.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # $Id: ncurses.py 66424 2008-09-13 01:22:08Z andrew.kuchling $
- #
-diff -u Python-2.6.4/Demo/curses/tclock.py.orig Python-2.6.4/Demo/curses/tclock.py
---- Python-2.6.4/Demo/curses/tclock.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/curses/tclock.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # $Id: tclock.py 46626 2006-06-03 23:07:21Z andrew.kuchling $
- #
-diff -u Python-2.6.4/Demo/parser/test_parser.py.orig Python-2.6.4/Demo/parser/test_parser.py
---- Python-2.6.4/Demo/parser/test_parser.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/parser/test_parser.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- #  (Force the script to use the latest build.)
- #
- #  test_parser.py
-diff -u Python-2.6.4/Demo/sockets/gopher.py.orig Python-2.6.4/Demo/sockets/gopher.py
---- Python-2.6.4/Demo/sockets/gopher.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/gopher.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # A simple gopher client.
- #
-diff -u Python-2.6.4/Demo/sockets/throughput.py.orig Python-2.6.4/Demo/sockets/throughput.py
---- Python-2.6.4/Demo/sockets/throughput.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/throughput.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Test network throughput.
- #
-diff -u Python-2.6.4/Demo/sockets/rpython.py.orig Python-2.6.4/Demo/sockets/rpython.py
---- Python-2.6.4/Demo/sockets/rpython.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/rpython.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Remote python client.
- # Execute Python commands remotely and send output back.
-diff -u Python-2.6.4/Demo/sockets/echosvr.py.orig Python-2.6.4/Demo/sockets/echosvr.py
---- Python-2.6.4/Demo/sockets/echosvr.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/echosvr.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Python implementation of an 'echo' tcp server: echo all data it receives.
- #
-diff -u Python-2.6.4/Demo/sockets/telnet.py.orig Python-2.6.4/Demo/sockets/telnet.py
---- Python-2.6.4/Demo/sockets/telnet.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/telnet.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Minimal interface to the Internet telnet protocol.
- #
-diff -u Python-2.6.4/Demo/sockets/finger.py.orig Python-2.6.4/Demo/sockets/finger.py
---- Python-2.6.4/Demo/sockets/finger.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/finger.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Python interface to the Internet finger daemon.
- #
-diff -u Python-2.6.4/Demo/sockets/udpecho.py.orig Python-2.6.4/Demo/sockets/udpecho.py
---- Python-2.6.4/Demo/sockets/udpecho.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/udpecho.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Client and server for udp (datagram) echo.
- #
-diff -u Python-2.6.4/Demo/sockets/rpythond.py.orig Python-2.6.4/Demo/sockets/rpythond.py
---- Python-2.6.4/Demo/sockets/rpythond.py.orig	Mon Feb 21 10:46:40 2011
-+++ Python-2.6.4/Demo/sockets/rpythond.py	Mon Feb 21 10:46:40 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Remote python server.
- # Execute Python commands remotely and send output back.
-diff -u Python-2.6.4/Tools/ssl/get-remote-certificate.py.orig Python-2.6.4/Tools/ssl/get-remote-certificate.py
---- Python-2.6.4/Tools/ssl/get-remote-certificate.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/ssl/get-remote-certificate.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # fetch the certificate that the server(s) are providing in PEM form
- #
-diff -u Python-2.6.4/Tools/compiler/demo.py.orig Python-2.6.4/Tools/compiler/demo.py
---- Python-2.6.4/Tools/compiler/demo.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/compiler/demo.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Print names of all methods defined in module
- 
-diff -u Python-2.6.4/Tools/compiler/dumppyc.py.orig Python-2.6.4/Tools/compiler/dumppyc.py
---- Python-2.6.4/Tools/compiler/dumppyc.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/compiler/dumppyc.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import marshal
- import dis
-diff -u Python-2.6.4/Tools/webchecker/wsgui.py.orig Python-2.6.4/Tools/webchecker/wsgui.py
---- Python-2.6.4/Tools/webchecker/wsgui.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/webchecker/wsgui.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Tkinter-based GUI for websucker.
- 
-diff -u Python-2.6.4/Tools/webchecker/webchecker.py.orig Python-2.6.4/Tools/webchecker/webchecker.py
---- Python-2.6.4/Tools/webchecker/webchecker.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/webchecker/webchecker.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Original code by Guido van Rossum; extensive changes by Sam Bayer,
- # including code to check URL fragments.
-diff -u Python-2.6.4/Tools/webchecker/websucker.py.orig Python-2.6.4/Tools/webchecker/websucker.py
---- Python-2.6.4/Tools/webchecker/websucker.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/webchecker/websucker.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """A variant on webchecker that creates a mirror copy of a remote site."""
- 
-diff -u Python-2.6.4/Tools/webchecker/wcgui.py.orig Python-2.6.4/Tools/webchecker/wcgui.py
---- Python-2.6.4/Tools/webchecker/wcgui.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/webchecker/wcgui.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """GUI interface to webchecker.
- 
-diff -u Python-2.6.4/Tools/faqwiz/faqw.py.orig Python-2.6.4/Tools/faqwiz/faqw.py
---- Python-2.6.4/Tools/faqwiz/faqw.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/faqwiz/faqw.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#!/usr/bin/python2.6
- 
- """FAQ wizard bootstrap."""
- 
-diff -u Python-2.6.4/Tools/unicode/comparecodecs.py.orig Python-2.6.4/Tools/unicode/comparecodecs.py
---- Python-2.6.4/Tools/unicode/comparecodecs.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/unicode/comparecodecs.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """ Compare the output of two codecs.
- 
-diff -u Python-2.6.4/Tools/i18n/msgfmt.py.orig Python-2.6.4/Tools/i18n/msgfmt.py
---- Python-2.6.4/Tools/i18n/msgfmt.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/i18n/msgfmt.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: iso-8859-1 -*-
- # Written by Martin v. Löwis <[email protected]>
- 
-diff -u Python-2.6.4/Tools/i18n/makelocalealias.py.orig Python-2.6.4/Tools/i18n/makelocalealias.py
---- Python-2.6.4/Tools/i18n/makelocalealias.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/i18n/makelocalealias.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- """
-     Convert the X11 locale.alias file into a mapping dictionary suitable
-     for locale.py.
-diff -u Python-2.6.4/Tools/i18n/pygettext.py.orig Python-2.6.4/Tools/i18n/pygettext.py
---- Python-2.6.4/Tools/i18n/pygettext.py.orig	Mon Feb 21 10:46:41 2011
-+++ Python-2.6.4/Tools/i18n/pygettext.py	Mon Feb 21 10:46:41 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: iso-8859-1 -*-
- # Originally written by Barry Warsaw <[email protected]>
- #
-diff -u Python-2.6.4/Tools/freeze/freeze.py.orig Python-2.6.4/Tools/freeze/freeze.py
---- Python-2.6.4/Tools/freeze/freeze.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/freeze/freeze.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Freeze a Python script into a binary.
- 
-diff -u Python-2.6.4/Tools/modulator/Tkextra.py.orig Python-2.6.4/Tools/modulator/Tkextra.py
---- Python-2.6.4/Tools/modulator/Tkextra.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/modulator/Tkextra.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # A Python function that generates dialog boxes with a text message,
- # optional bitmap, and any number of buttons.
-diff -u Python-2.6.4/Tools/modulator/modulator.py.orig Python-2.6.4/Tools/modulator/modulator.py
---- Python-2.6.4/Tools/modulator/modulator.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/modulator/modulator.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- #
- # Modulator - Generate skeleton modules.
- #
-diff -u Python-2.6.4/Tools/pybench/pybench.py.orig Python-2.6.4/Tools/pybench/pybench.py
---- Python-2.6.4/Tools/pybench/pybench.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/pybench/pybench.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python -O
-+#!/usr/bin/python2.6
- 
- """ A Python Benchmark Suite
- 
-diff -u Python-2.6.4/Tools/pybench/Setup.py.orig Python-2.6.4/Tools/pybench/Setup.py
---- Python-2.6.4/Tools/pybench/Setup.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/pybench/Setup.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!python
-+#!/usr/bin/python2.6
- 
- # Setup file for pybench
- #
-diff -u Python-2.6.4/Tools/pybench/clockres.py.orig Python-2.6.4/Tools/pybench/clockres.py
---- Python-2.6.4/Tools/pybench/clockres.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/pybench/clockres.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """ clockres - calculates the resolution in seconds of a given timer.
- 
-diff -u Python-2.6.4/Tools/pybench/systimes.py.orig Python-2.6.4/Tools/pybench/systimes.py
---- Python-2.6.4/Tools/pybench/systimes.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/pybench/systimes.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """ systimes() user and system timer implementations for use by
-     pybench.
-diff -u Python-2.6.4/Tools/scripts/fixheader.py.orig Python-2.6.4/Tools/scripts/fixheader.py
---- Python-2.6.4/Tools/scripts/fixheader.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/fixheader.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Add some standard cpp magic to a header file
- 
-diff -u Python-2.6.4/Tools/scripts/fixdiv.py.orig Python-2.6.4/Tools/scripts/fixdiv.py
---- Python-2.6.4/Tools/scripts/fixdiv.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/fixdiv.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """fixdiv - tool to fix division operators.
- 
-diff -u Python-2.6.4/Tools/scripts/which.py.orig Python-2.6.4/Tools/scripts/which.py
---- Python-2.6.4/Tools/scripts/which.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/which.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Variant of "which".
- # On stderr, near and total misses are reported.
-diff -u Python-2.6.4/Tools/scripts/suff.py.orig Python-2.6.4/Tools/scripts/suff.py
---- Python-2.6.4/Tools/scripts/suff.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/suff.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # suff
- #
-diff -u Python-2.6.4/Tools/scripts/pysource.py.orig Python-2.6.4/Tools/scripts/pysource.py
---- Python-2.6.4/Tools/scripts/pysource.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/pysource.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """\
- List python source files.
-diff -u Python-2.6.4/Tools/scripts/lll.py.orig Python-2.6.4/Tools/scripts/lll.py
---- Python-2.6.4/Tools/scripts/lll.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/lll.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Find symbolic links and show where they point to.
- # Arguments are directories to search; default is current directory.
-diff -u Python-2.6.4/Tools/scripts/pickle2db.py.orig Python-2.6.4/Tools/scripts/pickle2db.py
---- Python-2.6.4/Tools/scripts/pickle2db.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/pickle2db.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- Synopsis: %(prog)s [-h|-b|-g|-r|-a|-d] [ picklefile ] dbfile
-diff -u Python-2.6.4/Tools/scripts/texi2html.py.orig Python-2.6.4/Tools/scripts/texi2html.py
---- Python-2.6.4/Tools/scripts/texi2html.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/texi2html.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Convert GNU texinfo files into HTML, one file per node.
- # Based on Texinfo 2.14.
-diff -u Python-2.6.4/Tools/scripts/mkreal.py.orig Python-2.6.4/Tools/scripts/mkreal.py
---- Python-2.6.4/Tools/scripts/mkreal.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/mkreal.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # mkreal
- #
-diff -u Python-2.6.4/Tools/scripts/ftpmirror.py.orig Python-2.6.4/Tools/scripts/ftpmirror.py
---- Python-2.6.4/Tools/scripts/ftpmirror.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/ftpmirror.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Mirror a remote ftp subtree into a local directory tree.
- 
-diff -u Python-2.6.4/Tools/scripts/lfcr.py.orig Python-2.6.4/Tools/scripts/lfcr.py
---- Python-2.6.4/Tools/scripts/lfcr.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/lfcr.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- "Replace LF with CRLF in argument files.  Print names of changed files."
- 
-diff -u Python-2.6.4/Tools/scripts/ptags.py.orig Python-2.6.4/Tools/scripts/ptags.py
---- Python-2.6.4/Tools/scripts/ptags.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/ptags.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # ptags
- #
-diff -u Python-2.6.4/Tools/scripts/copytime.py.orig Python-2.6.4/Tools/scripts/copytime.py
---- Python-2.6.4/Tools/scripts/copytime.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/copytime.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Copy one file's atime and mtime to another
- 
-diff -u Python-2.6.4/Tools/scripts/finddiv.py.orig Python-2.6.4/Tools/scripts/finddiv.py
---- Python-2.6.4/Tools/scripts/finddiv.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/finddiv.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """finddiv - a grep-like tool that looks for division operators.
- 
-diff -u Python-2.6.4/Tools/scripts/combinerefs.py.orig Python-2.6.4/Tools/scripts/combinerefs.py
---- Python-2.6.4/Tools/scripts/combinerefs.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/combinerefs.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- combinerefs path
-diff -u Python-2.6.4/Tools/scripts/cvsfiles.py.orig Python-2.6.4/Tools/scripts/cvsfiles.py
---- Python-2.6.4/Tools/scripts/cvsfiles.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/cvsfiles.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Print a list of files that are mentioned in CVS directories.
- 
-diff -u Python-2.6.4/Tools/scripts/reindent.py.orig Python-2.6.4/Tools/scripts/reindent.py
---- Python-2.6.4/Tools/scripts/reindent.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/reindent.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Released to the public domain, by Tim Peters, 03 October 2000.
- 
-diff -u Python-2.6.4/Tools/scripts/checkpyc.py.orig Python-2.6.4/Tools/scripts/checkpyc.py
---- Python-2.6.4/Tools/scripts/checkpyc.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/checkpyc.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # Check that all ".pyc" files exist and are up-to-date
- # Uses module 'os'
- 
-diff -u Python-2.6.4/Tools/scripts/fixps.py.orig Python-2.6.4/Tools/scripts/fixps.py
---- Python-2.6.4/Tools/scripts/fixps.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/fixps.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Fix Python script(s) to reference the interpreter via /usr/bin/env python.
- # Warning: this overwrites the file without making a backup.
-diff -u Python-2.6.4/Tools/scripts/crlf.py.orig Python-2.6.4/Tools/scripts/crlf.py
---- Python-2.6.4/Tools/scripts/crlf.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/crlf.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- "Replace CRLF with LF in argument files.  Print names of changed files."
- 
- import sys, os
-diff -u Python-2.6.4/Tools/scripts/methfix.py.orig Python-2.6.4/Tools/scripts/methfix.py
---- Python-2.6.4/Tools/scripts/methfix.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/methfix.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Fix Python source files to avoid using
- #       def method(self, (arg1, ..., argn)):
-diff -u Python-2.6.4/Tools/scripts/classfix.py.orig Python-2.6.4/Tools/scripts/classfix.py
---- Python-2.6.4/Tools/scripts/classfix.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/classfix.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # This script is obsolete -- it is kept for historical purposes only.
- #
-diff -u Python-2.6.4/Tools/scripts/xxci.py.orig Python-2.6.4/Tools/scripts/xxci.py
---- Python-2.6.4/Tools/scripts/xxci.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/xxci.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # xxci
- #
-diff -u Python-2.6.4/Tools/scripts/findnocoding.py.orig Python-2.6.4/Tools/scripts/findnocoding.py
---- Python-2.6.4/Tools/scripts/findnocoding.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/findnocoding.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """List all those Python files that require a coding directive
- 
-diff -u Python-2.6.4/Tools/scripts/fixnotice.py.orig Python-2.6.4/Tools/scripts/fixnotice.py
---- Python-2.6.4/Tools/scripts/fixnotice.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/fixnotice.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """(Ostensibly) fix copyright notices in files.
- 
-diff -u Python-2.6.4/Tools/scripts/eptags.py.orig Python-2.6.4/Tools/scripts/eptags.py
---- Python-2.6.4/Tools/scripts/eptags.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/eptags.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Create a TAGS file for Python programs, usable with GNU Emacs.
- 
- usage: eptags pyfiles...
-diff -u Python-2.6.4/Tools/scripts/linktree.py.orig Python-2.6.4/Tools/scripts/linktree.py
---- Python-2.6.4/Tools/scripts/linktree.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/linktree.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # linktree
- #
-diff -u Python-2.6.4/Tools/scripts/checkappend.py.orig Python-2.6.4/Tools/scripts/checkappend.py
---- Python-2.6.4/Tools/scripts/checkappend.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/checkappend.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Released to the public domain, by Tim Peters, 28 February 2000.
- 
-diff -u Python-2.6.4/Tools/scripts/pindent.py.orig Python-2.6.4/Tools/scripts/pindent.py
---- Python-2.6.4/Tools/scripts/pindent.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/pindent.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # This file contains a class and a main program that perform three
- # related (though complimentary) formatting operations on Python
-diff -u Python-2.6.4/Tools/scripts/google.py.orig Python-2.6.4/Tools/scripts/google.py
---- Python-2.6.4/Tools/scripts/google.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/google.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- import sys, webbrowser
- 
-diff -u Python-2.6.4/Tools/scripts/nm2def.py.orig Python-2.6.4/Tools/scripts/nm2def.py
---- Python-2.6.4/Tools/scripts/nm2def.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/nm2def.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """nm2def.py
- 
- Helpers to extract symbols from Unix libs and auto-generate
-diff -u Python-2.6.4/Tools/scripts/md5sum.py.orig Python-2.6.4/Tools/scripts/md5sum.py
---- Python-2.6.4/Tools/scripts/md5sum.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/md5sum.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Python utility to print MD5 checksums of argument files.
- """
-diff -u Python-2.6.4/Tools/scripts/logmerge.py.orig Python-2.6.4/Tools/scripts/logmerge.py
---- Python-2.6.4/Tools/scripts/logmerge.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/logmerge.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Consolidate a bunch of CVS or RCS logs read from stdin.
- 
-diff -u Python-2.6.4/Tools/scripts/svneol.py.orig Python-2.6.4/Tools/scripts/svneol.py
---- Python-2.6.4/Tools/scripts/svneol.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/svneol.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- SVN helper script.
-diff -u Python-2.6.4/Tools/scripts/rgrep.py.orig Python-2.6.4/Tools/scripts/rgrep.py
---- Python-2.6.4/Tools/scripts/rgrep.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/rgrep.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Reverse grep.
- 
-diff -u Python-2.6.4/Tools/scripts/h2py.py.orig Python-2.6.4/Tools/scripts/h2py.py
---- Python-2.6.4/Tools/scripts/h2py.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/h2py.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Read #define's and translate to Python code.
- # Handle #include statements.
-diff -u Python-2.6.4/Tools/scripts/pathfix.py.orig Python-2.6.4/Tools/scripts/pathfix.py
---- Python-2.6.4/Tools/scripts/pathfix.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/pathfix.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Change the #! line occurring in Python scripts.  The new interpreter
- # pathname must be given with a -i option.
-diff -u Python-2.6.4/Tools/scripts/byext.py.orig Python-2.6.4/Tools/scripts/byext.py
---- Python-2.6.4/Tools/scripts/byext.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/byext.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Show file statistics by extension."""
- 
-diff -u Python-2.6.4/Tools/scripts/ifdef.py.orig Python-2.6.4/Tools/scripts/ifdef.py
---- Python-2.6.4/Tools/scripts/ifdef.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/ifdef.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Selectively preprocess #ifdef / #ifndef statements.
- # Usage:
-diff -u Python-2.6.4/Tools/scripts/treesync.py.orig Python-2.6.4/Tools/scripts/treesync.py
---- Python-2.6.4/Tools/scripts/treesync.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/treesync.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Script to synchronize two source trees.
- 
-diff -u Python-2.6.4/Tools/scripts/ndiff.py.orig Python-2.6.4/Tools/scripts/ndiff.py
---- Python-2.6.4/Tools/scripts/ndiff.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/ndiff.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Module ndiff version 1.7.0
- # Released to the public domain 08-Dec-2000,
-diff -u Python-2.6.4/Tools/scripts/findlinksto.py.orig Python-2.6.4/Tools/scripts/findlinksto.py
---- Python-2.6.4/Tools/scripts/findlinksto.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/findlinksto.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # findlinksto
- #
-diff -u Python-2.6.4/Tools/scripts/objgraph.py.orig Python-2.6.4/Tools/scripts/objgraph.py
---- Python-2.6.4/Tools/scripts/objgraph.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/objgraph.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # objgraph
- #
-diff -u Python-2.6.4/Tools/scripts/untabify.py.orig Python-2.6.4/Tools/scripts/untabify.py
---- Python-2.6.4/Tools/scripts/untabify.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/untabify.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- "Replace tabs with spaces in argument files.  Print names of changed files."
- 
-diff -u Python-2.6.4/Tools/scripts/db2pickle.py.orig Python-2.6.4/Tools/scripts/db2pickle.py
---- Python-2.6.4/Tools/scripts/db2pickle.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/db2pickle.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """
- Synopsis: %(prog)s [-h|-g|-b|-r|-a] dbfile [ picklefile ]
-diff -u Python-2.6.4/Tools/scripts/parseentities.py.orig Python-2.6.4/Tools/scripts/parseentities.py
---- Python-2.6.4/Tools/scripts/parseentities.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/parseentities.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2.6
- """ Utility for parsing HTML entity definitions available from:
- 
-       http://www.w3.org/ as e.g.
-diff -u Python-2.6.4/Tools/scripts/dutree.py.orig Python-2.6.4/Tools/scripts/dutree.py
---- Python-2.6.4/Tools/scripts/dutree.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/dutree.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- # Format du output in a tree shape
- 
- import os, sys, errno
-diff -u Python-2.6.4/Tools/scripts/pdeps.py.orig Python-2.6.4/Tools/scripts/pdeps.py
---- Python-2.6.4/Tools/scripts/pdeps.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/pdeps.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # pdeps
- #
-diff -u Python-2.6.4/Tools/scripts/cleanfuture.py.orig Python-2.6.4/Tools/scripts/cleanfuture.py
---- Python-2.6.4/Tools/scripts/cleanfuture.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/cleanfuture.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """cleanfuture [-d][-r][-v] path ...
- 
-diff -u Python-2.6.4/Tools/scripts/hotshotmain.py.orig Python-2.6.4/Tools/scripts/hotshotmain.py
---- Python-2.6.4/Tools/scripts/hotshotmain.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/hotshotmain.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: iso-8859-1 -*-
- 
- """
-diff -u Python-2.6.4/Tools/scripts/byteyears.py.orig Python-2.6.4/Tools/scripts/byteyears.py
---- Python-2.6.4/Tools/scripts/byteyears.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/byteyears.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Print the product of age and size of each file, in suitable units.
- #
-diff -u Python-2.6.4/Tools/scripts/gprof2html.py.orig Python-2.6.4/Tools/scripts/gprof2html.py
---- Python-2.6.4/Tools/scripts/gprof2html.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/gprof2html.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python2.3
-+#!/usr/bin/python2.6
- 
- """Transform gprof(1) output into useful HTML."""
- 
-diff -u Python-2.6.4/Tools/scripts/fixcid.py.orig Python-2.6.4/Tools/scripts/fixcid.py
---- Python-2.6.4/Tools/scripts/fixcid.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/fixcid.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Perform massive identifier substitution on C source files.
- # This actually tokenizes the files (to some extent) so it can
-diff -u Python-2.6.4/Tools/scripts/reindent-rst.py.orig Python-2.6.4/Tools/scripts/reindent-rst.py
---- Python-2.6.4/Tools/scripts/reindent-rst.py.orig	Mon Feb 21 10:46:42 2011
-+++ Python-2.6.4/Tools/scripts/reindent-rst.py	Mon Feb 21 10:46:42 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- # Make a reST file compliant to our pre-commit hook.
- # Currently just remove trailing whitespace.
-diff -u Python-2.6.4/Mac/BuildScript/build-installer.py.orig Python-2.6.4/Mac/BuildScript/build-installer.py
---- Python-2.6.4/Mac/BuildScript/build-installer.py.orig	Mon Feb 21 10:46:43 2011
-+++ Python-2.6.4/Mac/BuildScript/build-installer.py	Mon Feb 21 10:46:43 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """
- This script is used to build the "official unofficial" universal build on
- Mac OS X. It requires Mac OS X 10.4, Xcode 2.2 and the 10.4u SDK to do its
-diff -u Python-2.6.4/Mac/scripts/zappycfiles.py.orig Python-2.6.4/Mac/scripts/zappycfiles.py
---- Python-2.6.4/Mac/scripts/zappycfiles.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Mac/scripts/zappycfiles.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2.6
- """Recursively zap all .pyc and .pyo files"""
- import os
- import sys
-diff -u Python-2.6.4/Mac/scripts/buildpkg.py.orig Python-2.6.4/Mac/scripts/buildpkg.py
---- Python-2.6.4/Mac/scripts/buildpkg.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Mac/scripts/buildpkg.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """buildpkg.py -- Build OS X packages for Apple's Installer.app.
- 
-diff -u Python-2.6.4/Mac/Tools/fixapplepython23.py.orig Python-2.6.4/Mac/Tools/fixapplepython23.py
---- Python-2.6.4/Mac/Tools/fixapplepython23.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Mac/Tools/fixapplepython23.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.6
- """fixapplepython23 - Fix Apple-installed Python 2.3 (on Mac OS X 10.3)
- 
- Python 2.3 (and 2.3.X for X<5) have the problem that building an extension
-diff -u Python-2.6.4/Misc/find_recursionlimit.py.orig Python-2.6.4/Misc/find_recursionlimit.py
---- Python-2.6.4/Misc/find_recursionlimit.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Misc/find_recursionlimit.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Find the maximum recursion limit that prevents interpreter termination.
- 
- This script finds the maximum safe recursion limit on a particular
-diff -u Python-2.6.4/Parser/asdl_c.py.orig Python-2.6.4/Parser/asdl_c.py
---- Python-2.6.4/Parser/asdl_c.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Parser/asdl_c.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.6
- """Generate C code from an ASDL description."""
- 
- # TO DO
-diff -u Python-2.6.4/Doc/includes/email-alternative.py.orig Python-2.6.4/Doc/includes/email-alternative.py
---- Python-2.6.4/Doc/includes/email-alternative.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Doc/includes/email-alternative.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python2.6
- 
- import smtplib
- 
-diff -u Python-2.6.4/Doc/includes/email-unpack.py.orig Python-2.6.4/Doc/includes/email-unpack.py
---- Python-2.6.4/Doc/includes/email-unpack.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Doc/includes/email-unpack.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Unpack a MIME message into a directory of files."""
- 
-diff -u Python-2.6.4/Doc/includes/email-dir.py.orig Python-2.6.4/Doc/includes/email-dir.py
---- Python-2.6.4/Doc/includes/email-dir.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Doc/includes/email-dir.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- """Send the contents of a directory as a MIME message."""
- 
-diff -u Python-2.6.4/Doc/tools/rstlint.py.orig Python-2.6.4/Doc/tools/rstlint.py
---- Python-2.6.4/Doc/tools/rstlint.py.orig	Mon Feb 21 10:46:44 2011
-+++ Python-2.6.4/Doc/tools/rstlint.py	Mon Feb 21 10:46:44 2011
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- # -*- coding: utf-8 -*-
- 
- # Check for stylistic and formal issues in .rst and .py
--- a/components/python/python26/Python26-01-solaris-lib-dirs.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-diff --git Python-2.6.4/Modules/_multiprocessing/multiprocessing.h Python-2.6.4/Modules/_multiprocessing/multiprocessing.h
---- Python-2.6.4/Modules/_multiprocessing/multiprocessing.h
-+++ Python-2.6.4/Modules/_multiprocessing/multiprocessing.h
[email protected]@ -3,6 +3,10 @@
- 
- #define PY_SSIZE_T_CLEAN
- 
-+/* needed on Solaris for the definition of CMSG_SPACE and friends */
-+#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE_EXTENDED 1
-+
- #include "Python.h"
- #include "structmember.h"
- #include "pythread.h"
-diff --git Python-2.6.4/setup.py Python-2.6.4/setup.py
-new file mode 100644
---- Python-2.6.4/setup.py
-+++ Python-2.6.4/setup.py
[email protected]@ -309,10 +309,10 @@
-         return sys.platform
- 
-     def detect_modules(self):
--        # Ensure that /usr/local is always used
--        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
--        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
--
-+        if sys.platform != 'sunos5':
-+            # Ensure that /usr/local is always used
-+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-         # We must get the values from the Makefile and not the environment
[email protected]@ -610,11 +610,22 @@
-         exts.append( Extension('_csv', ['_csv.c']) )
- 
-         # socket(2)
-+        socket_libs = []
-+        if self.compiler.find_library_file(lib_dirs,
-+                                           'socket'):
-+            socket_libs.append('socket')
-+        if self.compiler.find_library_file(lib_dirs,
-+                                           'nsl'):
-+            socket_libs.append('nsl')
-+        if self.compiler.find_library_file(lib_dirs,
-+                                           'resolv'):
-+            socket_libs.append('resolv')
-         exts.append( Extension('_socket', ['socketmodule.c'],
--                               depends = ['socketmodule.h']) )
-+                               depends = ['socketmodule.h'],
-+                               libraries = socket_libs) )
-         # Detect SSL support for the socket module (via _ssl)
-         search_for_ssl_incs_in = [
--                              '/usr/local/ssl/include',
-+                              '/usr/sfw/include',
-                               '/usr/contrib/ssl/include/'
-                              ]
-         ssl_incs = find_file('openssl/ssl.h', inc_dirs,
[email protected]@ -625,8 +636,12 @@
-                                ['/usr/kerberos/include'])
-             if krb5_h:
-                 ssl_incs += krb5_h
-+        if sys.maxint == 2147483647L:
-+            sfw_libdir = '/usr/sfw/lib';
-+        else:
-+            sfw_libdir = '/usr/sfw/lib/64';
-         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
--                                     ['/usr/local/ssl/lib',
-+                                     [sfw_libdir,
-                                       '/usr/contrib/ssl/lib/'
-                                      ] )
- 
[email protected]@ -635,6 +650,7 @@
-             exts.append( Extension('_ssl', ['_ssl.c'],
-                                    include_dirs = ssl_incs,
-                                    library_dirs = ssl_libs,
-+				   runtime_library_dirs = ssl_libs,
-                                    libraries = ['ssl', 'crypto'],
-                                    depends = ['socketmodule.h']), )
-         else:
[email protected]@ -1079,6 +1095,14 @@
- 
-         # Curses support, requiring the System V version of curses, often
-         # provided by the ncurses library.
-+        curses_lib_dirs = []
-+        curses_inc_dirs = []
-+        if platform == 'sunos5':
-+            # look for ncurses in /usr/gnu on Solaris
-+            curses_inc_dirs.append('/usr/include/ncurses')
-+            curses_lib_dirs.append('/usr/gnu/lib')
-+            curses_lib_dirs.append('/usr/gnu/lib/amd64')
-+            curses_lib_dirs.append('/usr/gnu/lib/sparcv9')
-         panel_library = 'panel'
-         if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
-             curses_libs = ['ncursesw']
[email protected]@ -1087,10 +1111,13 @@
-             panel_library = 'panelw'
-             exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                    libraries = curses_libs) )
--        elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
-+        elif (self.compiler.find_library_file(lib_dirs + curses_lib_dirs, 'ncurses')):
-             curses_libs = ['ncurses']
-             exts.append( Extension('_curses', ['_cursesmodule.c'],
--                                   libraries = curses_libs) )
-+                                   libraries = curses_libs,
-+                                   library_dirs = curses_lib_dirs,
-+                                   runtime_library_dirs = curses_lib_dirs,
-+                                   include_dirs = curses_inc_dirs ) )
-         elif (self.compiler.find_library_file(lib_dirs, 'curses')
-               and platform != 'darwin'):
-                 # OSX has an old Berkeley curses, not good enough for
[email protected]@ -1109,9 +1136,12 @@
- 
-         # If the curses module is enabled, check for the panel module
-         if (module_enabled(exts, '_curses') and
--            self.compiler.find_library_file(lib_dirs, panel_library)):
-+            self.compiler.find_library_file(lib_dirs + curses_lib_dirs, panel_library)):
-             exts.append( Extension('_curses_panel', ['_curses_panel.c'],
--                                   libraries = [panel_library] + curses_libs) )
-+                                   libraries = [panel_library] + curses_libs,
-+                                   include_dirs = curses_inc_dirs,
-+                                   library_dirs = curses_lib_dirs,
-+                                   runtime_library_dirs = curses_lib_dirs ) )
-         else:
-             missing.append('_curses_panel')
- 
[email protected]@ -1324,8 +1354,13 @@
-             if macros.get('HAVE_SEM_OPEN', False):
-                 multiprocessing_srcs.append('_multiprocessing/semaphore.c')
- 
-+        multiproc_libs = []
-+        if platform == 'sunos5':
-+            multiproc_libs = [ "xnet" ]
-+
-         exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                  define_macros=macros.items(),
-+                                 libraries=multiproc_libs,
-                                  include_dirs=["Modules/_multiprocessing"]))
-         # End multiprocessing
- 
[email protected]@ -1549,15 +1584,26 @@
-         # Assume we haven't found any of the libraries or include files
-         # The versions with dots are used on Unix, and the versions without
-         # dots on Windows, for detection by cygwin.
-+        added_lib_dirs = []
-+        tcl_tk_lib_dirs = ['/usr/sfw/lib']
-+        tcl_tk_inc_dirs = ['/usr/sfw/include']
-         tcllib = tklib = tcl_includes = tk_includes = None
-         for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
-                         '82', '8.1', '81', '8.0', '80']:
--            tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
--            tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
-+            tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version, tcl_tk_lib_dirs)
-+            tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version, tcl_tk_lib_dirs)
-             if tklib and tcllib:
-                 # Exit the loop when we've found the Tcl/Tk libraries
-                 break
- 
-+            tklib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tk' + version)
-+            tcllib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tcl' + version)
-+            if tklib and tcllib:
-+                # found the libs in a non-standard dir
-+                added_lib_dirs.append(os.path.dirname(tcllib))
-+                # Exit the loop when we've found the Tcl/Tk libraries
-+                break
-+
-         # Now check for the header files
-         if tklib and tcllib:
-             # Check for the include files on Debian and {Free,Open}BSD, where
[email protected]@ -1572,6 +1618,7 @@
-             for dir in inc_dirs:
-                 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
-                 tk_include_sub += [dir + os.sep + "tk" + dotversion]
-+            tcl_include_sub += tcl_tk_inc_dirs
-             tk_include_sub += tcl_include_sub
-             tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
-             tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
[email protected]@ -1636,6 +1683,7 @@
-                         include_dirs = include_dirs,
-                         libraries = libs,
-                         library_dirs = added_lib_dirs,
-+                        runtime_library_dirs = added_lib_dirs
-                         )
-         self.extensions.append(ext)
- 
-diff --git Python-2.6.4/Lib/site-packages/vendor-packages.pth Python2.6.4/Lib/site-packages/vendor-packages.pth
---- /dev/null	Sat Feb 12 00:21:26 2011
-+++ Python-2.6.4/Lib/site-packages/vendor-packages.pth	Sat Feb 12 00:47:05 2011
[email protected]@ -0,0 +1,1 @@
-+import site; site.addsitedir('/usr/lib/python2.6/vendor-packages')
--- a/components/python/python26/Python26-02-pycc.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-diff --git Python-2.6.4/Makefile.pre.in Python-2.6.4/Makefile.pre.in
---- Python-2.6.4/Makefile.pre.in.orig	Sun Feb 13 21:00:17 2011
-+++ Python-2.6.4/Makefile.pre.in	Sun Feb 13 21:02:35 2011
[email protected]@ -663,6 +663,8 @@
- 
- $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
- 
-+install-pycc:	$(srcdir)/pycc
-+	$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINLIBDEST)
- 
- ######################################################################
- 
[email protected]@ -728,7 +728,7 @@
-                $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
- 
- # Install everything
--install:	@[email protected] altinstall bininstall maninstall @[email protected]
-+install:	@[email protected] altinstall bininstall maninstall @[email protected] install-pycc
- 
- # Install almost everything without disturbing previous versions
- altinstall:	@[email protected] altbininstall libinstall inclinstall libainstall \
-
-diff --git Python-2.6.4/pycc Python-2.6.4/pycc
-new file mode 100644
---- /dev/null
-+++ Python-2.6.4/pycc
[email protected]@ -0,0 +1,172 @@
-+#!/bin/ksh
-+#
-+# Script for running the C/C++ compiler when building python modules
-+#
-+# CDDL HEADER START
-+#
-+# The contents of this file are subject to the terms of the
-+# Common Development and Distribution License, Version 1.0 only
-+# (the "License").  You may not use this file except in compliance
-+# with the License.
-+#
-+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-+# or http://www.opensolaris.org/os/licensing.
-+# See the License for the specific language governing permissions
-+# and limitations under the License.
-+#
-+# When distributing Covered Code, include this CDDL HEADER in each
-+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-+# If applicable, add the following below this CDDL HEADER, with the
-+# fields enclosed by brackets "[]" replaced with your own identifying
-+# information: Portions Copyright [yyyy] [name of copyright owner]
-+#
-+# CDDL HEADER END
-+#
-+#
-+# Copyright 2004-2005 Sun Microsystems, Inc.  All rights reserved.
-+# Use is subject to license terms.
-+#
-+
-+MYNAME=`basename $0`
-+
-+# name of the compiler executable
-+CCEXE='cc'
-+# name of the GNU compiler executable
-+GCCEXE='gcc'
-+# name of the programming language
-+CLANG='C'
-+# name of the env variable for setting the compiler path
-+CVAR='CC'
-+
-+if [ "x$PYCC_CC" != x ]; then
-+    CC="$PYCC_CC"
-+fi
-+
-+if [ "x$MYNAME" = xpyCC ]; then
-+    CCEXE='CC'
-+    GCCEXE='g++'
-+    CLANG='C++'
-+    CC="$CXX"
-+    CVAR='CXX'
-+    if [ "x$PYCC_CXX" != x ]; then
-+        CC="$PYCC_CXX"
-+    fi
-+fi
-+
-+SAVED_IFS="$IFS"
-+IFS=:
-+
-+# check if the CC env variable is set
-+if [ "x$CC" != x ]; then
-+    # verify that it doesn't point to this script
-+    if /usr/bin/cmp -s "$CC" $0; then
-+        echo "WARNING: "$CVAR" is set to this script; ignoring this value to avoid an infinite loop"
-+	CC=
-+    fi
-+fi
-+
-+# check again if the CC env variable is set
-+if [ "x$CC" != x ]; then
-+    case "$CC" in
-+	/* )
-+	    # $CC is an absolute path name
-+            # check if $CC exists
-+	    if [ ! -e "$CC" ]; then
-+		echo "WARNING: pycc: $CC not found" 1>&2
-+		CC=
-+	    else
-+        # check if $CC is an executable
-+		if [ ! -x "$CC" -o ! -f "$CC" ]; then
-+		    echo "WARNING: pycc: $CC is not an executable" 1>&2
-+		    CC=
-+		fi
-+	    fi
-+	    ;;
-+	* )
-+	    # try to find $CC in the PATH
-+	    NEW_CC=
-+	    for dir in $PATH; do
-+		if [ -x "$dir/$CC" ]; then
-+		    NEW_CC="$dir/$CC"
-+		    break
-+		fi
-+	    done
-+	    if [ "x$NEW_CC" = x ]; then
-+		echo "WARNING: pycc: $CC not found" 1>&2
-+		CC=
-+	    else
-+		CC="$NEW_CC"
-+	    fi
-+	    ;;
-+    esac
-+fi
-+
-+if [ "x$CC" = x ]; then
-+    # Look for the Sun Studio compiler in the PATH
-+    for dir in $PATH; do
-+	if [ -x "$dir/$CCEXE" ]; then
-+	    CC="$dir/$CCEXE"
-+	    break
-+	fi
-+    done
-+fi
-+
-+if [ "x$CC" = x ]; then
-+    # Look for gcc in the PATH
-+    for dir in $PATH; do
-+	if [ -x "$dir/$GCCEXE" ]; then
-+	    CC="$dir/$GCCEXE"
-+	    break
-+	fi
-+    done
-+fi
-+
-+if [ "x$CC" = x ]; then
-+    # Check for Sun Studio in /opt/SUNWspro (default install location)
-+    if [ -x /opt/SUNWspro/bin/$CCEXE ]; then
-+	CC=/opt/SUNWspro/bin/$CCEXE
-+    fi
-+fi
-+
-+if [ "x$CC" = x ]; then
-+    # Check for the GNU compiler in /usr/sfw/bin
-+    if [ -x /usr/sfw/bin/$GCCEXE ]; then
-+	CC=/usr/sfw/bin/$GCCEXE
-+    fi
-+fi
-+
-+if [ "x$CC" = x ]; then
-+    # Cannot continue without a C compiler
-+    echo "ERROR: no $CLANG compiler not found; update your PATH or set the $CVAR env variable" 1>&2
-+    exit 1
-+fi
-+
-+IFS="$SAVED_IFS"
-+
-+# We need to make some modifications to adapt correctly to compiler options
-+# that differ between GCC and Studio.
-+
-+extra_flags=
-+
-+is_gcc=no
-+
-+$CC --version >/dev/null 2>&1 && is_gcc=yes
-+
-+if [ "$is_gcc" = yes ]; then
-+	for flag in "${@}"; do
-+		# need -shared to link shared objects properly
-+		if [ "$flag" = "-G" ]; then
-+			extra_flags="$extra_flags -shared"
-+		fi
-+		# workaround for 6223255
-+		if [ "$flag" = "-m64" ]; then
-+			extra_flags="$extra_flags -R/usr/sfw/lib/amd64"
-+		fi
-+	done
-+	# force PIC compilation
-+	extra_flags="$extra_flags -fPIC -DPIC"
-+else
-+	extra_flags="$extra_flags -KPIC"
-+fi
-+
-+exec "$CC" $extra_flags "${@}"
--- a/components/python/python26/Python26-03-distutils-pycc.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff --git Python-2.6.4/Lib/distutils/sysconfig.py Python-2.6.4/Lib/distutils/sysconfig.py
---- Python-2.6.4/Lib/distutils/sysconfig.py
-+++ Python-2.6.4/Lib/distutils/sysconfig.py
[email protected]@ -166,16 +166,10 @@
-             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                             'CCSHARED', 'LDSHARED', 'SO')
- 
--        if 'CC' in os.environ:
--            cc = os.environ['CC']
--        if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
--        if 'LDSHARED' in os.environ:
--            ldshared = os.environ['LDSHARED']
--        if 'CPP' in os.environ:
--            cpp = os.environ['CPP']
--        else:
--            cpp = cc + " -E"           # not always
-+        # On Solaris, we must always use pycc/pyCC, which will then look up
-+        # $CC and $CXX
-+        cpp = cc + " -E"
-+
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--- a/components/python/python26/Python26-04-distutils-log.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-diff --git Python-2.6.4/Lib/distutils/spawn.py Python-2.6.4/Lib/distutils/spawn.py
---- Python-2.6.4/Lib/distutils/spawn.py
-+++ Python-2.6.4/Lib/distutils/spawn.py
[email protected]@ -73,7 +73,7 @@
-     if search_path:
-         # either we find one or it stays the same
-         executable = find_executable(executable) or executable
--    log.info(string.join([executable] + cmd[1:], ' '))
-+    log.info("%s", string.join([executable] + cmd[1:], ' '))
-     if not dry_run:
-         # spawn for NT requires a full path to the .exe
-         try:
[email protected]@ -98,7 +98,7 @@
-     if search_path:
-         # either we find one or it stays the same
-         executable = find_executable(executable) or executable
--    log.info(string.join([executable] + cmd[1:], ' '))
-+    log.info("%s", string.join([executable] + cmd[1:], ' '))
-     if not dry_run:
-         # spawnv for OS/2 EMX requires a full path to the .exe
-         try:
[email protected]@ -119,7 +119,7 @@
-                   verbose=0,
-                   dry_run=0):
- 
--    log.info(string.join(cmd, ' '))
-+    log.info("%s", string.join(cmd, ' '))
-     if dry_run:
-         return
-     exec_fn = search_path and os.execvp or os.execv
--- a/components/python/python26/Python26-05-isalibs.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,452 +0,0 @@
-diff --git Python-2.6.4/Lib/distutils/command/build_ext.py Python-2.6.4/Lib/distutils/command/build_ext.py
---- Python-2.6.4/Lib/distutils/command/build_ext.py
-+++ Python-2.6.4/Lib/distutils/command/build_ext.py
[email protected]@ -636,6 +636,8 @@
-         modpath = fullname.split('.')
-         filename = self.get_ext_filename(ext_name)
-         filename = os.path.split(filename)[-1]
-+        if sys.maxint != 2147483647L:
-+            filename = os.path.join("64", filename)
- 
-         if not self.inplace:
-             # no further work needed
[email protected]@ -677,7 +679,13 @@
-         so_ext = get_config_var('SO')
-         if os.name == 'nt' and self.debug:
-             return apply(os.path.join, ext_path) + '_d' + so_ext
--        return os.path.join(*ext_path) + so_ext
-+        # .so extensions are word-size specific
-+        path = apply(os.path.join, ext_path)
-+        if sys.maxint == 2147483647L:
-+            return path + so_ext
-+        dirname = os.path.dirname(path);
-+        basename = os.path.basename(path);
-+        return os.path.join(dirname, "64", basename + so_ext)
- 
-     def get_export_symbols (self, ext):
-         """Return the list of symbols that a shared extension has to
-diff --git Python-2.6.4/Makefile.pre.in Python-2.6.4/Makefile.pre.in
---- Python-2.6.4/Makefile.pre.in
-+++ Python-2.6.4/Makefile.pre.in
[email protected]@ -87,18 +87,18 @@
- 
- # Expanded directories
- BINDIR=		$(exec_prefix)/bin
--LIBDIR=		$(exec_prefix)/lib
-+LIBDIR=		@[email protected]
- MANDIR=		@[email protected]
- INCLUDEDIR=	@[email protected]
- CONFINCLUDEDIR=	$(exec_prefix)/include
- SCRIPTDIR=	$(prefix)/lib
- 
- # Detailed destination directories
--BINLIBDEST=	$(LIBDIR)/python$(VERSION)
--LIBDEST=	$(SCRIPTDIR)/python$(VERSION)
--INCLUDEPY=	$(INCLUDEDIR)/python$(VERSION)
--CONFINCLUDEPY=	$(CONFINCLUDEDIR)/python$(VERSION)
--LIBP=		$(LIBDIR)/python$(VERSION)
-+BINLIBDEST=		$(exec_prefix)/lib/python$(VERSION)
-+LIBDEST=		$(SCRIPTDIR)/python$(VERSION)
-+INCLUDEPY=		$(INCLUDEDIR)/python$(VERSION)
-+CONFINCLUDEPY=		$(CONFINCLUDEDIR)/python$(VERSION)
-+LIBP=			$(exec_prefix)/lib/python$(VERSION)
- 
- # Symbols used for using shared libraries
- SO=		@[email protected]
-diff --git Python-2.6.4/Python/import.c Python-2.6.4/Python/import.c
---- Python-2.6.4/Python/import.c
-+++ Python-2.6.4/Python/import.c
[email protected]@ -1191,6 +1191,57 @@
- static int find_init_module(char *); /* Forward */
- static struct filedescr importhookdescr = {"", "", IMP_HOOK};
- 
-+#ifdef HAVE_STAT
-+static char *
-+insert_64dir(char *buf, size_t buflen)
-+{
-+	char *base;
-+	char *cp;
-+	size_t blen;
-+
-+	if ((blen = strlen(buf)) == 0)
-+		return (NULL);
-+
-+	cp = &buf[blen - 1];
-+	while (cp != buf && *cp != SEP)
-+		cp--;
-+
-+	if (cp != buf)
-+		cp++;
-+
-+	if (blen + strlen("64/") + 1 >= buflen)
-+		return NULL;
-+
-+	base = strdup(cp);
-+	sprintf(cp, "64%c%s", SEP, base);
-+	free(base);
-+
-+	return buf;
-+}
-+
-+/*
-+ * If we're on a 64-bit platform, modify lookups for shared object files.
-+ */
-+static size_t modify_path(struct filedescr *fdp, char *buf, size_t buflen)
-+{
-+	struct stat statbuf;
-+
-+	if (sizeof(void *) != 8)
-+		return 0;
-+
-+	if (stat(buf, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
-+		return 0;
-+
-+	if (fdp->type != C_EXTENSION)
-+		return 0;
-+
-+	if (insert_64dir(buf, buflen) == NULL)
-+		return 0;
-+
-+	return strlen("64/");
-+}
-+#endif
-+
- static struct filedescr *
- find_module(char *fullname, char *subname, PyObject *path, char *buf,
- 	    size_t buflen, FILE **p_fp, PyObject **p_loader)
[email protected]@ -1208,11 +1259,10 @@
- 	static struct filedescr fd_builtin = {"", "", C_BUILTIN};
- 	static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
- 	char name[MAXPATHLEN+1];
--#if defined(PYOS_OS2)
- 	size_t saved_len;
- 	size_t saved_namelen;
- 	char *saved_buf = NULL;
--#endif
-+
- 	if (p_loader != NULL)
- 		*p_loader = NULL;
- 
[email protected]@ -1431,15 +1481,19 @@
- 		}
- #endif
- #endif
--#if defined(PYOS_OS2)
-+
- 		/* take a snapshot of the module spec for restoration
- 		 * after the 8 character DLL hackery
- 		 */
- 		saved_buf = strdup(buf);
- 		saved_len = len;
- 		saved_namelen = namelen;
--#endif /* PYOS_OS2 */
-+
- 		for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
-+#ifdef HAVE_STAT
-+                        len += modify_path(fdp, buf, buflen);
-+#endif
-+
- #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
- 			/* OS/2 limits DLLs to 8 character names (w/o
- 			   extension)
[email protected]@ -1480,21 +1534,18 @@
- 					fp = NULL;
- 				}
- 			}
--#if defined(PYOS_OS2)
-+
- 			/* restore the saved snapshot */
- 			strcpy(buf, saved_buf);
- 			len = saved_len;
- 			namelen = saved_namelen;
--#endif
- 		}
--#if defined(PYOS_OS2)
- 		/* don't need/want the module name snapshot anymore */
- 		if (saved_buf)
- 		{
- 			free(saved_buf);
- 			saved_buf = NULL;
- 		}
--#endif
- 		Py_XDECREF(copy);
- 		if (fp != NULL)
- 			break;
-diff --git Python-2.6.4/Python/importdl.h Python-2.6.4/Python/importdl.h
---- Python-2.6.4/Python/importdl.h
-+++ Python-2.6.4/Python/importdl.h
[email protected]@ -31,8 +31,9 @@
- extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
- 					     FILE *);
- 
--/* Max length of module suffix searched for -- accommodates "module.slb" */
--#define MAXSUFFIXSIZE 12
-+/* Max length of module suffix searched for -- accommodates "module.slb"
-+   and "64/" */
-+#define MAXSUFFIXSIZE 15
- 
- #ifdef MS_WINDOWS
- #include <windows.h>
-diff --git Python-2.6.4/configure.in Python-2.6.4/configure.in
---- Python-2.6.4/configure.in
-+++ Python-2.6.4/configure.in
[email protected]@ -17,8 +17,44 @@
- AH_TOP([
- #ifndef Py_PYCONFIG_H
- #define Py_PYCONFIG_H
-+
- ])
- AH_BOTTOM([
-+
-+#include <sys/isa_defs.h>
-+
-+/*
-+ * Python originally defined these statically, which prevents a 32-64 python
-+ * from working at all.
-+ */
-+
-+#define SIZEOF_SHORT 2
-+#define SIZEOF_INT 4
-+#define SIZEOF_LONG_LONG 8
-+#define SIZEOF_FPOS_T 8
-+#define SIZEOF_OFF_T 8
-+#define SIZEOF_PTHREAD_T 4
-+
-+#ifdef _LP64
-+#define SIZEOF_LONG 8
-+#define SIZEOF_UINTPTR_T 8
-+#define SIZEOF_VOID_P 8
-+#define SIZEOF_TIME_T 8
-+#define SIZEOF_SIZE_T 8
-+#define SIZEOF_LONG_DOUBLE 16
-+#else
-+#define SIZEOF_LONG 4
-+#define SIZEOF_UINTPTR_T 4
-+#define SIZEOF_VOID_P 4
-+#define SIZEOF_TIME_T 4
-+#define SIZEOF_SIZE_T 4
-+#if defined(__i386)
-+#define SIZEOF_LONG_DOUBLE 12
-+#else
-+#define SIZEOF_LONG_DOUBLE 16
-+#endif
-+#endif
-+
- /* Define the macros needed if on a UnixWare 7.x system. */
- #if defined(__USLC__) && defined(__SCO_VERSION__)
- #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
[email protected]@ -65,6 +101,26 @@
- 
- define_xopen_source=yes
- 
-+# AC_CHECK_SIZEOF without the AC_DEFINE_UNQUOTED
-+AC_DEFUN([PY_CHECK_SIZEOF],
-+[AS_LITERAL_IF([$1], [],
-+               [AC_FATAL([$0: requires literal arguments])])dnl
-+AC_CHECK_TYPE([$1], [], [], [$3])
-+AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
-+[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  _AC_COMPUTE_INT([(long) (sizeof ($1))],
-+                  [AS_TR_SH([ac_cv_sizeof_$1])],
-+                  [AC_INCLUDES_DEFAULT([$3])],
-+                  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
-+else
-+  AS_TR_SH([ac_cv_sizeof_$1])=0
-+fi])dnl
-+])# PY_CHECK_SIZEOF
-+
- # Arguments passed to configure.
- AC_SUBST(CONFIG_ARGS)
- CONFIG_ARGS="$ac_configure_args"
[email protected]@ -1377,14 +1433,10 @@
- 
- # Sizes of various common basic types
- # ANSI C requires sizeof(char) == 1, so no need to check it
--AC_CHECK_SIZEOF(int, 4)
--AC_CHECK_SIZEOF(long, 4)
--AC_CHECK_SIZEOF(void *, 4)
- AC_CHECK_SIZEOF(short, 2)
- AC_CHECK_SIZEOF(float, 4)
- AC_CHECK_SIZEOF(double, 8)
--AC_CHECK_SIZEOF(fpos_t, 4)
--AC_CHECK_SIZEOF(size_t, 4)
-+AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(pid_t, 4)
- 
- AC_MSG_CHECKING(for long long support)
[email protected]@ -1394,9 +1446,6 @@
-   have_long_long=yes
- ])
- AC_MSG_RESULT($have_long_long)
--if test "$have_long_long" = yes ; then
--AC_CHECK_SIZEOF(long long, 8)
--fi
- 
- AC_MSG_CHECKING(for long double support)
- have_long_double=no
[email protected]@ -1404,10 +1453,6 @@
-   AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define this if you have the type long double.])
-   have_long_double=yes
- ])
--AC_MSG_RESULT($have_long_double)
--if test "$have_long_double" = yes ; then
--AC_CHECK_SIZEOF(long double, 12)
--fi
- 
- AC_MSG_CHECKING(for _Bool support)
- have_c99_bool=no
[email protected]@ -1421,102 +1466,26 @@
- fi
- 
- AC_CHECK_TYPES(uintptr_t, 
--   [AC_CHECK_SIZEOF(uintptr_t, 4)], 
-+   [], 
-    [], [#ifdef HAVE_STDINT_H
-         #include <stdint.h>
-         #endif])
- 
- 
--# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
--AC_MSG_CHECKING(size of off_t)
--AC_CACHE_VAL(ac_cv_sizeof_off_t,
--[AC_TRY_RUN([#include <stdio.h>
-+PY_CHECK_SIZEOF(off_t,4,[
-+#include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
--main()
--{
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(off_t));
--  exit(0);
--}],
--ac_cv_sizeof_off_t=`cat conftestval`,
--ac_cv_sizeof_off_t=0,
--ac_cv_sizeof_off_t=4)
- ])
--AC_MSG_RESULT($ac_cv_sizeof_off_t)
--AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
--[The number of bytes in an off_t.])
- 
- AC_MSG_CHECKING(whether to enable large file support)
--if test "$have_long_long" = yes -a \
--	"$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
--	"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
--  AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, 
--  [Defined to enable large file support when an off_t is bigger than a long
--   and long long is available and at least as big as an off_t. You may need
--   to add some flags for configuration and compilation to enable this mode.
--   (For Solaris and Linux, the necessary defines are already defined.)])
--  AC_MSG_RESULT(yes)
--else
--  AC_MSG_RESULT(no)
--fi
- 
--# AC_CHECK_SIZEOF() doesn't include <time.h>.
--AC_MSG_CHECKING(size of time_t)
--AC_CACHE_VAL(ac_cv_sizeof_time_t,
--[AC_TRY_RUN([#include <stdio.h>
--#include <time.h>
--main()
--{
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(time_t));
--  exit(0);
--}],
--ac_cv_sizeof_time_t=`cat conftestval`,
--ac_cv_sizeof_time_t=0,
--ac_cv_sizeof_time_t=4)
--])
--AC_MSG_RESULT($ac_cv_sizeof_time_t)
--AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, 
--[The number of bytes in a time_t.])
--
--
--# if have pthread_t then define SIZEOF_PTHREAD_T
--ac_save_cc="$CC"
--if test "$ac_cv_kpthread" = "yes"
--then CC="$CC -Kpthread"
--elif test "$ac_cv_kthread" = "yes"
--then CC="$CC -Kthread"
--elif test "$ac_cv_pthread" = "yes"
--then CC="$CC -pthread"
--fi
--AC_MSG_CHECKING(for pthread_t)
--have_pthread_t=no
--AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
--AC_MSG_RESULT($have_pthread_t)
--if test "$have_pthread_t" = yes ; then
--  # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
--  AC_MSG_CHECKING(size of pthread_t)
--  AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
--  [AC_TRY_RUN([#include <stdio.h>
--#include <pthread.h>
--  main()
--  {
--    FILE *f=fopen("conftestval", "w");
--    if (!f) exit(1);
--    fprintf(f, "%d\n", sizeof(pthread_t));
--    exit(0);
--  }],
--  ac_cv_sizeof_pthread_t=`cat conftestval`,
--  ac_cv_sizeof_pthread_t=0,
--  ac_cv_sizeof_pthread_t=4)
--  ])
--  AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
--  AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
--   [The number of bytes in a pthread_t.])
--fi
--CC="$ac_save_cc"
-+AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
-+[Defined to enable large file support when an off_t is bigger than a long
-+ and long long is available and at least as big as an off_t. You may need
-+ to add some flags for configuration and compilation to enable this mode.
-+ (For Solaris and Linux, the necessary defines are already defined.)])
-+AC_MSG_RESULT(yes)
- 
- AC_MSG_CHECKING(for --enable-toolbox-glue)
- AC_ARG_ENABLE(toolbox-glue,
[email protected]@ -1810,12 +1779,6 @@
- if test -z "$CCSHARED"
- then
- 	case $ac_sys_system/$ac_sys_release in
--	SunOS*) if test "$GCC" = yes;
--		then CCSHARED="-fPIC";
--		elif test `uname -p` = sparc;
--		then CCSHARED="-xcode=pic32";
--		else CCSHARED="-Kpic";
--		fi;;
- 	hp*|HP*) if test "$GCC" = yes;
- 		 then CCSHARED="-fPIC";
- 		 else CCSHARED="+z";
[email protected]@ -3308,12 +3271,6 @@
- wchar_h="no"
- )
- 
--# determine wchar_t size
--if test "$wchar_h" = yes
--then
--  AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
--fi
--
- AC_MSG_CHECKING(for UCS-4 tcl)
- have_ucs4_tcl=no
- AC_TRY_COMPILE([
[email protected]@ -3344,6 +3301,11 @@
-   ac_cv_wchar_t_signed=no,
-   ac_cv_wchar_t_signed=yes)])
-   AC_MSG_RESULT($ac_cv_wchar_t_signed)
-+ 
-+  PY_CHECK_SIZEOF(wchar_t, 4, [
-+  #include <wchar.h>
-+  #include <stdlib.h
-+  ])
- fi
-   
- AC_MSG_CHECKING(what type to use for unicode)
--- a/components/python/python26/Python26-06-write_compiled_module-atomic.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-diff --git Python-2.6.4/Python/import.c Python-2.6.4/Python/import.c
---- Python-2.6.4/Python/import.c
-+++ Python-2.6.4/Python/import.c
[email protected]@ -866,8 +866,9 @@
- 
- /* Write a compiled module to a file, placing the time of last
-    modification of its source into the header.
--   Errors are ignored, if a write error occurs an attempt is made to
--   remove the file. */
-+   Write to a temporary file first so that creating the file is atomic.
-+   Errors are ignored, if a write/unlink/rename error occurs an attempt
-+   is made to remove the temporary file. */
- 
- static void
- write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat)
[email protected]@ -879,12 +880,21 @@
- #else
- 	mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;
- #endif 
-+	char *tmppathname;
-+ 
-+	/* the temporary file is called cpathname + ".tmp" */
-+	if ((tmppathname = PyMem_Malloc(strlen(cpathname) + strlen(".tmp") + 1))
-+		== NULL) {
-+		return;
-+	}
-+	sprintf (tmppathname, "%s.tmp", cpathname);
-+	fp = open_exclusive(tmppathname, mode);
- 
--	fp = open_exclusive(cpathname, mode);
- 	if (fp == NULL) {
- 		if (Py_VerboseFlag)
- 			PySys_WriteStderr(
--				"# can't create %s\n", cpathname);
-+				"# can't create %s\n", tmppathname);
-+		PyMem_Free(tmppathname);
- 		return;
- 	}
- 	PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION);
[email protected]@ -893,10 +903,11 @@
- 	PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
- 	if (fflush(fp) != 0 || ferror(fp)) {
- 		if (Py_VerboseFlag)
--			PySys_WriteStderr("# can't write %s\n", cpathname);
-+			PySys_WriteStderr("# can't write %s\n", tmppathname);
- 		/* Don't keep partial file */
- 		fclose(fp);
--		(void) unlink(cpathname);
-+		(void) unlink(tmppathname);
-+		PyMem_Free(tmppathname);
- 		return;
- 	}
- 	/* Now write the true mtime */
[email protected]@ -905,8 +916,30 @@
- 	PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
- 	fflush(fp);
- 	fclose(fp);
-+	/* Delete the old compiled file, if exists */
-+	if (unlink (cpathname)) {
-+		if ((errno != ENOENT)) {
-+			/* the file exists but could not be deleted */
-+			if (Py_VerboseFlag)
-+				PySys_WriteStderr(
-+					"# can't unlink %s\n", cpathname);
-+			(void) unlink(tmppathname);
-+			PyMem_Free(tmppathname);
-+			return;
-+		}
-+	}
-+	/* rename the tmp file to the real file name */
-+	if (rename (tmppathname, cpathname)) {
-+		if (Py_VerboseFlag)
-+			PySys_WriteStderr(
-+				"# can't rename %s to %s\n", tmppathname, cpathname);
-+		(void) unlink(tmppathname);
-+		PyMem_Free(tmppathname);
-+		return;
-+	}
- 	if (Py_VerboseFlag)
- 		PySys_WriteStderr("# wrote %s\n", cpathname);
-+	PyMem_Free(tmppathname);
- }
- 
- static void
--- a/components/python/python26/Python26-07-dtrace.patch	Tue Mar 01 11:29:05 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,417 +0,0 @@
-diff --git Python-2.6.4/Include/frameobject.h Python-2.6.4/Include/frameobject.h
---- Python-2.6.4/Include/frameobject.h
-+++ Python-2.6.4/Include/frameobject.h
[email protected]@ -41,6 +41,7 @@
-     /* As of 2.3 f_lineno is only valid when tracing is active (i.e. when
-        f_trace is set) -- at other times use PyCode_Addr2Line instead. */
-     int f_lineno;		/* Current line number */
-+    int f_calllineno;		/* line number of call site */
-     int f_iblock;		/* index in f_blockstack */
-     PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
-     PyObject *f_localsplus[1];	/* locals+stack, dynamically sized */
-diff --git Python-2.6.4/Makefile.pre.in Python-2.6.4/Makefile.pre.in
---- Python-2.6.4/Makefile.pre.in
-+++ Python-2.6.4/Makefile.pre.in
[email protected]@ -201,6 +201,7 @@
- GRAMMAR_C=	$(srcdir)/Python/graminit.c
- GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
- 
-+DTRACE_OBJS=Python/dtrace.o Python/phelper.o
- 
- ##########################################################################
- # Parser
[email protected]@ -290,6 +291,7 @@
- 		Python/formatter_unicode.o \
- 		Python/formatter_string.o \
- 		Python/$(DYNLOADFILE) \
-+		$(DTRACE_OBJS) \
- 		$(LIBOBJS) \
- 		$(MACHDEP_OBJS) \
- 		$(THREADOBJ)
[email protected]@ -577,6 +579,18 @@
- Python/formatter_string.o: $(srcdir)/Python/formatter_string.c \
- 				$(STRINGLIB_HEADERS)
- 
-+Python/phelper.o: $(srcdir)/Python/phelper.d
-+	dtrace -o [email protected] -DPHELPER $(DFLAGS) $(CPPFLAGS) -C -G -s $(srcdir)/Python/phelper.d
-+
-+Python/python.h: $(srcdir)/Python/python.d
-+	dtrace -o [email protected] $(DFLAGS) -C -h -s $(srcdir)/Python/python.d
-+
-+Python/ceval.o: Python/ceval.c Python/python.h
-+	$(CC) -c $(BASECFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE -o [email protected] $<
-+
-+Python/dtrace.o: $(srcdir)/Python/python.d Python/ceval.o
-+	dtrace -o [email protected] $(DFLAGS) -C -G -s $(srcdir)/Python/python.d Python/ceval.o
-+
- ############################################################################
- # Header files
- 
-diff --git Python-2.6.4/Objects/frameobject.c Python-2.6.4/Objects/frameobject.c
---- Python-2.6.4/Objects/frameobject.c
-+++ Python-2.6.4/Objects/frameobject.c
[email protected]@ -698,6 +698,7 @@
- 	f->f_tstate = tstate;
- 
- 	f->f_lasti = -1;
-+ 	f->f_calllineno = code->co_firstlineno;
- 	f->f_lineno = code->co_firstlineno;
- 	f->f_iblock = 0;
- 
-diff --git Python-2.6.4/Python/ceval.c Python-2.6.4/Python/ceval.c
---- Python-2.6.4/Python/ceval.c
-+++ Python-2.6.4/Python/ceval.c
[email protected]@ -19,6 +19,11 @@
- 
- #include <ctype.h>
- 
-+#define HAVE_DTRACE
-+#ifdef HAVE_DTRACE
-+#include "python.h"
-+#endif
-+
- #ifndef WITH_TSC
- 
- #define READ_TIMESTAMP(var)
[email protected]@ -527,6 +532,55 @@
- 			  NULL);
- }
- 
-+#ifdef HAVE_DTRACE
-+static void
-+dtrace_entry(PyFrameObject *f)
-+{
-+	const char *filename;
-+	const char *fname;
-+	int lineno;
-+	
-+	filename = PyString_AsString(f->f_code->co_filename);
-+	fn