Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 devel/python/BUILD   |   12 +++++++++++-
 devel/python/DETAILS |    4 ++--
 devel/python/HISTORY |    8 ++++----
 devel/python/INSTALL |    7 +------
 4 files changed, 18 insertions(+), 13 deletions(-)

New commits:
commit 598a88076dbd69bf5ac48b292d8c7d87d90a9c14
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    python: => 2.7.18 [security]

commit 83ee2673252f4e268fe02e7f98c5261f0ecba5de
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "python - fix install"
    
    This reverts commit 9e344e03b790bd34ae59134617d5c29539e62917.
    
    Reason: staging was enabled again in a later commit.
    
    Conflicts:
        devel/python/HISTORY

diff --git a/devel/python/BUILD b/devel/python/BUILD
index a156a3a..ab8bcd5 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -9,4 +9,14 @@ if [[ -f 
$INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then
     "$SOURCE_DIRECTORY/spell-tmp"
 fi &&
 
-default_build
+default_build &&
+
+# python -c 'print "(c)", "lynx"*3'
+# can only have one primary python, the others must be alt
+if [[ $PY2K == y ]]; then
+  make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+  make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+fi &&
+
+message "${MESSAGE_COLOR}Fake stage complete, installing to real 
path...${DEFAULT_COLOR}"
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index f4f7de8..38e0166 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,6 @@
            SPELL=python
-         VERSION=2.7.17
-  SECURITY_PATCH=7
+         VERSION=2.7.18
+  SECURITY_PATCH=8
           SOURCE=Python-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 3637e8d..6f6e4cd 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2020-04-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.7.18; SECURITY_PATCH++ (CVE-2019-18348)
+       * INSTALL: correct path check and fix linking
+
 2019-10-21 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.7.17
 
@@ -10,10 +14,6 @@
 2018-10-05 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: enabled staging (actually helps in tracking symlinks)
 
-2018-09-27 Treeve Jelbert <treeve AT sourcemage.org>
-       * BUILD INSTALL: remove fake install
-         not needed if staging is disabled, also fixes segfault during 
install
-
 2018-04-30 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.7.15, SECURITY_PATCH++,
          (CVE-2018-1060, CVE-2018-1061, CVE-2017-9233, CVE-2016-9063,
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index d5b4166..d323281 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,9 +1,4 @@
-# can only have one primary python, the others must be alt
-if [[ $PY2K == y ]]; then
-  make install DESTDIR="$INSTALL_ROOT"
-else
-  make altinstall DESTDIR="$INSTALL_ROOT"
-fi &&
+cp -dRv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
 
 if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
   cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"