Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,4 +1,5 @@
bin/2to3 @PREFIX@/bin/2to3-2.7
bin/pydoc @PREFIX@/bin/pydoc2.7
bin/python @PREFIX@/bin/python2.7
bin/python2 @PREFIX@/bin/python2.7
bin/smtpd.py @PREFIX@/bin/smtpd2.7.py

View File

@@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.50 2015/09/07 12:02:05 jperkin Exp $
# $NetBSD: Makefile,v 1.67 2016/07/26 16:45:33 kamil Exp $
.include "dist.mk"
PKGNAME= python27-${PY_DISTVERSION}
PKGREVISION= 4
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -10,6 +11,8 @@ HOMEPAGE= http://www.python.org/
COMMENT= Interpreted, interactive, object-oriented programming language
LICENSE= python-software-foundation
DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
CONFLICTS+= python-[0-9]*
GNU_CONFIGURE= yes
@@ -57,9 +60,6 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.${OPSYS}
PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end
.if ${OPSYS} == "NetBSD"
. if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss])
PRIVILEGED_STAGES+= clean
. endif
# XXX work around a botched autoconf check which ignores libintl
CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes
.endif
@@ -82,9 +82,8 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
(${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
(${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64")
.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
(defined(ABI) && ${ABI} == "64")
IS_64BIT_PLATFORM?= yes
.else
IS_64BIT_PLATFORM?= no
@@ -133,10 +132,8 @@ BUILDLINK_TRANSFORM+= rm:-ldb
.endif
CFLAGS+= -DHAVE_DB_185_H
.if ${OPSYS} == "OSF1"
# configure complains about buggy getaddrinfo()
CONFIGURE_ARGS+= --disable-ipv6
.endif
CONFIGURE_ARGS.OSF1+= --disable-ipv6
.if defined(BUILDLINK_TRANSFORM)
MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
@@ -153,18 +150,50 @@ REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py
REPLACE_FILES.py27+= Lib/*/*/*/*.py
SUBST_CLASSES+= libffi
SUBST_MESSAGE.libffi= Fixing libffi include path on Darwin.
SUBST_STAGE.libffi= pre-configure
SUBST_FILES.libffi= setup.py
SUBST_SED.libffi= -e 's,/usr/include/ffi,${BUILDLINK_PREFIX.libffi}/include,'
SUBST_CLASSES+= findlib
SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin.
SUBST_STAGE.findlib= pre-configure
SUBST_FILES.findlib= Lib/distutils/unixccompiler.py
SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
# XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib
# Testing:
# >>> from ctypes.util import find_library
# >>> find_library("m")
# 'libm.so.0'
# >>> find_library("crypto")
# 'libcrypto.so.11'
# >>> find_library("GL")
# 'libGL.so.2'
# >>> find_library("curl")
# 'libcurl.so.4'
SUBST_CLASSES+= pfindlib
SUBST_MESSAGE.pfindlib= Fixing find_library() on POSIX-like (excluding Darwin) systems.
SUBST_STAGE.pfindlib= pre-configure
SUBST_FILES.pfindlib= Lib/ctypes/util.py
SUBST_SED.pfindlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
.include "options.mk"
SUBST_CLASSES+= sslbase
SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE.
SUBST_STAGE.sslbase= pre-configure
SUBST_FILES.sslbase= setup.py
SUBST_VARS.sslbase= SSLBASE
SUBST_CLASSES+= cacert
SUBST_MESSAGE.cacert= Configuring location of default CA certificate file.
SUBST_STAGE.cacert= pre-configure
SUBST_FILES.cacert= Modules/_ssl.c
SUBST_SED.cacert= -e 's,@PREFIX@,${PREFIX},'
post-extract:
${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.13 2015/05/24 07:44:07 adam Exp $
@comment $NetBSD: PLIST.common,v 1.15 2016/07/02 15:05:43 adam Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1437,8 +1437,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -1689,6 +1689,10 @@ lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.py
lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.pyc
lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.pyo
lib/python${PY_VER_SUFFIX}/idlelib/extend.txt
lib/python${PY_VER_SUFFIX}/idlelib/help.html
lib/python${PY_VER_SUFFIX}/idlelib/help.py
lib/python${PY_VER_SUFFIX}/idlelib/help.pyc
lib/python${PY_VER_SUFFIX}/idlelib/help.pyo
lib/python${PY_VER_SUFFIX}/idlelib/help.txt
lib/python${PY_VER_SUFFIX}/idlelib/idle.bat
lib/python${PY_VER_SUFFIX}/idlelib/idle.py
@@ -1726,12 +1730,18 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
@@ -2711,13 +2721,12 @@ lib/python${PY_VER_SUFFIX}/test/badsyntax_future7.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_future8.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_future9.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_nocaret.py
lib/python${PY_VER_SUFFIX}/test/buffer_tests.py
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
lib/python${PY_VER_SUFFIX}/test/capath/0e4015b9.0
lib/python${PY_VER_SUFFIX}/test/capath/4e1295a3.0
lib/python${PY_VER_SUFFIX}/test/capath/5ed36f99.0
lib/python${PY_VER_SUFFIX}/test/capath/6e88d7b8.0
lib/python${PY_VER_SUFFIX}/test/capath/99d0fa06.0
lib/python${PY_VER_SUFFIX}/test/capath/ce7b8643.0
lib/python${PY_VER_SUFFIX}/test/cfgparser.1
lib/python${PY_VER_SUFFIX}/test/check_soundcard.vbs
lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
@@ -2916,7 +2925,6 @@ lib/python${PY_VER_SUFFIX}/test/gdb_sample.py
lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyc
lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
lib/python${PY_VER_SUFFIX}/test/greyrgb.uue
lib/python${PY_VER_SUFFIX}/test/https_svn_python_org_root.pem
lib/python${PY_VER_SUFFIX}/test/ieee754.txt
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.gif
@@ -3240,9 +3248,6 @@ lib/python${PY_VER_SUFFIX}/test/test_codecs.pyo
lib/python${PY_VER_SUFFIX}/test/test_codeop.py
lib/python${PY_VER_SUFFIX}/test/test_codeop.pyc
lib/python${PY_VER_SUFFIX}/test/test_codeop.pyo
lib/python${PY_VER_SUFFIX}/test/test_coding.py
lib/python${PY_VER_SUFFIX}/test/test_coding.pyc
lib/python${PY_VER_SUFFIX}/test/test_coding.pyo
lib/python${PY_VER_SUFFIX}/test/test_coercion.py
lib/python${PY_VER_SUFFIX}/test/test_coercion.pyc
lib/python${PY_VER_SUFFIX}/test/test_coercion.pyo
@@ -3758,6 +3763,9 @@ lib/python${PY_VER_SUFFIX}/test/test_operator.pyo
lib/python${PY_VER_SUFFIX}/test/test_optparse.py
lib/python${PY_VER_SUFFIX}/test/test_optparse.pyc
lib/python${PY_VER_SUFFIX}/test/test_optparse.pyo
lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyc
lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyo
lib/python${PY_VER_SUFFIX}/test/test_os.py
lib/python${PY_VER_SUFFIX}/test/test_os.pyc
lib/python${PY_VER_SUFFIX}/test/test_os.pyo
@@ -3776,15 +3784,9 @@ lib/python${PY_VER_SUFFIX}/test/test_peepholer.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep247.py
lib/python${PY_VER_SUFFIX}/test/test_pep247.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep247.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep263.py
lib/python${PY_VER_SUFFIX}/test/test_pep263.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep263.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep277.py
lib/python${PY_VER_SUFFIX}/test/test_pep277.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep277.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep292.py
lib/python${PY_VER_SUFFIX}/test/test_pep292.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep292.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep352.py
lib/python${PY_VER_SUFFIX}/test/test_pep352.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep352.pyo
@@ -3968,6 +3970,9 @@ lib/python${PY_VER_SUFFIX}/test/test_softspace.pyo
lib/python${PY_VER_SUFFIX}/test/test_sort.py
lib/python${PY_VER_SUFFIX}/test/test_sort.pyc
lib/python${PY_VER_SUFFIX}/test/test_sort.pyo
lib/python${PY_VER_SUFFIX}/test/test_source_encoding.py
lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyc
lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyo
lib/python${PY_VER_SUFFIX}/test/test_spwd.py
lib/python${PY_VER_SUFFIX}/test/test_spwd.pyc
lib/python${PY_VER_SUFFIX}/test/test_spwd.pyo
@@ -4115,6 +4120,9 @@ lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyo
lib/python${PY_VER_SUFFIX}/test/test_tuple.py
lib/python${PY_VER_SUFFIX}/test/test_tuple.pyc
lib/python${PY_VER_SUFFIX}/test/test_tuple.pyo
lib/python${PY_VER_SUFFIX}/test/test_turtle.py
lib/python${PY_VER_SUFFIX}/test/test_turtle.pyc
lib/python${PY_VER_SUFFIX}/test/test_turtle.pyo
lib/python${PY_VER_SUFFIX}/test/test_typechecks.py
lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyc
lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyo

View File

@@ -1,6 +1,6 @@
# $NetBSD: dist.mk,v 1.10 2015/05/24 07:44:07 adam Exp $
# $NetBSD: dist.mk,v 1.12 2016/07/02 15:05:43 adam Exp $
PY_DISTVERSION= 2.7.10
PY_DISTVERSION= 2.7.12
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python27/distinfo

View File

@@ -1,15 +1,17 @@
$NetBSD: distinfo,v 1.51 2015/05/24 07:44:07 adam Exp $
$NetBSD: distinfo,v 1.58 2016/07/26 16:44:28 kamil Exp $
SHA1 (Python-2.7.10.tar.xz) = ee5a50c5562e7448f037d35fdedc18d95c748b9e
RMD160 (Python-2.7.10.tar.xz) = eb003de9bb52fc2c6a2d2e3dcb816ba0c56751d0
Size (Python-2.7.10.tar.xz) = 12250696 bytes
SHA1 (Python-2.7.12.tar.xz) = 05360b8ade117b35e266b2004a7f1f11250c6dcd
RMD160 (Python-2.7.12.tar.xz) = c330f6ac08ed67f307de0e726a288bab16c832d5
SHA512 (Python-2.7.12.tar.xz) = 6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f
Size (Python-2.7.12.tar.xz) = 12390820 bytes
SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
SHA1 (patch-Lib_distutils_unixccompiler.py) = def4142633b8f6b75e905b5c57be1d5c19b42d33
SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
SHA1 (patch-Modules___multiprocessing_semaphore.c) = 03b9c33ef38da383d5f7c2c84c17fe38cdd2911e
SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c
SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b
SHA1 (patch-Modules_mmapmodule.c) = 3f401b59883af3232b6c77a76a08e5feffa77044
SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a
@@ -18,10 +20,10 @@ SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
SHA1 (patch-ah) = 90b19239d8a7c8abc3bbc05d49408a2c5da6174d
SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
SHA1 (patch-am) = a7697dda83b151fdd30d460bdcf5ab3cc057c92b
SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968
SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
SHA1 (patch-au) = dcfac01d19dd3fc1eaa3b59a440f5c393c373f9e
SHA1 (patch-au) = 0ecdb937cbd58e3dbfa6fb94d1af5838619c77fd
SHA1 (patch-av) = e6aef090b444b455fe351308d251e670329b7dc3
SHA1 (patch-aw) = d07129531ec1427669092c504c12247206408c2d
SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e

28
lang/python27/options.mk Normal file
View File

@@ -0,0 +1,28 @@
# $NetBSD: options.mk,v 1.1 2016/07/26 16:44:28 kamil Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.python27
PKG_SUPPORTED_OPTIONS+= x11
PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mx11)
# Support for native X11 paths as an option
# This code is no-op for modular X11, however for simplicity don't make it conditional.
SUBST_CLASSES+= x11findlib
SUBST_MESSAGE.x11findlib= Fixing find_library() for native X11.
SUBST_STAGE.x11findlib= pre-configure
SUBST_FILES.x11findlib= Lib/ctypes/util.py
SUBST_SED.x11findlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib \1!'
# Required to get definition of X11BASE and retain X11 rpath paths for linker
# We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs
USE_X11= yes
SUBST_CLASSES+= cdlopen
SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so
SUBST_STAGE.cdlopen= pre-configure
SUBST_FILES.cdlopen= setup.py
SUBST_SED.cdlopen= -e "s!\(libraries=\[\],\)!\1 runtime_library_dirs=\['${X11BASE}/lib'\],!"
.endif

View File

@@ -1,18 +1,18 @@
$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2015/04/24 03:01:36 rodent Exp $
$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.4 2016/07/02 15:05:43 adam Exp $
* from cygport 2.7.3-dylib.patch
--- Lib/distutils/unixccompiler.py.orig 2014-12-10 15:59:34.000000000 +0000
--- Lib/distutils/unixccompiler.py.orig 2016-06-25 21:49:30.000000000 +0000
+++ Lib/distutils/unixccompiler.py
@@ -82,6 +82,7 @@ class UnixCCompiler(CCompiler):
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
@@ -84,6 +84,7 @@ class UnixCCompiler(CCompiler):
xcode_stub_lib_format = dylib_lib_format
if sys.platform == "cygwin":
exe_extension = ".exe"
+ dylib_lib_extension = ".dll.a"
def preprocess(self, source,
output_file=None, macros=None, include_dirs=None,
@@ -234,10 +235,8 @@ class UnixCCompiler(CCompiler):
@@ -236,10 +237,8 @@ class UnixCCompiler(CCompiler):
return ["+s", "-L" + dir]
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]

View File

@@ -0,0 +1,36 @@
$NetBSD: patch-Modules___multiprocessing_semaphore.c,v 1.1 2016/07/11 12:17:13 ryoon Exp $
--- Modules/_multiprocessing/semaphore.c.orig 2016-06-25 21:49:31.000000000 +0000
+++ Modules/_multiprocessing/semaphore.c
@@ -424,7 +424,11 @@ newsemlockobject(PyTypeObject *type, SEM
static PyObject *
semlock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
+#if defined(__NetBSD__)
+ char buffer[15];
+#else
char buffer[256];
+#endif
SEM_HANDLE handle = SEM_FAILED;
int kind, maxvalue, value;
PyObject *result;
@@ -444,10 +448,19 @@ semlock_new(PyTypeObject *type, PyObject
* _PyOS_URandom() are treated as unsigned long to ensure that the filename
* is valid (no special characters). */
do {
+#if defined(__NetBSD__)
+ unsigned char suffix1;
+ unsigned char suffix2;
+ _PyOS_URandom((char *)&suffix1, sizeof(suffix1));
+ _PyOS_URandom((char *)&suffix2, sizeof(suffix2));
+ PyOS_snprintf(buffer, sizeof(buffer), "/mp%ld-%x%x", (long)getpid(),
+ suffix1, suffix2);
+#else
unsigned long suffix;
_PyOS_URandom((char *)&suffix, sizeof(suffix));
PyOS_snprintf(buffer, sizeof(buffer), "/mp%ld-%lu", (long)getpid(),
suffix);
+#endif
SEM_CLEAR_ERROR();
handle = SEM_CREATE(buffer, value, maxvalue);
} while ((handle == SEM_FAILED) && (errno == EEXIST) && (++try < 100));

View File

@@ -0,0 +1,19 @@
$NetBSD: patch-Modules__ssl.c,v 1.1 2016/02/06 11:25:09 tron Exp $
Use CA certificate file provided by "mozilla-rootcerts" package by default
--- Modules/_ssl.c.orig 2015-12-05 19:47:13.000000000 +0000
+++ Modules/_ssl.c 2016-02-06 11:12:59.865409460 +0000
@@ -2952,10 +2952,12 @@
static PyObject *
set_default_verify_paths(PySSLContext *self, PyObject *unused)
{
+ const char *cacert_pem = "@PREFIX@/share/mozilla-rootcerts/cacert.pem";
if (!SSL_CTX_set_default_verify_paths(self->ctx)) {
_setSSLError(NULL, 0, __FILE__, __LINE__);
return NULL;
}
+ SSL_CTX_load_verify_locations(self->ctx, cacert_pem, NULL);
Py_RETURN_NONE;
}

View File

@@ -1,13 +0,0 @@
$NetBSD: patch-Modules_mmapmodule.c,v 1.2 2015/04/24 03:01:36 rodent Exp $
--- Modules/mmapmodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/mmapmodule.c
@@ -23,7 +23,7 @@
#ifndef MS_WINDOWS
#define UNIX
-# ifdef __APPLE__
+# if defined(__APPLE__) || defined(_SCO_DS)
# include <fcntl.h>
# endif
#endif

View File

@@ -1,4 +1,4 @@
$NetBSD: patch-am,v 1.19 2015/04/24 03:01:36 rodent Exp $
$NetBSD: patch-am,v 1.21 2016/07/26 16:44:28 kamil Exp $
Disabled modules for normal build:
bsddb
@@ -23,7 +23,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
cygwin 2.7.3-no-libm.patch
--- setup.py.orig 2014-12-10 16:00:01.000000000 +0000
--- setup.py.orig 2016-06-25 21:49:32.000000000 +0000
+++ setup.py
@@ -33,7 +33,7 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@@ -34,7 +34,7 @@ cygwin 2.7.3-no-libm.patch
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
@@ -438,10 +438,15 @@ class PyBuildExt(build_ext):
@@ -454,10 +454,15 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_modules(self):
@@ -54,7 +54,7 @@ cygwin 2.7.3-no-libm.patch
if cross_compiling:
self.add_gcc_paths()
self.add_multiarch_paths()
@@ -553,7 +558,7 @@ class PyBuildExt(build_ext):
@@ -569,7 +574,7 @@ class PyBuildExt(build_ext):
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
@@ -63,7 +63,7 @@ cygwin 2.7.3-no-libm.patch
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -789,11 +794,10 @@ class PyBuildExt(build_ext):
@@ -809,11 +814,10 @@ class PyBuildExt(build_ext):
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -78,7 +78,7 @@ cygwin 2.7.3-no-libm.patch
)
if ssl_incs is not None:
krb5_h = find_file('krb5.h', inc_dirs,
@@ -801,9 +805,7 @@ class PyBuildExt(build_ext):
@@ -821,9 +825,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -89,7 +89,7 @@ cygwin 2.7.3-no-libm.patch
if (ssl_incs is not None and
ssl_libs is not None):
@@ -822,7 +824,7 @@ class PyBuildExt(build_ext):
@@ -842,7 +844,7 @@ class PyBuildExt(build_ext):
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
@@ -98,7 +98,7 @@ cygwin 2.7.3-no-libm.patch
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if host_platform == 'darwin' and is_macosx_sdk_path(name):
@@ -922,175 +924,6 @@ class PyBuildExt(build_ext):
@@ -942,175 +944,6 @@ class PyBuildExt(build_ext):
else:
raise ValueError("unknown major BerkeleyDB version", major)
@@ -274,7 +274,7 @@ cygwin 2.7.3-no-libm.patch
# The sqlite interface
sqlite_setup_debug = False # verbose debug prints from this script?
@@ -1207,35 +1040,39 @@ class PyBuildExt(build_ext):
@@ -1227,35 +1060,39 @@ 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.
@@ -338,7 +338,7 @@ cygwin 2.7.3-no-libm.patch
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
@@ -1247,7 +1084,7 @@ class PyBuildExt(build_ext):
@@ -1267,7 +1104,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -347,7 +347,7 @@ cygwin 2.7.3-no-libm.patch
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(lib_dirs,
@@ -1291,18 +1128,14 @@ class PyBuildExt(build_ext):
@@ -1311,18 +1148,14 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs)
break
elif cand == "bdb":
@@ -374,7 +374,7 @@ cygwin 2.7.3-no-libm.patch
if dbmext is not None:
exts.append(dbmext)
else:
@@ -2230,9 +2063,9 @@ def main():
@@ -2250,9 +2083,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install

View File

@@ -1,12 +1,12 @@
$NetBSD: patch-au,v 1.8 2015/04/24 03:01:36 rodent Exp $
$NetBSD: patch-au,v 1.9 2015/12/06 18:22:35 adam Exp $
Fix for unpriviliged build.
Avoid opcode generator; it requires Python binary, and the file is already generated.
http://hg.python.org/cpython/rev/a0f43f4481e0
--- Makefile.pre.in.orig 2014-12-10 15:59:50.000000000 +0000
--- Makefile.pre.in.orig 2015-12-05 19:47:10.000000000 +0000
+++ Makefile.pre.in
@@ -512,7 +512,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
@@ -537,7 +537,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@@ -15,7 +15,16 @@ http://hg.python.org/cpython/rev/a0f43f4481e0
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
@@ -922,7 +922,8 @@ altbininstall: $(BUILDPYTHON)
@@ -696,8 +696,6 @@ Objects/bytearrayobject.o: $(srcdir)/Obj
Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
$(STRINGLIB_HEADERS)
-$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
- $(OPCODETARGETGEN) $(OPCODETARGETS_H)
Python/ceval.o: $(OPCODETARGETS_H)
@@ -952,7 +950,8 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
fi \
fi; \