View | Details | Raw Unified | Return to bug 191405 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.python.mk (-2 / +2 lines)
Lines 381-389 Link Here
381
381
382
# Python-2.7
382
# Python-2.7
383
.elif ${PYTHON_VERSION} == "python2.7"
383
.elif ${PYTHON_VERSION} == "python2.7"
384
PYTHON_PORTVERSION?=	2.7.6
384
PYTHON_PORTVERSION?=	2.7.8
385
PYTHON_PORTSDIR=	${PORTSDIR}/lang/python27
385
PYTHON_PORTSDIR=	${PORTSDIR}/lang/python27
386
PYTHON_REL=		276
386
PYTHON_REL=		278
387
PYTHON_SUFFIX=		27
387
PYTHON_SUFFIX=		27
388
PYTHON_VER=		2.7
388
PYTHON_VER=		2.7
389
389
(-)devel/py-setuptools/Makefile (-2 / +2 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	setuptools
3
PORTNAME=	setuptools
4
PORTVERSION=	5.1
4
PORTVERSION=	5.4.1
5
CATEGORIES=	devel python
5
CATEGORIES=	devel python
6
MASTER_SITES=	CHEESESHOP
6
MASTER_SITES=	CHEESESHOP
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 17-23 Link Here
17
PLIST_SUB=	PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \
17
PLIST_SUB=	PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \
18
		EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
18
		EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
19
19
20
USE_PYTHON=	yes
20
USE_PYTHON=		yes
21
USE_PYDISTUTILS=	yes
21
USE_PYDISTUTILS=	yes
22
PYDISTUTILS_AUTOPLIST=	yes
22
PYDISTUTILS_AUTOPLIST=	yes
23
PYDISTUTILS_SETUP=	${PYSETUP}
23
PYDISTUTILS_SETUP=	${PYSETUP}
(-)devel/py-setuptools/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (python/setuptools-5.1.tar.gz) = 5855a13607cae9123df0981d814d32b5b413b7a20422f642bf3f4c355383485b
1
SHA256 (python/setuptools-5.4.1.tar.gz) = 41194dc283bd186d5a7825c16b89d88bee369a6c4c4c7494e84909933b6f63be
2
SIZE (python/setuptools-5.1.tar.gz) = 804805
2
SIZE (python/setuptools-5.4.1.tar.gz) = 782761
(-)devel/py-setuptools/files/patch-setuptools__command__install_egg_info.py (+15 lines)
Line 0 Link Here
1
# install_egg_info command includes directory entries in --record output
2
# Issue: https://bitbucket.org/pypa/setuptools/issue/118
3
# TODO: Merge upstream
4
5
--- ./setuptools/command/install_egg_info.py.orig	2014-06-22 18:00:47.547029977 +1000
6
+++ ./setuptools/command/install_egg_info.py	2014-06-22 18:01:03.507130973 +1000
7
@@ -23,7 +23,7 @@
8
         ).egg_name()+'.egg-info'
9
         self.source = ei_cmd.egg_info
10
         self.target = os.path.join(self.install_dir, basename)
11
-        self.outputs = [self.target]
12
+        self.outputs = []
13
 
14
     def run(self):
15
         self.run_command('egg_info')
(-)devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py (-11 lines)
Lines 1-11 Link Here
1
--- setuptools/command/install_egg_info.py.orig	2013-11-27 22:45:15.000000000 +0100
2
+++ setuptools/command/install_egg_info.py	2013-11-27 22:45:23.000000000 +0100
3
@@ -23,7 +23,7 @@
4
         ).egg_name()+'.egg-info'
5
         self.source = ei_cmd.egg_info
6
         self.target = os.path.join(self.install_dir, basename)
7
-        self.outputs = [self.target]
8
+        self.outputs = []
9
 
10
     def run(self):
11
         self.run_command('egg_info')
(-)lang/python27/Makefile (-65 / +26 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	python27
4
PORTNAME=	python27
5
PORTVERSION=	2.7.6
5
PORTVERSION=	2.7.8
6
PORTREVISION=	4
7
CATEGORIES=	lang python ipv6
6
CATEGORIES=	lang python ipv6
8
MASTER_SITES=	PYTHON
7
MASTER_SITES=	PYTHON
9
MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
8
MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
Lines 42-50 Link Here
42
EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
41
EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
43
DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
42
DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
44
43
45
PLATFORMS=	plat-freebsd6 plat-freebsd7 plat-freebsd8 plat-freebsd9 \
46
		plat-freebsd10 plat-freebsd11
47
48
BIN_SCRIPTS=	2to3 idle pydoc smtpd.py
44
BIN_SCRIPTS=	2to3 idle pydoc smtpd.py
49
BIN_FILES=	python python-shared python-config python-shared-config \
45
BIN_FILES=	python python-shared python-config python-shared-config \
50
		${BIN_SCRIPTS}
46
		${BIN_SCRIPTS}
Lines 53-86 Link Here
53
			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
49
			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
54
BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
50
BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
55
51
56
OPTIONS_DEFINE=		THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
52
OPTIONS_DEFINE=		EXAMPLES FPECTL IPV6 NLS PTH PYMALLOC SEM THREADS
57
OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
53
OPTIONS_DEFAULT=	IPV6 PYMALLOC SEM THREADS UCS4
58
54
59
OPTIONS_SINGLE=		UCS
55
OPTIONS_SINGLE=		UNICODE
60
OPTIONS_SINGLE_UCS=	UCS2 UCS4
56
OPTIONS_SINGLE_UNICODE=	UCS2 UCS4
61
57
62
NLS_DESC=	Enable Gettext support for the locale module
58
NLS_DESC=	Enable Gettext support for the locale module
59
UCS2_DESC=	Enable UCS2 Unicode Strings
60
UCS4_DESC=	Enable ECS4 Unicode Strings
63
61
64
.include <bsd.port.options.mk>
62
FPECTL_CONFIGURE_ON=	--with-fpectl
63
IPV6_CONFIGURE_ENABLE=	ipv6
65
64
66
.if ${PORT_OPTIONS:MNLS}
65
# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
67
USES+=		gettext
66
# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
68
CPPFLAGS+=	-I${LOCALBASE}/include
67
# Upstream Issue: http://bugs.python.org/issue6299
69
LIBS+=		-L${LOCALBASE}/lib -lintl
68
NLS_USES=		gettext
70
.else
69
NLS_CPPFLAGS=		-I${LOCALBASE}/include
71
CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
70
NLS_LIBS=		-L${LOCALBASE}/lib -lintl
72
.endif
71
NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
73
72
73
PYMALLOC_CONFIGURE_WITH=	pymalloc
74
75
SEM_CONFIGURE_ENV=	ac_cv_posix_semaphores_enabled=yes
76
SEM_CONFIGURE_ENV_OFF=	ac_cv_posix_semaphores_enabled=no
77
78
UCS2_CONFIGURE_ON=	--enable-unicode=ucs2
79
UCS4_CONFIGURE_ON=	--enable-unicode=ucs4
80
74
.include <bsd.port.pre.mk>
81
.include <bsd.port.pre.mk>
75
82
76
.if ${PORT_OPTIONS:MSEM}
77
SEM_MSG=	""
78
.else
79
SEM_MSG=	"@comment "
80
.endif
81
82
SUB_FILES=	pkg-message
83
SUB_FILES=	pkg-message
83
SUB_LIST=	SEM=${SEM_MSG}
84
84
85
.if ${PORT_OPTIONS:MTHREADS}
85
.if ${PORT_OPTIONS:MTHREADS}
86
PLIST_SUB+=	THREADS=""
86
PLIST_SUB+=	THREADS=""
Lines 103-120 Link Here
103
CONFIGURE_ARGS+=	--without-threads
103
CONFIGURE_ARGS+=	--without-threads
104
.endif
104
.endif
105
105
106
.if ${PORT_OPTIONS:MUCS4}
107
CONFIGURE_ARGS+=	--enable-unicode=ucs4
108
.endif
109
110
.if ${PORT_OPTIONS:MUCS2}
111
CONFIGURE_ARGS+=	--enable-unicode=ucs2
112
.endif
113
114
.if empty(PORT_OPTIONS:MPYMALLOC)
115
CONFIGURE_ARGS+=	--without-pymalloc
116
.endif
117
118
.if ${ARCH} == i386
106
.if ${ARCH} == i386
119
PLIST_SUB+=	X86_ONLY=""
107
PLIST_SUB+=	X86_ONLY=""
120
.else
108
.else
Lines 140-155 Link Here
140
PLIST_SUB+=	NO_NIS=""
128
PLIST_SUB+=	NO_NIS=""
141
.endif
129
.endif
142
130
143
.if ${PORT_OPTIONS:MIPV6}
144
CONFIGURE_ARGS+=	--enable-ipv6
145
.else
146
CONFIGURE_ARGS+=	--disable-ipv6
147
.endif
148
149
.if ${PORT_OPTIONS:MFPECTL}
150
CONFIGURE_ARGS+=	--with-fpectl
151
.endif
152
153
CONFIGURE_ENV+=	OPT="${_PTH_CPPFLAGS}"
131
CONFIGURE_ENV+=	OPT="${_PTH_CPPFLAGS}"
154
132
155
post-extract:
133
post-extract:
Lines 159-170 Link Here
159
	${CHMOD} -R og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
137
	${CHMOD} -R og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
160
138
161
pre-patch:
139
pre-patch:
162
	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
163
		${PATCH_WRKSRC}/Lib/plat-freebsd9
164
	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
165
		${PATCH_WRKSRC}/Lib/plat-freebsd10
166
	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
167
		${PATCH_WRKSRC}/Lib/plat-freebsd11
168
	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
140
	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
169
	${LN} ${PATCH_WRKSRC}/Lib/smtpd.py ${PATCH_WRKSRC}/Tools/scripts/
141
	${LN} ${PATCH_WRKSRC}/Lib/smtpd.py ${PATCH_WRKSRC}/Tools/scripts/
170
.for script in ${BIN_SCRIPTS}
142
.for script in ${BIN_SCRIPTS}
Lines 226-240 Link Here
226
	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
198
	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
227
	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
199
	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
228
200
229
pre-su-install:
230
.for platform in ${PLATFORMS}
231
	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}
232
.for file in IN.py regen
233
	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
234
		${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/
235
.endfor
236
.endfor
237
238
pre-install:
201
pre-install:
239
	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
202
	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
240
	/LIBDIR.*\.py$$/ && \
203
	/LIBDIR.*\.py$$/ && \
Lines 271-285 Link Here
271
.endfor
234
.endfor
272
	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
235
	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
273
		${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1
236
		${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1
274
275
.if !defined(NOPORTDATA)
276
	@${MKDIR} ${STAGEDIR}${DATADIR}
237
	@${MKDIR} ${STAGEDIR}${DATADIR}
277
	@(cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | (cd ${STAGEDIR}${DATADIR}; ${TAR} --no-same-owner -xf -))
238
	@(cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | (cd ${STAGEDIR}${DATADIR}; ${TAR} --no-same-owner -xf -))
278
.endif
279
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
239
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
280
	@(cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
240
	@(cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
281
		(cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -))
241
		(cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -))
282
242
283
	@${CAT} ${PKGMESSAGE}
243
regression-test: build
244
	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
284
245
285
.include <bsd.port.post.mk>
246
.include <bsd.port.post.mk>
(-)lang/python27/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (python/Python-2.7.6.tar.xz) = 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1
1
SHA256 (python/Python-2.7.8.tar.xz) = edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a
2
SIZE (python/Python-2.7.6.tar.xz) = 10431288
2
SIZE (python/Python-2.7.8.tar.xz) = 10525244
(-)lang/python27/files/patch-CVE-2014-1912 (-50 lines)
Lines 1-50 Link Here
1
# HG changeset patch
2
# User Benjamin Peterson <benjamin@python.org>
3
# Date 1389671978 18000
4
# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
5
# Parent  2631d33ee7fbd5f0288931ef37872218d511d2e8
6
complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
7
8
# HG changeset patch
9
# User Stefan Krah <skrah@bytereef.org>
10
# Date 1390341952 -3600
11
# Node ID b6c5a37b221f5c617125faa363d1b460b0b61b42
12
# Parent  d55d1cbf5f9a9efa7908fc9412bae676a6b675ef
13
Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts.
14
15
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
16
--- Lib/test/test_socket.py
17
+++ Lib/test/test_socket.py
18
@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest):
19
 
20
     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
21
 
22
+    def testRecvFromIntoSmallBuffer(self):
23
+        # See issue #20246.
24
+        buf = bytearray(8)
25
+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
26
+
27
+    def _testRecvFromIntoSmallBuffer(self):
28
+        with test_support.check_py3k_warnings():
29
+            buf = buffer(MSG)
30
+        self.serv_conn.send(buf)
31
+
32
 
33
 TIPC_STYPE = 2000
34
 TIPC_LOWER = 200
35
 
36
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
37
--- Modules/socketmodule.c
38
+++ Modules/socketmodule.c
39
@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
40
     if (recvlen == 0) {
41
         /* If nbytes was not specified, use the buffer's length */
42
         recvlen = buflen;
43
+    } else if (recvlen > buflen) {
44
+        PyErr_SetString(PyExc_ValueError,
45
+                        "nbytes is greater than the length of the buffer");
46
+        goto error;
47
     }
48
 
49
     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
50
(-)lang/python27/files/patch-Doc-library-fcntl.rst (-11 lines)
Lines 1-11 Link Here
1
--- Doc/library/fcntl.rst.orig	2010-08-14 16:19:09.194215129 +0800
2
+++ Doc/library/fcntl.rst	2010-08-14 16:19:36.999453016 +0800
3
@@ -50,8 +50,6 @@
4
    operations are typically defined in the library module :mod:`termios` and the
5
    argument handling is even more complicated.
6
 
7
-   The op parameter is limited to values that can fit in 32-bits.
8
-
9
    The parameter *arg* can be one of an integer, absent (treated identically to the
10
    integer ``0``), an object supporting the read-only buffer interface (most likely
11
    a plain Python string) or an object supporting the read-write buffer interface.
(-)lang/python27/files/patch-Doc__library__fcntl.rst (+10 lines)
Line 0 Link Here
1
--- ./Doc/library/fcntl.rst.orig	2014-07-03 21:53:41.473098625 +1000
2
+++ ./Doc/library/fcntl.rst	2014-07-03 21:54:04.342833056 +1000
3
@@ -50,7 +50,6 @@
4
    operations are typically defined in the library module :mod:`termios` and the
5
    argument handling is even more complicated.
6
 
7
-   The op parameter is limited to values that can fit in 32-bits.
8
    Additional constants of interest for use as the *op* argument can be
9
    found in the :mod:`termios` module, under the same names as used in
10
    the relevant C header files.
(-)lang/python27/files/patch-Modules-fcntlmodule.c (-53 lines)
Lines 1-53 Link Here
1
--- Modules/fcntlmodule.c.orig	2010-08-14 16:36:54.991363730 +0800
2
+++ Modules/fcntlmodule.c	2010-08-14 16:41:05.555822031 +0800
3
@@ -97,20 +97,15 @@
4
 {
5
 #define IOCTL_BUFSZ 1024
6
     int fd;
7
-    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
8
+    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
9
        format for the 'code' parameter because Python turns 0x8000000
10
        into either a large positive number (PyLong or PyInt on 64-bit
11
        platforms) or a negative number on others (32-bit PyInt)
12
        whereas the system expects it to be a 32bit bit field value
13
        regardless of it being passed as an int or unsigned long on
14
-       various platforms.  See the termios.TIOCSWINSZ constant across
15
-       platforms for an example of thise.
16
-
17
-       If any of the 64bit platforms ever decide to use more than 32bits
18
-       in their unsigned long ioctl codes this will break and need
19
-       special casing based on the platform being built on.
20
+       various platforms.
21
      */
22
-    unsigned int code;
23
+    unsigned long code;
24
     int arg;
25
     int ret;
26
     char *str;
27
@@ -118,7 +113,7 @@
28
     int mutate_arg = 1;
29
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
30
 
31
-    if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
32
+    if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",
33
                          conv_descriptor, &fd, &code,
34
                          &str, &len, &mutate_arg)) {
35
         char *arg;
36
@@ -169,7 +164,7 @@
37
     }
38
 
39
     PyErr_Clear();
40
-    if (PyArg_ParseTuple(args, "O&Is#:ioctl",
41
+    if (PyArg_ParseTuple(args, "O&ks#:ioctl",
42
                          conv_descriptor, &fd, &code, &str, &len)) {
43
         if (len > IOCTL_BUFSZ) {
44
             PyErr_SetString(PyExc_ValueError,
45
@@ -191,7 +186,7 @@
46
     PyErr_Clear();
47
     arg = 0;
48
     if (!PyArg_ParseTuple(args,
49
-         "O&I|i;ioctl requires a file or file descriptor,"
50
+         "O&k|i;ioctl requires a file or file descriptor,"
51
          " an integer and optionally an integer or buffer argument",
52
                           conv_descriptor, &fd, &code, &arg)) {
53
       return NULL;
(-)lang/python27/files/patch-Modules__fcntlmodule.c (+53 lines)
Line 0 Link Here
1
--- ./Modules/fcntlmodule.c.orig	2014-07-03 21:57:10.429953240 +1000
2
+++ ./Modules/fcntlmodule.c	2014-07-03 21:59:36.517210444 +1000
3
@@ -98,20 +98,15 @@
4
 {
5
 #define IOCTL_BUFSZ 1024
6
     int fd;
7
-    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
8
+    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
9
        format for the 'code' parameter because Python turns 0x8000000
10
        into either a large positive number (PyLong or PyInt on 64-bit
11
        platforms) or a negative number on others (32-bit PyInt)
12
        whereas the system expects it to be a 32bit bit field value
13
        regardless of it being passed as an int or unsigned long on
14
-       various platforms.  See the termios.TIOCSWINSZ constant across
15
-       platforms for an example of this.
16
-
17
-       If any of the 64bit platforms ever decide to use more than 32bits
18
-       in their unsigned long ioctl codes this will break and need
19
-       special casing based on the platform being built on.
20
+       various platforms.
21
      */
22
-    unsigned int code;
23
+    unsigned long code;
24
     int arg;
25
     int ret;
26
     char *str;
27
@@ -119,7 +114,7 @@
28
     int mutate_arg = 1;
29
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
30
 
31
-    if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
32
+    if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",
33
                          conv_descriptor, &fd, &code,
34
                          &str, &len, &mutate_arg)) {
35
         char *arg;
36
@@ -170,7 +165,7 @@
37
     }
38
 
39
     PyErr_Clear();
40
-    if (PyArg_ParseTuple(args, "O&Is#:ioctl",
41
+    if (PyArg_ParseTuple(args, "O&ks#:ioctl",
42
                          conv_descriptor, &fd, &code, &str, &len)) {
43
         if (len > IOCTL_BUFSZ) {
44
             PyErr_SetString(PyExc_ValueError,
45
@@ -192,7 +187,7 @@
46
     PyErr_Clear();
47
     arg = 0;
48
     if (!PyArg_ParseTuple(args,
49
-         "O&I|i;ioctl requires a file or file descriptor,"
50
+         "O&k|i;ioctl requires a file or file descriptor,"
51
          " an integer and optionally an integer or buffer argument",
52
                           conv_descriptor, &fd, &code, &arg)) {
53
       return NULL;
(-)lang/python27/files/patch-issue20374 (-55 lines)
Lines 1-55 Link Here
1
# Description: fix readline.so build with readline 6.3
2
# Patch obtained from upstream, issue #20374
3
# http://bugs.python.org/issue20374
4
# PR: ports/187174
5
6
--- ./Modules/readline.c.orig	2013-11-10 07:36:41.000000000 +0000
7
+++ ./Modules/readline.c	2014-03-01 12:40:44.000000000 +0000
8
@@ -750,14 +750,22 @@
9
 }
10
 
11
 static int
12
+#if defined(_RL_FUNCTION_TYPEDEF)
13
 on_startup_hook(void)
14
+#else
15
+on_startup_hook()
16
+#endif
17
 {
18
     return on_hook(startup_hook);
19
 }
20
 
21
 #ifdef HAVE_RL_PRE_INPUT_HOOK
22
 static int
23
+#if defined(_RL_FUNCTION_TYPEDEF)
24
 on_pre_input_hook(void)
25
+#else
26
+on_pre_input_hook()
27
+#endif
28
 {
29
     return on_hook(pre_input_hook);
30
 }
31
@@ -852,7 +860,7 @@
32
  * before calling the normal completer */
33
 
34
 static char **
35
-flex_complete(char *text, int start, int end)
36
+flex_complete(const char *text, int start, int end)
37
 {
38
 #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
39
     rl_completion_append_character ='\0';
40
@@ -911,12 +919,12 @@
41
     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
42
     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
43
     /* Set our hook functions */
44
-    rl_startup_hook = (Function *)on_startup_hook;
45
+    rl_startup_hook = on_startup_hook;
46
 #ifdef HAVE_RL_PRE_INPUT_HOOK
47
-    rl_pre_input_hook = (Function *)on_pre_input_hook;
48
+    rl_pre_input_hook = on_pre_input_hook;
49
 #endif
50
     /* Set our completion function */
51
-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
52
+    rl_attempted_completion_function = flex_complete;
53
     /* Set Python word break characters */
54
     completer_word_break_characters =
55
         rl_completer_word_break_characters =
(-)lang/python27/files/patch-setup.py (-51 / +15 lines)
Lines 1-5 Link Here
1
--- setup.py.orig	2013-04-06 18:02:41.000000000 +0400
1
--- ./setup.py.orig	2014-07-04 18:02:21.711919294 +1000
2
+++ setup.py	2013-04-07 10:52:47.000000000 +0400
2
+++ ./setup.py	2014-07-04 18:11:14.642091269 +1000
3
@@ -33,7 +33,7 @@
3
@@ -33,7 +33,7 @@
4
 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
4
 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
5
 
5
 
Lines 9-33 Link Here
9
 
9
 
10
 def add_dir_to_list(dirlist, dir):
10
 def add_dir_to_list(dirlist, dir):
11
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
11
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
12
@@ -720,7 +720,7 @@
12
@@ -867,6 +867,8 @@
13
         # use the same library for the readline and curses modules.
14
         if 'curses' in readline_termcap_library:
15
             curses_library = readline_termcap_library
16
-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
17
+        elif self.compiler.find_library_file(lib_dirs, 'xxxncursesw'):
18
             curses_library = 'ncursesw'
19
         elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
20
             curses_library = 'ncurses'
21
@@ -755,7 +755,7 @@
22
             elif curses_library:
23
                 readline_libs.append(curses_library)
24
             elif self.compiler.find_library_file(lib_dirs +
25
-                                                     ['/usr/lib/termcap'],
26
+                                                     ['/usr/lib', '/usr/lib/termcap'],
27
                                                      'termcap'):
28
                 readline_libs.append('termcap')
29
             exts.append( Extension('readline', ['readline.c'],
30
@@ -862,6 +862,8 @@
31
             # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
13
             # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
32
             exts.append( Extension('_sha256', ['sha256module.c']) )
14
             exts.append( Extension('_sha256', ['sha256module.c']) )
33
             exts.append( Extension('_sha512', ['sha512module.c']) )
15
             exts.append( Extension('_sha512', ['sha512module.c']) )
Lines 36-42 Link Here
36
 
18
 
37
         # Modules that provide persistent dictionary-like semantics.  You will
19
         # Modules that provide persistent dictionary-like semantics.  You will
38
         # probably want to arrange for at least one of them to be available on
20
         # probably want to arrange for at least one of them to be available on
39
@@ -1208,7 +1210,7 @@
21
@@ -1212,7 +1214,7 @@
40
                 sysroot = macosx_sdk_root()
22
                 sysroot = macosx_sdk_root()
41
                 f = os.path.join(sysroot, f[1:])
23
                 f = os.path.join(sysroot, f[1:])
42
 
24
 
Lines 45-74 Link Here
45
             data = open(f).read()
27
             data = open(f).read()
46
             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
28
             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
47
             if m is not None:
29
             if m is not None:
48
@@ -1338,12 +1340,13 @@
30
@@ -1551,7 +1553,7 @@
49
         # provided by the ncurses library.
50
         panel_library = 'panel'
51
         if curses_library.startswith('ncurses'):
52
-            if curses_library == 'ncursesw':
53
+            if curses_library == 'xxxncursesw':
54
                 # Bug 1464056: If _curses.so links with ncursesw,
55
                 # _curses_panel.so must link with panelw.
56
                 panel_library = 'panelw'
57
             curses_libs = [curses_library]
58
             exts.append( Extension('_curses', ['_cursesmodule.c'],
59
+                                   library_dirs = ['/usr/lib'],
60
                                    libraries = curses_libs) )
61
         elif curses_library == 'curses' and host_platform != 'darwin':
62
                 # OSX has an old Berkeley curses, not good enough for
63
@@ -1356,6 +1359,7 @@
64
                 curses_libs = ['curses']
65
 
66
             exts.append( Extension('_curses', ['_cursesmodule.c'],
67
+                                   library_dirs = ['/usr/lib'],
68
                                    libraries = curses_libs) )
69
         else:
70
             missing.append('_curses')
71
@@ -1540,7 +1544,7 @@
72
             macros = dict()
31
             macros = dict()
73
             libraries = []
32
             libraries = []
74
 
33
 
Lines 77-92 Link Here
77
             # FreeBSD's P1003.1b semaphore support is very experimental
36
             # FreeBSD's P1003.1b semaphore support is very experimental
78
             # and has many known problems. (as of June 2008)
37
             # and has many known problems. (as of June 2008)
79
             macros = dict()
38
             macros = dict()
80
@@ -1592,7 +1596,7 @@
39
@@ -1602,9 +1604,10 @@
40
         else:
81
             missing.append('linuxaudiodev')
41
             missing.append('linuxaudiodev')
82
 
42
 
83
         if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
43
-        if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
84
-                        'freebsd7', 'freebsd8')
44
-                        'freebsd7', 'freebsd8')
85
+                        'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11')
45
-            or host_platform.startswith("gnukfreebsd")):
86
             or host_platform.startswith("gnukfreebsd")):
46
+# Initial backport of http://hg.python.org/cpython/rev/50f1922bc1d5
47
+
48
+        if any(sys.platform.startswith(prefix)
49
+               for prefix in ("linux", "freebsd", "gnukfreebsd")):
87
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
50
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
88
         else:
51
         else:
89
@@ -2176,9 +2180,7 @@
52
             missing.append('ossaudiodev')
53
@@ -2228,9 +2231,7 @@
90
           ext_modules=[Extension('_struct', ['_struct.c'])],
54
           ext_modules=[Extension('_struct', ['_struct.c'])],
91
 
55
 
92
           # Scripts to install
56
           # Scripts to install
(-)lang/python27/files/pkg-message.in (-13 / +4 lines)
Lines 1-18 Link Here
1
====
1
=====================================================================
2
Note that some of the standard modules are provided as separate
2
Note that some standard Python modules are provided as separate ports
3
ports since they require extra dependencies:
3
as they require additional dependencies. They are available as:
4
4
5
bsddb           databases/py-bsddb
5
bsddb           databases/py-bsddb
6
gdbm            databases/py-gdbm
6
gdbm            databases/py-gdbm
7
sqlite3         databases/py-sqlite3
7
sqlite3         databases/py-sqlite3
8
tkinter         x11-toolkits/py-tkinter
8
tkinter         x11-toolkits/py-tkinter
9
9
=====================================================================
10
Install them as needed.
11
====
12
%%SEM%%--------------------------------------------------------
13
%%SEM%%This package was built with the experimental POSIX
14
%%SEM%%semaphore support. Please ensure that the kernel on the
15
%%SEM%%system where you deploy this package is either compiled
16
%%SEM%%with 'options P1003_1B_SEMAPHORES', or has the sem.ko
17
%%SEM%%kernel module loaded.
18
%%SEM%%--------------------------------------------------------
(-)lang/python27/pkg-plist (-20 / +52 lines)
Lines 238-244 Link Here
238
%%PYTHON_LIBDIR%%/ctypes/test/test_cfuncs.py
238
%%PYTHON_LIBDIR%%/ctypes/test/test_cfuncs.py
239
%%PYTHON_LIBDIR%%/ctypes/test/test_checkretval.py
239
%%PYTHON_LIBDIR%%/ctypes/test/test_checkretval.py
240
%%PYTHON_LIBDIR%%/ctypes/test/test_delattr.py
240
%%PYTHON_LIBDIR%%/ctypes/test/test_delattr.py
241
%%PYTHON_LIBDIR%%/ctypes/test/test_errcheck.py
242
%%PYTHON_LIBDIR%%/ctypes/test/test_errno.py
241
%%PYTHON_LIBDIR%%/ctypes/test/test_errno.py
243
%%PYTHON_LIBDIR%%/ctypes/test/test_find.py
242
%%PYTHON_LIBDIR%%/ctypes/test/test_find.py
244
%%PYTHON_LIBDIR%%/ctypes/test/test_frombuffer.py
243
%%PYTHON_LIBDIR%%/ctypes/test/test_frombuffer.py
Lines 246-252 Link Here
246
%%PYTHON_LIBDIR%%/ctypes/test/test_functions.py
245
%%PYTHON_LIBDIR%%/ctypes/test/test_functions.py
247
%%PYTHON_LIBDIR%%/ctypes/test/test_incomplete.py
246
%%PYTHON_LIBDIR%%/ctypes/test/test_incomplete.py
248
%%PYTHON_LIBDIR%%/ctypes/test/test_init.py
247
%%PYTHON_LIBDIR%%/ctypes/test/test_init.py
249
%%PYTHON_LIBDIR%%/ctypes/test/test_integers.py
250
%%PYTHON_LIBDIR%%/ctypes/test/test_internals.py
248
%%PYTHON_LIBDIR%%/ctypes/test/test_internals.py
251
%%PYTHON_LIBDIR%%/ctypes/test/test_keeprefs.py
249
%%PYTHON_LIBDIR%%/ctypes/test/test_keeprefs.py
252
%%PYTHON_LIBDIR%%/ctypes/test/test_libc.py
250
%%PYTHON_LIBDIR%%/ctypes/test/test_libc.py
Lines 640-645 Link Here
640
%%PYTHON_LIBDIR%%/idlelib/HISTORY.txt
638
%%PYTHON_LIBDIR%%/idlelib/HISTORY.txt
641
%%PYTHON_LIBDIR%%/idlelib/HyperParser.py
639
%%PYTHON_LIBDIR%%/idlelib/HyperParser.py
642
%%PYTHON_LIBDIR%%/idlelib/IOBinding.py
640
%%PYTHON_LIBDIR%%/idlelib/IOBinding.py
641
%%PYTHON_LIBDIR%%/idlelib/Icons/idle.ico
642
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.gif
643
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.png
644
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.gif
645
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.png
646
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.gif
647
%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.png
643
%%PYTHON_LIBDIR%%/idlelib/Icons/folder.gif
648
%%PYTHON_LIBDIR%%/idlelib/Icons/folder.gif
644
%%PYTHON_LIBDIR%%/idlelib/Icons/idle.icns
649
%%PYTHON_LIBDIR%%/idlelib/Icons/idle.icns
645
%%PYTHON_LIBDIR%%/idlelib/Icons/minusnode.gif
650
%%PYTHON_LIBDIR%%/idlelib/Icons/minusnode.gif
Lines 692-697 Link Here
692
%%PYTHON_LIBDIR%%/idlelib/idle.bat
697
%%PYTHON_LIBDIR%%/idlelib/idle.bat
693
%%PYTHON_LIBDIR%%/idlelib/idle.py
698
%%PYTHON_LIBDIR%%/idlelib/idle.py
694
%%PYTHON_LIBDIR%%/idlelib/idle.pyw
699
%%PYTHON_LIBDIR%%/idlelib/idle.pyw
700
%%PYTHON_LIBDIR%%/idlelib/idle_test/README.txt
701
%%PYTHON_LIBDIR%%/idlelib/idle_test/__init__.py
702
%%PYTHON_LIBDIR%%/idlelib/idle_test/htest.py
703
%%PYTHON_LIBDIR%%/idlelib/idle_test/mock_idle.py
704
%%PYTHON_LIBDIR%%/idlelib/idle_test/mock_tk.py
705
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_autocomplete.py
706
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_autoexpand.py
707
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_calltips.py
708
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_config_name.py
709
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_delegator.py
710
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_formatparagraph.py
711
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_grep.py
712
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_hyperparser.py
713
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_idlehistory.py
714
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_parenmatch.py
715
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_pathbrowser.py
716
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_rstrip.py
717
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_searchengine.py
718
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_text.py
719
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_textview.py
720
%%PYTHON_LIBDIR%%/idlelib/idle_test/test_warning.py
695
%%PYTHON_LIBDIR%%/idlelib/idlever.py
721
%%PYTHON_LIBDIR%%/idlelib/idlever.py
696
%%PYTHON_LIBDIR%%/idlelib/keybindingDialog.py
722
%%PYTHON_LIBDIR%%/idlelib/keybindingDialog.py
697
%%PYTHON_LIBDIR%%/idlelib/macosxSupport.py
723
%%PYTHON_LIBDIR%%/idlelib/macosxSupport.py
Lines 911-919 Link Here
911
%%PYTHON_LIBDIR%%/lib-tk/Tkinter.py
937
%%PYTHON_LIBDIR%%/lib-tk/Tkinter.py
912
%%PYTHON_LIBDIR%%/lib-tk/test/README
938
%%PYTHON_LIBDIR%%/lib-tk/test/README
913
%%PYTHON_LIBDIR%%/lib-tk/test/runtktests.py
939
%%PYTHON_LIBDIR%%/lib-tk/test/runtktests.py
940
%%PYTHON_LIBDIR%%/lib-tk/test/widget_tests.py
914
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/__init__.py
941
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/__init__.py
942
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_geometry_managers.py
943
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_images.py
915
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.py
944
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.py
916
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_text.py
945
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_text.py
946
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_variables.py
947
%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_widgets.py
917
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/__init__.py
948
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/__init__.py
918
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/support.py
949
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/support.py
919
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_extensions.py
950
%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_extensions.py
Lines 976-993 Link Here
976
%%PYTHON_LIBDIR%%/pickletools.py
1007
%%PYTHON_LIBDIR%%/pickletools.py
977
%%PYTHON_LIBDIR%%/pipes.py
1008
%%PYTHON_LIBDIR%%/pipes.py
978
%%PYTHON_LIBDIR%%/pkgutil.py
1009
%%PYTHON_LIBDIR%%/pkgutil.py
979
%%PYTHON_LIBDIR%%/plat-freebsd6/IN.py
1010
%%PYTHON_LIBDIR%%/plat-%%PYTHON_PLATFORM%%/IN.py
980
%%PYTHON_LIBDIR%%/plat-freebsd6/regen
1011
%%PYTHON_LIBDIR%%/plat-%%PYTHON_PLATFORM%%/regen
981
%%PYTHON_LIBDIR%%/plat-freebsd7/IN.py
982
%%PYTHON_LIBDIR%%/plat-freebsd7/regen
983
%%PYTHON_LIBDIR%%/plat-freebsd8/IN.py
984
%%PYTHON_LIBDIR%%/plat-freebsd8/regen
985
%%PYTHON_LIBDIR%%/plat-freebsd9/IN.py
986
%%PYTHON_LIBDIR%%/plat-freebsd9/regen
987
%%PYTHON_LIBDIR%%/plat-freebsd10/IN.py
988
%%PYTHON_LIBDIR%%/plat-freebsd10/regen
989
%%PYTHON_LIBDIR%%/plat-freebsd11/IN.py
990
%%PYTHON_LIBDIR%%/plat-freebsd11/regen
991
%%PYTHON_LIBDIR%%/platform.py
1012
%%PYTHON_LIBDIR%%/platform.py
992
%%PYTHON_LIBDIR%%/plistlib.py
1013
%%PYTHON_LIBDIR%%/plistlib.py
993
%%PYTHON_LIBDIR%%/popen2.py
1014
%%PYTHON_LIBDIR%%/popen2.py
Lines 1080-1085 Link Here
1080
%%PYTHON_LIBDIR%%/test/autotest.py
1101
%%PYTHON_LIBDIR%%/test/autotest.py
1081
%%PYTHON_LIBDIR%%/test/bad_coding.py
1102
%%PYTHON_LIBDIR%%/test/bad_coding.py
1082
%%PYTHON_LIBDIR%%/test/bad_coding2.py
1103
%%PYTHON_LIBDIR%%/test/bad_coding2.py
1104
%%PYTHON_LIBDIR%%/test/bad_coding3.py
1083
%%PYTHON_LIBDIR%%/test/badcert.pem
1105
%%PYTHON_LIBDIR%%/test/badcert.pem
1084
%%PYTHON_LIBDIR%%/test/badkey.pem
1106
%%PYTHON_LIBDIR%%/test/badkey.pem
1085
%%PYTHON_LIBDIR%%/test/badsyntax_future3.py
1107
%%PYTHON_LIBDIR%%/test/badsyntax_future3.py
Lines 1281-1286 Link Here
1281
%%PYTHON_LIBDIR%%/test/greyrgb.uue
1303
%%PYTHON_LIBDIR%%/test/greyrgb.uue
1282
%%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem
1304
%%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem
1283
%%PYTHON_LIBDIR%%/test/ieee754.txt
1305
%%PYTHON_LIBDIR%%/test/ieee754.txt
1306
%%PYTHON_LIBDIR%%/test/imghdrdata/python.bmp
1307
%%PYTHON_LIBDIR%%/test/imghdrdata/python.gif
1308
%%PYTHON_LIBDIR%%/test/imghdrdata/python.jpg
1309
%%PYTHON_LIBDIR%%/test/imghdrdata/python.pbm
1310
%%PYTHON_LIBDIR%%/test/imghdrdata/python.pgm
1311
%%PYTHON_LIBDIR%%/test/imghdrdata/python.png
1312
%%PYTHON_LIBDIR%%/test/imghdrdata/python.ppm
1313
%%PYTHON_LIBDIR%%/test/imghdrdata/python.ras
1314
%%PYTHON_LIBDIR%%/test/imghdrdata/python.sgi
1315
%%PYTHON_LIBDIR%%/test/imghdrdata/python.tiff
1316
%%PYTHON_LIBDIR%%/test/imghdrdata/python.xbm
1284
%%PYTHON_LIBDIR%%/test/infinite_reload.py
1317
%%PYTHON_LIBDIR%%/test/infinite_reload.py
1285
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
1318
%%PYTHON_LIBDIR%%/test/inspect_fodder.py
1286
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
1319
%%PYTHON_LIBDIR%%/test/inspect_fodder2.py
Lines 1498-1503 Link Here
1498
%%PYTHON_LIBDIR%%/test/test_imageop.py
1531
%%PYTHON_LIBDIR%%/test/test_imageop.py
1499
%%PYTHON_LIBDIR%%/test/test_imaplib.py
1532
%%PYTHON_LIBDIR%%/test/test_imaplib.py
1500
%%PYTHON_LIBDIR%%/test/test_imgfile.py
1533
%%PYTHON_LIBDIR%%/test/test_imgfile.py
1534
%%PYTHON_LIBDIR%%/test/test_imghdr.py
1501
%%PYTHON_LIBDIR%%/test/test_imp.py
1535
%%PYTHON_LIBDIR%%/test/test_imp.py
1502
%%PYTHON_LIBDIR%%/test/test_import.py
1536
%%PYTHON_LIBDIR%%/test/test_import.py
1503
%%PYTHON_LIBDIR%%/test/test_importhooks.py
1537
%%PYTHON_LIBDIR%%/test/test_importhooks.py
Lines 1629-1634 Link Here
1629
%%PYTHON_LIBDIR%%/test/test_socketserver.py
1663
%%PYTHON_LIBDIR%%/test/test_socketserver.py
1630
%%PYTHON_LIBDIR%%/test/test_softspace.py
1664
%%PYTHON_LIBDIR%%/test/test_softspace.py
1631
%%PYTHON_LIBDIR%%/test/test_sort.py
1665
%%PYTHON_LIBDIR%%/test/test_sort.py
1666
%%PYTHON_LIBDIR%%/test/test_spwd.py
1632
%%PYTHON_LIBDIR%%/test/test_sqlite.py
1667
%%PYTHON_LIBDIR%%/test/test_sqlite.py
1633
%%PYTHON_LIBDIR%%/test/test_ssl.py
1668
%%PYTHON_LIBDIR%%/test/test_ssl.py
1634
%%PYTHON_LIBDIR%%/test/test_startfile.py
1669
%%PYTHON_LIBDIR%%/test/test_startfile.py
Lines 2393-2398 Link Here
2393
@dirrm %%PYTHON_LIBDIR%%/test/cjkencodings
2428
@dirrm %%PYTHON_LIBDIR%%/test/cjkencodings
2394
@dirrm %%PYTHON_LIBDIR%%/test/data
2429
@dirrm %%PYTHON_LIBDIR%%/test/data
2395
@dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
2430
@dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
2431
@dirrm %%PYTHON_LIBDIR%%/test/imghdrdata
2396
@dirrm %%PYTHON_LIBDIR%%/test/subprocessdata
2432
@dirrm %%PYTHON_LIBDIR%%/test/subprocessdata
2397
@dirrm %%PYTHON_LIBDIR%%/test/tracedmodules
2433
@dirrm %%PYTHON_LIBDIR%%/test/tracedmodules
2398
@dirrm %%PYTHON_LIBDIR%%/test/xmltestdata
2434
@dirrm %%PYTHON_LIBDIR%%/test/xmltestdata
Lines 2401-2412 Link Here
2401
@dirrm %%PYTHON_LIBDIR%%/sqlite3
2437
@dirrm %%PYTHON_LIBDIR%%/sqlite3
2402
@dirrm %%PYTHON_LIBDIR%%/site-packages
2438
@dirrm %%PYTHON_LIBDIR%%/site-packages
2403
@dirrm %%PYTHON_LIBDIR%%/pydoc_data
2439
@dirrm %%PYTHON_LIBDIR%%/pydoc_data
2404
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd11
2440
@dirrm %%PYTHON_LIBDIR%%/plat-%%PYTHON_PLATFORM%%
2405
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd10
2406
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
2407
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
2408
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd7
2409
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd6
2410
@dirrm %%PYTHON_LIBDIR%%/multiprocessing/dummy
2441
@dirrm %%PYTHON_LIBDIR%%/multiprocessing/dummy
2411
@dirrm %%PYTHON_LIBDIR%%/multiprocessing
2442
@dirrm %%PYTHON_LIBDIR%%/multiprocessing
2412
@dirrm %%PYTHON_LIBDIR%%/logging
2443
@dirrm %%PYTHON_LIBDIR%%/logging
Lines 2425-2430 Link Here
2425
@dirrm %%PYTHON_LIBDIR%%/importlib
2456
@dirrm %%PYTHON_LIBDIR%%/importlib
2426
@dirrm %%PYTHON_LIBDIR%%/json/tests
2457
@dirrm %%PYTHON_LIBDIR%%/json/tests
2427
@dirrm %%PYTHON_LIBDIR%%/json
2458
@dirrm %%PYTHON_LIBDIR%%/json
2459
@dirrm %%PYTHON_LIBDIR%%/idlelib/idle_test
2428
@dirrm %%PYTHON_LIBDIR%%/idlelib/Icons
2460
@dirrm %%PYTHON_LIBDIR%%/idlelib/Icons
2429
@dirrm %%PYTHON_LIBDIR%%/idlelib
2461
@dirrm %%PYTHON_LIBDIR%%/idlelib
2430
@dirrm %%PYTHON_LIBDIR%%/hotshot
2462
@dirrm %%PYTHON_LIBDIR%%/hotshot

Return to bug 191405