summaryrefslogtreecommitdiff
path: root/lang/python27
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python27')
-rw-r--r--lang/python27/Makefile3
-rw-r--r--lang/python27/PLIST.common78
-rw-r--r--lang/python27/dist.mk4
-rw-r--r--lang/python27/distinfo20
-rw-r--r--lang/python27/patches/patch-al24
-rw-r--r--lang/python27/patches/patch-am22
-rw-r--r--lang/python27/patches/patch-ao6
-rw-r--r--lang/python27/patches/patch-au8
-rw-r--r--lang/python27/patches/patch-ax6
-rw-r--r--lang/python27/patches/patch-ca29
-rw-r--r--lang/python27/patches/patch-cb21
11 files changed, 83 insertions, 138 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index c67d473ba1d..ee862549b2a 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/04/23 10:35:28 tron Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/13 11:31:13 obache Exp $
.include "dist.mk"
PKGNAME= python27-${PY_DISTVERSION}
-PKGREVISION= 3
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index aa94b413bd5..66a57f8873b 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2011/06/13 11:31:13 obache Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1939,6 +1939,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle
lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py
lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyo
+lib/python${PY_VER_SUFFIX}/lib2to3/__main__.py
+lib/python${PY_VER_SUFFIX}/lib2to3/__main__.pyc
+lib/python${PY_VER_SUFFIX}/lib2to3/__main__.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/btm_matcher.py
lib/python${PY_VER_SUFFIX}/lib2to3/btm_matcher.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/btm_matcher.pyo
@@ -2578,9 +2581,32 @@ lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
lib/python${PY_VER_SUFFIX}/test/cfgparser.1
lib/python${PY_VER_SUFFIX}/test/check_soundcard.vbs
-lib/python${PY_VER_SUFFIX}/test/cjkencodings_test.py
-lib/python${PY_VER_SUFFIX}/test/cjkencodings_test.pyc
-lib/python${PY_VER_SUFFIX}/test/cjkencodings_test.pyo
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5hkscs-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5hkscs.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/cp949-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/cp949.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_jisx0213-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_jisx0213.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_jp-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_jp.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_kr-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/euc_kr.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gb18030-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gb18030.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gb2312-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gb2312.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gbk-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/gbk.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/hz-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/hz.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/johab-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/johab.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jis-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jis.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213-utf8.txt
+lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213.txt
lib/python${PY_VER_SUFFIX}/test/cmath_testcases.txt
lib/python${PY_VER_SUFFIX}/test/curses_tests.py
lib/python${PY_VER_SUFFIX}/test/curses_tests.pyc
@@ -2827,6 +2853,9 @@ lib/python${PY_VER_SUFFIX}/test/ssl_key.pem
lib/python${PY_VER_SUFFIX}/test/string_tests.py
lib/python${PY_VER_SUFFIX}/test/string_tests.pyc
lib/python${PY_VER_SUFFIX}/test/string_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.py
+lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.pyc
+lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.pyo
lib/python${PY_VER_SUFFIX}/test/svn_python_org_https_cert.pem
lib/python${PY_VER_SUFFIX}/test/test_MimeWriter.py
lib/python${PY_VER_SUFFIX}/test/test_MimeWriter.pyc
@@ -3475,6 +3504,9 @@ lib/python${PY_VER_SUFFIX}/test/test_module.pyo
lib/python${PY_VER_SUFFIX}/test/test_modulefinder.py
lib/python${PY_VER_SUFFIX}/test/test_modulefinder.pyc
lib/python${PY_VER_SUFFIX}/test/test_modulefinder.pyo
+lib/python${PY_VER_SUFFIX}/test/test_msilib.py
+lib/python${PY_VER_SUFFIX}/test/test_msilib.pyc
+lib/python${PY_VER_SUFFIX}/test/test_msilib.pyo
lib/python${PY_VER_SUFFIX}/test/test_multibytecodec.py
lib/python${PY_VER_SUFFIX}/test/test_multibytecodec.pyc
lib/python${PY_VER_SUFFIX}/test/test_multibytecodec.pyo
@@ -3790,45 +3822,15 @@ lib/python${PY_VER_SUFFIX}/test/test_syntax.pyo
lib/python${PY_VER_SUFFIX}/test/test_sys.py
lib/python${PY_VER_SUFFIX}/test/test_sys.pyc
lib/python${PY_VER_SUFFIX}/test/test_sys.pyo
-lib/python${PY_VER_SUFFIX}/test/test_sysconfig.py
-lib/python${PY_VER_SUFFIX}/test/test_sysconfig.pyc
-lib/python${PY_VER_SUFFIX}/test/test_sysconfig.pyo
lib/python${PY_VER_SUFFIX}/test/test_sys_setprofile.py
lib/python${PY_VER_SUFFIX}/test/test_sys_setprofile.pyc
lib/python${PY_VER_SUFFIX}/test/test_sys_setprofile.pyo
lib/python${PY_VER_SUFFIX}/test/test_sys_settrace.py
lib/python${PY_VER_SUFFIX}/test/test_sys_settrace.pyc
lib/python${PY_VER_SUFFIX}/test/test_sys_settrace.pyo
-lib/python${PY_VER_SUFFIX}/test/test_tarfile.py
-lib/python${PY_VER_SUFFIX}/test/test_tarfile.pyc
-lib/python${PY_VER_SUFFIX}/test/test_tarfile.pyo
-lib/python${PY_VER_SUFFIX}/test/test_tcl.py
-lib/python${PY_VER_SUFFIX}/test/test_tcl.pyc
-lib/python${PY_VER_SUFFIX}/test/test_tcl.pyo
-lib/python${PY_VER_SUFFIX}/test/test_telnetlib.py
-lib/python${PY_VER_SUFFIX}/test/test_telnetlib.pyc
-lib/python${PY_VER_SUFFIX}/test/test_telnetlib.pyo
-lib/python${PY_VER_SUFFIX}/test/test_tempfile.py
-lib/python${PY_VER_SUFFIX}/test/test_tempfile.pyc
-lib/python${PY_VER_SUFFIX}/test/test_tempfile.pyo
-lib/python${PY_VER_SUFFIX}/test/test_textwrap.py
-lib/python${PY_VER_SUFFIX}/test/test_textwrap.pyc
-lib/python${PY_VER_SUFFIX}/test/test_textwrap.pyo
-lib/python${PY_VER_SUFFIX}/test/test_thread.py
-lib/python${PY_VER_SUFFIX}/test/test_thread.pyc
-lib/python${PY_VER_SUFFIX}/test/test_thread.pyo
-lib/python${PY_VER_SUFFIX}/test/test_threaded_import.py
-lib/python${PY_VER_SUFFIX}/test/test_threaded_import.pyc
-lib/python${PY_VER_SUFFIX}/test/test_threaded_import.pyo
-lib/python${PY_VER_SUFFIX}/test/test_threadedtempfile.py
-lib/python${PY_VER_SUFFIX}/test/test_threadedtempfile.pyc
-lib/python${PY_VER_SUFFIX}/test/test_threadedtempfile.pyo
-lib/python${PY_VER_SUFFIX}/test/test_threading.py
-lib/python${PY_VER_SUFFIX}/test/test_threading.pyc
-lib/python${PY_VER_SUFFIX}/test/test_threading.pyo
-lib/python${PY_VER_SUFFIX}/test/test_threading_local.py
-lib/python${PY_VER_SUFFIX}/test/test_threading_local.pyc
-lib/python${PY_VER_SUFFIX}/test/test_threading_local.pyo
+lib/python${PY_VER_SUFFIX}/test/test_sysconfig.py
+lib/python${PY_VER_SUFFIX}/test/test_sysconfig.pyc
+lib/python${PY_VER_SUFFIX}/test/test_sysconfig.pyo
lib/python${PY_VER_SUFFIX}/test/test_tarfile.py
lib/python${PY_VER_SUFFIX}/test/test_tarfile.pyc
lib/python${PY_VER_SUFFIX}/test/test_tarfile.pyo
@@ -4049,13 +4051,13 @@ lib/python${PY_VER_SUFFIX}/test/threaded_import_hangers.pyo
lib/python${PY_VER_SUFFIX}/test/time_hashlib.py
lib/python${PY_VER_SUFFIX}/test/time_hashlib.pyc
lib/python${PY_VER_SUFFIX}/test/time_hashlib.pyo
+lib/python${PY_VER_SUFFIX}/test/tokenize_tests.txt
lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.py
lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.pyc
lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.pyo
lib/python${PY_VER_SUFFIX}/test/tracedmodules/testmod.py
lib/python${PY_VER_SUFFIX}/test/tracedmodules/testmod.pyc
lib/python${PY_VER_SUFFIX}/test/tracedmodules/testmod.pyo
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests.txt
lib/python${PY_VER_SUFFIX}/test/warning_tests.py
lib/python${PY_VER_SUFFIX}/test/warning_tests.pyc
lib/python${PY_VER_SUFFIX}/test/warning_tests.pyo
diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk
index b3ac0354721..63760eed1d6 100644
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1.1.1 2011/02/22 08:51:58 obache Exp $
+# $NetBSD: dist.mk,v 1.2 2011/06/13 11:31:13 obache Exp $
-PY_DISTVERSION= 2.7.1
+PY_DISTVERSION= 2.7.2
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE= ${.CURDIR}/../../lang/python27/distinfo
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 14567a05066..01448da19d2 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.4 2011/05/06 16:27:04 abs Exp $
+$NetBSD: distinfo,v 1.5 2011/06/13 11:31:13 obache Exp $
-SHA1 (Python-2.7.1.tar.bz2) = fbe1894322ff91b80726e269c97454f4129fc2a3
-RMD160 (Python-2.7.1.tar.bz2) = 3ce59305f6cd3fb320a53771d0ea01ec0687005f
-Size (Python-2.7.1.tar.bz2) = 11722546 bytes
+SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
+RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
+Size (Python-2.7.2.tar.bz2) = 11754834 bytes
SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
-SHA1 (patch-al) = 2c6a578b62dfba45b2ba01a6b004f1d8feee0fe2
-SHA1 (patch-am) = 760ed52308b31043bbf28528adf2a99f2420d85b
+SHA1 (patch-al) = f1c11a62106a5b5c2346d326525b85039d00f503
+SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
-SHA1 (patch-ao) = 2061473e5e672b4cc38d91c5d8f885cb361a35b3
-SHA1 (patch-au) = 700dc128833af755f3ea08c4db79c127453b12e6
+SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
+SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
-SHA1 (patch-ax) = b3a69107d3abbc8476ce79fb05aa8c9f293896a2
-SHA1 (patch-ca) = aa0ad5a9dff1cd7c1c456aa6371733727ac1425b
-SHA1 (patch-cb) = f8fa30bb9aae0ef02c187d1d6db176bac731381e
+SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index 913b87063b7..c160d562c07 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $
---- configure.orig 2010-11-01 01:47:19.000000000 +0000
+--- configure.orig 2011-06-11 15:46:28.000000000 +0000
+++ configure
-@@ -4912,15 +4912,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -4927,15 +4927,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-@@ -7586,9 +7581,9 @@ then
+@@ -7648,9 +7643,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -32,7 +32,7 @@ $NetBSD: patch-al,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -7612,15 +7607,15 @@ then
+@@ -7674,15 +7669,15 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -52,21 +52,17 @@ $NetBSD: patch-al,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
-@@ -7649,8 +7644,11 @@ then
- esac
- fi;;
+@@ -7713,6 +7708,9 @@ then
NetBSD*|DragonFly*)
-- LDSHARED="cc -shared ${LDFLAGS}"
-- LDCXXSHARED="c++ -shared ${LDFLAGS}";;
-+ LDSHARED='$(CC) -shared'
-+ LDCXXSHARED='$(CXX) -shared ${LDFLAGS}';;
+ LDSHARED='$(CC) -shared'
+ LDCXXSHARED='$(CXX) -shared';;
+ Interix*)
+ LDSHARED='$(CC) -shared'" ${LDFLAGS}"
+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared'
-@@ -7695,6 +7693,7 @@ then
+@@ -7757,6 +7755,7 @@ then
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -74,7 +70,7 @@ $NetBSD: patch-al,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -7751,6 +7750,7 @@ then
+@@ -7813,6 +7812,7 @@ then
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index 3db7010efc7..5163f520b34 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2011/05/06 16:27:04 abs Exp $
+$NetBSD: patch-am,v 1.3 2011/06/13 11:31:13 obache Exp $
Disabled modules for normal build:
bsddb
@@ -19,7 +19,7 @@ headers and libraries from the system.
Build the 1.85 compat module all the time against the BDB version of choice.
---- setup.py.orig 2010-10-31 16:40:21.000000000 +0000
+--- setup.py.orig 2011-06-11 15:46:28.000000000 +0000
+++ setup.py
@@ -21,7 +21,7 @@ from distutils.spawn import find_executa
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
@@ -30,8 +30,8 @@ Build the 1.85 compat module all the time against the BDB version of choice.
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -346,9 +346,15 @@ class PyBuildExt(build_ext):
- return sys.platform
+@@ -368,9 +368,15 @@ class PyBuildExt(build_ext):
+ os.unlink(tmpfile)
def detect_modules(self):
- # Ensure that /usr/local is always used
@@ -46,10 +46,10 @@ Build the 1.85 compat module all the time against the BDB version of choice.
+ self.compiler.library_dirs.insert(0, libdir)
+ if incdir not in self.compiler.include_dirs:
+ self.compiler.include_dirs.insert(0, incdir)
+ self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and
- # CPPFLAGS for header and library files.
-@@ -692,9 +698,7 @@ class PyBuildExt(build_ext):
+@@ -715,9 +721,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -60,7 +60,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -809,172 +813,6 @@ class PyBuildExt(build_ext):
+@@ -832,172 +836,6 @@ class PyBuildExt(build_ext):
else:
raise ValueError("unknown major BerkeleyDB version", major)
@@ -190,7 +190,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
- tmp.append(dn)
- db_dirs_to_check = tmp
-
-- # Look for a version specific db-X.Y before an ambiguoius dbX
+- # Look for a version specific db-X.Y before an ambiguous dbX
- # XXX should we -ever- look for a dbX name? Do any
- # systems really not name their library by version and
- # symlink to more general names?
@@ -233,7 +233,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# The sqlite interface
sqlite_setup_debug = False # verbose debug prints from this script?
-@@ -1090,31 +928,12 @@ class PyBuildExt(build_ext):
+@@ -1113,31 +951,12 @@ class PyBuildExt(build_ext):
# we do not build this one. Otherwise this build will pick up
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
@@ -270,7 +270,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
dbm_order = ['gdbm']
# The standard Unix dbm module:
-@@ -1170,18 +989,14 @@ class PyBuildExt(build_ext):
+@@ -1193,18 +1012,14 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs)
break
elif cand == "bdb":
@@ -297,7 +297,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
if dbmext is not None:
exts.append(dbmext)
else:
-@@ -2043,9 +1858,9 @@ def main():
+@@ -2066,9 +1881,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
diff --git a/lang/python27/patches/patch-ao b/lang/python27/patches/patch-ao
index ff10f86a2bb..214d531f22e 100644
--- a/lang/python27/patches/patch-ao
+++ b/lang/python27/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-ao,v 1.2 2011/06/13 11:31:13 obache Exp $
---- Lib/distutils/util.py.orig 2010-05-05 19:09:31.000000000 +0000
+--- Lib/distutils/util.py.orig 2011-06-11 15:46:24.000000000 +0000
+++ Lib/distutils/util.py
-@@ -177,6 +177,8 @@ def get_platform ():
+@@ -176,6 +176,8 @@ def get_platform ():
# See 'i386' case
if sys.maxint >= 2**32:
machine = 'ppc64'
diff --git a/lang/python27/patches/patch-au b/lang/python27/patches/patch-au
index 0e62877b1fc..1841ab3e402 100644
--- a/lang/python27/patches/patch-au
+++ b/lang/python27/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2011/02/22 10:50:38 adam Exp $
+$NetBSD: patch-au,v 1.3 2011/06/13 11:31:13 obache Exp $
---- Makefile.pre.in.orig 2010-04-12 00:10:46.000000000 +0000
+--- Makefile.pre.in.orig 2011-06-11 15:46:26.000000000 +0000
+++ Makefile.pre.in
-@@ -444,7 +444,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
+@@ -447,7 +447,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@@ -11,7 +11,7 @@ $NetBSD: patch-au,v 1.2 2011/02/22 10:50:38 adam 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
-@@ -815,7 +815,8 @@ altbininstall: $(BUILDPYTHON)
+@@ -820,7 +820,8 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
fi \
fi; \
diff --git a/lang/python27/patches/patch-ax b/lang/python27/patches/patch-ax
index 25d29badf8a..536c4321fe1 100644
--- a/lang/python27/patches/patch-ax
+++ b/lang/python27/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-ax,v 1.2 2011/06/13 11:31:13 obache Exp $
chop "-RELEASE" or "-DEVELOPMENT" from release for DragonFly.
---- Lib/sysconfig.py.orig 2010-11-06 04:06:18.000000000 +0000
+--- Lib/sysconfig.py.orig 2011-06-11 15:46:25.000000000 +0000
+++ Lib/sysconfig.py
-@@ -697,6 +697,8 @@ def get_platform():
+@@ -679,6 +679,8 @@ def get_platform():
machine = 'ppc64'
else:
machine = 'ppc'
diff --git a/lang/python27/patches/patch-ca b/lang/python27/patches/patch-ca
deleted file mode 100644
index 457474d629a..00000000000
--- a/lang/python27/patches/patch-ca
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2011/03/28 16:00:07 drochner Exp $
-
-Issue #11662 (CVE-2011-1521)
-
---- Lib/urllib.py.orig 2007-03-14 08:27:57.000000000 +0000
-+++ Lib/urllib.py
-@@ -638,10 +638,20 @@ class FancyURLopener(URLopener):
- newurl = headers['uri']
- else:
- return
-- void = fp.read()
-- fp.close()
-+
- # In case the server sent a relative URL, join with original:
- newurl = basejoin(self.type + ":" + url, newurl)
-+
-+ # For security reasons we do not allow redirects to protocols
-+ # other than HTTP, HTTPS or FTP.
-+ newurl_lower = newurl.lower()
-+ if not (newurl_lower.startswith('http://') or
-+ newurl_lower.startswith('https://') or
-+ newurl_lower.startswith('ftp://')):
-+ return
-+
-+ void = fp.read()
-+ fp.close()
- return self.open(newurl)
-
- def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
diff --git a/lang/python27/patches/patch-cb b/lang/python27/patches/patch-cb
deleted file mode 100644
index 1af34378a99..00000000000
--- a/lang/python27/patches/patch-cb
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2011/03/28 16:00:07 drochner Exp $
-
-Issue #11662 (CVE-2011-1521)
-
---- Lib/urllib2.py.orig 2011-03-28 15:17:02.000000000 +0000
-+++ Lib/urllib2.py
-@@ -578,6 +578,14 @@ class HTTPRedirectHandler(BaseHandler):
-
- newurl = urlparse.urljoin(req.get_full_url(), newurl)
-
-+ # For security reasons we do not allow redirects to protocols
-+ # other than HTTP, HTTPS or FTP.
-+ newurl_lower = newurl.lower()
-+ if not (newurl_lower.startswith('http://') or
-+ newurl_lower.startswith('https://') or
-+ newurl_lower.startswith('ftp://')):
-+ return
-+
- # XXX Probably want to forget about the state of the current
- # request, although that might interact poorly with other
- # handlers that also use handler-specific request attributes
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 08:17:26 +0000