- Update to 1.8

- Add fix for CVE-2012-0845

PR:		ports/165026
Submitted by:	David Naylor <naylor.b.david@gmail.com> (maintainer)

6 files changed, 88 insertions, 161 deletions

diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index d8f08506caf9..fcefc0cb4f4e 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pypy
-DISTVERSION=	1.7
+DISTVERSION=	1.8
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/
 DISTNAME=	release-${DISTVERSION}
@@ -29,7 +29,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-WRKSRC=		${WRKDIR}/pypy-pypy-release-${DISTVERSION}
+WRKSRC=		${WRKDIR}/pypy-pypy-2346207d9946
 
 PYPYDIRS=	include lib-python lib_pypy site-packages
 PYPYPREFIX?=	${PREFIX}/${PORTNAME}-${DISTVERSION}
@@ -65,7 +65,11 @@ WITH_BOEHM_GC=	yes
 # Use pypy if it is installed, else use python (to translate)
 .if !defined(PY)
 .if !defined(PYPY)
+.if ${PYPY_PRIMARY} == pypy
 PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || true
+.else
+PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || ${WHICH} pypy 2> /dev/null || true
+.endif
 .endif
 .if exists(${PYPY})
 PY=		${PYPY}
@@ -136,6 +140,9 @@ pre-fetch:
 	@${ECHO} "however an average machine takes in excess of 4 hours, per instance."
 	@sleep 1
 
+post-patch:
+	@${RM} -f ${WRKSRC}/lib-python/2.7/SimpleXMLRPCServer.py.orig
+
 do-configure:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%PYPYPREFIX%%|${PYPYPREFIX}|g' \
@@ -146,8 +153,8 @@ do-configure:
 	${ECHO} "all: ${PYPY_NAMES}" > ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 .for inst in ${PYPY_INST}
-	${ECHO} "${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c" >> ${WRKDIR}/Makefile
-	${ECHO} "	${CP} build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c ${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
+	${ECHO} "${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c" >> ${WRKDIR}/Makefile
+	${ECHO} "	${CP} build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c ${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 	${ECHO} ".done_translate_${PYPY_${inst}_NAME}:" >> ${WRKDIR}/Makefile
 	${ECHO} "	${RM} -rf build_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
@@ -158,9 +165,9 @@ do-configure:
 					targetpypystandalone.py ${PYPY_${inst}_OBJSPACE_ARGS} )" >> ${WRKDIR}/Makefile
 	${ECHO} "	${TOUCH} .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
-	${ECHO} "build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
-	${ECHO} "	${REINPLACE_CMD} -e 's|^%.o: %.c\$$\$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/Makefile" >> ${WRKDIR}/Makefile
-	${ECHO} "	${MAKE} -C build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1 pypy-c" >> ${WRKDIR}/Makefile
+	${ECHO} "build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
+	${ECHO} "	${REINPLACE_CMD} -e 's|^%.o: %.c\$$\$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/Makefile" >> ${WRKDIR}/Makefile
+	${ECHO} "	${MAKE} -C build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1 pypy-c" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 .endfor
 
@@ -172,8 +179,8 @@ do-install:
 .for dir in ${PYPYDIRS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${PYPYPREFIX}
 .endfor
-.for file in LICENSE README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PYPYPREFIX}/${file}
+.for f in LICENSE README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PYPYPREFIX}/${f}
 .endfor
 .for name in ${PYPY_NAMES:O}
 	${INSTALL_PROGRAM} ${WRKDIR}/${name} ${PYPYPREFIX}/bin/${name}
@@ -201,8 +208,8 @@ pkg-plist: build
 	cd ${WRKSRC} && ${FIND} ${dir} -type f >> ${WRKDIR}/.plist-files-gen
 	cd ${WRKSRC} && ${FIND} ${dir} -type d >> ${WRKDIR}/.plist-dirs-gen
 .endfor
-.for file in LICENSE README
-	${ECHO} ${file} >> ${WRKDIR}/.plist-files-gen
+.for f in LICENSE README
+	${ECHO} ${f} >> ${WRKDIR}/.plist-files-gen
 .endfor
 	${ECHO} 'bin' >> ${WRKDIR}/.plist-dirs-gen
 	${REINPLACE_CMD} -e 's|^|%%PYPYPREFIX%%/|g' -e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|g' ${WRKDIR}/.plist-files-gen
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 7258552fc7f4..386e2941d38d 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pypy/release-1.7.tar.bz2) = 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
-SIZE (pypy/release-1.7.tar.bz2) = 14842336
+SHA256 (pypy/release-1.8.tar.bz2) = ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
+SIZE (pypy/release-1.8.tar.bz2) = 14927806
diff --git a/lang/pypy/files/bsd.pypy.inst.mk b/lang/pypy/files/bsd.pypy.inst.mk
index a566a9f4175b..56255fd63735 100644
--- a/lang/pypy/files/bsd.pypy.inst.mk
+++ b/lang/pypy/files/bsd.pypy.inst.mk
@@ -3,7 +3,7 @@
 # options available.  --gcrootfinder=asmgcc does not work under FreeBSD/amd64.
 
 PYPY_DEFAULT_NAME?=		pypy
-PYPY_DEFAULT_TRANSLATE_ARGS?=	--thread
+PYPY_DEFAULT_TRANSLATE_ARGS?=
 PYPY_DEFAULT_OPT?=		jit
 PYPY_DEFAULT_OBJSPACE_ARGS?=
 
diff --git a/lang/pypy/files/patch-CVE-2012-0845 b/lang/pypy/files/patch-CVE-2012-0845
new file mode 100644
index 000000000000..8d8f4c6af19c
--- /dev/null
+++ b/lang/pypy/files/patch-CVE-2012-0845
@@ -0,0 +1,14 @@
+--- lib-python/2.7/SimpleXMLRPCServer.py.orig	2012-02-19 02:22:59.736459292 +0800
++++ lib-python/2.7/SimpleXMLRPCServer.py	2012-02-19 02:24:04.434444259 +0800
+@@ -486,7 +486,10 @@
+             L = []
+             while size_remaining:
+                 chunk_size = min(size_remaining, max_chunk_size)
+-                L.append(self.rfile.read(chunk_size))
++                chunk = self.rfile.read(chunk_size)
++                if not chunk:
++                    break
++                L.append(chunk)
+                 size_remaining -= len(L[-1])
+             data = ''.join(L)
+ 
diff --git a/lang/pypy/files/patch-pypy__translator__platform__freebsd.py b/lang/pypy/files/patch-pypy__translator__platform__freebsd.py
deleted file mode 100644
index 8e1db3074d82..000000000000
--- a/lang/pypy/files/patch-pypy__translator__platform__freebsd.py
+++ /dev/null
@@ -1,34 +0,0 @@
---- pypy/translator/platform/freebsd.py	2011-08-15 17:10:35.000000000 +0200
-+++ pypy/translator/platform/freebsd.py	2011-10-05 20:49:51.000000000 +0200
-@@ -1,6 +1,7 @@
- """Support for FreeBSD."""
- 
- import os
-+import shlex
- 
- from pypy.translator.platform import posix
- 
-@@ -10,16 +11,18 @@
-     else:
-         return default
- 
--def get_env_vector(key, default):
-+def get_env_vector(key, default, required=()):
-     string = get_env(key, default)
--    # XXX: handle quotes
--    return string.split()
-+    args = shlex.split(string)
-+    args.extend(i for i in required if i not in args)
-+    return args
- 
- class Freebsd(posix.BasePosix):
-     name = "freebsd"
- 
--    link_flags = get_env_vector("LDFLAGS", '-pthread')
--    cflags = get_env_vector("CFLAGS", "-O3 -pthread -fomit-frame-pointer")
-+    # FreeBSD requires '-pthread' to be passed for successful compiling
-+    link_flags = get_env_vector("LDFLAGS", "", ("-pthread",))
-+    cflags = get_env_vector("CFLAGS", "-O3 -fomit-frame-pointer", ("-pthread",))
-     standalone_only = []
-     shared_only = []
-     so_ext = 'so'
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index ec6b4b2a2578..02c1efe98495 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -1252,6 +1252,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/PatternGrammar.txt
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/__init__.py
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/__init__.pyc
+%%PYPYPREFIX%%/lib-python/2.7/lib2to3/__main__.py
+%%PYPYPREFIX%%/lib-python/2.7/lib2to3/__main__.pyc
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_matcher.py
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_matcher.pyc
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_utils.py
@@ -2182,8 +2184,32 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/buffer_tests.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/cfgparser.1
 %%PYPYPREFIX%%/lib-python/2.7/test/check_soundcard.vbs
-%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings_test.py
-%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings_test.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5hkscs-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5hkscs.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/cp949-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/cp949.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jisx0213-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jisx0213.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jp-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jp.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_kr-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_kr.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb18030-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb18030.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb2312-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb2312.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gbk-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gbk.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/hz-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/hz.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/johab-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/johab.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jis-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jis.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jisx0213-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jisx0213.txt
 %%PYPYPREFIX%%/lib-python/2.7/test/cmath_testcases.txt
 %%PYPYPREFIX%%/lib-python/2.7/test/crashers/README
 %%PYPYPREFIX%%/lib-python/2.7/test/crashers/bogus_code_obj.py
@@ -2438,6 +2464,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/ssl_key.pem
 %%PYPYPREFIX%%/lib-python/2.7/test/string_tests.py
 %%PYPYPREFIX%%/lib-python/2.7/test/string_tests.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata/sigchild_ignore.py
+%%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata/sigchild_ignore.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/svn_python_org_https_cert.pem
 %%PYPYPREFIX%%/lib-python/2.7/test/test_MimeWriter.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_MimeWriter.pyc
@@ -2872,6 +2900,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/test_module.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_modulefinder.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_modulefinder.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/test_msilib.py
+%%PYPYPREFIX%%/lib-python/2.7/test/test_msilib.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec_support.py
@@ -3743,113 +3773,6 @@
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/version.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/versionpredicate.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/versionpredicate.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/_parseaddr.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/_parseaddr.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/base64mime.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/base64mime.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/charset.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/charset.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/encoders.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/encoders.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/errors.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/errors.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/feedparser.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/feedparser.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/generator.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/generator.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/header.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/header.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/iterators.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/iterators.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/message.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/message.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/application.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/application.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/audio.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/audio.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/base.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/base.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/image.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/image.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/message.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/message.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/multipart.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/multipart.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/nonmultipart.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/nonmultipart.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/text.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/text.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/parser.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/parser.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/quoprimime.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/quoprimime.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/PyBanner048.gif
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/audiotest.au
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_01.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_02.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_03.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_04.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_05.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_06.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_07.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_08.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_09.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_10.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_11.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_12.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_12a.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_13.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_14.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_15.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_16.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_17.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_18.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_19.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_20.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_21.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_22.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_23.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_24.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_25.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_26.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_27.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_28.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_29.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_30.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_31.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_32.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_33.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_34.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_35.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_36.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_37.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_38.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_39.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_40.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_41.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_42.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_43.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_44.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_45.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_46.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs_renamed.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs_renamed.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_renamed.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_renamed.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_torture.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_torture.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/utils.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/utils.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/heapq.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/heapq.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/httplib.py
@@ -4469,6 +4392,8 @@
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_sort.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_ssl.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_ssl.pyc
+%%PYPYPREFIX%%/lib-python/modified-2.7/test/test_str.py
+%%PYPYPREFIX%%/lib-python/modified-2.7/test/test_str.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_struct.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_struct.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_subprocess.py
@@ -4677,6 +4602,7 @@
 %%PYPYPREFIX%%/lib_pypy/distributed/protocol.py
 %%PYPYPREFIX%%/lib_pypy/distributed/protocol.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/socklayer.py
+%%PYPYPREFIX%%/lib_pypy/distributed/socklayer.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/support.py
 %%PYPYPREFIX%%/lib_pypy/distributed/support.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/test/__init__.py
@@ -4701,6 +4627,20 @@
 %%PYPYPREFIX%%/lib_pypy/marshal.pyc
 %%PYPYPREFIX%%/lib_pypy/msvcrt.py
 %%PYPYPREFIX%%/lib_pypy/msvcrt.pyc
+%%PYPYPREFIX%%/lib_pypy/numpy.py
+%%PYPYPREFIX%%/lib_pypy/numpy.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/__init__.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/__init__.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/__init__.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/__init__.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/_methods.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/_methods.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/arrayprint.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/arrayprint.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/fromnumeric.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/fromnumeric.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/numeric.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/numeric.pyc
 %%PYPYPREFIX%%/lib_pypy/pwd.py
 %%PYPYPREFIX%%/lib_pypy/pwd.pyc
 %%PYPYPREFIX%%/lib_pypy/pyexpat.py
@@ -4840,6 +4780,8 @@
 @dirrm %%PYPYPREFIX%%/lib_pypy/pyrepl/test
 @dirrm %%PYPYPREFIX%%/lib_pypy/pyrepl
 @dirrm %%PYPYPREFIX%%/lib_pypy/pypy_test
+@dirrm %%PYPYPREFIX%%/lib_pypy/numpypy/core
+@dirrm %%PYPYPREFIX%%/lib_pypy/numpypy
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed/test
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed/demo
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed
@@ -4863,10 +4805,6 @@
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/json
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/idlelib/Icons
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/idlelib
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/test
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/mime
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/tests
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/command
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils
@@ -4884,10 +4822,12 @@
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/unittest
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/xmltestdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/tracedmodules
+@dirrm %%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/leakers
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/decimaltestdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/data
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/crashers
+@dirrm %%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/sqlite3/test
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/sqlite3