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

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
sambuc
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python27/patches/patch-Include_node.h
-15
View File
@@ -1,15 +0,0 @@
$NetBSD: patch-Include_node.h,v 1.1 2013/04/17 13:21:05 obache Exp $
* _PyNode_SizeOf is used by parsermodule
--- Include/node.h.orig 2013-04-06 14:02:25.000000000 +0000
+++ Include/node.h
@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n,
char *str, int lineno, int col_offset);
PyAPI_FUNC(void) PyNode_Free(node *n);
#ifndef Py_LIMITED_API
-Py_ssize_t _PyNode_SizeOf(node *n);
+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
#endif
/* Node access functions */
lang/python27/patches/patch-Include_pyport.h
+19
View File
@@ -0,0 +1,19 @@
$NetBSD: patch-Include_pyport.h,v 1.2 2014/07/02 09:53:16 adam Exp $
SunOS defines gethostname in <unistd.h>
http://bugs.python.org/issue19561
--- Include/pyport.h.orig 2014-05-31 18:58:38.000000000 +0000
+++ Include/pyport.h
@@ -640,11 +640,6 @@ Please be conservative with adding new o
in platform-specific #ifdefs.
**************************************************************************/
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
#ifdef __BEOS__
/* Unchecked */
/* It's in the libs, but not the headers... - [cjh] */
lang/python27/patches/patch-Lib_dumbdb.py
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-Lib_dumbdb.py,v 1.1 2015/03/03 17:19:58 snj Exp $
http://bugs.python.org/issue22885
--- Lib/dumbdbm.py.orig 2015-03-03 09:05:52.000000000 -0800
+++ Lib/dumbdbm.py 2015-03-03 09:10:02.000000000 -0800
@@ -21,6 +21,7 @@ is read when the database is opened, and
"""
+import ast as _ast
import os as _os
import __builtin__
import UserDict
@@ -85,7 +86,7 @@ class _Database(UserDict.DictMixin):
with f:
for line in f:
line = line.rstrip()
- key, pos_and_siz_pair = eval(line)
+ key, pos_and_siz_pair = _ast.literal_eval(line)
self._index[key] = pos_and_siz_pair
# Write the index dict to the directory file. The original directory
lang/python27/patches/patch-Lib_multiprocessing_process.py
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-Lib_multiprocessing_process.py,v 1.1 2014/07/17 15:26:49 ryoon Exp $
--- Lib/multiprocessing/process.py.orig 2014-06-30 02:05:29.000000000 +0000
+++ Lib/multiprocessing/process.py
@@ -306,7 +306,15 @@ class _MainProcess(Process):
self._popen = None
self._counter = itertools.count(1)
self._children = set()
- self._authkey = AuthenticationString(os.urandom(32))
+ # Get randomness from urandom or the 'random' module.
+ # from http://bugs.python.org/issue6645
+ # for SCO OpenServer 5.0.7/3.2 and AIX
+ try:
+ self._authkey = AuthenticationString(os.urandom(32))
+ except:
+ import random
+ bytes = [chr(random.randrange(256)) for i in range(32)]
+ self._authkey = AuthenticationString(bytes)
self._tempdir = None
_current_process = _MainProcess()
lang/python27/patches/patch-Lib_test_test__dumbdbm.py
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-Lib_test_test__dumbdbm.py,v 1.1 2015/03/03 17:19:58 snj Exp $
http://bugs.python.org/issue22885
--- Lib/test/test_dumbdbm.py.orig 2015-03-03 09:05:53.000000000 -0800
+++ Lib/test/test_dumbdbm.py 2015-03-03 09:10:02.000000000 -0800
@@ -160,6 +160,14 @@ class DumbDBMTestCase(unittest.TestCase)
self.assertEqual(expected, got)
f.close()
+ def test_eval(self):
+ with open(_fname + '.dir', 'w') as stream:
+ stream.write("str(__import__('sys').stdout.write('Hacked!')), 0\n")
+ with test_support.captured_stdout() as stdout:
+ with self.assertRaises(ValueError):
+ dumbdbm.open(_fname).close()
+ self.assertEqual(stdout.getvalue(), '')
+
def tearDown(self):
_delete_files()
lang/python27/patches/patch-Modules___ssl.c
-17
View File
@@ -1,17 +0,0 @@
$NetBSD: patch-Modules___ssl.c,v 1.3 2013/11/12 18:57:25 adam Exp $
Cygwin fix from cygport 2.6.2-ssl-threads.patch
--- Modules/_ssl.c.orig 2013-11-10 07:36:41.000000000 +0000
+++ Modules/_ssl.c
@@ -16,6 +16,10 @@
#include "Python.h"
+#ifdef __CYGWIN__
+#undef WITH_THREAD
+#endif
+
#ifdef WITH_THREAD
#include "pythread.h"
lang/python27/patches/patch-Modules_getaddrinfo.c
+20
View File
@@ -0,0 +1,20 @@
$NetBSD: patch-Modules_getaddrinfo.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
--- Modules/getaddrinfo.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/getaddrinfo.c
@@ -66,6 +66,15 @@
#define YES 1
#define NO 0
+/* SCO OpenServer 5.0.7/3.2's sys/reg.h defines ERR. */
+#if defined(ERR)
+#undef ERR
+#endif
+
+# if defined(_SCO_DS)
+typedef int socklen_t;
+#endif
+
#ifdef FAITH
static int translate = NO;
static struct in6_addr faith_prefix = IN6ADDR_GAI_ANY_INIT;
lang/python27/patches/patch-Modules_getpath.c
+3 -3
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-Modules_getpath.c,v 1.1 2013/04/17 13:21:05 obache Exp $
$NetBSD: patch-Modules_getpath.c,v 1.2 2014/11/02 13:31:11 spz Exp $
* from cygport 2.7.3-getpath-exe-extension.patch
--- Modules/getpath.c.orig 2013-04-06 14:02:37.000000000 +0000
--- Modules/getpath.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/getpath.c
@@ -436,6 +436,28 @@ calculate_path(void)
@@ -451,6 +451,28 @@ calculate_path(void)
if (isxfile(progpath))
break;
lang/python27/patches/patch-Modules_mmapmodule.c
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-Modules_mmapmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
--- Modules/mmapmodule.c.orig 2014-06-30 02:05:43.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
lang/python27/patches/patch-Modules_posixmodule.c
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-Modules_posixmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
--- Modules/posixmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/posixmodule.c
@@ -317,6 +317,10 @@ extern int lstat(const char *, struct st
#define PARSE_PID "i"
#define PyLong_FromPid PyInt_FromLong
#define PyLong_AsPid PyInt_AsLong
+#elif SIZEOF_PID_T == SIZEOF_SHORT
+#define PARSE_PID "i"
+#define PyLong_FromPid PyInt_FromLong
+#define PyLong_AsPid PyInt_AsLong
#elif SIZEOF_PID_T == SIZEOF_LONG
#define PARSE_PID "l"
#define PyLong_FromPid PyInt_FromLong
lang/python27/patches/patch-Modules_readline.c
-44
View File
@@ -1,44 +0,0 @@
$NetBSD: patch-Modules_readline.c,v 1.2 2014/03/27 06:26:24 obache Exp $
* fixes for readline-6.3
http://bugs.python.org/issue20374
--- Modules/readline.c.orig 2013-11-10 07:36:41.000000000 +0000
+++ Modules/readline.c
@@ -750,7 +750,11 @@ on_hook(PyObject *func)
}
static int
+#if defined(_RL_FUNCTION_TYPEDEF)
on_startup_hook(void)
+#else
+on_startup_hook()
+#endif
{
return on_hook(startup_hook);
}
@@ -852,7 +856,7 @@ on_completion(const char *text, int stat
* before calling the normal completer */
static char **
-flex_complete(char *text, int start, int end)
+flex_complete(const char *text, int start, int end)
{
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rl_completion_append_character ='\0';
@@ -911,12 +915,12 @@ setup_readline(void)
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
/* Set our hook functions */
- rl_startup_hook = (Function *)on_startup_hook;
+ rl_startup_hook = on_startup_hook;
#ifdef HAVE_RL_PRE_INPUT_HOOK
- rl_pre_input_hook = (Function *)on_pre_input_hook;
+ rl_pre_input_hook = on_pre_input_hook;
#endif
/* Set our completion function */
- rl_attempted_completion_function = (CPPFunction *)flex_complete;
+ rl_attempted_completion_function = flex_complete;
/* Set Python word break characters */
completer_word_break_characters =
rl_completer_word_break_characters =
lang/python27/patches/patch-Modules_socketmodule.c
+11 -17
View File
@@ -1,19 +1,13 @@
$NetBSD: patch-Modules_socketmodule.c,v 1.1 2014/02/09 09:02:50 tron Exp $
$NetBSD: patch-Modules_socketmodule.c,v 1.4 2014/07/17 15:26:49 ryoon Exp $
Fix vulnerability reported in SA56624. Patch taken from here:
http://hg.python.org/cpython/rev/87673659d8f7
--- Modules/socketmodule.c.orig 2013-11-10 07:36:41.000000000 +0000
+++ Modules/socketmodule.c 2014-02-09 08:41:25.000000000 +0000
@@ -2742,6 +2742,10 @@
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
+ } else if (recvlen > buflen) {
+ PyErr_SetString(PyExc_ValueError,
+ "nbytes is greater than the length of the buffer");
+ goto error;
}
--- Modules/socketmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/socketmodule.c
@@ -244,7 +244,7 @@ shutdown(how) -- shut down traffic in on
/* Irix 6.5 fails to define this variable at all. This is needed
for both GCC and SGI's compiler. I'd say that the SGI headers
are just busted. Same thing for Solaris. */
-#if (defined(__sgi) || defined(sun)) && !defined(INET_ADDRSTRLEN)
+#if (defined(__sgi) || defined(sun) || defined(_SCO_DS)) && !defined(INET_ADDRSTRLEN)
#define INET_ADDRSTRLEN 16
#endif
readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
lang/python27/patches/patch-ab
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.2 2012/04/13 18:47:31 adam Exp $
$NetBSD: patch-ab,v 1.3 2014/11/02 13:31:11 spz Exp $
--- Lib/distutils/command/build_ext.py.orig 2010-04-01 18:17:09.000000000 +0000
--- Lib/distutils/command/build_ext.py.orig 2014-06-30 02:05:25.000000000 +0000
+++ Lib/distutils/command/build_ext.py
@@ -513,8 +513,19 @@ class build_ext (Command):
@@ -511,8 +511,19 @@ class build_ext (Command):
# that go into the mix.
if ext.extra_objects:
objects.extend(ext.extra_objects)
lang/python27/patches/patch-ad
+2 -2
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-ad,v 1.2 2014/11/02 13:31:11 spz Exp $
Add ability to parse unsigned integers as externalized by NetBSD proplib(3).
--- Lib/plistlib.py.orig 2010-04-20 20:59:37.000000000 +0000
--- Lib/plistlib.py.orig 2014-06-30 02:05:30.000000000 +0000
+++ Lib/plistlib.py
@@ -463,7 +463,7 @@ class PlistParser:
def end_false(self):
lang/python27/patches/patch-ae
+2 -2
View File
@@ -1,9 +1,9 @@
$NetBSD: patch-ae,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-ae,v 1.2 2014/11/02 13:31:11 spz Exp $
XXXbjs: I use amd64, and audioop is broken on 64-bit platforms.
Thus, this needs to be tested.
--- Modules/sunaudiodev.c.orig 2010-05-09 14:46:46.000000000 +0000
--- Modules/sunaudiodev.c.orig 2014-06-30 02:05:44.000000000 +0000
+++ Modules/sunaudiodev.c
@@ -224,7 +224,11 @@ sad_ibufcount(sadobject *self)
{
lang/python27/patches/patch-ah
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-ah,v 1.3 2014/11/02 13:31:11 spz Exp $
--- Modules/_cursesmodule.c.orig 2013-04-06 14:02:36.000000000 +0000
--- Modules/_cursesmodule.c.orig 2014-06-30 02:05:41.000000000 +0000
+++ Modules/_cursesmodule.c
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary
lang/python27/patches/patch-al
+45 -25
View File
@@ -1,4 +1,4 @@
$NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
$NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
@@ -6,9 +6,9 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
--- configure.orig 2013-04-06 14:02:41.000000000 +0000
--- configure.orig 2014-06-30 02:05:48.000000000 +0000
+++ configure
@@ -3243,7 +3243,7 @@ case $ac_sys_system/$ac_sys_release in
@@ -3252,7 +3252,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.
@@ -17,15 +17,15 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
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
@@ -5342,15 +5342,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
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`
@@ -34,16 +34,29 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -6037,7 +6032,7 @@ $as_echo "$CC" >&6; }
# Calculate the right deployment target for this build.
#
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
- if test ${cur_target} '>' 10.2; then
+ if false; then
@@ -5393,6 +5388,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
LDLIBRARY='libpython$(VERSION).so'
RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
;;
+ SCO_SV*)
+ LDLIBRARY='libpython$(VERSION).so'
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ INSTSONAME="$LDLIBRARY".$SOVERSION
+ ;;
esac
else # shared is disabled
@@ -6050,8 +6050,7 @@ $as_echo "$CC" >&6; }
cur_target_minor=`sw_vers -productVersion | \
sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
cur_target="${cur_target_major}.${cur_target_minor}"
- if test ${cur_target_major} -eq 10 && \
- test ${cur_target_minor} -ge 3
+ if false
then
cur_target=10.3
if test ${enable_universalsdk}; then
if test "${UNIVERSAL_ARCHS}" = "all"; then
@@ -8214,9 +8209,9 @@ then
@@ -8209,9 +8208,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -56,7 +69,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
@@ -8240,15 +8235,15 @@ then
@@ -8234,9 +8233,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -67,7 +80,9 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
fi
fi
else
# building for OS X 10.3 and later
@@ -8250,7 +8249,7 @@ then
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
@@ -76,7 +91,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
@@ -8276,9 +8271,15 @@ then
@@ -8278,6 +8277,9 @@ then
;;
esac
fi;;
@@ -86,13 +101,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
NetBSD*|DragonFly*)
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'
@@ -8322,7 +8323,8 @@ then
@@ -8324,7 +8326,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@@ -102,7 +111,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
@@ -8374,11 +8376,12 @@ then
@@ -8376,11 +8379,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -116,3 +125,14 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
@@ -10370,6 +10374,10 @@ int
main ()
{
int x=kqueue()
+/* SCO OpenServer 5.0.7/3.2 has not kqueue, but detected as yes. */
+#if defined(_SCO_DS)
+#error no kqueue
+#endif
;
return 0;
}
lang/python27/patches/patch-am
+34 -8
View File
@@ -1,4 +1,4 @@
$NetBSD: patch-am,v 1.14 2014/03/27 05:36:37 obache Exp $
$NetBSD: patch-am,v 1.18 2014/11/02 13:31:11 spz Exp $
Disabled modules for normal build:
bsddb
@@ -17,11 +17,13 @@ Those have separate packages where needed.
Only check the BUILDLINK_DIR for libraries etc, do not pick up random
headers and libraries from the system.
Build the _ssl module with pkgsrc choiced OpenSSL.
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 2013-11-10 07:36:41.000000000 +0000
--- setup.py.orig 2014-06-30 02:05:48.000000000 +0000
+++ setup.py
@@ -33,7 +33,7 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@@ -61,7 +63,22 @@ cygwin 2.7.3-no-libm.patch
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -797,9 +802,7 @@ class PyBuildExt(build_ext):
@@ -787,11 +792,10 @@ class PyBuildExt(build_ext):
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
- '/usr/local/ssl/include',
- '/usr/contrib/ssl/include/'
+ '@SSLBASE@/include'
]
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
- search_for_ssl_incs_in
+ ssl_incs = find_file('openssl/ssl.h', [],
+ search_for_ssl_incs_in + inc_dirs
)
if ssl_incs is not None:
krb5_h = find_file('krb5.h', inc_dirs,
@@ -799,9 +803,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -72,7 +89,16 @@ cygwin 2.7.3-no-libm.patch
if (ssl_incs is not None and
ssl_libs is not None):
@@ -918,175 +921,6 @@ class PyBuildExt(build_ext):
@@ -820,7 +822,7 @@ class PyBuildExt(build_ext):
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
- inc_dirs + search_for_ssl_incs_in)
+ search_for_ssl_incs_in + inc_dirs)
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if host_platform == 'darwin' and is_macosx_sdk_path(name):
@@ -920,175 +922,6 @@ class PyBuildExt(build_ext):
else:
raise ValueError("unknown major BerkeleyDB version", major)
@@ -248,7 +274,7 @@ cygwin 2.7.3-no-libm.patch
# The sqlite interface
sqlite_setup_debug = False # verbose debug prints from this script?
@@ -1204,35 +1038,39 @@ class PyBuildExt(build_ext):
@@ -1205,35 +1038,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.
@@ -312,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
@@ -1244,7 +1082,7 @@ class PyBuildExt(build_ext):
@@ -1245,7 +1082,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -321,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,
@@ -1288,18 +1126,14 @@ class PyBuildExt(build_ext):
@@ -1289,18 +1126,14 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs)
break
elif cand == "bdb":
@@ -348,7 +374,7 @@ cygwin 2.7.3-no-libm.patch
if dbmext is not None:
exts.append(dbmext)
else:
@@ -2222,9 +2056,9 @@ def main():
@@ -2228,9 +2061,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
lang/python27/patches/patch-an
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-an,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-an,v 1.2 2014/11/02 13:31:11 spz Exp $
--- Modules/makesetup.orig 2007-09-05 11:47:34.000000000 +0000
--- Modules/makesetup.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/makesetup
@@ -164,6 +164,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
-rpath) libs="$libs $arg"; skip=libs;;
lang/python27/patches/patch-ao
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ao,v 1.4 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-ao,v 1.5 2014/11/02 13:31:11 spz Exp $
--- Lib/distutils/util.py.orig 2013-04-06 14:02:26.000000000 +0000
--- Lib/distutils/util.py.orig 2014-06-30 02:05:26.000000000 +0000
+++ Lib/distutils/util.py
@@ -101,6 +101,8 @@ def get_platform ():
osname, release, machine = _osx_support.get_platform_osx(
lang/python27/patches/patch-au
+4 -4
View File
@@ -1,12 +1,12 @@
$NetBSD: patch-au,v 1.6 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-au,v 1.7 2014/11/02 13:31:11 spz Exp $
Fix for unpriviliged build.
http://hg.python.org/cpython/rev/a0f43f4481e0
--- Makefile.pre.in.orig 2013-04-06 14:02:34.000000000 +0000
--- Makefile.pre.in.orig 2014-06-30 02:05:39.000000000 +0000
+++ Makefile.pre.in
@@ -489,7 +489,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
@@ -499,7 +499,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@@ -15,7 +15,7 @@ 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
@@ -879,7 +879,8 @@ altbininstall: $(BUILDPYTHON)
@@ -890,7 +890,8 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
fi \
fi; \
lang/python27/patches/patch-av
+2 -2
View File
@@ -1,9 +1,9 @@
$NetBSD: patch-av,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-av,v 1.2 2014/11/02 13:31:11 spz Exp $
Add a knob (enviroment variable) for disabling installation of egg metadata
in extensions until we have infrastructure in place for dealing w/ it.
--- Lib/distutils/command/install.py.orig 2010-05-05 19:09:31.000000000 +0000
--- Lib/distutils/command/install.py.orig 2014-06-30 02:05:25.000000000 +0000
+++ Lib/distutils/command/install.py
@@ -666,7 +666,8 @@ class install (Command):
('install_headers', has_headers),
lang/python27/patches/patch-aw
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-aw,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-aw,v 1.2 2014/11/02 13:31:11 spz Exp $
--- Modules/nismodule.c.orig 2010-08-19 09:09:04.000000000 +0000
--- Modules/nismodule.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/nismodule.c
@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
return map;
lang/python27/patches/patch-ax
+3 -3
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-ax,v 1.4 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-ax,v 1.5 2014/11/02 13:31:11 spz Exp $
chop "-RELEASE" or "-DEVELOPMENT" from release for DragonFly.
--- Lib/sysconfig.py.orig 2013-04-06 14:02:29.000000000 +0000
--- Lib/sysconfig.py.orig 2014-06-30 02:05:31.000000000 +0000
+++ Lib/sysconfig.py
@@ -559,6 +559,8 @@ def get_platform():
@@ -603,6 +603,8 @@ def get_platform():
osname, release, machine = _osx_support.get_platform_osx(
get_config_vars(),
osname, release, machine)
lang/python27/patches/patch-az
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-az,v 1.3 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-az,v 1.4 2014/11/02 13:31:11 spz Exp $
--- Modules/selectmodule.c.orig Mon Jul 25 08:09:14 2011
--- Modules/selectmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
+++ Modules/selectmodule.c
@@ -1856,7 +1856,9 @@ initselect(void)
@@ -1906,7 +1906,9 @@ initselect(void)
PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
#endif
PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL);
lang/python27/patches/patch-pyconfig.h.in
+4 -4
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-pyconfig.h.in,v 1.2 2013/04/12 09:03:41 adam Exp $
$NetBSD: patch-pyconfig.h.in,v 1.3 2014/11/02 13:31:11 spz Exp $
--- pyconfig.h.in.orig 2011-06-11 17:46:28.000000000 +0200
+++ pyconfig.h.in 2011-11-29 20:17:04.328552361 +0100
@@ -1191,7 +1191,9 @@
--- pyconfig.h.in.orig 2014-06-30 02:05:48.000000000 +0000
+++ pyconfig.h.in
@@ -1200,7 +1200,9 @@
#undef _UINT64_T
/* Define to the level of X/Open that your system supports */
lang/python27/patches/patch-xa
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-xa,v 1.1 2012/08/14 18:19:02 drochner Exp $
$NetBSD: patch-xa,v 1.2 2014/11/02 13:31:11 spz Exp $
--- Python/thread_pthread.h.orig 2012-03-30 13:06:51.000000000 +0000
--- Python/thread_pthread.h.orig 2014-06-30 02:05:47.000000000 +0000
+++ Python/thread_pthread.h
@@ -34,6 +34,9 @@
@@ -46,6 +46,9 @@
we need to add 0 to make it work there as well. */
#if (_POSIX_SEMAPHORES+0) == -1
#define HAVE_BROKEN_POSIX_SEMAPHORES