Page MenuHomeFreeBSD
Files F142072653

D1323.diff
No OneTemporary
Actions

D1323.diff
View Options

Index: head/lang/python-doc-html/distinfo
===================================================================
--- head/lang/python-doc-html/distinfo
+++ head/lang/python-doc-html/distinfo
@@ -1,11 +1,11 @@
-SHA256 (python/python-2.7.8-docs-html.tar.bz2) = e0aa9b08bf2cad4d7769e86fc7d0b05f5d0af0609c757a5c633841c5a703c73f
-SIZE (python/python-2.7.8-docs-html.tar.bz2) = 4511331
-SHA256 (python/python-2.7.8-docs-pdf-a4.tar.bz2) = 1132c2a5943f4d931deb71c731b4ab71afe3fb2048ef41626e5ef17f69f3249b
-SIZE (python/python-2.7.8-docs-pdf-a4.tar.bz2) = 10749796
-SHA256 (python/python-2.7.8-docs-pdf-letter.tar.bz2) = a637545d5846fc5367c45c3c77fc8e86fcf35b423ffd72acbd24c42e82b6ffee
-SIZE (python/python-2.7.8-docs-pdf-letter.tar.bz2) = 10803933
-SHA256 (python/python-2.7.8-docs-text.tar.bz2) = 4f4601d578ad12e1ca4de9234a023f0a368b8d6cdcee94aca6ae7bafb7e89dd2
-SIZE (python/python-2.7.8-docs-text.tar.bz2) = 1587163
+SHA256 (python/python-2.7.9-docs-html.tar.bz2) = 9c8ec955491a53b20794cd20065f1ccee15622a0ffc89a6c301d879513a67b50
+SIZE (python/python-2.7.9-docs-html.tar.bz2) = 4527125
+SHA256 (python/python-2.7.9-docs-pdf-a4.tar.bz2) = b1ce63f4d234f3aab2fe8c29e8889063fcd6786ee2fc71edeab26f826eeaeea5
+SIZE (python/python-2.7.9-docs-pdf-a4.tar.bz2) = 10679722
+SHA256 (python/python-2.7.9-docs-pdf-letter.tar.bz2) = 2e76fcfca34790ccb35dda55c84057abdce5362cd2421f6f4db8904b59b82545
+SIZE (python/python-2.7.9-docs-pdf-letter.tar.bz2) = 10734252
+SHA256 (python/python-2.7.9-docs-text.tar.bz2) = 3929ff923aebaf33c6e7a6339c535191d30e3d9e2e21c63aaa05171ecc3d60df
+SIZE (python/python-2.7.9-docs-text.tar.bz2) = 1601304
SHA256 (python/python-3.2.5-docs-html.tar.bz2) = 5a7f7f79d58cf87511aae66784ae71e3e108ca8185bd40706c4bb43e5e0348bc
SIZE (python/python-3.2.5-docs-html.tar.bz2) = 4435429
SHA256 (python/python-3.2.5-docs-pdf-a4.tar.bz2) = bfa07657b5d3810fa3cc16cd210459457cfaedff0887e2617b2deabd21e432e3
Index: head/lang/python27/Makefile
===================================================================
--- head/lang/python27/Makefile
+++ head/lang/python27/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= python27
-PORTVERSION= 2.7.8
-PORTREVISION= 6
+PORTVERSION= 2.7.9
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
@@ -94,8 +93,8 @@
LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi
.endif
-# See http://bugs.freebsd.org/115940
-.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) # the world with NO_NIS
+# See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
+.if defined(WITHOUT_NIS) || !exists(/usr/include/rpcsvc/yp_prot.h)
PLIST_SUB+= NO_NIS="@comment "
.else
PLIST_SUB+= NO_NIS=""
Index: head/lang/python27/distinfo
===================================================================
--- head/lang/python27/distinfo
+++ head/lang/python27/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-2.7.8.tar.xz) = edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a
-SIZE (python/Python-2.7.8.tar.xz) = 10525244
+SHA256 (python/Python-2.7.9.tar.xz) = 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916
+SIZE (python/Python-2.7.9.tar.xz) = 12164712
Index: head/lang/python27/files/patch-Modules-_ctypes-libffi-configure
===================================================================
--- head/lang/python27/files/patch-Modules-_ctypes-libffi-configure
+++ head/lang/python27/files/patch-Modules-_ctypes-libffi-configure
@@ -1,22 +1,11 @@
---- Modules/_ctypes/libffi/configure.orig 2010-03-19 19:59:20.000000000 +0100
-+++ Modules/_ctypes/libffi/configure 2011-03-06 09:20:16.000000000 +0100
-@@ -6289,7 +6289,7 @@
+--- Modules/_ctypes/libffi/configure.orig 2014-12-16 08:10:12.000000000 +0100
++++ Modules/_ctypes/libffi/configure 2014-12-16 08:10:40.000000000 +0100
+@@ -7526,7 +7526,7 @@
rm -rf conftest*
;;
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
-@@ -11275,6 +11275,9 @@
- powerpc-*-freebsd*)
- TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- ;;
-+ powerpc64-*-freebsd*)
-+ TARGET=POWERPC; TARGETDIR=powerpc
-+ ;;
- powerpc*-*-rtems*)
- TARGET=POWERPC; TARGETDIR=powerpc
- ;;
-
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
Index: head/lang/python27/files/patch-issue21166
===================================================================
--- head/lang/python27/files/patch-issue21166
+++ head/lang/python27/files/patch-issue21166
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Ned Deily <nad@acm.org>
-# Date 1408739459 25200
-# Node ID edb6b282469ea0e8f819d0310afb2937b59dd6b9
-# Parent 727fd4ead3fd854e900ed89362714ad1f7434e5a
-Issue #21166: Prevent possible segfaults and other random failures of
-python --generate-posix-vars in pybuilddir.txt build target by ensuring
-that pybuilddir.txt is always regenerated when configure is run and
-that the newly built skeleton python does not inadvertently import
-modules from previously installed instances.
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -447,8 +447,18 @@ platform: $(BUILDPYTHON) pybuilddir.txt
- # Create build directory and generate the sysconfig build-time data there.
- # pybuilddir.txt contains the name of the build dir and is used for
- # sys.path fixup -- see Modules/getpath.c.
-+# Since this step runs before shared modules are built, try to avoid bootstrap
-+# problems by creating a dummy pybuildstr.txt just to allow interpreter
-+# initialization to succeed. It will be overwritten by generate-posix-vars
-+# or removed in case of failure.
- pybuilddir.txt: $(BUILDPYTHON)
-- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+ @echo "none" > ./pybuilddir.txt
-+ $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\
-+ if test $$? -ne 0 ; then \
-+ echo "generate-posix-vars failed" ; \
-+ rm -f ./pybuilddir.txt ; \
-+ exit 1 ; \
-+ fi
-
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-diff --git a/Misc/NEWS b/Misc/NEWS
---- Misc/NEWS
-+++ Misc/NEWS
-@@ -120,6 +120,9 @@ Build
- - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/
- now display special message when and only when there are failures.
-
-+- Issue #21166: Prevent possible segfaults and other random failures of
-+ python --generate-posix-vars in pybuilddir.txt build target.
-+
- Windows
- -------
-
-diff --git a/configure b/configure
---- configure
-+++ configure
-@@ -2857,6 +2857,9 @@ case $host_os in *\ *) host_os=`echo "$h
-
-
-
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
- $as_echo_n "checking for python interpreter for cross build... " >&6; }
-diff --git a/configure.ac b/configure.ac
---- configure.ac
-+++ configure.ac
-@@ -16,6 +16,9 @@ AC_CANONICAL_HOST
- AC_SUBST(build)
- AC_SUBST(host)
-
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
- AC_MSG_CHECKING([for python interpreter for cross build])
- if test -z "$PYTHON_FOR_BUILD"; then
-
Index: head/lang/python27/pkg-plist
===================================================================
--- head/lang/python27/pkg-plist
+++ head/lang/python27/pkg-plist
@@ -1430,6 +1430,17 @@
lib/python2.7/encodings/zlib_codec.py
lib/python2.7/encodings/zlib_codec.pyo
lib/python2.7/encodings/zlib_codec.pyc
+lib/python2.7/ensurepip/__init__.py
+lib/python2.7/ensurepip/__init__.pyc
+lib/python2.7/ensurepip/__init__.pyo
+lib/python2.7/ensurepip/__main__.py
+lib/python2.7/ensurepip/__main__.pyc
+lib/python2.7/ensurepip/__main__.pyo
+lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_uninstall.py
+lib/python2.7/ensurepip/_uninstall.pyc
+lib/python2.7/ensurepip/_uninstall.pyo
lib/python2.7/filecmp.py
lib/python2.7/filecmp.pyo
lib/python2.7/filecmp.pyc
@@ -1708,6 +1719,9 @@
lib/python2.7/idlelib/idle_test/test_config_name.py
lib/python2.7/idlelib/idle_test/test_config_name.pyo
lib/python2.7/idlelib/idle_test/test_config_name.pyc
+lib/python2.7/idlelib/idle_test/test_configdialog.py
+lib/python2.7/idlelib/idle_test/test_configdialog.pyc
+lib/python2.7/idlelib/idle_test/test_configdialog.pyo
lib/python2.7/idlelib/idle_test/test_delegator.py
lib/python2.7/idlelib/idle_test/test_delegator.pyo
lib/python2.7/idlelib/idle_test/test_delegator.pyc
@@ -1732,6 +1746,9 @@
lib/python2.7/idlelib/idle_test/test_rstrip.py
lib/python2.7/idlelib/idle_test/test_rstrip.pyo
lib/python2.7/idlelib/idle_test/test_rstrip.pyc
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.py
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc
+lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo
lib/python2.7/idlelib/idle_test/test_searchengine.py
lib/python2.7/idlelib/idle_test/test_searchengine.pyo
lib/python2.7/idlelib/idle_test/test_searchengine.pyc
@@ -1744,6 +1761,9 @@
lib/python2.7/idlelib/idle_test/test_warning.py
lib/python2.7/idlelib/idle_test/test_warning.pyo
lib/python2.7/idlelib/idle_test/test_warning.pyc
+lib/python2.7/idlelib/idle_test/test_widgetredir.py
+lib/python2.7/idlelib/idle_test/test_widgetredir.pyc
+lib/python2.7/idlelib/idle_test/test_widgetredir.pyo
lib/python2.7/idlelib/idlever.py
lib/python2.7/idlelib/idlever.pyo
lib/python2.7/idlelib/idlever.pyc
@@ -1889,6 +1909,9 @@
lib/python2.7/lib2to3/fixes/fix_apply.py
lib/python2.7/lib2to3/fixes/fix_apply.pyo
lib/python2.7/lib2to3/fixes/fix_apply.pyc
+lib/python2.7/lib2to3/fixes/fix_asserts.py
+lib/python2.7/lib2to3/fixes/fix_asserts.pyc
+lib/python2.7/lib2to3/fixes/fix_asserts.pyo
lib/python2.7/lib2to3/fixes/fix_basestring.py
lib/python2.7/lib2to3/fixes/fix_basestring.pyo
lib/python2.7/lib2to3/fixes/fix_basestring.pyc
@@ -2235,6 +2258,9 @@
lib/python2.7/lib-tk/test/test_tkinter/__init__.py
lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo
lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc
+lib/python2.7/lib-tk/test/test_tkinter/test_font.py
+lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc
+lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo
lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo
lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc
@@ -2657,6 +2683,9 @@
lib/python2.7/test/__init__.py
lib/python2.7/test/__init__.pyo
lib/python2.7/test/__init__.pyc
+lib/python2.7/test/_mock_backport.py
+lib/python2.7/test/_mock_backport.pyc
+lib/python2.7/test/_mock_backport.pyo
lib/python2.7/test/audiodata/pluck-pcm24.aiff
lib/python2.7/test/audiodata/pluck-pcm24.wav
lib/python2.7/test/audiodata/pluck-pcm16.aiff
@@ -2693,6 +2722,10 @@
lib/python2.7/test/buffer_tests.py
lib/python2.7/test/buffer_tests.pyo
lib/python2.7/test/buffer_tests.pyc
+lib/python2.7/test/capath/4e1295a3.0
+lib/python2.7/test/capath/5ed36f99.0
+lib/python2.7/test/capath/6e88d7b8.0
+lib/python2.7/test/capath/99d0fa06.0
lib/python2.7/test/cfgparser.1
lib/python2.7/test/check_soundcard.vbs
lib/python2.7/test/cmath_testcases.txt
@@ -2874,6 +2907,7 @@
lib/python2.7/test/decimaltestdata/tointegral.decTest
lib/python2.7/test/decimaltestdata/tointegralx.decTest
lib/python2.7/test/decimaltestdata/xor.decTest
+lib/python2.7/test/dh512.pem
lib/python2.7/test/doctest_aliases.py
lib/python2.7/test/doctest_aliases.pyo
lib/python2.7/test/doctest_aliases.pyc
@@ -2914,12 +2948,19 @@
lib/python2.7/test/inspect_fodder2.pyo
lib/python2.7/test/inspect_fodder2.pyc
lib/python2.7/test/keycert.pem
+lib/python2.7/test/keycert2.pem
+lib/python2.7/test/keycert3.pem
+lib/python2.7/test/keycert4.pem
+lib/python2.7/test/keycert.passwd.pem
lib/python2.7/test/list_tests.py
lib/python2.7/test/list_tests.pyo
lib/python2.7/test/list_tests.pyc
lib/python2.7/test/lock_tests.py
lib/python2.7/test/lock_tests.pyo
lib/python2.7/test/lock_tests.pyc
+lib/python2.7/test/make_ssl_certs.py
+lib/python2.7/test/make_ssl_certs.pyc
+lib/python2.7/test/make_ssl_certs.pyo
lib/python2.7/test/mapping_tests.py
lib/python2.7/test/mapping_tests.pyo
lib/python2.7/test/mapping_tests.pyc
@@ -2938,6 +2979,7 @@
lib/python2.7/test/profilee.py
lib/python2.7/test/profilee.pyo
lib/python2.7/test/profilee.pyc
+lib/python2.7/test/pycacert.pem
lib/python2.7/test/pyclbr_input.py
lib/python2.7/test/pyclbr_input.pyo
lib/python2.7/test/pyclbr_input.pyc
@@ -2965,6 +3007,7 @@
lib/python2.7/test/reperf.py
lib/python2.7/test/reperf.pyo
lib/python2.7/test/reperf.pyc
+lib/python2.7/test/revocation.crl
lib/python2.7/test/sample_doctest.py
lib/python2.7/test/sample_doctest.pyo
lib/python2.7/test/sample_doctest.pyc
@@ -2977,6 +3020,7 @@
lib/python2.7/test/script_helper.py
lib/python2.7/test/script_helper.pyo
lib/python2.7/test/script_helper.pyc
+lib/python2.7/test/selfsigned_pythontestdotnet.pem
lib/python2.7/test/seq_tests.py
lib/python2.7/test/seq_tests.pyo
lib/python2.7/test/seq_tests.pyc
@@ -2985,6 +3029,12 @@
lib/python2.7/test/sortperf.py
lib/python2.7/test/sortperf.pyo
lib/python2.7/test/sortperf.pyc
+lib/python2.7/test/ssl_cert.pem
+lib/python2.7/test/ssl_key.passwd.pem
+lib/python2.7/test/ssl_key.pem
+lib/python2.7/test/ssl_servers.py
+lib/python2.7/test/ssl_servers.pyc
+lib/python2.7/test/ssl_servers.pyo
lib/python2.7/test/string_tests.py
lib/python2.7/test/string_tests.pyo
lib/python2.7/test/string_tests.pyc
@@ -3347,6 +3397,9 @@
lib/python2.7/test/test_email_renamed.py
lib/python2.7/test/test_email_renamed.pyo
lib/python2.7/test/test_email_renamed.pyc
+lib/python2.7/test/test_ensurepip.py
+lib/python2.7/test/test_ensurepip.pyc
+lib/python2.7/test/test_ensurepip.pyo
lib/python2.7/test/test_enumerate.py
lib/python2.7/test/test_enumerate.pyo
lib/python2.7/test/test_enumerate.pyc

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 6:36 PM (19 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27665592
Default Alt Text
D1323.diff (14 KB)

Event Timeline