summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python34/Makefile3
-rw-r--r--lang/python34/PLIST88
-rw-r--r--lang/python34/dist.mk4
-rw-r--r--lang/python34/distinfo11
-rw-r--r--lang/python34/patches/patch-Lib_os.py57
-rw-r--r--lang/python34/patches/patch-al22
6 files changed, 67 insertions, 118 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 5d6a80c11e8..bf06bac0e00 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/05/15 12:43:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/20 08:59:31 wen Exp $
.include "dist.mk"
PKGNAME= python34-${PY_DISTVERSION}
-PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python34/PLIST b/lang/python34/PLIST
index e3a584353e8..a892e9ca96d 100644
--- a/lang/python34/PLIST
+++ b/lang/python34/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/09 02:27:14 wen Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/20 08:59:31 wen Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1547,7 +1547,7 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.4-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-2.1-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
lib/python${PY_VER_SUFFIX}/enum.py
@@ -1795,6 +1795,8 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/README.txt
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyc
@@ -1821,6 +1823,7 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
@@ -2417,6 +2420,8 @@ lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyc
lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyo
+lib/python${PY_VER_SUFFIX}/test/coding20731.pyc
+lib/python${PY_VER_SUFFIX}/test/coding20731.pyo
lib/python${PY_VER_SUFFIX}/test/curses_tests.pyc
lib/python${PY_VER_SUFFIX}/test/curses_tests.pyo
lib/python${PY_VER_SUFFIX}/test/datetimetester.pyc
@@ -2905,8 +2910,6 @@ lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.pyc
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.pyo
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.pyc
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.pyo
-lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.pyc
-lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.pyo
lib/python${PY_VER_SUFFIX}/test/test_netrc.pyc
lib/python${PY_VER_SUFFIX}/test/test_netrc.pyo
lib/python${PY_VER_SUFFIX}/test/test_nis.pyc
@@ -3357,6 +3360,7 @@ 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/coding20731.py
lib/python${PY_VER_SUFFIX}/test/curses_tests.py
lib/python${PY_VER_SUFFIX}/test/data/README
lib/python${PY_VER_SUFFIX}/test/datetimetester.py
@@ -3557,40 +3561,6 @@ lib/python${PY_VER_SUFFIX}/test/mime.types
lib/python${PY_VER_SUFFIX}/test/mock_socket.py
lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py
lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/missing_directory.zip
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test/empty
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/nested_portion1.zip
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.pyc
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.pyo
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.py
-lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/top_level_portion1.zip
lib/python${PY_VER_SUFFIX}/test/nokia.pem
lib/python${PY_VER_SUFFIX}/test/nullbytecert.pem
lib/python${PY_VER_SUFFIX}/test/nullcert.pem
@@ -3726,7 +3696,6 @@ lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_transports.py
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_unix_events.py
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_windows_events.py
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_windows_utils.py
-lib/python${PY_VER_SUFFIX}/test/test_asyncio/tests.txt
lib/python${PY_VER_SUFFIX}/test/test_asyncore.py
lib/python${PY_VER_SUFFIX}/test/test_atexit.py
lib/python${PY_VER_SUFFIX}/test/test_audioop.py
@@ -3995,6 +3964,8 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.pyc
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.pyo
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.pyc
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.pyo
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.pyc
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.pyo
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_util.pyc
@@ -4076,6 +4047,40 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_packages.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_path.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_relative_imports.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/util.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/missing_directory.zip
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/nested_portion1.zip
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.pyc
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.pyo
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/top_level_portion1.zip
lib/python${PY_VER_SUFFIX}/test/test_importlib/regrtest.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/source/__init__.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/source/__init__.pyc
@@ -4101,6 +4106,7 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/source/util.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_abc.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.py
+lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_util.py
lib/python${PY_VER_SUFFIX}/test/test_importlib/test_windows.py
@@ -4206,7 +4212,6 @@ lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_fork.py
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_forkserver.py
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.py
lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.py
-lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.py
lib/python${PY_VER_SUFFIX}/test/test_netrc.py
lib/python${PY_VER_SUFFIX}/test/test_nis.py
lib/python${PY_VER_SUFFIX}/test/test_nntplib.py
@@ -4477,6 +4482,8 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__init__.pyc
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__init__.pyo
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.pyc
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.pyo
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.pyc
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.pyo
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.pyc
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.pyo
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.pyc
@@ -4488,6 +4495,7 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_variables.pyo
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_widgets.pyc
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_widgets.pyo
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.py
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.py
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.py
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.py
lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_text.py
diff --git a/lang/python34/dist.mk b/lang/python34/dist.mk
index 02628930c02..5332f659f6c 100644
--- a/lang/python34/dist.mk
+++ b/lang/python34/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2014/05/09 02:27:14 wen Exp $
+# $NetBSD: dist.mk,v 1.2 2014/05/20 08:59:31 wen Exp $
-PY_DISTVERSION= 3.4.0
+PY_DISTVERSION= 3.4.1
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python34/distinfo
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index cd7be471dd5..aaac5fe91de 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.7 2014/05/15 12:43:52 wiz Exp $
+$NetBSD: distinfo,v 1.8 2014/05/20 08:59:31 wen Exp $
-SHA1 (Python-3.4.0.tar.xz) = f54d7cf6af5dbd9bddbe31cf4772f39711381dbe
-RMD160 (Python-3.4.0.tar.xz) = f6b4664a4333a2010f8e168e252de7c22013e4a8
-Size (Python-3.4.0.tar.xz) = 14084912 bytes
+SHA1 (Python-3.4.1.tar.xz) = 143e098efe7ee7bec8a4904ec4b322f28a067a03
+RMD160 (Python-3.4.1.tar.xz) = 276fda8bd4ef515da83645ddd5f01eb0f68522a5
+Size (Python-3.4.1.tar.xz) = 14125788 bytes
SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce
-SHA1 (patch-Lib_os.py) = 0e834a55d4c2ac70a1daaddbed439dff2de37c8e
SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
SHA1 (patch-ah) = b3a1363f6d210f855f3769650e3891b0df5c531d
-SHA1 (patch-al) = 0944fb5b807985723070ac44358505c3053f9997
+SHA1 (patch-al) = 9920f04aed35d66dfc9509344ad159c918510376
SHA1 (patch-am) = dbce46a877a01ecef01767cdfb0c3a2137431833
SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
SHA1 (patch-ao) = bc7bb76ca7b3b8302dd966fad85171236c1f06e6
diff --git a/lang/python34/patches/patch-Lib_os.py b/lang/python34/patches/patch-Lib_os.py
deleted file mode 100644
index fc7f684cca8..00000000000
--- a/lang/python34/patches/patch-Lib_os.py
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-Lib_os.py,v 1.1 2014/05/15 12:43:52 wiz Exp $
-
-Fix for CVE-2014-2667 based on
-http://hg.python.org/cpython/rev/6370d44013f7
-
---- Lib/os.py.orig 2014-03-17 02:31:29.000000000 +0000
-+++ Lib/os.py
-@@ -206,23 +206,16 @@ SEEK_SET = 0
- SEEK_CUR = 1
- SEEK_END = 2
-
--
--def _get_masked_mode(mode):
-- mask = umask(0)
-- umask(mask)
-- return mode & ~mask
--
- # Super directory utilities.
- # (Inspired by Eric Raymond; the doc strings are mostly his)
-
- def makedirs(name, mode=0o777, exist_ok=False):
- """makedirs(path [, mode=0o777][, exist_ok=False])
-
-- Super-mkdir; create a leaf directory and all intermediate ones.
-- Works like mkdir, except that any intermediate path segment (not
-- just the rightmost) will be created if it does not exist. If the
-- target directory with the same mode as we specified already exists,
-- raises an OSError if exist_ok is False, otherwise no exception is
-+ Super-mkdir; create a leaf directory and all intermediate ones. Works like
-+ mkdir, except that any intermediate path segment (not just the rightmost)
-+ will be created if it does not exist. If the target directory already
-+ exists, raise an OSError if exist_ok is False. Otherwise no exception is
- raised. This is recursive.
-
- """
-@@ -243,20 +236,7 @@ def makedirs(name, mode=0o777, exist_ok=
- try:
- mkdir(name, mode)
- except OSError as e:
-- dir_exists = path.isdir(name)
-- expected_mode = _get_masked_mode(mode)
-- if dir_exists:
-- # S_ISGID is automatically copied by the OS from parent to child
-- # directories on mkdir. Don't consider it being set to be a mode
-- # mismatch as mkdir does not unset it when not specified in mode.
-- actual_mode = st.S_IMODE(lstat(name).st_mode) & ~st.S_ISGID
-- else:
-- actual_mode = -1
-- if not (e.errno == errno.EEXIST and exist_ok and dir_exists and
-- actual_mode == expected_mode):
-- if dir_exists and actual_mode != expected_mode:
-- e.strerror += ' (mode %o != expected mode %o)' % (
-- actual_mode, expected_mode)
-+ if not exist_ok or e.errno != errno.EEXIST or not path.isdir(name):
- raise
-
- def removedirs(name):
diff --git a/lang/python34/patches/patch-al b/lang/python34/patches/patch-al
index e8edccfd269..1d8c476d970 100644
--- a/lang/python34/patches/patch-al
+++ b/lang/python34/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 2014/05/09 09:19:06 wiz Exp $
+$NetBSD: patch-al,v 1.3 2014/05/20 08:59:31 wen Exp $
MirBSD support
http://bugs.python.org/issue21458
@@ -9,9 +9,9 @@ Changes for consistency across pkgsrc platforms.
XXX: Not sure what the BLDSHARED changes are about.
---- configure.orig 2013-05-15 16:33:00.000000000 +0000
+--- configure.orig 2014-05-20 15:08:33.000000000 +0000
+++ configure
-@@ -3332,7 +3332,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3354,7 +3354,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
# OpenBSD 4.6, but is fixed in 4.7.
@@ -20,7 +20,7 @@ XXX: Not sure what the BLDSHARED changes are about.
define_xopen_source=no
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE
-@@ -5594,15 +5594,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5632,15 +5632,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
PY3LIBRARY=libpython3.so
fi
;;
@@ -28,7 +28,7 @@ XXX: Not sure what the BLDSHARED changes are about.
+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*)
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
- case $ac_sys_system in
- FreeBSD*)
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -37,7 +37,7 @@ XXX: Not sure what the BLDSHARED changes are about.
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
-@@ -8465,8 +8460,8 @@ then
+@@ -8532,8 +8527,8 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -48,7 +48,7 @@ XXX: Not sure what the BLDSHARED changes are about.
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
fi ;;
Darwin/*)
-@@ -8491,9 +8486,9 @@ then
+@@ -8555,9 +8550,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -61,7 +61,7 @@ XXX: Not sure what the BLDSHARED changes are about.
fi
fi
;;
-@@ -8527,9 +8522,15 @@ then
+@@ -8591,9 +8586,15 @@ then
;;
esac
fi;;
@@ -77,7 +77,7 @@ XXX: Not sure what the BLDSHARED changes are about.
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared'
-@@ -8570,7 +8571,8 @@ then
+@@ -8634,7 +8635,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@@ -87,7 +87,7 @@ XXX: Not sure what the BLDSHARED changes are about.
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -8613,11 +8615,12 @@ then
+@@ -8683,11 +8685,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -101,7 +101,7 @@ XXX: Not sure what the BLDSHARED changes are about.
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -13707,8 +13710,6 @@ $as_echo "$SOABI" >&6; }
+@@ -13917,8 +13920,6 @@ $as_echo "$SOABI" >&6; }
case $ac_sys_system in
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 15:02:47 +0000