Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/python3/DETAILS                |    2 +-
 devel/python3/HISTORY                |    5 +++++
 devel/python3/PRE_BUILD              |    1 +
 devel/python3/patches/makefile.patch |   21 +++++++++++++++++++++
 devel/python3/patches/pystate.patch  |   14 ++++++++++++++
 5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 98e7a662e8e2eb4b4f163d537e335ae7f197fd67
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/python3: SECURITY_PATCH++ for 3.7.1/3.6.7

commit 1e0365eea060f41a245d07fb79abdc1f9de53894
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/python3: fixed building of some tests

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 469e8f0..26bf836 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -4,7 +4,7 @@ if [[ "${PYTHON3_BRANCH}" == "devel" ]]; then
 else
          VERSION=3.6.7
 fi
-  SECURITY_PATCH=6
+  SECURITY_PATCH=7
           SOURCE=Python-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index f1a9025..e46cf04 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2018-10-22 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++, (CVE-2018-14647)
+       * PRE_BUILD, patches{makefile.patch,pystate.patch}: added patches
+         to fix building of tests
+
 2018-10-21 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: versions 3.7.1/3.6.7
 
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
index dce9f62..10db567 100755
--- a/devel/python3/PRE_BUILD
+++ b/devel/python3/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build      &&
 cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
 if is_depends_enabled ${SPELL} gcc && ! is_version_less $(installed_version 
gcc) 4.9; then
   # Forcing GCC's builtin atomics
   sed -i 's;defined(HAVE_STD_ATOMIC);!&;' Include/pyatomic.h
diff --git a/devel/python3/patches/makefile.patch 
b/devel/python3/patches/makefile.patch
new file mode 100644
index 0000000..75d8928
--- /dev/null
+++ b/devel/python3/patches/makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -708,7 +708,7 @@
+       fi
+ 
+ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) 
$(PY3LIBRARY)
+-      $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o 
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++      $(CC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o 
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ ############################################################################
+ # Importlib
+@@ -767,7 +767,7 @@
+       $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c
+ 
+ Programs/_testembed.o: $(srcdir)/Programs/_testembed.c
+-      $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
++      $(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
+ 
+ Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h 
$(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h
+ 
diff --git a/devel/python3/patches/pystate.patch 
b/devel/python3/patches/pystate.patch
new file mode 100644
index 0000000..da28050
--- /dev/null
+++ b/devel/python3/patches/pystate.patch
@@ -0,0 +1,14 @@
+diff --git a/Include/pystate.h b/Include/pystate.h
+--- a/Include/pystate.h
++++ b/Include/pystate.h
+@@ -81,9 +81,9 @@
+         .install_signal_handlers = -1, \
+         .ignore_environment = -1, \
+         .use_hash_seed = -1, \
+-        .coerce_c_locale = -1, \
+         .faulthandler = -1, \
+         .tracemalloc = -1, \
++        .coerce_c_locale = -1, \
+         .utf8_mode = -1, \
+         .argc = -1, \
+         .nmodule_search_path = -1}