Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
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
Download Patch File Download Diff File Expand all files Collapse all files

10
lang/python27/patches/patch-Lib_distutils_unixccompiler.py
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]

36
lang/python27/patches/patch-Modules___multiprocessing_semaphore.c Normal file
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));

19
lang/python27/patches/patch-Modules__ssl.c Normal file
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;
}

13
lang/python27/patches/patch-Modules_mmapmodule.c
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

24
lang/python27/patches/patch-am
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

19
lang/python27/patches/patch-au
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; \