Release version 2.7.18.6

ucodery · ucodery · commit 4e6719fb9422 · 2022-12-21T16:53:17.000-08:00
diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst
@@ -53,7 +53,7 @@ standard.  However, mailcap files are supported on most Unix systems.
    external condition (such as the machine architecture, or the window system in
    use) to determine whether or not the mailcap line applies.  :func:`findmatch`
    will automatically check such conditions and skip the entry if the check fails.
-   
+
    .. versionchanged:: 2.7.18.6
 
       To prevent security issues with shell metacharacters (symbols that have
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
@@ -1,3 +1,7 @@
+.. 
+   Copyright (C) 2022 ActiveState Software Inc.
+   stdtypes.rst is licensed under the PSFLv2 License.
+   See the file LICENSE for details.
 .. XXX: reference/datamodel and this have quite a few overlaps!
 
 
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
@@ -1,3 +1,8 @@
+..
+   Copyright (C) 2022 ActiveState Software Inc.
+   2.7.rst is licensed under the PSFLv2 License.
+   See the file LICENSE for details.
+
 ****************************
   What's New in Python 2.7
 ****************************
diff --git a/Include/longobject.h b/Include/longobject.h
@@ -153,7 +153,7 @@ PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj,
 # error "_PY_LONG_DEFAULT_MAX_STR_DIGITS smaller than threshold."
 #endif
 
-int Py_LongMaxStrDigits;
+extern int Py_LongMaxStrDigits;
 
 #ifdef __cplusplus
 }
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -27,7 +27,7 @@
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"2.7.18.5"
+#define PY_VERSION      	"2.7.18.6"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 ActiveState Software Inc.
+# test_int.py is licensed under the PSFLv2 License.
+# See the file LICENSE for details.
 import sys
 
 import unittest
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 ActiveState Software Inc.
+# test_long.py is licensed under the PSFLv2 License.
+# See the file LICENSE for details.
 import unittest
 import sys
 
diff --git a/Misc/NEWS.d/2.7.18.6.rst b/Misc/NEWS.d/2.7.18.6.rst
@@ -2,6 +2,25 @@
 .. date: 2022-11-16
 .. nonce: as$i9+
 .. release date: 2022-11-16
-.. section: Library
+.. original section: Library
+.. section: Security
 
 Address CVE-2021-3733 in urllib2
+
+.. bpo: 0
+.. date: 2022-11-16
+.. nonce: as$i9+
+.. release date: 2022-11-16
+.. original section: Core and Builtins
+.. section: Security
+
+Address CVE-2020-10735 for long objects
+
+.. bpo: 0
+.. date: 2022-11-16
+.. nonce: as$i9+
+.. release date: 2022-11-16
+.. original section: Library
+.. section: Security
+
+Address CVE-2015-20107 in mailcap
diff --git a/Modules/main.c b/Modules/main.c
@@ -1,3 +1,7 @@
+/* Copyright (C) 2022 ActiveState Software Inc.
+ * main.c is licensed under the PSFLv2 License.
+ * See the file LICENSE for details.
+ */
 /* Python interpreter main program */
 
 #include "Python.h"
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -1,3 +1,7 @@
+/* Copyright (C) 2022 ActiveState Software Inc.
+ * longobject.c is licensed under the PSFLv2 License.
+ * See the file LICENSE for details.
+ */
 /* Long (arbitrary precision) integer object implementation */
 
 /* XXX The functional organization of this file is terrible */
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1,4 +1,7 @@
-
+/* Copyright (C) 2022 ActiveState Software Inc.
+ * pythonrun.c is licensed under the PSFLv2 License.
+ * See the file LICENSE for details.
+ */
 /* Python interpreter top-level routines, including init/exit */
 
 #include "Python.h"
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1,4 +1,7 @@
-
+/* Copyright (C) 2022 ActiveState Software Inc.
+ * sysmodule.c is licensed under the PSFLv2 License.
+ * See the file LICENSE for details.
+ */
 /* System module */
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ PyAPI_FUNC(PyObject ) _PyLong_FormatAdvanced(PyObject obj,`
`153`	`153`	`# error "_PY_LONG_DEFAULT_MAX_STR_DIGITS smaller than threshold."`
`154`	`154`	`#endif`
`155`	`155`
`156`		`-int Py_LongMaxStrDigits;`
	`156`	`+extern int Py_LongMaxStrDigits;`
`157`	`157`
`158`	`158`	`#ifdef __cplusplus`
`159`	`159`	`}`