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 Python 2.4.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c611bcabc57
branches: trunk
changeset: 493564:7c611bcabc57
user: recht <recht%pkgsrc.org@localhost>
date: Mon May 09 20:37:51 2005 +0000
description:
update to Python 2.4.1
Highlights of this new release include:
- Bug fixes. According to the release notes, several dozen bugs
have been fixed, including a fix for the SimpleXMLRPCServer
security issue (PSF-2005-001).
Also add a patch by Joerg Sonnenberger to add basic support
for DragonFly BSD.
For a detailed list of changes see:
http://python.org/2.4.1/NEWS.html
diffstat:
lang/python24/Makefile | 9 +-
lang/python24/PLIST.common | 24 +++-
lang/python24/PLIST.common_end | 3 +-
lang/python24/distinfo | 16 +-
lang/python24/patches/patch-af | 4 +-
lang/python24/patches/patch-al | 62 +++----
lang/python24/patches/patch-am | 288 ++++++++++++++++++++--------------------
lang/python24/patches/patch-an | 82 -----------
8 files changed, 210 insertions(+), 278 deletions(-)
diffs (truncated from 727 to 300 lines):
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/Makefile
--- a/lang/python24/Makefile Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/Makefile Mon May 09 20:37:51 2005 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/09 20:37:51 recht Exp $
#
-DISTNAME= Python-2.4
-PKGNAME= python24-2.4
-PKGREVISION= 5
+DISTNAME= Python-2.4.1
+PKGNAME= python24-2.4.1
CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.1/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht%NetBSD.org@localhost
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/PLIST.common
--- a/lang/python24/PLIST.common Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/PLIST.common Mon May 09 20:37:51 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2005/02/18 22:25:22 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2005/05/09 20:37:51 recht Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
bin/smtpd${PY_VER_SUFFIX}.py
@@ -493,6 +493,27 @@
lib/python${PY_VER_SUFFIX}/distutils/sysconfig.py
lib/python${PY_VER_SUFFIX}/distutils/sysconfig.pyc
lib/python${PY_VER_SUFFIX}/distutils/sysconfig.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/__init__.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/__init__.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/__init__.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/support.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/support.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/support.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_py.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_py.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_py.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_scripts.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_scripts.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_build_scripts.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_dist.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_dist.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_dist.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyo
lib/python${PY_VER_SUFFIX}/distutils/text_file.py
lib/python${PY_VER_SUFFIX}/distutils/text_file.pyc
lib/python${PY_VER_SUFFIX}/distutils/text_file.pyo
@@ -628,6 +649,7 @@
lib/python${PY_VER_SUFFIX}/email/test/data/msg_40.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_41.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_42.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_43.txt
lib/python${PY_VER_SUFFIX}/email/test/test_email.py
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyc
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyo
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/PLIST.common_end
--- a/lang/python24/PLIST.common_end Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/PLIST.common_end Mon May 09 20:37:51 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2005/01/23 20:41:48 recht Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2005/05/09 20:37:51 recht Exp $
@dirrm lib/python${PY_VER_SUFFIX}/xml/sax
@dirrm lib/python${PY_VER_SUFFIX}/xml/parsers
@dirrm lib/python${PY_VER_SUFFIX}/xml/dom
@@ -20,6 +20,7 @@
@dirrm lib/python${PY_VER_SUFFIX}/email/test
@dirrm lib/python${PY_VER_SUFFIX}/email
@dirrm lib/python${PY_VER_SUFFIX}/distutils/command
+@dirrm lib/python${PY_VER_SUFFIX}/distutils/tests
@dirrm lib/python${PY_VER_SUFFIX}/distutils
@dirrm lib/python${PY_VER_SUFFIX}/curses
@dirrm lib/python${PY_VER_SUFFIX}/config
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/distinfo
--- a/lang/python24/distinfo Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/distinfo Mon May 09 20:37:51 2005 +0000
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:03:11 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/05/09 20:37:51 recht Exp $
-SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e
-RMD160 (Python-2.4.tar.bz2) = b0c0ee7b791432323012de38be903362dea847a7
-Size (Python-2.4.tar.bz2) = 7840762 bytes
+SHA1 (Python-2.4.1.tar.bz2) = a4b58cf31359198dbb123b789440bcaf9052d198
+RMD160 (Python-2.4.1.tar.bz2) = 8c682c9af21666cc6b8eaa08f8719eed231ab3ad
+Size (Python-2.4.1.tar.bz2) = 7847025 bytes
+SHA1 (patch-am.old) = 85ed6ef1ffa004dd98b9904864fa857779234be0
SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
SHA1 (patch-ad) = 0fa1c66fa0ad9ce345c44b13fd3897975837c72e
SHA1 (patch-ae) = 7232b64cc3d201daf0bc00476eb58aa694a6df2a
-SHA1 (patch-af) = 82486cc06585a05a0151b3508e5bbcb3c7281681
+SHA1 (patch-af) = e7c0f100b2255942d5f8b8c02723b184cdaeceac
SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 2cd3088f1d8b4e827c89fa75c2f7663f842451af
-SHA1 (patch-am) = aa71ec2f9cc8f434ff38b19df23b5dd433e13e5a
-SHA1 (patch-an) = 02222a16fb6b5eac69098e8c310f62bb75fa559b
+SHA1 (patch-al) = d8365c06b5a309c6fc196a607fafa8cda27cb982
+SHA1 (patch-am) = 9ce50340d76e8612384f94d4b03414d3f38e35d3
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/patches/patch-af
--- a/lang/python24/patches/patch-af Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/patches/patch-af Mon May 09 20:37:51 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+$NetBSD: patch-af,v 1.2 2005/05/09 20:37:51 recht Exp $
--- Makefile.pre.in.orig Sun Sep 26 19:26:55 2004
+++ Makefile.pre.in
@@ -25,7 +25,7 @@
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
-+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.0 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
++ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.1 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(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
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/patches/patch-al
--- a/lang/python24/patches/patch-al Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/patches/patch-al Mon May 09 20:37:51 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.5 2005/01/24 21:46:33 tv Exp $
+$NetBSD: patch-al,v 1.6 2005/05/09 20:37:51 recht Exp $
---- configure.orig 2004-11-06 20:24:12.000000000 -0500
-+++ configure
-@@ -1479,6 +1479,8 @@ case $ac_sys_system/$ac_sys_release in
+--- configure.orig 2005-03-29 01:23:02.000000000 +0200
++++ configure 2005-05-09 21:14:53.000000000 +0200
+@@ -1482,6 +1482,8 @@
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
OpenBSD/2.* | OpenBSD/3.[0123456])
define_xopen_source=no;;
@@ -11,31 +11,16 @@
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
SunOS/5.6)
-@@ -3392,7 +3394,7 @@ _ACEOF
+@@ -3402,7 +3404,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
- Linux*|GNU*|NetBSD*|FreeBSD*)
-+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*)
++ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3418,6 +3420,14 @@ _ACEOF
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
-+ Darwin*)
-+ if test -z "$enable_framework"; then
-+ LDLIBRARY='libpython$(VERSION).dylib'
-+ BLDLIBRARY='-L. -lpython$(VERSION)'
-+ RUNSHARED=DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}
-+ fi
-+ ;;
-+
- esac
- else # shared is disabled
- case $ac_sys_system in
-@@ -3816,7 +3826,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+@@ -3826,7 +3828,12 @@
;;
# is there any other compiler on Darwin besides gcc?
Darwin*)
@@ -49,7 +34,7 @@
;;
esac
;;
-@@ -10165,7 +10180,10 @@ fi
+@@ -10186,7 +10193,10 @@
case "$enable_toolbox_glue" in
yes)
extra_machdep_objs="Python/mactoolboxglue.o"
@@ -61,8 +46,8 @@
cat >>confdefs.h <<\_ACEOF
#define USE_TOOLBOX_OBJECT_GLUE 1
-@@ -10295,7 +10313,7 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+@@ -10332,7 +10342,7 @@
+ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework. Ignore undefined symbols, assuming they come from Python
- LDSHARED="$LDSHARED -undefined suppress"
@@ -70,8 +55,8 @@
fi ;;
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10305,8 +10323,8 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+@@ -10342,8 +10352,8 @@
+ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -81,8 +66,8 @@
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10324,12 +10342,12 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+@@ -10362,12 +10372,12 @@
+ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -97,27 +82,34 @@
BSD/OS*/4*) LDSHARED="gcc -shared";;
OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -10338,7 +10356,8 @@ then
+@@ -10376,7 +10386,8 @@
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
- NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
-+ NetBSD*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
++ NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
+ Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
-@@ -10370,7 +10389,9 @@ then
+@@ -10408,7 +10419,9 @@
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
+- FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+ Darwin/7*) CCSHARED="-fPIC -fno-common";;
- FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
++ FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ Interix*) CCSHARED="";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -10428,6 +10449,7 @@ then
+@@ -10461,11 +10474,12 @@
+ OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
+ SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
+ ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
+- FreeBSD*|NetBSD*|OpenBSD*)
++ FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
+ if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
@@ -125,7 +117,7 @@
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -14297,6 +14319,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14335,6 +14349,7 @@
/* end confdefs.h. */
#include "confdefs.h"
diff -r 5f989cd9ecc2 -r 7c611bcabc57 lang/python24/patches/patch-am
--- a/lang/python24/patches/patch-am Mon May 09 20:29:26 2005 +0000
+++ b/lang/python24/patches/patch-am Mon May 09 20:37:51 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/12/05 23:27:52 recht Exp $
+$NetBSD: patch-am,v 1.2 2005/05/09 20:37:51 recht Exp $
---- setup.py.orig Sat Nov 13 12:13:34 2004
-+++ setup.py
-@@ -15,7 +15,7 @@ from distutils.command.install import in
+--- setup.py.orig 2005-03-09 23:27:24.000000000 +0100
++++ setup.py 2005-05-09 15:11:47.000000000 +0200
+@@ -15,7 +15,7 @@
from distutils.command.install_lib import install_lib
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"]
++disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "bsddb", "gdbm", "mpz", "pyexpat", "readline"]
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -238,9 +238,15 @@ class PyBuildExt(build_ext):
+@@ -238,9 +238,15 @@
return sys.platform
def detect_modules(self):
@@ -30,7 +30,7 @@
Home |
Main Index |
Thread Index |
Old Index