Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.39 2014/03/27 05:36:37 obache Exp $
# $NetBSD: Makefile,v 1.48 2015/03/03 17:19:58 snj Exp $
.include "dist.mk"
PKGNAME= python27-${PY_DISTVERSION}
PKGREVISION= 3
PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -30,7 +30,8 @@ CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
USE_LANGUAGES= c c++
PTHREAD_OPTS+= require
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
@@ -75,6 +76,8 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
PY_PLATNAME= hp-ux11
.elif ${OPSYS} == "Linux"
PY_PLATNAME= linux2
.elif ${OS_VARIANT} == "SCOOSR5"
PY_PLATNAME= sco_sv3
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
@@ -162,6 +165,12 @@ SUBST_STAGE.findlib= pre-configure
SUBST_FILES.findlib= Lib/distutils/unixccompiler.py
SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_CLASSES+= sslbase
SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE.
SUBST_STAGE.sslbase= pre-configure
SUBST_FILES.sslbase= setup.py
SUBST_VARS.sslbase= SSLBASE
post-extract:
${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
@@ -173,6 +182,12 @@ post-install:
${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0
.endif
.if ${OS_VARIANT} == "SCOOSR5"
# SCO OpenServer 5.0.7/3.2 has no socklen_t in system headers, but has in
# GNU pth's header. It should be used in this case.
CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
.endif
BUILDLINK_DEPMETHOD.readline= build
.include "../../archivers/bzip2/buildlink3.mk"

View File

@@ -1,2 +0,0 @@
@comment $NetBSD: PLIST.Cygwin,v 1.1 2013/04/17 13:21:05 obache Exp $
bin/libpython${PY_VER_SUFFIX}.dll

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.9 2014/03/12 12:40:57 obache Exp $
@comment $NetBSD: PLIST.common,v 1.12 2014/12/16 08:45:12 chopps Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -479,9 +479,6 @@ lib/python${PY_VER_SUFFIX}/ctypes/test/test_checkretval.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_delattr.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_delattr.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_delattr.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errcheck.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errcheck.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errcheck.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errno.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errno.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_errno.pyo
@@ -503,9 +500,6 @@ lib/python${PY_VER_SUFFIX}/ctypes/test/test_incomplete.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_init.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_init.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_init.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_integers.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_integers.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_integers.pyo
lib/python${PY_VER_SUFFIX}/ctypes/test/test_internals.py
lib/python${PY_VER_SUFFIX}/ctypes/test/test_internals.pyc
lib/python${PY_VER_SUFFIX}/ctypes/test/test_internals.pyo
@@ -1437,6 +1431,17 @@ lib/python${PY_VER_SUFFIX}/encodings/uu_codec.pyo
lib/python${PY_VER_SUFFIX}/encodings/zlib_codec.py
lib/python${PY_VER_SUFFIX}/encodings/zlib_codec.pyc
lib/python${PY_VER_SUFFIX}/encodings/zlib_codec.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/__init__.py
lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
lib/python${PY_VER_SUFFIX}/filecmp.py
lib/python${PY_VER_SUFFIX}/filecmp.pyc
lib/python${PY_VER_SUFFIX}/filecmp.pyo
@@ -1565,6 +1570,13 @@ lib/python${PY_VER_SUFFIX}/idlelib/IOBinding.pyc
lib/python${PY_VER_SUFFIX}/idlelib/IOBinding.pyo
lib/python${PY_VER_SUFFIX}/idlelib/Icons/folder.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle.icns
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle.ico
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_16.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_16.png
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_32.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_32.png
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_48.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/idle_48.png
lib/python${PY_VER_SUFFIX}/idlelib/Icons/minusnode.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/openfolder.gif
lib/python${PY_VER_SUFFIX}/idlelib/Icons/plusnode.gif
@@ -1683,6 +1695,76 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle.py
lib/python${PY_VER_SUFFIX}/idlelib/idle.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle.pyw
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/README.txt
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autocomplete.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autocomplete.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autocomplete.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_widgetredir.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_widgetredir.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_widgetredir.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idlever.py
lib/python${PY_VER_SUFFIX}/idlelib/idlever.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idlever.pyo
@@ -1895,12 +1977,27 @@ lib/python${PY_VER_SUFFIX}/lib-tk/test/runtktests.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/__init__.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/__init__.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/__init__.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_font.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_font.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_font.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_geometry_managers.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_geometry_managers.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_geometry_managers.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_images.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_images.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_images.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_loadtk.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_loadtk.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_loadtk.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_text.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_variables.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_tkinter/test_widgets.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/__init__.pyo
@@ -1919,6 +2016,9 @@ lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_style.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/test_ttk/test_widgets.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.py
lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/test/widget_tests.pyo
lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.py
lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.pyc
lib/python${PY_VER_SUFFIX}/lib-tk/tkColorChooser.pyo
@@ -1971,6 +2071,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/fixes/__init__.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_apply.py
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_apply.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_apply.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_asserts.py
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_asserts.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_asserts.pyo
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_basestring.py
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_basestring.pyc
lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_basestring.pyo
@@ -2572,6 +2675,9 @@ lib/python${PY_VER_SUFFIX}/test/Sine-1000Hz-300ms.aif
lib/python${PY_VER_SUFFIX}/test/__init__.py
lib/python${PY_VER_SUFFIX}/test/__init__.pyc
lib/python${PY_VER_SUFFIX}/test/__init__.pyo
lib/python${PY_VER_SUFFIX}/test/_mock_backport.py
lib/python${PY_VER_SUFFIX}/test/_mock_backport.pyc
lib/python${PY_VER_SUFFIX}/test/_mock_backport.pyo
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.aiff
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.au
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.wav
@@ -2585,15 +2691,16 @@ lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm8.au
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm8.wav
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-ulaw.aifc
lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-ulaw.au
lib/python${PY_VER_SUFFIX}/test/audiotest.au
lib/python${PY_VER_SUFFIX}/test/audiotests.py
lib/python${PY_VER_SUFFIX}/test/audiotests.pyc
lib/python${PY_VER_SUFFIX}/test/audiotests.pyo
lib/python${PY_VER_SUFFIX}/test/audiotest.au
lib/python${PY_VER_SUFFIX}/test/autotest.py
lib/python${PY_VER_SUFFIX}/test/autotest.pyc
lib/python${PY_VER_SUFFIX}/test/autotest.pyo
lib/python${PY_VER_SUFFIX}/test/bad_coding.py
lib/python${PY_VER_SUFFIX}/test/bad_coding2.py
lib/python${PY_VER_SUFFIX}/test/bad_coding3.py
lib/python${PY_VER_SUFFIX}/test/badcert.pem
lib/python${PY_VER_SUFFIX}/test/badkey.pem
lib/python${PY_VER_SUFFIX}/test/badsyntax_future3.py
@@ -2607,6 +2714,10 @@ lib/python${PY_VER_SUFFIX}/test/badsyntax_nocaret.py
lib/python${PY_VER_SUFFIX}/test/buffer_tests.py
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
lib/python${PY_VER_SUFFIX}/test/capath/4e1295a3.0
lib/python${PY_VER_SUFFIX}/test/capath/5ed36f99.0
lib/python${PY_VER_SUFFIX}/test/capath/6e88d7b8.0
lib/python${PY_VER_SUFFIX}/test/capath/99d0fa06.0
lib/python${PY_VER_SUFFIX}/test/cfgparser.1
lib/python${PY_VER_SUFFIX}/test/check_soundcard.vbs
lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
@@ -2787,6 +2898,7 @@ lib/python${PY_VER_SUFFIX}/test/decimaltestdata/testall.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegral.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegralx.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/xor.decTest
lib/python${PY_VER_SUFFIX}/test/dh512.pem
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.py
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyc
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyo
@@ -2806,6 +2918,17 @@ lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
lib/python${PY_VER_SUFFIX}/test/greyrgb.uue
lib/python${PY_VER_SUFFIX}/test/https_svn_python_org_root.pem
lib/python${PY_VER_SUFFIX}/test/ieee754.txt
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.gif
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.jpg
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.pbm
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.pgm
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.png
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.ppm
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.ras
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.sgi
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.tiff
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.xbm
lib/python${PY_VER_SUFFIX}/test/infinite_reload.py
lib/python${PY_VER_SUFFIX}/test/infinite_reload.pyc
lib/python${PY_VER_SUFFIX}/test/infinite_reload.pyo
@@ -2815,13 +2938,20 @@ lib/python${PY_VER_SUFFIX}/test/inspect_fodder.pyo
lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.py
lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.pyc
lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.pyo
lib/python${PY_VER_SUFFIX}/test/keycert.passwd.pem
lib/python${PY_VER_SUFFIX}/test/keycert.pem
lib/python${PY_VER_SUFFIX}/test/keycert2.pem
lib/python${PY_VER_SUFFIX}/test/keycert3.pem
lib/python${PY_VER_SUFFIX}/test/keycert4.pem
lib/python${PY_VER_SUFFIX}/test/list_tests.py
lib/python${PY_VER_SUFFIX}/test/list_tests.pyc
lib/python${PY_VER_SUFFIX}/test/list_tests.pyo
lib/python${PY_VER_SUFFIX}/test/lock_tests.py
lib/python${PY_VER_SUFFIX}/test/lock_tests.pyc
lib/python${PY_VER_SUFFIX}/test/lock_tests.pyo
lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.py
lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.pyc
lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.pyo
lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
@@ -2841,6 +2971,7 @@ lib/python${PY_VER_SUFFIX}/test/pickletester.pyo
lib/python${PY_VER_SUFFIX}/test/profilee.py
lib/python${PY_VER_SUFFIX}/test/profilee.pyc
lib/python${PY_VER_SUFFIX}/test/profilee.pyo
lib/python${PY_VER_SUFFIX}/test/pycacert.pem
lib/python${PY_VER_SUFFIX}/test/pyclbr_input.py
lib/python${PY_VER_SUFFIX}/test/pyclbr_input.pyc
lib/python${PY_VER_SUFFIX}/test/pyclbr_input.pyo
@@ -2868,6 +2999,7 @@ lib/python${PY_VER_SUFFIX}/test/relimport.pyo
lib/python${PY_VER_SUFFIX}/test/reperf.py
lib/python${PY_VER_SUFFIX}/test/reperf.pyc
lib/python${PY_VER_SUFFIX}/test/reperf.pyo
lib/python${PY_VER_SUFFIX}/test/revocation.crl
lib/python${PY_VER_SUFFIX}/test/sample_doctest.py
lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyc
lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyo
@@ -2880,6 +3012,7 @@ lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.pyo
lib/python${PY_VER_SUFFIX}/test/script_helper.py
lib/python${PY_VER_SUFFIX}/test/script_helper.pyc
lib/python${PY_VER_SUFFIX}/test/script_helper.pyo
lib/python${PY_VER_SUFFIX}/test/selfsigned_pythontestdotnet.pem
lib/python${PY_VER_SUFFIX}/test/seq_tests.py
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyc
lib/python${PY_VER_SUFFIX}/test/seq_tests.pyo
@@ -2888,6 +3021,12 @@ lib/python${PY_VER_SUFFIX}/test/sha256.pem
lib/python${PY_VER_SUFFIX}/test/sortperf.py
lib/python${PY_VER_SUFFIX}/test/sortperf.pyc
lib/python${PY_VER_SUFFIX}/test/sortperf.pyo
lib/python${PY_VER_SUFFIX}/test/ssl_cert.pem
lib/python${PY_VER_SUFFIX}/test/ssl_key.passwd.pem
lib/python${PY_VER_SUFFIX}/test/ssl_key.pem
lib/python${PY_VER_SUFFIX}/test/ssl_servers.py
lib/python${PY_VER_SUFFIX}/test/ssl_servers.pyc
lib/python${PY_VER_SUFFIX}/test/ssl_servers.pyo
lib/python${PY_VER_SUFFIX}/test/string_tests.py
lib/python${PY_VER_SUFFIX}/test/string_tests.pyc
lib/python${PY_VER_SUFFIX}/test/string_tests.pyo
@@ -3250,6 +3389,9 @@ lib/python${PY_VER_SUFFIX}/test/test_email_codecs.pyo
lib/python${PY_VER_SUFFIX}/test/test_email_renamed.py
lib/python${PY_VER_SUFFIX}/test/test_email_renamed.pyc
lib/python${PY_VER_SUFFIX}/test/test_email_renamed.pyo
lib/python${PY_VER_SUFFIX}/test/test_ensurepip.py
lib/python${PY_VER_SUFFIX}/test/test_ensurepip.pyc
lib/python${PY_VER_SUFFIX}/test/test_ensurepip.pyo
lib/python${PY_VER_SUFFIX}/test/test_enumerate.py
lib/python${PY_VER_SUFFIX}/test/test_enumerate.pyc
lib/python${PY_VER_SUFFIX}/test/test_enumerate.pyo
@@ -3430,6 +3572,9 @@ lib/python${PY_VER_SUFFIX}/test/test_imaplib.pyo
lib/python${PY_VER_SUFFIX}/test/test_imgfile.py
lib/python${PY_VER_SUFFIX}/test/test_imgfile.pyc
lib/python${PY_VER_SUFFIX}/test/test_imgfile.pyo
lib/python${PY_VER_SUFFIX}/test/test_imghdr.py
lib/python${PY_VER_SUFFIX}/test/test_imghdr.pyc
lib/python${PY_VER_SUFFIX}/test/test_imghdr.pyo
lib/python${PY_VER_SUFFIX}/test/test_imp.py
lib/python${PY_VER_SUFFIX}/test/test_imp.pyc
lib/python${PY_VER_SUFFIX}/test/test_imp.pyo
@@ -3823,18 +3968,21 @@ lib/python${PY_VER_SUFFIX}/test/test_softspace.pyo
lib/python${PY_VER_SUFFIX}/test/test_sort.py
lib/python${PY_VER_SUFFIX}/test/test_sort.pyc
lib/python${PY_VER_SUFFIX}/test/test_sort.pyo
lib/python${PY_VER_SUFFIX}/test/test_spwd.py
lib/python${PY_VER_SUFFIX}/test/test_spwd.pyc
lib/python${PY_VER_SUFFIX}/test/test_spwd.pyo
lib/python${PY_VER_SUFFIX}/test/test_sqlite.py
lib/python${PY_VER_SUFFIX}/test/test_sqlite.pyc
lib/python${PY_VER_SUFFIX}/test/test_sqlite.pyo
lib/python${PY_VER_SUFFIX}/test/test_ssl.py
lib/python${PY_VER_SUFFIX}/test/test_ssl.pyc
lib/python${PY_VER_SUFFIX}/test/test_ssl.pyo
lib/python${PY_VER_SUFFIX}/test/test_stat.py
lib/python${PY_VER_SUFFIX}/test/test_stat.pyc
lib/python${PY_VER_SUFFIX}/test/test_stat.pyo
lib/python${PY_VER_SUFFIX}/test/test_startfile.py
lib/python${PY_VER_SUFFIX}/test/test_startfile.pyc
lib/python${PY_VER_SUFFIX}/test/test_startfile.pyo
lib/python${PY_VER_SUFFIX}/test/test_stat.py
lib/python${PY_VER_SUFFIX}/test/test_stat.pyc
lib/python${PY_VER_SUFFIX}/test/test_stat.pyo
lib/python${PY_VER_SUFFIX}/test/test_str.py
lib/python${PY_VER_SUFFIX}/test/test_str.pyc
lib/python${PY_VER_SUFFIX}/test/test_str.pyo

View File

@@ -1,6 +1,6 @@
# $NetBSD: dist.mk,v 1.6 2013/11/12 18:57:25 adam Exp $
# $NetBSD: dist.mk,v 1.9 2014/12/16 07:07:32 chopps Exp $
PY_DISTVERSION= 2.7.6
PY_DISTVERSION= 2.7.9
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python27/distinfo

View File

@@ -1,28 +1,32 @@
$NetBSD: distinfo,v 1.35 2014/03/27 06:26:24 obache Exp $
$NetBSD: distinfo,v 1.49 2015/03/03 17:19:58 snj Exp $
SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80
RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a
Size (Python-2.7.6.tar.xz) = 10431288 bytes
SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e
SHA1 (Python-2.7.9.tar.xz) = 3172f6e957713c2d9fca462cc16068222fd1b9d3
RMD160 (Python-2.7.9.tar.xz) = 2b047c3b56987b473c3ca957ad87f5582c37d6f6
Size (Python-2.7.9.tar.xz) = 12164712 bytes
SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
SHA1 (patch-Include_pyport.h) = 971c7c548b92595712d0d70a0917a0ccc83b6c7e
SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc
SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3
SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451
SHA1 (patch-Modules_socketmodule.c) = 07c76dcf6dc8605446bc8e01d80e1f1e30a5ebf7
SHA1 (patch-Lib_dumbdb.py) = b4b154f511c8852e2f869653eccd7d9a1c21e734
SHA1 (patch-Lib_multiprocessing_process.py) = b47ad4cbeddbcfb4342c08c84d0d515a793815d4
SHA1 (patch-Lib_test_test__dumbdbm.py) = f59f0d8bbf910bac369528129b564597a77379ba
SHA1 (patch-Modules_getaddrinfo.c) = 696c58c4c4bbb710fb1508d7d88864d0b08cfc79
SHA1 (patch-Modules_getpath.c) = aa8a54717a85f831e3ceaad19d96c43bc38aef10
SHA1 (patch-Modules_mmapmodule.c) = 87ea76e6d8263045c1ca794ff5c75ed631a74b6d
SHA1 (patch-Modules_posixmodule.c) = b8960592611499202bb5ff8521d619e0637177b6
SHA1 (patch-Modules_socketmodule.c) = 960ce4af2a142c471c707de446f2d390044bbc13
SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498
SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582
SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34
SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
SHA1 (patch-ab) = 6a38874aaaccc878541554546835ccbf6136bbd5
SHA1 (patch-ad) = 061aefac15fe3834271770f0fd225e12f84d961a
SHA1 (patch-ae) = 7fadf9e2f5fe7ad42e14f9cf9ef92e92a3a40787
SHA1 (patch-ah) = 0648597f53bef7832af589378104a4d43290714a
SHA1 (patch-al) = 4bd68f7995f5b76c3d62f370f31568930055c76f
SHA1 (patch-am) = 5e287cddd574e86e1ef07e6e862e72aacaa70b93
SHA1 (patch-an) = f1179125d2042e44b864488864144cae057171cb
SHA1 (patch-ao) = ad4377682b01a4965c84ac46e398ec5e841ee0f5
SHA1 (patch-au) = 98c925a32b2067055d9082a24b8a8b8b1069eb90
SHA1 (patch-av) = 3cd52c97afe7b3331559e75b1d69c886014c1d8e
SHA1 (patch-aw) = ff445b01cd4979d26baf27aabb291a803c4a2ec2
SHA1 (patch-ax) = 63948a78cbd4dd5438cd0fc1ce8a23e6ec13626c
SHA1 (patch-az) = e373cb7e80650b3cc9f491864ab2c2ddfd4c8395
SHA1 (patch-pyconfig.h.in) = 11aae6980d82ec577088dc4e13f5e3b5180360e6
SHA1 (patch-xa) = e996624c1d4aa978f853dab31a096b8587fed7a2

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 */

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] */

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

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()

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()

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"

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;

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;

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

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

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 =

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);

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)

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):

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)
{

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

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;
}

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

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;;

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(

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; \

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),

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;

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)

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);

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 */

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