Upgrade to 1.6.

4 files changed, 83 insertions, 11 deletions

diff --git a/lang/python22/files/Setup b/lang/python22/files/Setup
index ec3a6be9631a..e550ce3aca12 100644
--- a/lang/python22/files/Setup
+++ b/lang/python22/files/Setup
@@ -1,3 +1,4 @@
+# -*- makefile -*-
 # The file Setup is used by the makesetup script to construct the files
 # Makefile and config.c, from Makefile.pre and config.c.in,
 # respectively.  The file Setup itself is initially copied from
@@ -40,6 +41,9 @@
 # used to build modules as shared libraries.  (They must be installed
 # using "make sharedinstall".)  (For compatibility, *noconfig* has the
 # same effect as *shared*.)
+#
+# In addition, *static* reverses this effect (negating a previous
+# *shared* line).
 
 # NOTE: As a standard policy, as many modules as can be supported by a
 # platform should be present.  The distribution comes with all modules
@@ -87,6 +91,7 @@ regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style
 pcre pcremodule.c pypcre.c	# Regular expressions, Perl style (for re.py)
 posix posixmodule.c		# posix (UNIX) system calls
 signal signalmodule.c		# signal(2)
+_sre _sre.c			# Fredrik Lundh's new regular expressions
 
 # The SGI specific GL module:
 
@@ -104,11 +109,10 @@ GLHACK=-Dclear=__GLclear
 
 # Uncommenting the following line tells makesetup that all following
 # modules are to be built as shared libraries (see above for more
-# detail):
+# detail; also note that *static* reverses this effect):
 
 #*shared*
 
-
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
 # now incorporated in an optional module, configured in the Setup file
 # instead of by a configure script switch.  You may have to insert a
@@ -129,6 +133,10 @@ strop stropmodule.c	# fast string operations implemented in C
 struct structmodule.c	# binary structure packing/unpacking
 time timemodule.c # -lm	# time operations and variables
 operator operator.c	# operator.add() and similar goodies
+_codecs _codecsmodule.c	# access to the builtin codecs and codec registry
+
+unicodedata unicodedata.c unicodedatabase.c
+                        # static Unicode character database
 
 _locale _localemodule.c  # access to ISO C locale support
 
@@ -140,10 +148,16 @@ _locale _localemodule.c  # access to ISO C locale support
 fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
 pwd pwdmodule.c		# pwd(3) 
 grp grpmodule.c		# grp(3)
+errno errnomodule.c	# posix (UNIX) errno values
+mmap mmapmodule.c       # Memory-mapped files (also works on Win32)
 select selectmodule.c	# select(2); not on ancient System V
 socket socketmodule.c	# socket(2); not on ancient System V
 errno errnomodule.c	# posix (UNIX) errno values
 
+# Socket module compiled with SSL support; you must edit the SSL variable:
+#SSL=/usr
+#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto
+
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
 crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
@@ -253,6 +267,11 @@ sha shamodule.c
 #sunaudiodev sunaudiodev.c
 
 
+# Linux specific modules -- off by default:
+
+#linuxaudiodev linuxaudiodev.c
+
+
 # George Neville-Neil's timing module:
 
 timing timingmodule.c
@@ -313,13 +332,13 @@ syslog syslogmodule.c		# syslog daemon interface
 # -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
 # -L/usr/5lib before -lcurses).
 
-curses cursesmodule.c -lmytinfo -lncurses -ltermcap
+_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap
 
 
 
 # Tommy Burnette's 'new' module (creates new empty objects of certain kinds):
 
-#new newmodule.c
+new newmodule.c
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -340,8 +359,7 @@ dl dlmodule.c
 
 dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
 
-# Anthony Baxter's gdbm module (derived from Jack's dbm module)
-# GNU dbm(3) will require -lgdbm:
+# Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
 
 #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 
@@ -361,7 +379,7 @@ bsddb bsddbmodule.o
 
 
 
-# David Wayne Williams' soundex module
+# David Wayne Williams' soundex module (obsolete -- this will disappear!)
 #soundex soundex.c
 
 # Helper module for various ascii-encoders
@@ -393,9 +411,27 @@ fpectl fpectlmodule.c
 fpetest fpetestmodule.c
 
 # Andrew Kuchling's zlib module.
-# This require zlib 1.0.4 (or later).  See http://quest.jpl.nasa.gov/zlib/
+# This require zlib 1.1.3 (or later).
+# See http://www.cdrom.com/pub/infozip/zlib/
 zlib zlibmodule.c -lz
 
 
+# Interface to the Expat XML parser
+#
+# Expat is written by James Clark and must be downloaded separately
+# (see below).  The pyexpat module was written by Paul Prescod after a
+# prototype by Jack Jansen.
+#
+# The Expat dist includes Windows .lib and .dll files.  Home page is at
+# http://www.jclark.com/xml/expat.html, the current production release is
+# always ftp://ftp.jclark.com/pub/xml/expat.zip.
+#
+# (Note: the expat build process doesn't yet build a libexpat.a; you can
+# do this manually while we try convince the author to add it.)
+#
+#EXPAT_DIR=/usr/local/src/expat/
+#pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat
+
+
 # Example -- included for reference only:
 # xx xxmodule.c
diff --git a/lang/python22/files/Setup.OpenSSL b/lang/python22/files/Setup.OpenSSL
new file mode 100644
index 000000000000..8e5c71a0efd7
--- /dev/null
+++ b/lang/python22/files/Setup.OpenSSL
@@ -0,0 +1,8 @@
+*static*
+
+# Socket module compiled with SSL support; you must edit the SSL variable:
+SSL=/usr
+socket socketmodule.c \
+        -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+        -L$(SSL)/lib -lssl -lcrypto
+
diff --git a/lang/python22/files/patch-Misc:Makefile.pre.in b/lang/python22/files/patch-Misc:Makefile.pre.in
new file mode 100644
index 000000000000..2eaf2f04c91f
--- /dev/null
+++ b/lang/python22/files/patch-Misc:Makefile.pre.in
@@ -0,0 +1,11 @@
+--- Misc/Makefile.pre.in.orig	Wed Dec  9 18:05:33 1998
++++ Misc/Makefile.pre.in	Thu Sep  7 21:04:19 2000
+@@ -92,7 +92,7 @@
+ TARGET=		python
+ 
+ # Installed python binary (used only by boot target)
+-PYTHON=		python
++PYTHON?=	python
+ 
+ # Add more -I and -D options here
+ CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
diff --git a/lang/python22/files/patch-aa b/lang/python22/files/patch-aa
index 0836dbae9158..bf67a5c243e4 100644
--- a/lang/python22/files/patch-aa
+++ b/lang/python22/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Feb 23 10:43:15 1999
-+++ Makefile.in	Sun Aug 13 21:28:59 2000
-@@ -125,14 +125,14 @@
+--- Makefile.in.orig	Thu Aug  3 19:00:01 2000
++++ Makefile.in	Wed Aug 16 17:38:14 2000
+@@ -95,14 +95,14 @@
  # Modes for directories, executables and data files created by the
  # install process.  Default to group-writable directories but
  # user-only-writable for executables and data files.
@@ -18,3 +18,20 @@
  
  # Use this to make a link between python$(VERSION) and python in $(BINDIR)
  LN=@LN@
+@@ -259,7 +259,7 @@
+ # Install the library
+ PLATDIR=	plat-$(MACHDEP)
+ MACHDEPS=	$(PLATDIR)
+-LIBSUBDIRS=	lib-old lib-tk site-packages test test/output encodings \
++LIBSUBDIRS=	lib-old lib-tk site-packages test test/output curses encodings \
+ 		distutils distutils/command $(MACHDEPS)
+ libinstall:	python $(srcdir)/Lib/$(PLATDIR)
+ 		@for i in $(SCRIPTDIR) $(LIBDEST); \
+@@ -303,6 +303,7 @@
+ 				case $$i in \
+ 				*CVS) ;; \
+ 				*.py[co]) ;; \
++				*.orig) ;; \
+ 				*~) ;; \
+ 				*) \
+ 					if test -d $$i; then continue; fi; \