update to 2.3.5

This is a bug-fix release. It contains the fix for
http://www.python.org/security/PSF-2005-001/
which we added in 2.3.4nb7.

6 files changed, 42 insertions, 86 deletions

diff --git a/lang/python23-nth/Makefile b/lang/python23-nth/Makefile
index 5311caf2620..29cc8462526 100644
--- a/lang/python23-nth/Makefile
+++ b/lang/python23-nth/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/02/04 15:39:04 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/02/15 12:25:07 drochner Exp $
 #
 
-PKGNAME=	python23-nth-2.3.4
-PKGREVISION=	2
+PKGNAME=	python23-nth-2.3.5
 
 CONFLICTS+=	python-[0-9]*
 
diff --git a/lang/python23-nth/distinfo b/lang/python23-nth/distinfo
index f4ca1000bd7..5c5ca7a4186 100644
--- a/lang/python23-nth/distinfo
+++ b/lang/python23-nth/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
+$NetBSD: distinfo,v 1.2 2005/02/15 12:25:07 drochner Exp $
 
-SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
-Size (Python-2.3.4.tgz) = 8502738 bytes
-SHA1 (patch-aa) = e1cc7d9beda2ac131e8d0b3dc8136deb4b182ac3
+SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
+Size (Python-2.3.5.tgz) = 8535749 bytes
+SHA1 (patch-aa) = a4dce2e265c08750d7c4f7ad55b0e05053a337b4
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
-SHA1 (patch-ah) = f9a46bfe82acec594cf44afd43f359a5248edadb
-SHA1 (patch-al) = 358edaa5be92249182f0c4644f9a3cc944218ebc
+SHA1 (patch-ah) = da362d3e2e46077c3177796f0c926661b0f751d4
+SHA1 (patch-al) = fa8c2ea3a7ae2569920f1f7948ec417ecf11515d
 SHA1 (patch-am) = 6d5d24b5a58bd577e8b88527793b27e624455643
 SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
 SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
 SHA1 (patch-cb) = 301205b29db1ca60f06b2dc0423f5f911eabcd18
 SHA1 (patch-da) = b082eff79571726701aab53c37d8d53a8115e204
-SHA1 (patch-db) = ac37d14f55c165fee1d8225304d6c3c8ec203fec
 SHA1 (patch-dc) = 151159e0bafd248040ab57e5c05152a91fe44ac6
diff --git a/lang/python23-nth/patches/patch-aa b/lang/python23-nth/patches/patch-aa
index b66239f5b4d..fe2fe73314b 100644
--- a/lang/python23-nth/patches/patch-aa
+++ b/lang/python23-nth/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/15 12:25:07 drochner Exp $
 
---- Include/patchlevel.h.orig	2004-05-19 05:14:27.000000000 +0200
-+++ Include/patchlevel.h	2004-06-02 14:00:51.000000000 +0200
+--- Include/patchlevel.h.orig	2005-02-08 12:37:01.000000000 +0100
++++ Include/patchlevel.h
 @@ -26,7 +26,7 @@
  #define PY_RELEASE_SERIAL	0
  
  /* Version as a string */
--#define PY_VERSION		"2.3.4"
-+#define PY_VERSION		"2n3.4"
+-#define PY_VERSION		"2.3.5"
++#define PY_VERSION		"2n3.5"
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
     Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
diff --git a/lang/python23-nth/patches/patch-ah b/lang/python23-nth/patches/patch-ah
index 77eb599b4d1..c7c911a94a2 100644
--- a/lang/python23-nth/patches/patch-ah
+++ b/lang/python23-nth/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
+$NetBSD: patch-ah,v 1.2 2005/02/15 12:25:07 drochner Exp $
 
---- Makefile.pre.in.orig	Tue Nov 18 20:54:00 2003
-+++ Makefile.pre.in	Thu Nov 11 18:54:35 2004
-@@ -56,7 +56,7 @@
+--- Makefile.pre.in.orig	2005-01-11 14:48:52.000000000 +0100
++++ Makefile.pre.in
+@@ -56,7 +56,7 @@ MAKESETUP=      $(srcdir)/Modules/makese
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
  CFLAGS=		$(BASECFLAGS) $(OPT)
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -305,7 +305,7 @@
+@@ -308,7 +308,7 @@ all:		$(BUILDPYTHON) oldsharedmods share
  $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
  		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
  			Modules/$(MAINOBJ) \
@@ -20,16 +20,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  
  platform: $(BUILDPYTHON)
  	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -345,7 +345,7 @@
- 
- libpython$(VERSION).so: $(LIBRARY_OBJS)
- 	if test $(INSTSONAME) != $(LDLIBRARY); then \
--		$(LDSHARED) -Wl,-soname=$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-+		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
- 		$(LN) -f $(INSTSONAME) $@; \
- 	else\
- 		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -354,6 +354,9 @@
+@@ -357,6 +357,9 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
  libpython$(VERSION).sl: $(LIBRARY_OBJS)
  	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
  
@@ -39,7 +30,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
  # minimal framework (not including the Lib directory and such) in the current
  # directory.
-@@ -613,7 +616,12 @@
+@@ -616,7 +619,12 @@ altbininstall:	$(BUILDPYTHON)
  				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
  			fi \
  		fi; \
diff --git a/lang/python23-nth/patches/patch-al b/lang/python23-nth/patches/patch-al
index 22fdae1f585..eb1cd706224 100644
--- a/lang/python23-nth/patches/patch-al
+++ b/lang/python23-nth/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
+$NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
 
---- configure.orig	2004-05-07 14:13:40.000000000 -0500
+--- configure.orig	2005-01-11 14:48:52.000000000 +0100
 +++ configure
-@@ -1318,7 +1318,7 @@ rm confdefs.h
+@@ -1351,7 +1351,7 @@ rm confdefs.h
  mv confdefs.h.new confdefs.h
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  
  
  SOVERSION=1.0
-@@ -1440,6 +1440,8 @@ case $ac_sys_system/$ac_sys_release in
+@@ -1481,6 +1481,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[01234])
      define_xopen_source=no;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3603,7 +3605,7 @@ _ACEOF
+@@ -3733,7 +3735,7 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -29,7 +29,7 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3624,6 +3626,14 @@ _ACEOF
+@@ -3754,6 +3756,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -44,7 +44,7 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
    esac
    # DG/UX requires some fancy ld contortions to produce a .so from an .a
    case $MACHDEP in
-@@ -4021,7 +4031,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+@@ -4152,7 +4162,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -58,30 +58,32 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10082,7 +10097,7 @@ then
- 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+@@ -10979,7 +10994,7 @@ then
+ 			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
 -			LDSHARED="$LDSHARED -undefined suppress"
 +			LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
  		fi ;;
- 	Darwin/*)
+ 	Darwin/1.4*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10091,10 +10106,10 @@ then
- 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
- 		else
- 			# No framework, use the Python app as bundle-loader
--			BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
--			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+			BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+			LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- 		fi ;;
+@@ -11009,12 +11024,12 @@ then
+ 				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			else
+ 				# No framework, use the Python app as bundle-loader
+-				BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
+-				LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
++				BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
++				LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ 			fi
+ 		fi
+ 		;;
 -	Linux*|GNU*) LDSHARED='$(CC) -shared';;
 +	Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
  	dgux*) LDSHARED="ld -G";;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	OpenBSD*|FreeBSD*)
-@@ -13855,6 +13870,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15127,6 +15142,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python23-nth/patches/patch-db b/lang/python23-nth/patches/patch-db
deleted file mode 100644
index 1c91d34b259..00000000000
--- a/lang/python23-nth/patches/patch-db
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-db,v 1.1.1.1 2005/01/23 22:57:21 recht Exp $
-
---- Modules/getpath.c.orig	Thu Nov 11 18:08:55 2004
-+++ Modules/getpath.c	Thu Nov 11 18:10:13 2004
-@@ -374,6 +374,9 @@
- #ifdef WITH_NEXT_FRAMEWORK
-     NSModule pythonModule;
- #endif
-+#ifdef __APPLE__
-+    unsigned long nsexeclength = MAXPATHLEN;
-+#endif
- 
- 	/* If there is no slash in the argv0 path, then we have to
- 	 * assume python is on the user's $PATH, since there's no
-@@ -382,6 +385,20 @@
- 	 */
- 	if (strchr(prog, SEP))
- 		strncpy(progpath, prog, MAXPATHLEN);
-+#ifdef __APPLE__
-+	/* On Mac OS X, if a script uses an interpreter of the form
-+	 * "#!/opt/python2.3/bin/python", the kernel only passes "python"
-+	 * as argv[0], which falls through to the $PATH search below.
-+	 * If /opt/python2.3/bin isn't in your path, or is near the end,
-+	 * this algorithm may incorrectly find /usr/bin/python. To work
-+	 * around this, we can use _NSGetExecutablePath to get a better
-+	 * hint of what the intended interpreter was, although this
-+	 * will fail if a relative path was used. but in that case,
-+	 * absolutize() should help us out below
-+	 */
-+	else if(0 == _NSGetExecutablePath(progpath, &nsexeclength) && progpath[0] == SEP)
-+	  ;
-+#endif // __APPLE__
- 	else if (path) {
- 		while (1) {
- 			char *delim = strchr(path, DELIM);