pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/python24 Update to 2.4.4:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c2c6bec744d
branches: trunk
changeset: 529639:7c2c6bec744d
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Jun 08 14:16:15 2007 +0000
description:
Update to 2.4.4:
We are pleased to announce the release of Python 2.4.4 (FINAL), a
bugfix release of Python 2.4, on October 18, 2006.
Important: 2.4.4 includes a security fix (PSF-2006-001) for the
repr() of unicode strings in wide unicode builds (UCS-4) [does not
affect pkgsrc]
Python 2.4 is now in bugfix-only mode; no new features are being
added. At least 80 bugs have been squished since Python 2.4.3,
including a number of bugs and potential bugs found by with the
Coverity and Klocwork static analysis tools. We'd like to offer
our thanks to both these firms for making this available for open
source projects - see their websites if you're interested.
diffstat:
lang/python24/Makefile | 11 ++++-----
lang/python24/PLIST.common | 10 ++++++++-
lang/python24/distinfo | 29 +++++++++++++------------
lang/python24/patches/patch-ab | 13 ++++++-----
lang/python24/patches/patch-ac | 8 +++---
lang/python24/patches/patch-ae | 6 ++--
lang/python24/patches/patch-af | 23 ++++++++++----------
lang/python24/patches/patch-ah | 22 ++++++++++----------
lang/python24/patches/patch-ak | 8 +++---
lang/python24/patches/patch-al | 46 +++++++++++++++++++++---------------------
lang/python24/patches/patch-am | 33 ++++++++++++++++++++++-------
lang/python24/patches/patch-ao | 12 +++++-----
lang/python24/patches/patch-ap | 8 +++---
lang/python24/patches/patch-ar | 17 +++++++++++++++
14 files changed, 144 insertions(+), 102 deletions(-)
diffs (truncated from 647 to 300 lines):
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/Makefile
--- a/lang/python24/Makefile Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/Makefile Fri Jun 08 14:16:15 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2007/04/22 20:12:43 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2007/06/08 14:16:15 wiz Exp $
#
-DISTNAME= Python-2.4.3
-PKGNAME= python24-2.4.3
-PKGREVISION= 3
+DISTNAME= Python-2.4.4
+PKGNAME= python24-2.4.4
CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.3/ \
- http://www.python.org/ftp/python/2.4.3/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.4/ \
+ http://www.python.org/ftp/python/2.4.4/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht%NetBSD.org@localhost
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/PLIST.common
--- a/lang/python24/PLIST.common Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/PLIST.common Fri Jun 08 14:16:15 2007 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.common,v 1.7 2006/11/03 07:15:41 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2007/06/08 14:16:15 wiz Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
bin/smtpd${PY_VER_SUFFIX}.py
include/python${PY_VER_SUFFIX}/Python.h
+include/python${PY_VER_SUFFIX}/Python-ast.h
include/python${PY_VER_SUFFIX}/abstract.h
include/python${PY_VER_SUFFIX}/bitset.h
include/python${PY_VER_SUFFIX}/boolobject.h
@@ -239,6 +240,9 @@
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.py
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.pyc
lib/python${PY_VER_SUFFIX}/bsddb/test/test_misc.pyo
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.py
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.pyc
+lib/python${PY_VER_SUFFIX}/bsddb/test/test_pickle.pyo
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.py
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.pyc
lib/python${PY_VER_SUFFIX}/bsddb/test/test_queue.pyo
@@ -1817,6 +1821,7 @@
lib/python${PY_VER_SUFFIX}/test/seq_tests.py
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyc
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/sgml_input.html
lib/python${PY_VER_SUFFIX}/test/sortperf.py
lib/python${PY_VER_SUFFIX}/test/sortperf.pyc
lib/python${PY_VER_SUFFIX}/test/sortperf.pyo
@@ -2726,6 +2731,9 @@
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.py
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.pyc
lib/python${PY_VER_SUFFIX}/test/tf_inherit_check.pyo
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.py
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.pyc
+lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.pyo
lib/python${PY_VER_SUFFIX}/test/tokenize_tests.txt
lib/python${PY_VER_SUFFIX}/test/xmltests.py
lib/python${PY_VER_SUFFIX}/test/xmltests.pyc
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/distinfo
--- a/lang/python24/distinfo Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/distinfo Fri Jun 08 14:16:15 2007 +0000
@@ -1,22 +1,23 @@
-$NetBSD: distinfo,v 1.23 2006/12/27 20:49:04 joerg Exp $
+$NetBSD: distinfo,v 1.24 2007/06/08 14:16:15 wiz Exp $
-SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384
-RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc
-Size (Python-2.4.3.tar.bz2) = 8005915 bytes
+SHA1 (Python-2.4.4.tar.bz2) = 9e0971f93df8acbd947378d0d16a32fcc8897ba2
+RMD160 (Python-2.4.4.tar.bz2) = 4c7b5b70178fe69881b62201ef0bab55037d8708
+Size (Python-2.4.4.tar.bz2) = 8158073 bytes
SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
-SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
-SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
+SHA1 (patch-ab) = 98b94620baf5d9d5e8681529297124c2d07a901b
+SHA1 (patch-ac) = 4a7a83c9a7bb26254d17907fe15f895276910364
SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1
-SHA1 (patch-ae) = ccf62e62129f6f09bf46bb026bfb03d131a3aa1a
-SHA1 (patch-af) = 640a4dab8a96744ade37b3f3a5b0e7b0efabbe59
+SHA1 (patch-ae) = 7e00d719044fa0f205692392d9ebe87146715206
+SHA1 (patch-af) = f468e8c172fc5aaae1bf843898a30c00ec753537
SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
-SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1
+SHA1 (patch-ah) = 154b40eec926a6dcc968c635467807766d1cfaa3
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
-SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = bc5afee33587598e369799db2a15cbcace90f68b
-SHA1 (patch-am) = a8be9e5d3558c27e38d4323601335ad3bcde1f85
+SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5
+SHA1 (patch-al) = 10acea9003d856d2663a4b5bbecbd801eca8c0c8
+SHA1 (patch-am) = 0a240e711ecbdc5c736637e7a9f6446b40960a0d
SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
-SHA1 (patch-ao) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
-SHA1 (patch-ap) = 477adb465ef7ba2d0458cbaec74cd2841dcdea14
+SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843
+SHA1 (patch-ap) = 467f4493291e1a07fd65b092863dc1a8e3832f80
SHA1 (patch-aq) = 10f1964892763e0d1b2345bd053d7929dd4b317e
+SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/patches/patch-ab
--- a/lang/python24/patches/patch-ab Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/patches/patch-ab Fri Jun 08 14:16:15 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/08 14:16:15 wiz Exp $
---- Lib/distutils/command/build_ext.py.orig Sun Dec 5 22:03:11 2004
-+++ Lib/distutils/command/build_ext.py Sun Dec 5 22:03:25 2004
-@@ -485,7 +485,17 @@
+--- Lib/distutils/command/build_ext.py.orig 2004-11-10 22:23:15.000000000 +0000
++++ Lib/distutils/command/build_ext.py
+@@ -485,8 +485,18 @@ class build_ext (Command):
# that go into the mix.
if ext.extra_objects:
objects.extend(ext.extra_objects)
@@ -14,9 +14,10 @@
+ # any sensible compiler will give precedence to later
+ # command line args. Hence we combine them in order:
extra_args = ext.extra_link_args or []
-+
+
+ if os.environ.has_key('LDFLAGS'):
+ extra_args.extend(string.split(os.environ['LDFLAGS']))
-
++
# Detect target language, if not provided
language = ext.language or self.compiler.detect_language(sources)
+
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/patches/patch-ac
--- a/lang/python24/patches/patch-ac Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/patches/patch-ac Fri Jun 08 14:16:15 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+$NetBSD: patch-ac,v 1.2 2007/06/08 14:16:16 wiz Exp $
---- Lib/distutils/command/build_scripts.py.orig Sun Dec 5 22:05:11 2004
-+++ Lib/distutils/command/build_scripts.py Sun Dec 5 22:05:34 2004
-@@ -104,7 +104,7 @@
+--- Lib/distutils/command/build_scripts.py.orig 2004-11-10 22:23:15.000000000 +0000
++++ Lib/distutils/command/build_scripts.py
+@@ -104,7 +104,7 @@ class build_scripts (Command):
outf.write("#!%s%s\n" %
(os.path.join(
sysconfig.get_config_var("BINDIR"),
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/patches/patch-ae
--- a/lang/python24/patches/patch-ae Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/patches/patch-ae Fri Jun 08 14:16:15 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2006/04/12 20:21:48 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2007/06/08 14:16:16 wiz Exp $
---- Lib/test/test_fcntl.py.orig 2006-02-20 11:32:05.000000000 +0100
+--- Lib/test/test_fcntl.py.orig 2006-10-03 13:08:57.000000000 +0000
+++ Lib/test/test_fcntl.py
@@ -20,7 +20,7 @@ else:
if sys.platform.startswith('atheos'):
@@ -10,4 +10,4 @@
+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin',
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3'):
+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/patches/patch-af
--- a/lang/python24/patches/patch-af Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/patches/patch-af Fri Jun 08 14:16:15 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
+$NetBSD: patch-af,v 1.8 2007/06/08 14:16:16 wiz Exp $
---- Makefile.pre.in.orig 2006-03-13 13:08:41.000000000 +0000
+--- Makefile.pre.in.orig 2006-10-08 17:41:25.000000000 +0000
+++ Makefile.pre.in
@@ -30,6 +30,7 @@ VPATH= @srcdir@
@@ -19,7 +19,7 @@
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
-@@ -153,7 +154,6 @@ LIBC= @LIBC@
+@@ -157,7 +158,6 @@ LIBC= @LIBC@
SYSLIBS= $(LIBM) $(LIBC)
SHLIBS= @SHLIBS@
@@ -27,7 +27,7 @@
THREADOBJ= @THREADOBJ@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
-@@ -308,10 +308,10 @@ LIBRARY_OBJS= \
+@@ -312,10 +312,10 @@ LIBRARY_OBJS= \
all: $(BUILDPYTHON) oldsharedmods sharedmods
# Build the interpreter
@@ -41,7 +41,7 @@
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -351,14 +351,18 @@ $(LIBRARY): $(LIBRARY_OBJS)
+@@ -355,14 +355,17 @@ $(LIBRARY): $(LIBRARY_OBJS)
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -54,16 +54,15 @@
fi
libpython$(VERSION).sl: $(LIBRARY_OBJS)
-- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+ $(LDSHARED) -o $@ $(LDFLAGS) $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+
+libpython2.4.2.dylib: $(LIBRARY_OBJS)
+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC)
$(LIBM)
-+
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
-@@ -437,8 +441,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -450,8 +453,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DVPATH='"$(VPATH)"' \
-o $@ $(srcdir)/Modules/getpath.c
@@ -74,7 +73,7 @@
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@@ -520,7 +524,7 @@ PYTHON_HEADERS= \
+@@ -533,7 +536,7 @@ PYTHON_HEADERS= \
Include/weakrefobject.h \
pyconfig.h
@@ -83,7 +82,7 @@
######################################################################
-@@ -629,7 +633,12 @@ altbininstall: $(BUILDPYTHON)
+@@ -655,7 +658,12 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
fi \
fi; \
@@ -97,7 +96,7 @@
fi
# Install the manual page
-@@ -747,7 +756,7 @@ $(srcdir)/Lib/$(PLATDIR):
+@@ -773,7 +781,7 @@ $(srcdir)/Lib/$(PLATDIR):
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
export EXE; EXE="$(BUILDEXE)"; \
@@ -106,7 +105,7 @@
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -792,7 +801,7 @@ libainstall: all
+@@ -818,7 +826,7 @@ libainstall: all
fi; \
fi
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
diff -r f9e062490386 -r 7c2c6bec744d lang/python24/patches/patch-ah
--- a/lang/python24/patches/patch-ah Fri Jun 08 13:55:41 2007 +0000
+++ b/lang/python24/patches/patch-ah Fri Jun 08 14:16:15 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
+$NetBSD: patch-ah,v 1.3 2007/06/08 14:16:16 wiz Exp $
---- Modules/_cursesmodule.c.orig 2005-06-15 20:48:16.000000000 +0200
-+++ Modules/_cursesmodule.c 2005-10-01 22:25:32.000000000 +0200
-@@ -317,17 +317,9 @@
+--- Modules/_cursesmodule.c.orig 2006-09-27 19:17:32.000000000 +0000
++++ Modules/_cursesmodule.c
+@@ -317,17 +317,9 @@ Window_OneArgNoReturnFunction(wattroff,
Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr")
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -20,7 +20,7 @@
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -788,11 +780,7 @@
+@@ -788,11 +780,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
} else if (rtn<=255)
return Py_BuildValue("c", rtn);
else
@@ -32,7 +32,7 @@
}
static PyObject *
-@@ -1950,7 +1938,6 @@
+@@ -1953,7 +1941,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
}
@@ -40,7 +40,7 @@
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
-@@ -1969,7 +1956,6 @@
Home |
Main Index |
Thread Index |
Old Index