[packages/python] - rediff patches
baggins
baggins at pld-linux.org
Sun Sep 26 15:14:54 CEST 2021
commit 4d51998b6434f919fd8dea21280d11f82a8bea00
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Sep 26 15:14:35 2021 +0200
- rediff patches
python-DNStests.patch | 38 ++++++-----
python-ac_fixes.patch | 53 ++++++++-------
python-bdist_rpm.patch | 20 +++---
python-install_prefix.patch | 31 +++++----
python-multilib.patch | 113 +++++++++++++++++---------------
python-pythonpath.patch | 153 ++++++++++++++++++++++++--------------------
python-verbose.patch | 11 ++--
7 files changed, 224 insertions(+), 195 deletions(-)
---
diff --git a/python-DNStests.patch b/python-DNStests.patch
index a04e064..d057225 100644
--- a/python-DNStests.patch
+++ b/python-DNStests.patch
@@ -13,15 +13,16 @@ Subject: [PATCH] Mark tests that require access to resolver
new file mode 100644
index 0000000..f77cbe7
---- /dev/null
-+++ b/Lib/test/checkDNS.py
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/checkDNS.py Python-2.7.18/Lib/test/checkDNS.py
+--- Python-2.7.18.org/Lib/test/checkDNS.py 1970-01-01 01:00:00.000000000 +0100
++++ Python-2.7.18/Lib/test/checkDNS.py 2021-09-26 12:34:35.277872284 +0200
@@ -0,0 +1,3 @@
+import os
+
+canresolve = os.access("/etc/resolv.conf", os.R_OK)
-index 86a26dc..8f07ada 100644
---- a/Lib/test/test_mimetools.py
-+++ b/Lib/test/test_mimetools.py
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/test_mimetools.py Python-2.7.18/Lib/test/test_mimetools.py
+--- Python-2.7.18.org/Lib/test/test_mimetools.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/test/test_mimetools.py 2021-09-26 12:34:35.277872284 +0200
@@ -1,5 +1,6 @@
import unittest
from test import test_support
@@ -37,9 +38,9 @@ index 86a26dc..8f07ada 100644
def test_boundary(self):
s = set([""])
for i in xrange(100):
-index 81806c9..d88fd97 100644
---- a/Lib/test/test_smtplib.py
-+++ b/Lib/test/test_smtplib.py
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/test_smtplib.py Python-2.7.18/Lib/test/test_smtplib.py
+--- Python-2.7.18.org/Lib/test/test_smtplib.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/test/test_smtplib.py 2021-09-26 12:34:35.281205654 +0200
@@ -10,6 +10,7 @@ import select
import unittest
@@ -68,7 +69,7 @@ index 81806c9..d88fd97 100644
+ @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
def testTimeoutDefault(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30)
@@ -86,6 +90,7 @@ class GeneralTests(unittest.TestCase):
self.assertEqual(smtp.sock.gettimeout(), 30)
@@ -76,17 +77,17 @@ index 81806c9..d88fd97 100644
+ @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
def testTimeoutNone(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30)
@@ -96,6 +101,7 @@ class GeneralTests(unittest.TestCase):
- self.assertTrue(smtp.sock.gettimeout() is None)
+ self.assertIsNone(smtp.sock.gettimeout())
smtp.close()
+ @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
def testTimeoutValue(self):
smtp = smtplib.SMTP(HOST, self.port, timeout=30)
self.assertEqual(smtp.sock.gettimeout(), 30)
-@@ -243,6 +249,7 @@ class DebuggingServerTests(unittest.TestCase):
+@@ -243,6 +249,7 @@ class DebuggingServerTests(unittest.Test
class NonConnectingTests(unittest.TestCase):
@@ -94,10 +95,10 @@ index 81806c9..d88fd97 100644
def testNotConnected(self):
# Test various operations on an unconnected SMTP object that
# should raise exceptions (at present the attempt in SMTP.send
-index 3a273f8..e6a4c73 100644
---- a/Lib/test/test_urllib.py
-+++ b/Lib/test/test_urllib.py
-@@ -11,6 +11,7 @@ import StringIO
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/test_urllib.py Python-2.7.18/Lib/test/test_urllib.py
+--- Python-2.7.18.org/Lib/test/test_urllib.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/test/test_urllib.py 2021-09-26 12:34:35.281205654 +0200
+@@ -12,6 +12,7 @@ import tempfile
from test import test_support
from base64 import b64encode
@@ -105,7 +106,7 @@ index 3a273f8..e6a4c73 100644
def hexescape(char):
-@@ -222,6 +223,7 @@ Content-Type: text/html; charset=iso-8859-1
+@@ -334,6 +335,7 @@ Connection: close
finally:
self.unfakehttp()
@@ -113,6 +114,3 @@ index 3a273f8..e6a4c73 100644
def test_missing_localfile(self):
self.assertRaises(IOError, urllib.urlopen,
'file://localhost/a/missing/file.py')
---
-1.8.3.rc2
-
diff --git a/python-ac_fixes.patch b/python-ac_fixes.patch
index 15f05ea..101a810 100644
--- a/python-ac_fixes.patch
+++ b/python-ac_fixes.patch
@@ -1,34 +1,13 @@
---- Python-2.5.2.orig/configure.ac 2008-02-13 19:17:17.000000000 +0000
-+++ Python-2.5.2/configure.ac 2008-02-26 09:43:17.000000000 +0000
-@@ -767,13 +767,13 @@
- if test "$Py_DEBUG" = 'true' ; then
- # Optimization messes up debuggers, so turn it off for
- # debug builds.
-- OPT="-g -O0 -Wall $STRICT_PROTO"
-+ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
- else
-- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
-+ OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
- fi
- ;;
- *)
-- OPT="-O3 -Wall $STRICT_PROTO"
-+ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
- ;;
- esac
- case $ac_sys_system in
---- Python-2.7/Makefile.pre.in~ 2010-04-12 02:10:46.000000000 +0200
-+++ Python-2.7/Makefile.pre.in 2010-07-05 20:04:00.942224202 +0200
-@@ -831,7 +831,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Makefile.pre.in Python-2.7.18/Makefile.pre.in
+--- Python-2.7.18.org/Makefile.pre.in 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Makefile.pre.in 2021-09-26 12:34:28.007790961 +0200
+@@ -1030,14 +1030,12 @@ altmaninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
- $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
+ $(DESTDIR)$(MANDIR)/man1/python.1
- # Install the library
- PLATDIR= plat-$(MACHDEP)
-@@ -900,9 +900,7 @@
# Install the unversioned manual pages
maninstall: altmaninstall
-rm -f $(DESTDIR)$(MANDIR)/man1/python2.1
@@ -38,8 +17,8 @@
+ (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python.1 python2.1)
# Install the library
- PLATDIR= plat-$(MACHDEP)
-@@ -953,7 +953,7 @@
+ PLATDIR= @PLATDIR@
+@@ -1180,7 +1178,7 @@ $(srcdir)/Lib/$(PLATDIR):
python-config: $(srcdir)/Misc/python-config.in
# Substitution happens here, as the completely-expanded BINDIR
# is not available in configure
@@ -48,3 +27,23 @@
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+diff -urNp -x '*.orig' Python-2.7.18.org/configure.ac Python-2.7.18/configure.ac
+--- Python-2.7.18.org/configure.ac 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/configure.ac 2021-09-26 12:34:28.007790961 +0200
+@@ -1090,13 +1090,13 @@ then
+ if test "$Py_DEBUG" = 'true' ; then
+ # Optimization messes up debuggers, so turn it off for
+ # debug builds.
+- OPT="-g -O0 -Wall $STRICT_PROTO"
++ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ else
+- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
++ OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ fi
+ ;;
+ *)
+- OPT="-O3 -Wall $STRICT_PROTO"
++ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ ;;
+ esac
+ case $ac_sys_system in
diff --git a/python-bdist_rpm.patch b/python-bdist_rpm.patch
index 775f499..5209631 100644
--- a/python-bdist_rpm.patch
+++ b/python-bdist_rpm.patch
@@ -1,6 +1,7 @@
---- Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py 2015-05-23 18:09:01.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py 2015-12-03 09:23:08.000000000 +0100
-@@ -338,6 +338,16 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/command/bdist_rpm.py Python-2.7.18/Lib/distutils/command/bdist_rpm.py
+--- Python-2.7.18.org/Lib/distutils/command/bdist_rpm.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/distutils/command/bdist_rpm.py 2021-09-26 12:34:38.927912757 +0200
+@@ -338,6 +338,16 @@ class bdist_rpm (Command):
if self.rpm3_mode:
rpm_cmd.extend(['--define',
'_topdir %s' % os.path.abspath(self.rpm_base)])
@@ -17,7 +18,7 @@
if not self.keep_temp:
rpm_cmd.append('--clean')
-@@ -351,7 +361,7 @@
+@@ -351,7 +361,7 @@ class bdist_rpm (Command):
# list is empty)
nvr_string = "%{name}-%{version}-%{release}"
src_rpm = nvr_string + ".src.rpm"
@@ -26,9 +27,10 @@
q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
src_rpm, non_src_rpm, spec_path)
---- Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py 2015-05-23 18:09:02.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py 2015-12-03 09:24:55.000000000 +0100
-@@ -48,6 +48,8 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/tests/test_bdist_rpm.py Python-2.7.18/Lib/distutils/tests/test_bdist_rpm.py
+--- Python-2.7.18.org/Lib/distutils/tests/test_bdist_rpm.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/distutils/tests/test_bdist_rpm.py 2021-09-26 12:34:38.927912757 +0200
+@@ -54,6 +54,8 @@ class BuildRpmTestCase(support.TempdirMa
'the rpm command is not found')
@unittest.skipIf(find_executable('rpmbuild') is None,
'the rpmbuild command is not found')
@@ -37,12 +39,12 @@
def test_quiet(self):
# let's create a package
tmp_dir = self.mkdtemp()
-@@ -91,6 +93,8 @@
+@@ -98,6 +100,8 @@ class BuildRpmTestCase(support.TempdirMa
'the rpm command is not found')
@unittest.skipIf(find_executable('rpmbuild') is None,
'the rpmbuild command is not found')
+ @unittest.skipIf(os.environ.get("WITHIN_PYTHON_RPM_BUILD"),
+ 'building the python rpm')
def test_no_optimize_flag(self):
- # let's create a package that brakes bdist_rpm
+ # let's create a package that breaks bdist_rpm
tmp_dir = self.mkdtemp()
diff --git a/python-install_prefix.patch b/python-install_prefix.patch
index 2670c10..08128e7 100644
--- a/python-install_prefix.patch
+++ b/python-install_prefix.patch
@@ -1,6 +1,7 @@
---- Python-2.7.6.orig/Lib/distutils/command/install.py 2015-11-22 14:29:00.153420762 +0100
-+++ Python-2.7.6/Lib/distutils/command/install.py 2015-11-22 14:28:19.000000000 +0100
-@@ -13,6 +13,8 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/command/install.py Python-2.7.18/Lib/distutils/command/install.py
+--- Python-2.7.18.org/Lib/distutils/command/install.py 2021-09-26 12:34:36.324550580 +0200
++++ Python-2.7.18/Lib/distutils/command/install.py 2021-09-26 12:34:37.124559456 +0200
+@@ -13,6 +13,8 @@ from types import *
from distutils.core import Command
from distutils.debug import DEBUG
from distutils.sysconfig import get_config_vars
@@ -9,7 +10,7 @@
from distutils.errors import DistutilsPlatformError
from distutils.file_util import write_file
from distutils.util import convert_path, subst_vars, change_root
-@@ -306,9 +308,9 @@
+@@ -306,9 +308,9 @@ class install (Command):
'py_version': py_version,
'py_version_short': py_version[0:3],
'py_version_nodot': py_version[0] + py_version[2],
@@ -21,7 +22,7 @@
'exec_prefix': exec_prefix,
'userbase': self.install_userbase,
'usersite': self.install_usersite,
-@@ -428,8 +430,8 @@
+@@ -428,8 +430,8 @@ class install (Command):
raise DistutilsOptionError, \
"must not supply exec-prefix without prefix"
@@ -32,9 +33,10 @@
else:
if self.exec_prefix is None:
---- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2015-11-22 14:29:00.153420762 +0100
-+++ Python-2.7.6/Lib/distutils/sysconfig.py 2015-11-22 13:49:06.000000000 +0100
-@@ -19,8 +19,10 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/sysconfig.py Python-2.7.18/Lib/distutils/sysconfig.py
+--- Python-2.7.18.org/Lib/distutils/sysconfig.py 2021-09-26 12:34:36.324550580 +0200
++++ Python-2.7.18/Lib/distutils/sysconfig.py 2021-09-26 12:34:37.124559456 +0200
+@@ -19,8 +19,10 @@ import sys
from distutils.errors import DistutilsPlatformError
# These are needed in a couple of spots, so just compute them once.
@@ -47,7 +49,7 @@
# Path to the base directory of the project. On Windows the binary may
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
-@@ -75,7 +77,7 @@
+@@ -80,7 +82,7 @@ def get_python_inc(plat_specific=0, pref
sys.exec_prefix -- i.e., ignore 'plat_specific'.
"""
if prefix is None:
@@ -56,7 +58,7 @@
if os.name == "posix":
if python_build:
-@@ -116,7 +118,10 @@
+@@ -126,7 +128,10 @@ def get_python_lib(plat_specific=0, stan
sys.exec_prefix -- i.e., ignore 'plat_specific'.
"""
if prefix is None:
@@ -67,10 +69,11 @@
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
- if plat_specific:
---- Python-2.7.6.orig/Lib/site.py 2015-11-22 14:29:00.153420762 +0100
-+++ Python-2.7.6/Lib/site.py 2015-11-22 13:40:03.000000000 +0100
-@@ -64,7 +64,7 @@
+ if plat_specific or standard_lib or prefix != "/usr":
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/site.py Python-2.7.18/Lib/site.py
+--- Python-2.7.18.org/Lib/site.py 2021-09-26 12:34:36.324550580 +0200
++++ Python-2.7.18/Lib/site.py 2021-09-26 12:34:37.124559456 +0200
+@@ -64,7 +64,7 @@ import __builtin__
import traceback
# Prefixes for site-packages; add additional prefixes like /usr/local here
diff --git a/python-multilib.patch b/python-multilib.patch
index 1740783..0d11b80 100644
--- a/python-multilib.patch
+++ b/python-multilib.patch
@@ -1,6 +1,7 @@
---- Python-2.7.10.orig/Include/pythonrun.h 2015-05-23 18:09:00.000000000 +0200
-+++ Python-2.7.10/Include/pythonrun.h 2015-12-02 19:31:20.058862685 +0100
-@@ -108,6 +108,8 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Include/pythonrun.h Python-2.7.18/Include/pythonrun.h
+--- Python-2.7.18.org/Include/pythonrun.h 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Include/pythonrun.h 2021-09-26 12:34:29.851145003 +0200
+@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
PyAPI_FUNC(const char *) Py_GetPlatform(void);
@@ -9,9 +10,10 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
---- Python-2.7.10.orig/Lib/distutils/command/install.py 2015-05-23 18:09:01.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/command/install.py 2015-12-02 19:31:20.058862685 +0100
-@@ -22,6 +22,8 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/command/install.py Python-2.7.18/Lib/distutils/command/install.py
+--- Python-2.7.18.org/Lib/distutils/command/install.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/distutils/command/install.py 2021-09-26 12:34:29.851145003 +0200
+@@ -22,6 +22,8 @@ from site import USER_BASE
from site import USER_SITE
@@ -20,7 +22,7 @@
if sys.version < "2.2":
WINDOWS_SCHEME = {
'purelib': '$base',
-@@ -41,15 +43,15 @@
+@@ -41,15 +43,15 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
@@ -40,9 +42,10 @@
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
---- Python-2.7.10.orig/Lib/distutils/sysconfig.py 2015-05-23 18:09:02.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/sysconfig.py 2015-12-02 19:31:20.058862685 +0100
-@@ -119,8 +119,12 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/sysconfig.py Python-2.7.18/Lib/distutils/sysconfig.py
+--- Python-2.7.18.org/Lib/distutils/sysconfig.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/distutils/sysconfig.py 2021-09-26 12:34:29.851145003 +0200
+@@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
@@ -57,9 +60,10 @@
if standard_lib:
return libpython
else:
---- Python-2.7.10.orig/Lib/distutils/tests/test_install.py 2015-05-23 18:09:02.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/tests/test_install.py 2015-12-02 19:31:20.058862685 +0100
-@@ -56,7 +56,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/tests/test_install.py Python-2.7.18/Lib/distutils/tests/test_install.py
+--- Python-2.7.18.org/Lib/distutils/tests/test_install.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/distutils/tests/test_install.py 2021-09-26 12:34:29.851145003 +0200
+@@ -57,7 +57,7 @@ class InstallTestCase(support.TempdirMan
expected = os.path.normpath(expected)
self.assertEqual(got, expected)
@@ -68,8 +72,9 @@
check_path(cmd.install_lib, libdir)
check_path(cmd.install_platlib, libdir)
check_path(cmd.install_purelib, libdir)
---- Python-2.7.10.orig/Lib/site.py 2015-05-23 18:09:06.000000000 +0200
-+++ Python-2.7.10/Lib/site.py 2015-12-02 19:31:20.058862685 +0100
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/site.py Python-2.7.18/Lib/site.py
+--- Python-2.7.18.org/Lib/site.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/site.py 2021-09-26 12:34:29.851145003 +0200
@@ -288,13 +288,18 @@ def getsitepackages():
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -92,9 +97,10 @@
return sitepackages
def addsitepackages(known_paths):
---- Python-2.7.10.orig/Lib/sysconfig.py 2015-05-23 18:09:07.000000000 +0200
-+++ Python-2.7.10/Lib/sysconfig.py 2015-12-02 19:33:48.483250053 +0100
-@@ -5,22 +5,24 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/sysconfig.py Python-2.7.18/Lib/sysconfig.py
+--- Python-2.7.18.org/Lib/sysconfig.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/sysconfig.py 2021-09-26 12:34:29.851145003 +0200
+@@ -5,22 +5,24 @@ import sys
import os
from os.path import pardir, realpath
@@ -127,7 +133,7 @@
'include': '{base}/include/python',
'platinclude': '{base}/include/python',
'scripts': '{base}/bin',
-@@ -65,10 +67,10 @@
+@@ -65,10 +67,10 @@ _INSTALL_SCHEMES = {
'data' : '{userbase}',
},
'posix_user': {
@@ -142,7 +148,7 @@
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
-@@ -409,7 +411,7 @@
+@@ -414,7 +416,7 @@ def get_config_h_filename():
else:
inc_dir = _PROJECT_BASE
else:
@@ -151,19 +157,16 @@
return os.path.join(inc_dir, 'pyconfig.h')
def get_scheme_names():
---- Python-2.7.10.orig/Lib/test/test_site.py 2015-05-23 18:09:12.000000000 +0200
-+++ Python-2.7.10/Lib/test/test_site.py 2015-12-02 19:31:20.058862685 +0100
-@@ -226,7 +226,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/test_site.py Python-2.7.18/Lib/test/test_site.py
+--- Python-2.7.18.org/Lib/test/test_site.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/test/test_site.py 2021-09-26 12:34:29.851145003 +0200
+@@ -250,21 +250,21 @@ class HelperFunctionsTests(unittest.Test
if sys.platform in ('os2emx', 'riscos'):
self.assertEqual(len(dirs), 1)
- wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
self.assertEqual(dirs[0], wanted)
- elif (sys.platform == "darwin" and
- sysconfig.get_config_var("PYTHONFRAMEWORK")):
-@@ -235,17 +235,17 @@ class HelperFunctionsTests(unittest.Test
- self.assertEqual(dirs[0], wanted)
elif os.sep == '/':
# OS X, Linux, FreeBSD, etc
- self.assertEqual(len(dirs), 2)
@@ -183,10 +186,11 @@
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
self.assertEqual(dirs[1], wanted)
- class PthFile(object):
---- Python-2.7.10.orig/Makefile.pre.in 2015-12-02 19:31:01.322061528 +0100
-+++ Python-2.7.10/Makefile.pre.in 2015-12-02 19:31:20.058862685 +0100
-@@ -87,6 +87,8 @@
+ def test_no_home_directory(self):
+diff -urNp -x '*.orig' Python-2.7.18.org/Makefile.pre.in Python-2.7.18/Makefile.pre.in
+--- Python-2.7.18.org/Makefile.pre.in 2021-09-26 12:34:29.067802877 +0200
++++ Python-2.7.18/Makefile.pre.in 2021-09-26 12:34:29.851145003 +0200
+@@ -91,6 +91,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
@@ -195,7 +199,7 @@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
-@@ -106,7 +108,7 @@
+@@ -110,7 +112,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@@ -204,8 +208,8 @@
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
-@@ -639,7 +641,7 @@
- Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
+@@ -701,7 +703,7 @@ regen-ast:
+ Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
Python/getplatform.o: $(srcdir)/Python/getplatform.c
- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
@@ -213,8 +217,9 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
---- Python-2.7.10.orig/Modules/getpath.c 2015-05-23 18:09:20.000000000 +0200
-+++ Python-2.7.10/Modules/getpath.c 2015-12-02 19:31:20.062196042 +0100
+diff -urNp -x '*.orig' Python-2.7.18.org/Modules/getpath.c Python-2.7.18/Modules/getpath.c
+--- Python-2.7.18.org/Modules/getpath.c 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Modules/getpath.c 2021-09-26 12:34:29.851145003 +0200
@@ -95,6 +95,17 @@
extern "C" {
#endif
@@ -233,7 +238,7 @@
#if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
-@@ -129,7 +141,7 @@
+@@ -108,7 +119,7 @@ static char prefix[MAXPATHLEN+1];
static char exec_prefix[MAXPATHLEN+1];
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL;
@@ -242,9 +247,10 @@
static void
reduce(char *dir)
---- Python-2.7.10.orig/Python/getplatform.c 2015-05-23 18:09:24.000000000 +0200
-+++ Python-2.7.10/Python/getplatform.c 2015-12-02 19:31:20.062196042 +0100
-@@ -10,3 +10,23 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Python/getplatform.c Python-2.7.18/Python/getplatform.c
+--- Python-2.7.18.org/Python/getplatform.c 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Python/getplatform.c 2021-09-26 12:34:29.851145003 +0200
+@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
}
@@ -268,9 +274,10 @@
+{
+ return LIB;
+}
---- Python-2.7.10.orig/Python/sysmodule.c 2015-05-23 18:09:24.000000000 +0200
-+++ Python-2.7.10/Python/sysmodule.c 2015-12-02 19:31:20.062196042 +0100
-@@ -1437,6 +1437,10 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Python/sysmodule.c Python-2.7.18/Python/sysmodule.c
+--- Python-2.7.18.org/Python/sysmodule.c 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Python/sysmodule.c 2021-09-26 12:34:29.851145003 +0200
+@@ -1437,6 +1437,10 @@ _PySys_Init(void)
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
PyString_FromString(Py_GetPlatform()));
@@ -281,9 +288,10 @@
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
---- Python-2.7.10.orig/configure.ac 2015-12-02 19:31:01.322061528 +0100
-+++ Python-2.7.10/configure.ac 2015-12-02 19:31:20.062196042 +0100
-@@ -739,6 +739,44 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/configure.ac Python-2.7.18/configure.ac
+--- Python-2.7.18.org/configure.ac 2021-09-26 12:34:29.067802877 +0200
++++ Python-2.7.18/configure.ac 2021-09-26 12:34:29.851145003 +0200
+@@ -773,6 +773,44 @@ SunOS*)
;;
esac
@@ -328,9 +336,10 @@
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
---- Python-2.7.10.orig/setup.py 2015-12-02 19:31:01.312061456 +0100
-+++ Python-2.7.10/setup.py 2015-12-02 19:31:20.062196042 +0100
-@@ -496,6 +496,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/setup.py Python-2.7.18/setup.py
+--- Python-2.7.18.org/setup.py 2021-09-26 12:34:29.061136136 +0200
++++ Python-2.7.18/setup.py 2021-09-26 12:34:29.851145003 +0200
+@@ -558,6 +558,7 @@ class PyBuildExt(build_ext):
except NameError:
have_unicode = 0
@@ -338,7 +347,7 @@
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
-@@ -507,8 +508,7 @@
+@@ -569,8 +570,7 @@ class PyBuildExt(build_ext):
):
add_dir_to_list(inc_dirs, d)
for d in (
@@ -348,7 +357,7 @@
):
add_dir_to_list(lib_dirs, d)
exts = []
-@@ -762,11 +762,11 @@
+@@ -828,11 +828,11 @@ class PyBuildExt(build_ext):
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@@ -362,7 +371,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1925,8 +1925,8 @@
+@@ -1986,8 +1986,8 @@ class PyBuildExt(build_ext):
added_lib_dirs.append('/usr/openwin/lib')
elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include')
diff --git a/python-pythonpath.patch b/python-pythonpath.patch
index a86255b..7715e66 100644
--- a/python-pythonpath.patch
+++ b/python-pythonpath.patch
@@ -1,6 +1,7 @@
---- Python-2.7.org/Demo/tix/INSTALL.txt 2001-11-11 15:07:37.000000000 +0100
-+++ Python-2.7/Demo/tix/INSTALL.txt 2010-07-05 20:00:03.472866047 +0200
-@@ -71,7 +71,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Demo/tix/INSTALL.txt Python-2.7.18/Demo/tix/INSTALL.txt
+--- Python-2.7.18.org/Demo/tix/INSTALL.txt 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Demo/tix/INSTALL.txt 2021-09-26 12:34:26.157770111 +0200
+@@ -71,7 +71,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_A
You should now have a working Tix implementation in Python. To see if all
is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
Under X windows, do
@@ -9,7 +10,7 @@
If this does not work, you may need to tell python where to find
the Tcl, Tk and Tix library files. This is done by setting the
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ TCL_LIBRARY, TK_LIBRARY and TIX_LIBRARY
env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
TK_LIBRARY=/usr/local/lib/tk8.3 \
TIX_LIBRARY=/usr/local/lib/tix8.1 \
@@ -18,9 +19,10 @@
If you find any bugs or have suggestions for improvement, please report them
---- p/Doc/c-api/init.rst~ 2012-04-10 01:07:28.000000000 +0200
-+++ p/Doc/c-api/init.rst 2012-05-10 17:41:58.815998870 +0200
-@@ -123,7 +123,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/c-api/init.rst Python-2.7.18/Doc/c-api/init.rst
+--- Python-2.7.18.org/Doc/c-api/init.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/c-api/init.rst 2021-09-26 12:34:26.157770111 +0200
+@@ -123,7 +123,7 @@ Process-wide parameters
Return the *prefix* for installed platform-independent files. This is derived
through a number of complicated rules from the program name set with
:c:func:`Py_SetProgramName` and some environment variables; for example, if the
@@ -29,7 +31,7 @@
returned string points into static storage; the caller should not modify its
value. This corresponds to the :makevar:`prefix` variable in the top-level
:file:`Makefile` and the ``--prefix`` argument to the :program:`configure`
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ Process-wide parameters
Return the *exec-prefix* for installed platform-*dependent* files. This is
derived through a number of complicated rules from the program name set with
:c:func:`Py_SetProgramName` and some environment variables; for example, if the
@@ -38,9 +40,10 @@
``'/usr/local'``. The returned string points into static storage; the caller
should not modify its value. This corresponds to the :makevar:`exec_prefix`
variable in the top-level :file:`Makefile` and the ``--exec-prefix``
---- Python-2.7.org/Doc/c-api/intro.rst 2010-06-11 02:23:01.000000000 +0200
-+++ Python-2.7/Doc/c-api/intro.rst 2010-07-05 20:00:03.482863587 +0200
-@@ -541,7 +541,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/c-api/intro.rst Python-2.7.18/Doc/c-api/intro.rst
+--- Python-2.7.18.org/Doc/c-api/intro.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/c-api/intro.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -544,7 +544,7 @@ where the executable named :file:`python
path (the environment variable :envvar:`PATH`).
For instance, if the Python executable is found in
@@ -49,9 +52,10 @@
:file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
the "fallback" location, used when no executable file named :file:`python` is
found along :envvar:`PATH`.) The user can override this behavior by setting the
---- Python-2.7.org/Doc/faq/library.rst 2010-03-12 10:57:43.000000000 +0100
-+++ Python-2.7/Doc/faq/library.rst 2010-07-05 20:00:03.486197135 +0200
-@@ -54,7 +54,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/faq/library.rst Python-2.7.18/Doc/faq/library.rst
+--- Python-2.7.18.org/Doc/faq/library.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/faq/library.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -56,7 +56,7 @@ scriptfile``.
The second can be done in a number of ways. The most straightforward way is to
write ::
@@ -60,7 +64,7 @@
as the very first line of your file, using the pathname for where the Python
interpreter is installed on your platform.
-@@ -650,7 +650,7 @@
+@@ -654,7 +654,7 @@ there existing code that would let me do
Yes. Here's a simple example that uses httplib::
@@ -69,9 +73,10 @@
import httplib, sys, time
---- Python-2.7.org/Doc/install/index.rst 2009-10-28 00:06:10.000000000 +0100
-+++ Python-2.7/Doc/install/index.rst 2010-07-05 20:00:03.506197416 +0200
-@@ -369,12 +369,12 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/install/index.rst Python-2.7.18/Doc/install/index.rst
+--- Python-2.7.18.org/Doc/install/index.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/install/index.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -450,12 +450,12 @@ them to go in :file:`/usr/local/lib/pyth
Another possibility is a network filesystem where the name used to write to a
remote directory is different from the name used to read it: for example, the
@@ -84,11 +89,12 @@
- /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
+ /usr/bin/python setup.py install --prefix=/mnt/@server/export
- In either case, the :option:`--prefix` option defines the installation base, and
- the :option:`--exec-prefix` option defines the platform-specific installation
---- Python-2.7.org/Doc/library/cgi.rst 2009-08-17 21:26:49.000000000 +0200
-+++ Python-2.7/Doc/library/cgi.rst 2010-07-05 20:00:03.509530626 +0200
-@@ -387,7 +387,7 @@
+ In either case, the :option:`!--prefix` option defines the installation base, and
+ the :option:`!--exec-prefix` option defines the platform-specific installation
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/library/cgi.rst Python-2.7.18/Doc/library/cgi.rst
+--- Python-2.7.18.org/Doc/library/cgi.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/library/cgi.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -395,7 +395,7 @@ mode should be ``0755`` octal (use ``chm
first line of the script contains ``#!`` starting in column 1 followed by the
pathname of the Python interpreter, for instance::
@@ -97,9 +103,10 @@
Make sure the Python interpreter exists and is executable by "others".
---- Python-2.7.org/Doc/library/pickle.rst 2009-04-27 17:29:09.000000000 +0200
-+++ Python-2.7/Doc/library/pickle.rst 2010-07-05 20:00:03.512863651 +0200
-@@ -737,7 +737,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/library/pickle.rst Python-2.7.18/Doc/library/pickle.rst
+--- Python-2.7.18.org/Doc/library/pickle.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/library/pickle.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -742,7 +742,7 @@ member are saved. When the instance is u
reading resumes from the last location. The :meth:`__setstate__` and
:meth:`__getstate__` methods are used to implement this behavior. ::
@@ -108,7 +115,7 @@
class TextReader:
"""Print and number lines in a text file."""
-@@ -774,7 +774,7 @@
+@@ -779,7 +779,7 @@ A sample usage might be something like t
>>> import TextReader
>>> obj = TextReader.TextReader("TextReader.py")
>>> obj.readline()
@@ -117,9 +124,10 @@
>>> obj.readline()
'2: '
>>> obj.readline()
---- Python-2.7.org/Doc/tutorial/interpreter.rst 2010-04-10 13:16:59.000000000 +0200
-+++ Python-2.7/Doc/tutorial/interpreter.rst 2010-07-05 20:00:03.516196870 +0200
-@@ -10,7 +10,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Doc/tutorial/interpreter.rst Python-2.7.18/Doc/tutorial/interpreter.rst
+--- Python-2.7.18.org/Doc/tutorial/interpreter.rst 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Doc/tutorial/interpreter.rst 2021-09-26 12:34:26.161103483 +0200
+@@ -10,7 +10,7 @@ Using the Python Interpreter
Invoking the Interpreter
========================
@@ -128,8 +136,9 @@
those machines where it is available; putting :file:`/usr/local/bin` in your
Unix shell's search path makes it possible to start it by typing the command ::
---- Python-2.7.org/Lib/cgi.py 2010-03-17 21:05:11.000000000 +0100
-+++ Python-2.7/Lib/cgi.py 2010-07-05 20:00:03.522865338 +0200
+diff -urNp -x '*.orig' Python-2.7.18.org/Lib/cgi.py Python-2.7.18/Lib/cgi.py
+--- Python-2.7.18.org/Lib/cgi.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Lib/cgi.py 2021-09-26 12:34:26.161103483 +0200
@@ -1,6 +1,6 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
@@ -139,8 +148,9 @@
# intentionally NOT "/usr/bin/env python". On many systems
# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
# scripts, and /usr/local/bin is the default directory where Python is
---- Python-2.7.org/Mac/PythonLauncher/factorySettings.plist 2004-07-16 14:34:23.000000000 +0200
-+++ Python-2.7/Mac/PythonLauncher/factorySettings.plist 2010-07-05 20:00:03.526197587 +0200
+diff -urNp -x '*.orig' Python-2.7.18.org/Mac/PythonLauncher/factorySettings.plist Python-2.7.18/Mac/PythonLauncher/factorySettings.plist
+--- Python-2.7.18.org/Mac/PythonLauncher/factorySettings.plist 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Mac/PythonLauncher/factorySettings.plist 2021-09-26 12:34:26.161103483 +0200
@@ -10,7 +10,7 @@
<false/>
<key>interpreter_list</key>
@@ -172,9 +182,10 @@
<string>/usr/bin/pythonw</string>
<string>/usr/bin/python</string>
<string>/sw/bin/pythonw</string>
---- Python-2.7.org/Misc/HISTORY 2010-03-07 16:23:59.000000000 +0100
-+++ Python-2.7/Misc/HISTORY 2010-07-05 20:00:03.576196805 +0200
-@@ -13236,9 +13236,9 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Misc/HISTORY Python-2.7.18/Misc/HISTORY
+--- Python-2.7.18.org/Misc/HISTORY 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Misc/HISTORY 2021-09-26 12:34:26.161103483 +0200
+@@ -13236,9 +13236,9 @@ but not in sys.argv[0], so you can still
were invoked.
- It is now recommended to use ``#!/usr/bin/env python'' instead of
@@ -186,7 +197,7 @@
never have to be edited when the Python interpreter lives in a
non-standard place. Note that this doesn't work for CGI scripts since
the python executable often doesn't live in the HTTP server's default
-@@ -16523,7 +16523,7 @@
+@@ -16523,7 +16523,7 @@ assign a function object to sys.exitfunc
Python exits or receives a SIGTERM or SIGHUP signal.
The interpreter is now generally assumed to live in
@@ -195,9 +206,10 @@
demo/scripts/fixps.py will update old scripts in place (you can easily
modify it to do other similar changes).
---- Python-2.7.org/README 2010-07-03 15:56:13.000000000 +0200
-+++ Python-2.7/README 2010-07-05 20:00:03.586197142 +0200
-@@ -331,7 +331,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/README Python-2.7.18/README
+--- Python-2.7.18.org/README 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/README 2021-09-26 12:34:26.161103483 +0200
+@@ -376,7 +376,7 @@ Red Hat Linux: Red Hat 9 built Python2.2
1.5.2 on most older Red Hat installations; several key Red Hat tools
require this version. Python 2.1.x may be installed as
/usr/bin/python2. The Makefile installs Python as
@@ -206,8 +218,9 @@
over /usr/bin/python, depending on how you have set up $PATH.
FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or
---- Python-2.7.org/Tools/faqwiz/faqw.py 2010-03-11 23:33:25.000000000 +0100
-+++ Python-2.7/Tools/faqwiz/faqw.py 2010-07-05 20:00:03.589530209 +0200
+diff -urNp -x '*.orig' Python-2.7.18.org/Tools/faqwiz/faqw.py Python-2.7.18/Tools/faqwiz/faqw.py
+--- Python-2.7.18.org/Tools/faqwiz/faqw.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Tools/faqwiz/faqw.py 2021-09-26 12:34:26.161103483 +0200
@@ -10,7 +10,7 @@
# executable.
@@ -217,17 +230,10 @@
# interpreter lives, change the value for FAQDIR to where your FAQ
# lives, and change the value for SRCDIR to where your faqwiz.py
# module lives. The faqconf.py and faqcust.py files live there, too.
---- Python-2.7.org/Tools/pybench/pybench.py 2009-10-09 16:32:19.000000000 +0200
-+++ Python-2.7/Tools/pybench/pybench.py 2010-07-05 20:00:03.592863527 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python -O
-+#!/usr/bin/python -O
-
- """ A Python Benchmark Suite
-
---- Python-2.7.org/Tools/pybench/README 2006-06-13 20:56:56.000000000 +0200
-+++ Python-2.7/Tools/pybench/README 2010-07-05 20:00:03.596196761 +0200
-@@ -141,7 +141,7 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Tools/pybench/README Python-2.7.18/Tools/pybench/README
+--- Python-2.7.18.org/Tools/pybench/README 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Tools/pybench/README 2021-09-26 12:34:26.161103483 +0200
+@@ -141,7 +141,7 @@ Benchmark: 2006-06-12 12:09:25
Processor: x86_64
Python:
@@ -236,9 +242,31 @@
Version: 2.4.2
Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
Bits: 64bit
---- Python-2.7.org/Tools/scripts/fixps.py 2004-08-09 19:27:55.000000000 +0200
-+++ Python-2.7/Tools/scripts/fixps.py 2010-07-05 20:00:03.599292989 +0200
-@@ -15,13 +15,13 @@
+diff -urNp -x '*.orig' Python-2.7.18.org/Tools/pybench/pybench.py Python-2.7.18/Tools/pybench/pybench.py
+--- Python-2.7.18.org/Tools/pybench/pybench.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Tools/pybench/pybench.py 2021-09-26 12:34:26.161103483 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python -O
++#!/usr/bin/python -O
+
+ """ A Python Benchmark Suite
+
+diff -urNp -x '*.orig' Python-2.7.18.org/Tools/scripts/README Python-2.7.18/Tools/scripts/README
+--- Python-2.7.18.org/Tools/scripts/README 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Tools/scripts/README 2021-09-26 12:34:26.161103483 +0200
+@@ -47,7 +47,7 @@ ndiff.py Intelligent diff between text
+ nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
+ objgraph.py Print object graph from nm output on a library
+ parseentities.py Utility for parsing HTML entity definitions
+-pathfix.py Change #!/usr/local/bin/python into something else
++pathfix.py Change #!/usr/bin/python into something else
+ pdeps.py Print dependencies between Python modules
+ pickle2db.py Load a pickle generated by db2pickle.py to a database
+ pindent.py Indent Python code, giving block-closing comments
+diff -urNp -x '*.orig' Python-2.7.18.org/Tools/scripts/fixps.py Python-2.7.18/Tools/scripts/fixps.py
+--- Python-2.7.18.org/Tools/scripts/fixps.py 2020-04-19 23:13:39.000000000 +0200
++++ Python-2.7.18/Tools/scripts/fixps.py 2021-09-26 12:34:26.161103483 +0200
+@@ -15,13 +15,13 @@ def main():
print filename, ': can\'t open :', msg
continue
line = f.readline()
@@ -255,14 +283,3 @@
'/usr/bin/env python', line)
print filename, ':', repr(line)
f = open(filename, "w")
---- Python-2.7.org/Tools/scripts/README 2010-02-24 18:06:31.000000000 +0100
-+++ Python-2.7/Tools/scripts/README 2010-07-05 20:00:03.602863895 +0200
-@@ -47,7 +47,7 @@
- nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
- objgraph.py Print object graph from nm output on a library
- parseentities.py Utility for parsing HTML entity definitions
--pathfix.py Change #!/usr/local/bin/python into something else
-+pathfix.py Change #!/usr/bin/python into something else
- pdeps.py Print dependencies between Python modules
- pickle2db.py Load a pickle generated by db2pickle.py to a database
- pindent.py Indent Python code, giving block-closing comments
diff --git a/python-verbose.patch b/python-verbose.patch
index 774c6e8..f5a1cc1 100644
--- a/python-verbose.patch
+++ b/python-verbose.patch
@@ -1,11 +1,12 @@
---- Python-2.7.4/Makefile.pre.in~ 2013-04-23 18:32:25.000000000 +0200
-+++ Python-2.7.4/Makefile.pre.in 2013-04-23 18:34:24.626857195 +0200
-@@ -450,7 +450,7 @@
- sharedmods: $(BUILDPYTHON)
+diff -urNp -x '*.orig' Python-2.7.18.org/Makefile.pre.in Python-2.7.18/Makefile.pre.in
+--- Python-2.7.18.org/Makefile.pre.in 2021-09-26 12:34:30.887823291 +0200
++++ Python-2.7.18/Makefile.pre.in 2021-09-26 12:34:31.717832579 +0200
+@@ -523,7 +523,7 @@ Modules/_math.o: Modules/_math.c Modules
+ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
@case "$$MAKEFLAGS" in \
*\ -s*|s*) quiet="-q";; \
- *) quiet="";; \
+ *) quiet="-vvv";; \
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/4d51998b6434f919fd8dea21280d11f82a8bea00
More information about the pld-cvs-commit
mailing list